Reorder lib files removing redundant dir layer

Move all the files of 'cns-libs/cnslibs/common' dir
to the 'openshift-storage-libs/openshiftstoragelibs',
because 'common' is the only dir there, which doesn't really makes sense.
And "cns" is old project name, so, replace it with
"openshift-storage-libs".

Also, fix all the imports of these libs.

Change-Id: Ife00a73554e73b21b214b15016b0c8dbbf423446

4 files changed, 40 insertions, 39 deletions

diff --git a/tests/functional/provisioning/test_dynamic_provisioning_block.py b/tests/functional/provisioning/test_dynamic_provisioning_block.py
index 3adbcd43..85b842eb 100644
--- a/tests/functional/provisioning/test_dynamic_provisioning_block.py
+++ b/tests/functional/provisioning/test_dynamic_provisioning_block.py
@@ -1,15 +1,22 @@
 from unittest import skip
 
-from cnslibs.common.baseclass import GlusterBlockBaseClass
-from cnslibs.common.cns_libs import (
+from glusto.core import Glusto as g
+
+from openshiftstoragelibs.baseclass import GlusterBlockBaseClass
+from openshiftstoragelibs.openshift_storage_libs import (
     get_iscsi_block_devices_by_path,
     get_iscsi_session,
     get_mpath_name_from_device_name,
     validate_multipath_pod,
-    )
-from cnslibs.common.command import cmd_run
-from cnslibs.common.exceptions import ExecutionError
-from cnslibs.common.openshift_ops import (
+)
+from openshiftstoragelibs.command import cmd_run
+from openshiftstoragelibs.exceptions import ExecutionError
+from openshiftstoragelibs.heketi_ops import (
+    heketi_blockvolume_delete,
+    heketi_blockvolume_info,
+    heketi_blockvolume_list
+)
+from openshiftstoragelibs.openshift_ops import (
     cmd_run_on_gluster_pod_or_node,
     get_gluster_pod_names_by_pvc_name,
     get_pod_name_from_dc,
@@ -25,15 +32,9 @@ from cnslibs.common.openshift_ops import (
     scale_dc_pod_amount_and_wait,
     verify_pvc_status_is_bound,
     wait_for_pod_be_ready,
-    wait_for_resource_absence
-    )
-from cnslibs.common.heketi_ops import (
-    heketi_blockvolume_delete,
-    heketi_blockvolume_info,
-    heketi_blockvolume_list
-    )
-from cnslibs.common.waiter import Waiter
-from glusto.core import Glusto as g
+    wait_for_resource_absence,
+)
+from openshiftstoragelibs.waiter import Waiter
 
 
 class TestDynamicProvisioningBlockP0(GlusterBlockBaseClass):
diff --git a/tests/functional/provisioning/test_dynamic_provisioning_file.py b/tests/functional/provisioning/test_dynamic_provisioning_file.py
index 3367bab2..f3b32d0f 100644
--- a/tests/functional/provisioning/test_dynamic_provisioning_file.py
+++ b/tests/functional/provisioning/test_dynamic_provisioning_file.py
@@ -1,11 +1,16 @@
 import time
 from unittest import skip
 
-from cnslibs.common.baseclass import BaseClass
-from cnslibs.common.exceptions import ExecutionError
-from cnslibs.common.heketi_ops import (
-    verify_volume_name_prefix)
-from cnslibs.common.openshift_ops import (
+from glusto.core import Glusto as g
+
+from openshiftstoragelibs.baseclass import BaseClass
+from openshiftstoragelibs.exceptions import ExecutionError
+from openshiftstoragelibs.heketi_ops import (
+    heketi_volume_delete,
+    heketi_volume_list,
+    verify_volume_name_prefix,
+)
+from openshiftstoragelibs.openshift_ops import (
     get_gluster_pod_names_by_pvc_name,
     get_pv_name_from_pvc,
     get_pod_name_from_dc,
@@ -22,12 +27,7 @@ from cnslibs.common.openshift_ops import (
     verify_pvc_status_is_bound,
     wait_for_pod_be_ready,
     wait_for_resource_absence)
-from cnslibs.common.heketi_ops import (
-    heketi_volume_delete,
-    heketi_volume_list
-    )
-from cnslibs.common.waiter import Waiter
-from glusto.core import Glusto as g
+from openshiftstoragelibs.waiter import Waiter
 
 
 class TestDynamicProvisioningP0(BaseClass):
diff --git a/tests/functional/provisioning/test_pv_resize.py b/tests/functional/provisioning/test_pv_resize.py
index 9490ce61..8c23ea8e 100644
--- a/tests/functional/provisioning/test_pv_resize.py
+++ b/tests/functional/provisioning/test_pv_resize.py
@@ -1,8 +1,11 @@
 import ddt
-from cnslibs.common.cns_libs import (
-    enable_pvc_resize)
-from cnslibs.common import heketi_ops
-from cnslibs.common.openshift_ops import (
+from glusto.core import Glusto as g
+
+from openshiftstoragelibs.baseclass import BaseClass
+from openshiftstoragelibs.openshift_storage_libs import enable_pvc_resize
+from openshiftstoragelibs.exceptions import ExecutionError
+from openshiftstoragelibs import heketi_ops
+from openshiftstoragelibs.openshift_ops import (
     resize_pvc,
     get_pod_name_from_dc,
     get_pv_name_from_pvc,
@@ -15,10 +18,7 @@ from cnslibs.common.openshift_ops import (
     wait_for_events,
     wait_for_pod_be_ready,
     wait_for_resource_absence)
-from cnslibs.common.openshift_version import get_openshift_version
-from cnslibs.common.baseclass import BaseClass
-from cnslibs.common.exceptions import ExecutionError
-from glusto.core import Glusto as g
+from openshiftstoragelibs.openshift_version import get_openshift_version
 
 
 @ddt.ddt
diff --git a/tests/functional/provisioning/test_storage_class_cases.py b/tests/functional/provisioning/test_storage_class_cases.py
index 148bbb10..5ecfcd67 100644
--- a/tests/functional/provisioning/test_storage_class_cases.py
+++ b/tests/functional/provisioning/test_storage_class_cases.py
@@ -3,9 +3,10 @@ from unittest import skip
 import ddt
 from glusto.core import Glusto as g
 
-from cnslibs.common.baseclass import BaseClass
-from cnslibs.common.cns_libs import validate_multipath_pod
-from cnslibs.common.openshift_ops import (
+from openshiftstoragelibs.baseclass import BaseClass
+from openshiftstoragelibs.openshift_storage_libs import validate_multipath_pod
+from openshiftstoragelibs.heketi_ops import verify_volume_name_prefix
+from openshiftstoragelibs.openshift_ops import (
     get_amount_of_gluster_nodes,
     get_gluster_blockvol_info_by_pvc_name,
     get_pod_name_from_dc,
@@ -17,9 +18,8 @@ from cnslibs.common.openshift_ops import (
     scale_dc_pod_amount_and_wait,
     wait_for_events,
     wait_for_pod_be_ready,
-    wait_for_resource_absence
+    wait_for_resource_absence,
 )
-from cnslibs.common.heketi_ops import verify_volume_name_prefix
 
 
 @ddt.ddt