diff options
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/common/provisioning/test_dynamic_provisioning_block_p0_cases.py | 12 | ||||
| -rw-r--r-- | tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py | 12 |
2 files changed, 16 insertions, 8 deletions
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])) |