diff options
author | kshithijiyer <kshithij.ki@gmail.com> | 2020-01-06 18:44:50 +0530 |
---|---|---|
committer | Bala Konda Reddy M <bmekala@redhat.com> | 2020-01-16 11:32:02 +0000 |
commit | 78907f61c7dca0b7981e179693fd7acf54b6c821 (patch) | |
tree | 47a72a7a8a8f06c9fb0dd7cf97e8b7b5ca379fea | |
parent | 1e921e09543b15b80d1cce0d83933f2c10a6acd2 (diff) |
[lib] Adding geo-rep params in gluster_base_class.py
Adding params in gluster_base_class.py to store value
of root user's password and non-root user's name, group
and password. sync_method will be mentioned inside the
testcase as there are testcases which are only specific
to one of the sync type and it doesn't make sense to add
it in the config file. Instead we'll write testcase as shown
below:
```
class georeptestcase(baseclass):
run_chmod_with_changelog_crawl(sync_type):
# Steps of the testcase
test_chmod_with_changelog_crawl_rsync():
# Calling function with rsync as sync_type.
run_chmod_with_changelog_crawl('rsync')
test_chmod_with_changelog_crawl_tarssh():
# Calling function with tarssh as sync_type.
run_chmod_with_changelog_crawl('tarssh')
```
Change-Id: Ie65f542e76bfbee89ac2914bdcd086e1bd08dfdb
Signed-off-by: kshithijiyer <kshithij.ki@gmail.com>
-rw-r--r-- | glustolibs-gluster/glustolibs/gluster/gluster_base_class.py | 11 | ||||
-rw-r--r-- | tests/gluster_basic_georep_config.yml | 11 | ||||
-rw-r--r-- | tests/gluster_tests_config.yml | 21 |
3 files changed, 34 insertions, 9 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py index a8b737f04..87ab97008 100644 --- a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py +++ b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py @@ -553,6 +553,17 @@ class GlusterBaseClass(TestCase): cls.num_of_nfs_ganesha_nodes = None cls.vips = [] + # Geo-rep Cluster information + try: + cls.geo_rep_info = (g.config['gluster']['geo_rep'] + ['cluster_config']) + except KeyError: + cls.geo_rep_info = {} + cls.geo_rep_info['root']['password'] = '' + cls.geo_rep_info['user']['name'] = '' + cls.geo_rep_info['user']['password'] = '' + cls.geo_rep_info['user']['group'] = '' + # Defining default volume_types configuration. cls.default_volume_type_config = { 'replicated': { diff --git a/tests/gluster_basic_georep_config.yml b/tests/gluster_basic_georep_config.yml index 644e743d3..6087f28f2 100644 --- a/tests/gluster_basic_georep_config.yml +++ b/tests/gluster_basic_georep_config.yml @@ -108,3 +108,14 @@ clients_info: host: client-vm1 client-vm2: &client2 host: client-vm2 + +# This section defines the details about geo-rep clusters to be created. +# Define this section for setting up geo-rep clusters. +cluster_config: + geo_rep: + root: + password: 'foobar' + user: + name: 'geoaccount' + group: 'geogroup' + password: 'non-root foobar' diff --git a/tests/gluster_tests_config.yml b/tests/gluster_tests_config.yml index 459cc7d53..3684080f2 100644 --- a/tests/gluster_tests_config.yml +++ b/tests/gluster_tests_config.yml @@ -128,9 +128,9 @@ gluster: # Defaults: [] files: [] - # This section defines the details about 'nfs-ganesha' or 'samba' clusters - # to be created. Define this section for setting up nfs-ganesha or - # samba clusters. + # This section defines the details about 'nfs-ganesha' or 'samba' + # or 'geo-rep' clusters to be created. Define this section for + # setting up nfs-ganesha or samba or geo-rep clusters. cluster_config: smb: enable: False @@ -160,6 +160,14 @@ gluster: num_of_nfs_ganesha_nodes: 4 vips: [] + geo_rep: + root: + password: 'foobar' + user: + name: 'geoaccount' + group: 'geogroup' + password: 'non-root foobar' + # 'volume_types' defines different volume types that we can create in # gluster and we have default values assigned to each of the volume # type to run the tests. This can be modified based on the @@ -330,12 +338,7 @@ gluster: enable: False nfs_ganesha: enable: False - geo_rep: - create_geo_rep_session: False - slave_volumes: [ *slave_vol1 ] - user: 'root' - group: 'geogroup' - sync_mode: 'rsync' + # 'mounts' is list of all mount points info.Each item in the list is the # details about the mountpoint. i.e 'protocol', 'server', 'volname', |