Pick up name of the glusterblock provisioner dc dynamically

Instead of crafting it manually. It allows us to use both approaches
from 'openshift-ansible' lib for naming of this dc - old and new ones.

Change-Id: Iac4513a50de51aefd401d2af4c798366ec10b02a

2 files changed, 17 insertions, 11 deletions

diff --git a/tests/functional/gluster_block/test_restart_gluster_block.py b/tests/functional/gluster_block/test_restart_gluster_block.py
index 96db077d..219110a6 100644
--- a/tests/functional/gluster_block/test_restart_gluster_block.py
+++ b/tests/functional/gluster_block/test_restart_gluster_block.py
@@ -1,4 +1,5 @@
 from openshiftstoragelibs.baseclass import BaseClass
+from openshiftstoragelibs import command
 from openshiftstoragelibs.heketi_ops import (
     heketi_blockvolume_create,
     heketi_blockvolume_delete)
@@ -13,8 +14,12 @@ from openshiftstoragelibs.openshift_ops import (
 class TestRestartGlusterBlockPod(BaseClass):
 
     def test_restart_gluster_block_provisioner_pod(self):
-        """Restart gluster-block provisioner pod
-        """
+        """Restart gluster-block provisioner pod."""
+
+        # Get glusterblock provisioner dc name
+        cmd = ("oc get dc | awk '{ print $1 }' | "
+               "grep -e glusterblock -e provisioner")
+        dc_name = command.cmd_run(cmd, self.ocp_master_node[0], True)
 
         # create heketi block volume
         vol_info = heketi_blockvolume_create(self.heketi_client_node,
@@ -26,7 +31,6 @@ class TestRestartGlusterBlockPod(BaseClass):
                         self.heketi_server_url, vol_info['id'])
 
         # restart gluster-block-provisioner-pod
-        dc_name = "glusterblock-%s-provisioner-dc" % self.storage_project_name
         pod_name = get_pod_name_from_dc(self.ocp_master_node[0], dc_name)
         oc_delete(self.ocp_master_node[0], 'pod', pod_name)
         wait_for_resource_absence(self.ocp_master_node[0], 'pod', pod_name)
diff --git a/tests/functional/provisioning/test_dynamic_provisioning_block.py b/tests/functional/provisioning/test_dynamic_provisioning_block.py
index 97a7252b..a3303500 100644
--- a/tests/functional/provisioning/test_dynamic_provisioning_block.py
+++ b/tests/functional/provisioning/test_dynamic_provisioning_block.py
@@ -206,14 +206,16 @@ class TestDynamicProvisioningBlockP0(GlusterBlockBaseClass):
 
     def test_glusterblock_logs_presence_verification(self):
         """Validate presence of glusterblock provisioner POD and it's status"""
-        gb_prov_cmd = ("oc get pods --all-namespaces "
-                       "-l glusterfs=block-%s-provisioner-pod "
-                       "-o=custom-columns=:.metadata.name,:.status.phase" % (
-                           self.storage_project_name))
-        ret, out, err = g.run(self.ocp_client[0], gb_prov_cmd, "root")
-
-        self.assertEqual(ret, 0, "Failed to get Glusterblock provisioner POD.")
-        gb_prov_name, gb_prov_status = out.split()
+
+        # Get glusterblock provisioner dc name
+        cmd = ("oc get dc | awk '{ print $1 }' | "
+               "grep -e glusterblock -e provisioner")
+        dc_name = cmd_run(cmd, self.ocp_master_node[0], True)
+
+        # Get glusterblock provisioner pod name and it's status
+        gb_prov_name, gb_prov_status = oc_get_custom_resource(
+            self.node, 'pod', custom=':.metadata.name,:.status.phase',
+            selector='deploymentconfig=%s' % dc_name)[0]
         self.assertEqual(gb_prov_status, 'Running')
 
         # Create Secret, SC and PVC