summaryrefslogtreecommitdiffstats
path: root/tests/functional/gluster_stability
diff options
context:
space:
mode:
authorValerii Ponomarov <vponomar@redhat.com>2019-03-07 20:30:44 +0530
committervponomar <vponomar@redhat.com>2019-03-18 11:34:37 +0000
commit32b611b2a6498b1de307142e335e09d1e0ec082c (patch)
treeaaf600ab6e6adabab7c3facbf30ae6f056731969 /tests/functional/gluster_stability
parent0fcdb081517c5904969b89b20326d21b361e448e (diff)
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
Diffstat (limited to 'tests/functional/gluster_stability')
-rw-r--r--tests/functional/gluster_stability/test_gluster_services_restart.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/functional/gluster_stability/test_gluster_services_restart.py b/tests/functional/gluster_stability/test_gluster_services_restart.py
index bbde551f..ff00407b 100644
--- a/tests/functional/gluster_stability/test_gluster_services_restart.py
+++ b/tests/functional/gluster_stability/test_gluster_services_restart.py
@@ -6,9 +6,9 @@ from unittest import skip
import ddt
from glusto.core import Glusto as g
-from cnslibs.common.baseclass import BaseClass
-from cnslibs.common.heketi_ops import heketi_blockvolume_list
-from cnslibs.common.openshift_ops import (
+from openshiftstoragelibs.baseclass import BaseClass
+from openshiftstoragelibs.heketi_ops import heketi_blockvolume_list
+from openshiftstoragelibs.openshift_ops import (
get_pod_name_from_dc,
match_pv_and_heketi_block_volumes,
match_pvc_and_pv,
@@ -27,7 +27,7 @@ from cnslibs.common.openshift_ops import (
wait_for_resource_absence,
wait_for_service_status_on_gluster_pod_or_node,
)
-from cnslibs.common.gluster_ops import (
+from openshiftstoragelibs.gluster_ops import (
get_block_hosting_volume_name,
get_gluster_vol_hosting_nodes,
match_heketi_and_gluster_block_volumes_by_prefix,
@@ -35,7 +35,7 @@ from cnslibs.common.gluster_ops import (
restart_gluster_vol_brick_processes,
wait_to_heal_complete,
)
-from cnslibs.common import utils
+from openshiftstoragelibs import utils
HEKETI_BLOCK_VOLUME_REGEX = "^Id:(.*).Cluster:(.*).Name:%s_(.*)$"