Reorder test files removing redundant dirs

Move all the files of 'tests/functional/common/' dir
to the 'tests/functional/', because 'common' is the only
dir there, which doesn't really makes sense.
Do the same about 'tests/functional/common/heketi/heketi_tests'
and 'tests/functional/common/heketi/'.

Change-Id: I1fa55e2e7bf09e9b9115629b06e1fd160e291a36

2 files changed, 0 insertions, 45 deletions

diff --git a/tests/functional/common/gluster_block/__init__.py b/tests/functional/common/gluster_block/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/tests/functional/common/gluster_block/__init__.py
+++ /dev/null
diff --git a/tests/functional/common/gluster_block/test_restart_gluster_block.py b/tests/functional/common/gluster_block/test_restart_gluster_block.py
deleted file mode 100644
index 90c10dec..00000000
--- a/tests/functional/common/gluster_block/test_restart_gluster_block.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from cnslibs.common.baseclass import BaseClass
-from cnslibs.common.heketi_ops import (
-    heketi_blockvolume_create,
-    heketi_blockvolume_delete)
-from cnslibs.common.openshift_ops import (
-    get_pod_name_from_dc,
-    oc_delete,
-    wait_for_pod_be_ready,
-    wait_for_resource_absence)
-
-
-class TestRestartGlusterBlockPod(BaseClass):
-
-    def test_restart_gluster_block_provisioner_pod(self):
-        """Restart gluster-block provisioner pod
-        """
-
-        # create heketi block volume
-        vol_info = heketi_blockvolume_create(self.heketi_client_node,
-                                             self.heketi_server_url,
-                                             size=5, json=True)
-        self.assertTrue(vol_info, "Failed to create heketi block"
-                        "volume of size 5")
-        self.addCleanup(heketi_blockvolume_delete, self.heketi_client_node,
-                        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)
-
-        # new gluster-pod name
-        pod_name = get_pod_name_from_dc(self.ocp_master_node[0], dc_name)
-        wait_for_pod_be_ready(self.ocp_master_node[0], pod_name)
-
-        # create new heketi block volume
-        vol_info = heketi_blockvolume_create(self.heketi_client_node,
-                                             self.heketi_server_url,
-                                             size=2, json=True)
-        self.assertTrue(vol_info, "Failed to create heketi block"
-                        "volume of size 2")
-        heketi_blockvolume_delete(self.heketi_client_node,
-                                  self.heketi_server_url,
-                                  vol_info['id'])