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

1 files changed, 9 insertions, 8 deletions

diff --git a/tests/functional/test_node_restart.py b/tests/functional/test_node_restart.py
index 6a0969ee..d1be4232 100644
--- a/tests/functional/test_node_restart.py
+++ b/tests/functional/test_node_restart.py
@@ -1,16 +1,17 @@
-
 import time
-
 from unittest import skip
-from cnslibs.common.baseclass import BaseClass
-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.openshift_ops import (
     check_service_status_on_pod,
     get_ocp_gluster_pod_names,
     oc_rsh,
-    wait_for_pod_be_ready)
-from cnslibs.common.waiter import Waiter
-from cnslibs.common.exceptions import ExecutionError
-from glusto.core import Glusto as g
+    wait_for_pod_be_ready,
+)
+from openshiftstoragelibs.waiter import Waiter
 
 
 class TestNodeRestart(BaseClass):