From aed2e7e9543969c604a61af020c8a5fbaf38cd04 Mon Sep 17 00:00:00 2001 From: vamahaja Date: Tue, 16 Jul 2019 12:04:19 +0530 Subject: Workaround BZ-1727360 in the "get_gluster_pod_names_by_pvc_name" func "get_gluster_pod_names_by_pvc_name" function depends on the ocp3.11 specific shell command, which fails on old OCP versions. So, fix it by getting info in compatible way. Also, update usages of this function with new return data structure. Change-Id: Ibb8559590a1288c032630b3292f631d28bc87263 Signed-off-by: vamahaja --- tests/functional/provisioning/test_dynamic_provisioning_block.py | 2 +- tests/functional/provisioning/test_dynamic_provisioning_file.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/functional/provisioning') diff --git a/tests/functional/provisioning/test_dynamic_provisioning_block.py b/tests/functional/provisioning/test_dynamic_provisioning_block.py index ae7198db..0a587973 100644 --- a/tests/functional/provisioning/test_dynamic_provisioning_block.py +++ b/tests/functional/provisioning/test_dynamic_provisioning_block.py @@ -176,7 +176,7 @@ class TestDynamicProvisioningBlockP0(GlusterBlockBaseClass): oc_delete(self.node, 'pod', gluster_pod_data["pod_name"]) cmd = ("oc get pods -o wide | grep glusterfs | grep %s | " "grep -v Terminating | awk '{print $1}'") % ( - gluster_pod_data["host_name"]) + gluster_pod_data["pod_hostname"]) for w in Waiter(600, 15): out = self.cmd_run(cmd) new_gluster_pod_name = out.strip().split("\n")[0].strip() diff --git a/tests/functional/provisioning/test_dynamic_provisioning_file.py b/tests/functional/provisioning/test_dynamic_provisioning_file.py index 64e94aba..4b53d3c6 100644 --- a/tests/functional/provisioning/test_dynamic_provisioning_file.py +++ b/tests/functional/provisioning/test_dynamic_provisioning_file.py @@ -242,7 +242,7 @@ class TestDynamicProvisioningP0(BaseClass): oc_delete(self.node, 'pod', gluster_pod_data["pod_name"]) cmd = ("oc get pods -o wide | grep glusterfs | grep %s | " "grep -v Terminating | awk '{print $1}'") % ( - gluster_pod_data["host_name"]) + gluster_pod_data["pod_hostname"]) for w in Waiter(600, 15): out = self.cmd_run(cmd) new_gluster_pod_name = out.strip().split("\n")[0].strip() -- cgit