diff options
author | Valerii Ponomarov <vponomar@redhat.com> | 2019-03-07 20:30:44 +0530 |
---|---|---|
committer | vponomar <vponomar@redhat.com> | 2019-03-18 11:34:37 +0000 |
commit | 32b611b2a6498b1de307142e335e09d1e0ec082c (patch) | |
tree | aaf600ab6e6adabab7c3facbf30ae6f056731969 | |
parent | 0fcdb081517c5904969b89b20326d21b361e448e (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
45 files changed, 233 insertions, 223 deletions
diff --git a/cns-libs/MANIFEST.in b/cns-libs/MANIFEST.in deleted file mode 100644 index c8639685..00000000 --- a/cns-libs/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -recursive-include cnslibs/common *.yaml *.json *.txt diff --git a/cns-libs/cnslibs/common/__init__.py b/cns-libs/cnslibs/common/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/cns-libs/cnslibs/common/__init__.py +++ /dev/null diff --git a/cns-libs/cnslibs/common/sample-multipath.txt b/cns-libs/cnslibs/common/sample-multipath.txt deleted file mode 100644 index 52550101..00000000 --- a/cns-libs/cnslibs/common/sample-multipath.txt +++ /dev/null @@ -1,14 +0,0 @@ -# LIO iSCSI -devices { - device { - vendor "LIO-ORG" - user_friendly_names "yes" # names like mpatha - path_grouping_policy "failover" # one path per group - path_selector "round-robin 0" - failback immediate - path_checker "tur" - prio "const" - no_path_retry 120 - rr_weight "uniform" - } -} diff --git a/openshift-storage-libs/MANIFEST.in b/openshift-storage-libs/MANIFEST.in new file mode 100644 index 00000000..121de5bf --- /dev/null +++ b/openshift-storage-libs/MANIFEST.in @@ -0,0 +1 @@ +recursive-include openshiftstoragelibs *.yaml *.json *.txt diff --git a/cns-libs/cnslibs/__init__.py b/openshift-storage-libs/openshiftstoragelibs/__init__.py index e69de29b..e69de29b 100644 --- a/cns-libs/cnslibs/__init__.py +++ b/openshift-storage-libs/openshiftstoragelibs/__init__.py diff --git a/cns-libs/cnslibs/common/baseclass.py b/openshift-storage-libs/openshiftstoragelibs/baseclass.py index df3392fc..366af6a9 100644 --- a/cns-libs/cnslibs/common/baseclass.py +++ b/openshift-storage-libs/openshiftstoragelibs/baseclass.py @@ -3,17 +3,17 @@ import unittest from glusto.core import Glusto as g -from cnslibs.common import command -from cnslibs.common.exceptions import ( +from openshiftstoragelibs import command +from openshiftstoragelibs.exceptions import ( + ConfigError, ExecutionError, - ConfigError ) -from cnslibs.common.heketi_ops import ( +from openshiftstoragelibs.heketi_ops import ( hello_heketi, heketi_blockvolume_delete, - heketi_volume_delete + heketi_volume_delete, ) -from cnslibs.common.openshift_ops import ( +from openshiftstoragelibs.openshift_ops import ( get_pod_name_from_dc, get_pv_name_from_pvc, oc_create_app_dc_with_io, diff --git a/cns-libs/cnslibs/common/command.py b/openshift-storage-libs/openshiftstoragelibs/command.py index 06912915..06912915 100644 --- a/cns-libs/cnslibs/common/command.py +++ b/openshift-storage-libs/openshiftstoragelibs/command.py diff --git a/cns-libs/cnslibs/common/exceptions.py b/openshift-storage-libs/openshiftstoragelibs/exceptions.py index 44daee12..44daee12 100644 --- a/cns-libs/cnslibs/common/exceptions.py +++ b/openshift-storage-libs/openshiftstoragelibs/exceptions.py diff --git a/cns-libs/cnslibs/common/gluster_ops.py b/openshift-storage-libs/openshiftstoragelibs/gluster_ops.py index e740daa3..8ac95d82 100644 --- a/cns-libs/cnslibs/common/gluster_ops.py +++ b/openshift-storage-libs/openshiftstoragelibs/gluster_ops.py @@ -10,16 +10,14 @@ from glustolibs.gluster.volume_ops import ( get_volume_list, volume_status, volume_start, - volume_stop + volume_stop, ) -from cnslibs.common import exceptions -from cnslibs.common.heketi_ops import heketi_blockvolume_info -from cnslibs.common.openshift_ops import ( - cmd_run_on_gluster_pod_or_node, -) -from cnslibs.common import podcmd -from cnslibs.common import waiter +from openshiftstoragelibs import exceptions +from openshiftstoragelibs.heketi_ops import heketi_blockvolume_info +from openshiftstoragelibs.openshift_ops import cmd_run_on_gluster_pod_or_node +from openshiftstoragelibs import podcmd +from openshiftstoragelibs import waiter @podcmd.GlustoPod() diff --git a/cns-libs/cnslibs/common/heketi_ops.py b/openshift-storage-libs/openshiftstoragelibs/heketi_ops.py index 2fe75572..02fefe66 100644 --- a/cns-libs/cnslibs/common/heketi_ops.py +++ b/openshift-storage-libs/openshiftstoragelibs/heketi_ops.py @@ -2,9 +2,9 @@ import json from glusto.core import Glusto as g -from cnslibs.common import exceptions -from cnslibs.common import heketi_version -from cnslibs.common.utils import parse_prometheus_data +from openshiftstoragelibs import exceptions +from openshiftstoragelibs import heketi_version +from openshiftstoragelibs.utils import parse_prometheus_data def _set_heketi_global_flags(heketi_server_url, **kwargs): @@ -998,7 +998,7 @@ def heketi_node_list(heketi_client_node, heketi_server_url, heketi_secret (str): Secret for 'heketi_user' Returns: list of strings which are node IDs - Raises: cnslibs.common.exceptions.ExecutionError when CLI command fails. + Raises: openshiftstoragelibs.exceptions.ExecutionError when command fails. """ heketi_server_url, json_arg, admin_key, user = _set_heketi_global_flags( diff --git a/cns-libs/cnslibs/common/heketi_version.py b/openshift-storage-libs/openshiftstoragelibs/heketi_version.py index d198ebeb..0da81176 100644 --- a/cns-libs/cnslibs/common/heketi_version.py +++ b/openshift-storage-libs/openshiftstoragelibs/heketi_version.py @@ -6,7 +6,7 @@ Usage example: # Assume Heketi server version is '7.0.0-3' and client is '7.0.0-5' Then we have following: - from cnslibs.common import heketi_version + from openshiftstoragelibs import heketi_version version = heketi_version.get_heketi_version() if version < '7.0.0-4': # True @@ -25,8 +25,8 @@ import re from glusto.core import Glusto as g import six -from cnslibs.common import command -from cnslibs.common import exceptions +from openshiftstoragelibs import command +from openshiftstoragelibs import exceptions HEKETI_VERSION_RE = r"(\d+)(?:\.)(\d+)(?:\.)(\d+)(?:\-)(\d+)$" diff --git a/cns-libs/cnslibs/common/naming.py b/openshift-storage-libs/openshiftstoragelibs/naming.py index b44559ad..b44559ad 100644 --- a/cns-libs/cnslibs/common/naming.py +++ b/openshift-storage-libs/openshiftstoragelibs/naming.py diff --git a/cns-libs/cnslibs/common/openshift_ops.py b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py index 0d44df1f..295dc42b 100644 --- a/cns-libs/cnslibs/common/openshift_ops.py +++ b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py @@ -13,12 +13,12 @@ from glustolibs.gluster import volume_ops import mock import yaml -from cnslibs.common import command -from cnslibs.common import exceptions -from cnslibs.common import openshift_version -from cnslibs.common import utils -from cnslibs.common import waiter -from cnslibs.common.heketi_ops import ( +from openshiftstoragelibs import command +from openshiftstoragelibs import exceptions +from openshiftstoragelibs import openshift_version +from openshiftstoragelibs import utils +from openshiftstoragelibs import waiter +from openshiftstoragelibs.heketi_ops import ( heketi_blockvolume_info, heketi_volume_info, ) diff --git a/cns-libs/cnslibs/common/cns_libs.py b/openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py index f7fc92f9..4d2b4f61 100644 --- a/cns-libs/cnslibs/common/cns_libs.py +++ b/openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py @@ -1,11 +1,12 @@ from glusto.core import Glusto as g import yaml -from cnslibs.common.command import cmd_run -from cnslibs.common.exceptions import ( +from openshiftstoragelibs.command import cmd_run +from openshiftstoragelibs.exceptions import ( ExecutionError, - NotSupportedException) -from cnslibs.common.openshift_version import get_openshift_version + NotSupportedException, +) +from openshiftstoragelibs.openshift_version import get_openshift_version MASTER_CONFIG_FILEPATH = "/etc/origin/master/master-config.yaml" diff --git a/cns-libs/cnslibs/common/openshift_version.py b/openshift-storage-libs/openshiftstoragelibs/openshift_version.py index a532d837..bc0c9be0 100644 --- a/cns-libs/cnslibs/common/openshift_version.py +++ b/openshift-storage-libs/openshiftstoragelibs/openshift_version.py @@ -4,7 +4,7 @@ Use this module for any OpenShift version comparisons. Usage example: # Assume OpenShift version is '3.10.45'. Then we have following: - from cnslibs.common import openshift_version + from openshiftstoragelibs import openshift_version version = openshift_version.get_openshift_version() if version < '3.10': # False @@ -28,7 +28,7 @@ import re from glusto.core import Glusto as g import six -from cnslibs.common import exceptions +from openshiftstoragelibs import exceptions OPENSHIFT_VERSION_RE = r"(?:v?)(\d+)(?:\.)(\d+)(?:\.(\d+))?$" diff --git a/cns-libs/cnslibs/common/podcmd.py b/openshift-storage-libs/openshiftstoragelibs/podcmd.py index 2673461b..bf84a8b9 100644 --- a/cns-libs/cnslibs/common/podcmd.py +++ b/openshift-storage-libs/openshiftstoragelibs/podcmd.py @@ -51,7 +51,7 @@ import types from glusto.core import Glusto as g -from cnslibs.common import openshift_ops +from openshiftstoragelibs import openshift_ops # Define a namedtuple that allows us to address pods instead of just # hosts, diff --git a/cns-libs/cnslibs/common/utils.py b/openshift-storage-libs/openshiftstoragelibs/utils.py index 2d16c497..2d16c497 100644 --- a/cns-libs/cnslibs/common/utils.py +++ b/openshift-storage-libs/openshiftstoragelibs/utils.py diff --git a/cns-libs/cnslibs/common/waiter.py b/openshift-storage-libs/openshiftstoragelibs/waiter.py index 0d0c8c3a..0d0c8c3a 100644 --- a/cns-libs/cnslibs/common/waiter.py +++ b/openshift-storage-libs/openshiftstoragelibs/waiter.py diff --git a/cns-libs/setup.py b/openshift-storage-libs/setup.py index bb3803a9..3e528cbf 100644 --- a/cns-libs/setup.py +++ b/openshift-storage-libs/setup.py @@ -1,8 +1,8 @@ #!/usr/bin/python from setuptools import setup, find_packages -version = '0.1' -name = 'cns-libs' +version = '0.2' +name = 'openshift-storage-libs' setup( name=name, diff --git a/tests/functional/arbiter/test_arbiter.py b/tests/functional/arbiter/test_arbiter.py index 587a74d3..ad1094b4 100644 --- a/tests/functional/arbiter/test_arbiter.py +++ b/tests/functional/arbiter/test_arbiter.py @@ -1,9 +1,9 @@ import ddt -from cnslibs.common.baseclass import BaseClass -from cnslibs.common import heketi_ops -from cnslibs.common import heketi_version -from cnslibs.common.openshift_ops import ( +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs import heketi_ops +from openshiftstoragelibs import heketi_version +from openshiftstoragelibs.openshift_ops import ( cmd_run_on_gluster_pod_or_node, get_gluster_vol_info_by_pvc_name, oc_create_pvc, diff --git a/tests/functional/gluster_block/test_restart_gluster_block.py b/tests/functional/gluster_block/test_restart_gluster_block.py index 90c10dec..96db077d 100644 --- a/tests/functional/gluster_block/test_restart_gluster_block.py +++ b/tests/functional/gluster_block/test_restart_gluster_block.py @@ -1,12 +1,13 @@ -from cnslibs.common.baseclass import BaseClass -from cnslibs.common.heketi_ops import ( +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.heketi_ops import ( heketi_blockvolume_create, heketi_blockvolume_delete) -from cnslibs.common.openshift_ops import ( +from openshiftstoragelibs.openshift_ops import ( get_pod_name_from_dc, oc_delete, wait_for_pod_be_ready, - wait_for_resource_absence) + wait_for_resource_absence, +) class TestRestartGlusterBlockPod(BaseClass): 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_(.*)$" diff --git a/tests/functional/heketi/test_block_volumes_heketi.py b/tests/functional/heketi/test_block_volumes_heketi.py index b75f58ac..62f90500 100644 --- a/tests/functional/heketi/test_block_volumes_heketi.py +++ b/tests/functional/heketi/test_block_volumes_heketi.py @@ -1,11 +1,11 @@ - -from cnslibs.common.heketi_ops import (heketi_blockvolume_create, - heketi_blockvolume_delete, - heketi_blockvolume_list, - heketi_volume_create, - heketi_volume_delete - ) -from cnslibs.common.baseclass import BaseClass +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.heketi_ops import ( + heketi_blockvolume_create, + heketi_blockvolume_delete, + heketi_blockvolume_list, + heketi_volume_create, + heketi_volume_delete, +) class TestBlockVolumeOps(BaseClass): diff --git a/tests/functional/heketi/test_check_brick_paths.py b/tests/functional/heketi/test_check_brick_paths.py index 1b5aa32d..3c8aa6df 100644 --- a/tests/functional/heketi/test_check_brick_paths.py +++ b/tests/functional/heketi/test_check_brick_paths.py @@ -1,9 +1,11 @@ from glusto.core import Glusto as g -from cnslibs.common.baseclass import BaseClass -from cnslibs.common.heketi_ops import (heketi_volume_create, - heketi_volume_delete) -from cnslibs.common import openshift_ops +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.heketi_ops import ( + heketi_volume_create, + heketi_volume_delete, +) +from openshiftstoragelibs import openshift_ops class TestHeketiVolume(BaseClass): diff --git a/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py b/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py index 93ef0593..04bce628 100644 --- a/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py +++ b/tests/functional/heketi/test_create_distributed_replica_heketi_volume.py @@ -4,18 +4,20 @@ import math from glusto.core import Glusto as g from glustolibs.gluster.volume_ops import get_volume_list, get_volume_info -from cnslibs.common import exceptions -from cnslibs.common.baseclass import BaseClass -from cnslibs.common.heketi_ops import (heketi_node_list, - heketi_node_enable, - heketi_node_disable, - heketi_node_info, - heketi_device_enable, - heketi_device_disable, - heketi_volume_create, - heketi_volume_list, - heketi_volume_delete) -from cnslibs.common import podcmd +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs import exceptions +from openshiftstoragelibs.heketi_ops import ( + heketi_device_disable, + heketi_device_enable, + heketi_node_disable, + heketi_node_enable, + heketi_node_info, + heketi_node_list, + heketi_volume_create, + heketi_volume_delete, + heketi_volume_list, +) +from openshiftstoragelibs import podcmd class TestHeketiVolume(BaseClass): diff --git a/tests/functional/heketi/test_device_info.py b/tests/functional/heketi/test_device_info.py index a48fd814..96199f74 100644 --- a/tests/functional/heketi/test_device_info.py +++ b/tests/functional/heketi/test_device_info.py @@ -1,5 +1,5 @@ -from cnslibs.common.baseclass import BaseClass -from cnslibs.common import heketi_ops +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs import heketi_ops class TestHeketiDeviceInfo(BaseClass): diff --git a/tests/functional/heketi/test_disabling_device.py b/tests/functional/heketi/test_disabling_device.py index f0e2c5c6..c8ec026b 100644 --- a/tests/functional/heketi/test_disabling_device.py +++ b/tests/functional/heketi/test_disabling_device.py @@ -1,10 +1,10 @@ from glusto.core import Glusto as g from glustolibs.gluster.volume_ops import get_volume_info -from cnslibs.common import exceptions -from cnslibs.common import baseclass -from cnslibs.common import heketi_ops -from cnslibs.common import podcmd +from openshiftstoragelibs import baseclass +from openshiftstoragelibs import exceptions +from openshiftstoragelibs import heketi_ops +from openshiftstoragelibs import podcmd class TestDisableHeketiDevice(baseclass.BaseClass): diff --git a/tests/functional/heketi/test_heketi_create_volume.py b/tests/functional/heketi/test_heketi_create_volume.py index c1be0d86..e9679317 100644 --- a/tests/functional/heketi/test_heketi_create_volume.py +++ b/tests/functional/heketi/test_heketi_create_volume.py @@ -2,20 +2,22 @@ from glusto.core import Glusto as g from glustolibs.gluster.volume_ops import get_volume_list, get_volume_info import six -from cnslibs.common.exceptions import ExecutionError -from cnslibs.common.baseclass import BaseClass -from cnslibs.common.heketi_ops import (heketi_volume_create, - heketi_volume_list, - heketi_volume_info, - heketi_blockvolume_create, - heketi_blockvolume_delete, - heketi_cluster_list, - heketi_cluster_delete, - heketi_node_info, - heketi_node_list, - heketi_node_delete, - heketi_volume_delete) -from cnslibs.common import podcmd +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.exceptions import ExecutionError +from openshiftstoragelibs.heketi_ops import ( + heketi_blockvolume_create, + heketi_blockvolume_delete, + heketi_cluster_delete, + heketi_cluster_list, + heketi_node_delete, + heketi_node_info, + heketi_node_list, + heketi_volume_create, + heketi_volume_delete, + heketi_volume_info, + heketi_volume_list, +) +from openshiftstoragelibs import podcmd class TestHeketiVolume(BaseClass): diff --git a/tests/functional/heketi/test_heketi_device_operations.py b/tests/functional/heketi/test_heketi_device_operations.py index 8bd87089..bec1d01f 100644 --- a/tests/functional/heketi/test_heketi_device_operations.py +++ b/tests/functional/heketi/test_heketi_device_operations.py @@ -3,21 +3,23 @@ import json import ddt from glusto.core import Glusto as g -from cnslibs.common.exceptions import ExecutionError -from cnslibs.common.baseclass import BaseClass -from cnslibs.common.heketi_ops import (heketi_node_enable, - heketi_node_info, - heketi_node_disable, - heketi_node_list, - heketi_volume_create, - heketi_device_add, - heketi_device_delete, - heketi_device_disable, - heketi_device_remove, - heketi_device_info, - heketi_device_enable, - heketi_topology_info, - heketi_volume_delete) +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.exceptions import ExecutionError +from openshiftstoragelibs.heketi_ops import ( + heketi_device_add, + heketi_device_delete, + heketi_device_disable, + heketi_device_enable, + heketi_device_info, + heketi_device_remove, + heketi_node_disable, + heketi_node_enable, + heketi_node_info, + heketi_node_list, + heketi_topology_info, + heketi_volume_create, + heketi_volume_delete, +) @ddt.ddt diff --git a/tests/functional/heketi/test_heketi_metrics.py b/tests/functional/heketi/test_heketi_metrics.py index 4653caee..f6601074 100644 --- a/tests/functional/heketi/test_heketi_metrics.py +++ b/tests/functional/heketi/test_heketi_metrics.py @@ -1,20 +1,20 @@ -from cnslibs.common import exceptions -from cnslibs.common.baseclass import BaseClass -from cnslibs.common.heketi_ops import ( +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs import exceptions +from openshiftstoragelibs.heketi_ops import ( get_heketi_metrics, heketi_cluster_info, heketi_cluster_list, heketi_topology_info, heketi_volume_create, heketi_volume_delete, - heketi_volume_list - ) -from cnslibs.common import heketi_version -from cnslibs.common.openshift_ops import ( + heketi_volume_list, +) +from openshiftstoragelibs import heketi_version +from openshiftstoragelibs.openshift_ops import ( get_pod_name_from_dc, scale_dc_pod_amount_and_wait, - wait_for_pod_be_ready - ) + wait_for_pod_be_ready, +) class TestHeketiMetrics(BaseClass): diff --git a/tests/functional/heketi/test_heketi_volume_operations.py b/tests/functional/heketi/test_heketi_volume_operations.py index d7b9aa18..c5fc4f84 100644 --- a/tests/functional/heketi/test_heketi_volume_operations.py +++ b/tests/functional/heketi/test_heketi_volume_operations.py @@ -1,8 +1,10 @@ -from cnslibs.common.heketi_ops import (heketi_volume_delete, - heketi_volume_create, - heketi_volume_expand, - heketi_volume_info) -from cnslibs.common.baseclass import BaseClass +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.heketi_ops import ( + heketi_volume_create, + heketi_volume_delete, + heketi_volume_expand, + heketi_volume_info, +) class TestHeketiVolumeOperations(BaseClass): diff --git a/tests/functional/heketi/test_node_enable_disable.py b/tests/functional/heketi/test_node_enable_disable.py index b8ce2c71..dcd2f7b4 100644 --- a/tests/functional/heketi/test_node_enable_disable.py +++ b/tests/functional/heketi/test_node_enable_disable.py @@ -1,16 +1,18 @@ """Test cases to disable and enable node in heketi.""" import json -from cnslibs.common.baseclass import BaseClass -from cnslibs.common.heketi_ops import (heketi_node_enable, - heketi_node_info, - heketi_node_disable, - heketi_node_list, - heketi_volume_create, - heketi_volume_delete - ) from glusto.core import Glusto as g +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.heketi_ops import ( + heketi_node_disable, + heketi_node_enable, + heketi_node_info, + heketi_node_list, + heketi_volume_create, + heketi_volume_delete, +) + class TestHeketiNodeState(BaseClass): """Test node enable and disable functionality.""" diff --git a/tests/functional/heketi/test_node_info.py b/tests/functional/heketi/test_node_info.py index ad60b844..5bf7270f 100644 --- a/tests/functional/heketi/test_node_info.py +++ b/tests/functional/heketi/test_node_info.py @@ -2,8 +2,8 @@ from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError from glustolibs.gluster.peer_ops import get_pool_list -from cnslibs.common.baseclass import BaseClass -from cnslibs.common import heketi_ops, podcmd +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs import heketi_ops, podcmd class TestHeketiVolume(BaseClass): diff --git a/tests/functional/heketi/test_server_state_examine_gluster.py b/tests/functional/heketi/test_server_state_examine_gluster.py index f74366ed..22352024 100644 --- a/tests/functional/heketi/test_server_state_examine_gluster.py +++ b/tests/functional/heketi/test_server_state_examine_gluster.py @@ -1,7 +1,7 @@ -from cnslibs.common.baseclass import BaseClass -from cnslibs.common import heketi_ops -from cnslibs.common import heketi_version -from cnslibs.common import openshift_ops +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs import heketi_ops +from openshiftstoragelibs import heketi_version +from openshiftstoragelibs import openshift_ops class TestHeketiServerStateExamineGluster(BaseClass): diff --git a/tests/functional/heketi/test_volume_creation.py b/tests/functional/heketi/test_volume_creation.py index 86618505..f8ca5d81 100644 --- a/tests/functional/heketi/test_volume_creation.py +++ b/tests/functional/heketi/test_volume_creation.py @@ -1,10 +1,10 @@ from glusto.core import Glusto as g from glustolibs.gluster import volume_ops -from cnslibs.common import exceptions -from cnslibs.common.baseclass import BaseClass -from cnslibs.common import heketi_ops -from cnslibs.common import podcmd +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs import exceptions +from openshiftstoragelibs import heketi_ops +from openshiftstoragelibs import podcmd class TestVolumeCreationTestCases(BaseClass): diff --git a/tests/functional/heketi/test_volume_deletion.py b/tests/functional/heketi/test_volume_deletion.py index 6f279899..7b1f2ded 100644 --- a/tests/functional/heketi/test_volume_deletion.py +++ b/tests/functional/heketi/test_volume_deletion.py @@ -1,8 +1,8 @@ from __future__ import division -from cnslibs.common.exceptions import ExecutionError -from cnslibs.common.baseclass import BaseClass -from cnslibs.common import heketi_ops +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.exceptions import ExecutionError +from openshiftstoragelibs import heketi_ops class TestVolumeDeleteTestCases(BaseClass): diff --git a/tests/functional/heketi/test_volume_expansion_and_devices.py b/tests/functional/heketi/test_volume_expansion_and_devices.py index 5e189e49..d87c18e5 100644 --- a/tests/functional/heketi/test_volume_expansion_and_devices.py +++ b/tests/functional/heketi/test_volume_expansion_and_devices.py @@ -4,9 +4,12 @@ import math from glusto.core import Glusto as g from glustolibs.gluster import volume_ops, rebalance_ops -from cnslibs.common.exceptions import ExecutionError -from cnslibs.common.baseclass import BaseClass -from cnslibs.common import heketi_ops, podcmd +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.exceptions import ExecutionError +from openshiftstoragelibs import ( + heketi_ops, + podcmd, +) class TestVolumeExpansionAndDevicesTestCases(BaseClass): diff --git a/tests/functional/heketi/test_volume_multi_req.py b/tests/functional/heketi/test_volume_multi_req.py index f6b0fcf6..3445a8a4 100644 --- a/tests/functional/heketi/test_volume_multi_req.py +++ b/tests/functional/heketi/test_volume_multi_req.py @@ -11,14 +11,20 @@ import yaml from glusto.core import Glusto as g -from cnslibs.common.baseclass import BaseClass -from cnslibs.common.heketi_ops import ( - heketi_volume_list) -from cnslibs.common.naming import ( - make_unique_label, extract_method_name) -from cnslibs.common.openshift_ops import ( - oc_create, oc_delete, oc_get_pvc, oc_get_pv, oc_get_all_pvs) -from cnslibs.common.waiter import Waiter +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.heketi_ops import heketi_volume_list +from openshiftstoragelibs.naming import ( + make_unique_label, + extract_method_name, +) +from openshiftstoragelibs.openshift_ops import ( + oc_create, + oc_delete, + oc_get_all_pvs, + oc_get_pv, + oc_get_pvc, +) +from openshiftstoragelibs.waiter import Waiter def build_storage_class(name, resturl, restuser='foo', restuserkey='foo'): 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 diff --git a/tests/functional/test_heketi_restart.py b/tests/functional/test_heketi_restart.py index a06bf9c6..0c32fea2 100644 --- a/tests/functional/test_heketi_restart.py +++ b/tests/functional/test_heketi_restart.py @@ -1,17 +1,18 @@ from jsondiff import diff -from cnslibs.common.baseclass import BaseClass -from cnslibs.common.heketi_ops import ( +from openshiftstoragelibs.baseclass import BaseClass +from openshiftstoragelibs.heketi_ops import ( heketi_topology_info, - hello_heketi, heketi_volume_create, - heketi_volume_delete + heketi_volume_delete, + hello_heketi, ) -from cnslibs.common.openshift_ops import ( +from openshiftstoragelibs.openshift_ops import ( get_pod_name_from_dc, oc_delete, wait_for_pod_be_ready, - wait_for_resource_absence) + wait_for_resource_absence, +) class TestRestartHeketi(BaseClass): 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): @@ -29,7 +29,7 @@ commands = "git+git://github.com/gluster/glusto-tests.git#egg=glustolibs-gluster&subdirectory=glustolibs-gluster" \ "git+git://github.com/gluster/glusto-tests.git#egg=glustolibs-io&subdirectory=glustolibs-io" \ "git+git://github.com/gluster/glusto-tests.git#egg=glustolibs-misc&subdirectory=glustolibs-misc" \ - --editable=file:///{toxinidir}/cns-libs + --editable=file:///{toxinidir}/openshift-storage-libs {posargs:bash -c "echo 'No commands have been specified. Exiting.'; exit 1"} [testenv:venv] |