From 78907f61c7dca0b7981e179693fd7acf54b6c821 Mon Sep 17 00:00:00 2001
From: kshithijiyer <kshithij.ki@gmail.com>
Date: Mon, 6 Jan 2020 18:44:50 +0530
Subject: [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>
---
 tests/gluster_basic_georep_config.yml | 11 +++++++++++
 tests/gluster_tests_config.yml        | 21 ++++++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'tests')

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',
-- 
cgit