Fix picking up of the heketi service

Doing 2 following things:
- Add 'heketi_service_name' config option to define the name of
  Heketi service in OCP. Without it we use hardcoded name 'heketi'
  which can be different on different setups.
- Add switching to the CNS project for CNS tests.

Change-Id: Iad308db7a1d63fc64ddd3f5b99823917b99c0706

4 files changed, 25 insertions, 8 deletions

diff --git a/cns-libs/cnslibs/cns/cns_baseclass.py b/cns-libs/cnslibs/cns/cns_baseclass.py
index a6edfdd0..6f8cb4b9 100644
--- a/cns-libs/cnslibs/cns/cns_baseclass.py
+++ b/cns-libs/cnslibs/cns/cns_baseclass.py
@@ -65,6 +65,7 @@ class CnsBaseClass(unittest.TestCase):
 
         # Initializes heketi config variables
         heketi_config = g.config['cns']['heketi_config']
+        cls.heketi_service_name = heketi_config['heketi_service_name']
         cls.heketi_client_node = heketi_config['heketi_client_node']
         cls.heketi_server_url = heketi_config['heketi_server_url']
         cls.heketi_cli_user = heketi_config['heketi_cli_user']
@@ -113,6 +114,13 @@ class CnsBaseClass(unittest.TestCase):
                                      cmd, cls.ocp_master_node[0], out, err))
         cls.secret_data_key = out.strip()
 
+        cmd = 'oc project %s' % cls.cns_project_name
+        ret, out, err = g.run(cls.ocp_client[0], cmd, "root")
+        if ret != 0:
+            raise ExecutionError("failed to execute cmd %s on %s out: "
+                                 "%s err: %s" % (
+                                     cmd, cls.ocp_client[0], out, err))
+
         if 'glustotest_run_id' not in g.config:
             g.config['glustotest_run_id'] = (
                 datetime.datetime.now().strftime('%H_%M_%d_%m_%Y'))
diff --git a/tests/cns_tests_sample_config.yml b/tests/cns_tests_sample_config.yml
index b77be3fa..0f031df6 100644
--- a/tests/cns_tests_sample_config.yml
+++ b/tests/cns_tests_sample_config.yml
@@ -72,6 +72,7 @@ cns:
     trusted_storage_pool_list:
         - [gluster_server1, gluster_server2]
     heketi_config:
+        heketi_service_name: "fake-name-of-heketi-service"
         heketi_client_node:
         heketi_server_url: "http://heketi-storage-project.cloudapps.mystorage.com"
         heketi_cli_user: "admin"
diff --git a/tests/functional/common/provisioning/test_dynamic_provisioning_block_p0_cases.py b/tests/functional/common/provisioning/test_dynamic_provisioning_block_p0_cases.py
index a7f98c7b..8db0b01d 100644
--- a/tests/functional/common/provisioning/test_dynamic_provisioning_block_p0_cases.py
+++ b/tests/functional/common/provisioning/test_dynamic_provisioning_block_p0_cases.py
@@ -29,7 +29,8 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass):
         g.log.info("test_dynamic_provisioning_glusterblock")
         storage_class = self.cns_storage_class['storage_class2']
         secret = self.cns_secret['secret2']
-        cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP"
+        cmd = ("oc get svc %s "
+               "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name)
         ret, out, err = g.run(self.ocp_master_node[0], cmd, "root")
         self.assertEqual(ret, 0, "failed to execute command %s on %s" % (
                              cmd, self.ocp_master_node[0]))
@@ -139,7 +140,8 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass):
         g.log.info("test_dynamic_provisioning_glusterblock_Heketipod_Failure")
         storage_class = self.cns_storage_class['storage_class2']
         secret = self.cns_secret['secret2']
-        cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP"
+        cmd = ("oc get svc %s "
+               "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name)
         ret, out, err = g.run(self.ocp_master_node[0], cmd, "root")
         self.assertEqual(ret, 0, "failed to execute command %s on %s" % (
                              cmd, self.ocp_master_node[0]))
@@ -234,7 +236,8 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass):
                              cmd, self.ocp_master_node[0]))
         ret = verify_pod_status_running(self.ocp_master_node[0], "heketi")
         self.assertTrue(ret, "verify heketi pod status as running failed")
-        cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP"
+        cmd = ("oc get svc %s "
+               "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name)
         ret, out, err = g.run(self.ocp_master_node[0], cmd, "root")
         self.assertEqual(ret, 0, "failed to execute command %s on %s" % (
                              cmd, self.ocp_master_node[0]))
@@ -294,7 +297,8 @@ class TestDynamicProvisioningBlockP0(CnsGlusterBlockBaseClass):
         g.log.info("test_dynamic_provisioning_glusterblock_Glusterpod_Failure")
         storage_class = self.cns_storage_class['storage_class2']
         secret = self.cns_secret['secret2']
-        cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP"
+        cmd = ("oc get svc %s "
+               "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name)
         ret, out, err = g.run(self.ocp_master_node[0], cmd, "root")
         self.assertEqual(ret, 0, "failed to execute command %s on %s" % (
                              cmd, self.ocp_master_node[0]))
diff --git a/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py b/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py
index 6fa8301b..734cc8a5 100644
--- a/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py
+++ b/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py
@@ -31,7 +31,8 @@ class TestDynamicProvisioningP0(CnsBaseClass):
         secret = self.cns_secret['secret1']
         sc_name = storage_class['name']
         pvc_name1 = "mongodb1"
-        cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP"
+        cmd = ("oc get svc %s "
+               "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name)
         ret, out, err = g.run(self.ocp_master_node[0], cmd, "root")
         self.assertEqual(ret, 0, "failed to execute command %s on %s" % (
                              cmd, self.ocp_master_node[0]))
@@ -111,7 +112,8 @@ class TestDynamicProvisioningP0(CnsBaseClass):
         secret = self.cns_secret['secret1']
         sc_name = storage_class['name']
         pvc_name2 = "mongodb2"
-        cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP"
+        cmd = ("oc get svc %s "
+               "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name)
         ret, out, err = g.run(self.ocp_master_node[0], cmd, "root")
         self.assertEqual(ret, 0, "failed to execute command %s on %s" % (
                              cmd, self.ocp_master_node[0]))
@@ -189,7 +191,8 @@ class TestDynamicProvisioningP0(CnsBaseClass):
                          cmd, self.ocp_master_node[0]))
         ret = verify_pod_status_running(self.ocp_master_node[0], "heketi")
         self.assertTrue(ret, "verify heketi pod status as running failed")
-        cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP"
+        cmd = ("oc get svc %s "
+               "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name)
         ret, out, err = g.run(self.ocp_master_node[0], cmd, "root")
         self.assertEqual(ret, 0, "failed to execute command %s on %s" % (
                              cmd, self.ocp_master_node[0]))
@@ -251,7 +254,8 @@ class TestDynamicProvisioningP0(CnsBaseClass):
         secret = self.cns_secret['secret1']
         sc_name = storage_class['name']
         pvc_name4 = "mongodb4"
-        cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP"
+        cmd = ("oc get svc %s "
+               "-o=custom-columns=:.spec.clusterIP" % self.heketi_service_name)
         ret, out, err = g.run(self.ocp_master_node[0], cmd, "root")
         self.assertEqual(ret, 0, "failed to execute command %s on %s" % (
                              cmd, self.ocp_master_node[0]))