Refactor config options

Doing following:
- Rename top-level config option group called 'cns' to the 'openshift'.
- Rename 'cns.setup.cns_project_name' option to the
  'openshift.storage_project_name'.
- Rename 'scale' option to the 'openshift.scale'.
- Delete ''devices' and 'zone' options from 'gluster_servers' config
  group.
- Delete 'cns.setup.cnd_username' option as unneeded.
- Delete 'cns.setup.cnd_password' option as unneeded.
- Delete 'oc_login' common function as unneeded after deletion of
  'cns.setup.cnd_username' and 'cns.setup.cnd_password' options.
- Remove 'Cns' word from base classes.
- Keep backwards compatibility for old options to make transition be
  smooth.

Change-Id: I04ddbbad5f64ffeac79a6744480d33a263d63001

1 files changed, 8 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 82511900..db80b6a4 100644
--- a/tests/functional/common/gluster_stability/test_gluster_services_restart.py
+++ b/tests/functional/common/gluster_stability/test_gluster_services_restart.py
@@ -34,7 +34,7 @@ from cnslibs.common.gluster_ops import (
     restart_brick_process,
     wait_to_heal_complete
 )
-from cnslibs.cns.cns_baseclass import CnsBaseClass
+from cnslibs.cns.cns_baseclass import BaseClass
 from cnslibs.common import podcmd
 
 HEKETI_BLOCK_VOLUME_REGEX = "^Id:(.*).Cluster:(.*).Name:%s_(.*)$"
@@ -45,7 +45,7 @@ SERVICE_TCMU = "tcmu-runner"
 
 
 @ddt.ddt
-class GlusterStabilityTestSetup(CnsBaseClass):
+class GlusterStabilityTestSetup(BaseClass):
     """class for gluster stability (restarts different servces) testcases
        TC No's: CNS-1393, CNS-1394, CNS-1395
     """
@@ -62,13 +62,13 @@ 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.get(
+        _storage_class = self.storage_classes.get(
             'storage_class2',
-            self.cns_storage_class.get('block_storage_class'))
-        self.provisioner = _cns_storage_class["provisioner"]
-        self.restsecretnamespace = _cns_storage_class["restsecretnamespace"]
-        self.restuser = _cns_storage_class["restuser"]
-        self.resturl = _cns_storage_class["resturl"]
+            self.storage_classes.get('block_storage_class'))
+        self.provisioner = _storage_class["provisioner"]
+        self.restsecretnamespace = _storage_class["restsecretnamespace"]
+        self.restuser = _storage_class["restuser"]
+        self.resturl = _storage_class["resturl"]
 
         # using pvc size count as 1 by default
         self.pvcsize = 1