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, 16 insertions, 8 deletions

diff --git a/tests/functional/common/provisioning/test_storage_class_cases.py b/tests/functional/common/provisioning/test_storage_class_cases.py
index 7e318eb0..52ac761a 100644
--- a/tests/functional/common/provisioning/test_storage_class_cases.py
+++ b/tests/functional/common/provisioning/test_storage_class_cases.py
@@ -34,12 +34,16 @@ class TestStorageClassCases(cns_baseclass.CnsBaseClass):
             parameter (dict): dictionary with storage class parameters
         """
         if vol_type == "glusterfile":
-            sc = self.cns_storage_class['storage_class1']
-            secret = self.cns_secret['secret1']
+            sc = self.cns_storage_class.get(
+                'storage_class1',
+                self.cns_storage_class.get('file_storage_class'))
+
             # Create secret file for usage in storage class
             self.secret_name = oc_create_secret(
-                self.ocp_master_node[0], namespace=secret['namespace'],
-                data_key=self.heketi_cli_key, secret_type=secret['type'])
+                self.ocp_master_node[0],
+                namespace=sc.get('secretnamespace', 'default'),
+                data_key=self.heketi_cli_key,
+                secret_type=sc.get('provisioner', 'kubernetes.io/glusterfs'))
             self.addCleanup(
                 oc_delete, self.ocp_master_node[0], 'secret', self.secret_name)
             sc_parameter = {
@@ -48,12 +52,16 @@ class TestStorageClassCases(cns_baseclass.CnsBaseClass):
                 "volumetype": "replicate:3"
             }
         elif vol_type == "glusterblock":
-            sc = self.cns_storage_class['storage_class2']
-            secret = self.cns_secret['secret2']
+            sc = self.cns_storage_class.get(
+                'storage_class2',
+                self.cns_storage_class.get('block_storage_class'))
+
             # Create secret file for usage in storage class
             self.secret_name = oc_create_secret(
-                self.ocp_master_node[0], namespace=secret['namespace'],
-                data_key=self.heketi_cli_key, secret_type=secret['type'])
+                self.ocp_master_node[0],
+                namespace=sc.get('restsecretnamespace', 'default'),
+                data_key=self.heketi_cli_key,
+                secret_type=sc.get('provisioner', 'gluster.org/glusterblock'))
             self.addCleanup(
                 oc_delete, self.ocp_master_node[0], 'secret', self.secret_name)
             sc_parameter = {