Cleanup and improve configuration

Our config file has dead options as well as unintuitive option names.

So, do following improvements:
- Delete unused config options from config file example.
- Delete setting of dead config options to the base class.
- Rename 'storage_class1' and 'storage_class2' config option groups to
  the 'file_storage_class' and 'block_storage_class' respectively to
  make it more understandable.
- Remove 'secrets' config option group as redundant. Secret names get
  calculated from custom prefix and randomly generated string.
  Namespace is used the same as for storage classes.
  And its 'type' was always storage class's provisioner value.

Change-Id: Ifa6d0ab430e8d69591f49bc7bf4c258151662550

1 files changed, 5 insertions, 8 deletions

diff --git a/tests/functional/common/gluster_stability/test_gluster_services_restart.py b/tests/functional/common/gluster_stability/test_gluster_services_restart.py
index 2cc09099..0a5d4e5e 100644
--- a/tests/functional/common/gluster_stability/test_gluster_services_restart.py
+++ b/tests/functional/common/gluster_stability/test_gluster_services_restart.py
@@ -51,17 +51,14 @@ class GlusterStabilityTestSetup(CnsBaseClass):
         # which uses time and date of test case
         self.prefix = "autotest-%s" % (self.glustotest_run_id.replace("_", ""))
 
-        _cns_storage_class = self.cns_storage_class['storage_class2']
+        _cns_storage_class = self.cns_storage_class.get(
+            'storage_class2',
+            self.cns_storage_class.get('block_storage_class'))
         self.provisioner = _cns_storage_class["provisioner"]
-        self.restsecretname = _cns_storage_class["restsecretname"]
         self.restsecretnamespace = _cns_storage_class["restsecretnamespace"]
         self.restuser = _cns_storage_class["restuser"]
         self.resturl = _cns_storage_class["resturl"]
 
-        _cns_secret = self.cns_secret['secret2']
-        self.secretnamespace = _cns_secret['namespace']
-        self.secrettype = _cns_secret['type']
-
         # using pvc size count as 1 by default
         self.pvcsize = 1
 
@@ -112,8 +109,8 @@ class GlusterStabilityTestSetup(CnsBaseClass):
             secretname (str): created secret file name
         """
         secretname = oc_create_secret(
-            self.oc_node, namespace=self.secretnamespace,
-            data_key=self.heketi_cli_key, secret_type=self.secrettype)
+            self.oc_node, namespace=self.restsecretnamespace,
+            data_key=self.heketi_cli_key, secret_type=self.provisioner)
         self.addCleanup(oc_delete, self.oc_node, 'secret', secretname)
 
         sc_name = oc_create_sc(