diff options
| -rw-r--r-- | tests/functional/common/provisioning/test_dynamic_provisioning_block_p0_cases.py | 20 | ||||
| -rw-r--r-- | tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py | 20 |
2 files changed, 16 insertions, 24 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 6b126be3..a7f98c7b 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,12 +29,11 @@ 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 | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP" 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])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl_block = "http://%s:8080" % heketi_cluster_ip if not export_heketi_cli_server( self.heketi_client_node, @@ -140,12 +139,11 @@ 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 | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP" 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])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl_block = "http://%s:8080" % heketi_cluster_ip if not export_heketi_cli_server( self.heketi_client_node, @@ -236,12 +234,11 @@ 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 | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP" 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])) - heketi_cluster_new_ip = out.strip().split("\n")[0] + heketi_cluster_new_ip = out.lstrip().strip() if heketi_cluster_new_ip != heketi_cluster_ip: oc_delete(self.ocp_master_node[0], 'sc', sc_name) resturl_block = "http://%s:8080" % heketi_cluster_new_ip @@ -297,12 +294,11 @@ 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 | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP" 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])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl_block = "http://%s:8080" % heketi_cluster_ip if not export_heketi_cli_server( self.heketi_client_node, 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 d7d43049..6fa8301b 100644 --- a/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py +++ b/tests/functional/common/provisioning/test_dynamic_provisioning_p0_cases.py @@ -31,12 +31,11 @@ class TestDynamicProvisioningP0(CnsBaseClass): secret = self.cns_secret['secret1'] sc_name = storage_class['name'] pvc_name1 = "mongodb1" - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP" 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])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl = "http://%s:8080" % heketi_cluster_ip ret = create_storage_class_file( self.ocp_master_node[0], @@ -112,12 +111,11 @@ class TestDynamicProvisioningP0(CnsBaseClass): secret = self.cns_secret['secret1'] sc_name = storage_class['name'] pvc_name2 = "mongodb2" - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP" 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])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl = "http://%s:8080" % heketi_cluster_ip ret = create_storage_class_file( self.ocp_master_node[0], @@ -191,12 +189,11 @@ 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 | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP" 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])) - heketi_cluster_new_ip = out.strip().split("\n")[0] + heketi_cluster_new_ip = out.lstrip().strip() if heketi_cluster_new_ip != heketi_cluster_ip: oc_delete(self.ocp_master_node[0], 'sc', sc_name) resturl = "http://%s:8080" % heketi_cluster_ip @@ -254,12 +251,11 @@ class TestDynamicProvisioningP0(CnsBaseClass): secret = self.cns_secret['secret1'] sc_name = storage_class['name'] pvc_name4 = "mongodb4" - cmd = ("oc get svc | grep heketi | grep -v endpoints " - "| awk '{print $2}'") + cmd = "oc get svc heketi -o=custom-columns=:.spec.clusterIP" 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])) - heketi_cluster_ip = out.strip().split("\n")[0] + heketi_cluster_ip = out.lstrip().strip() resturl = "http://%s:8080" % heketi_cluster_ip ret = create_storage_class_file( self.ocp_master_node[0], |