diff --git a/requirements.txt b/requirements.txt index e0318fe..4703cf3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,11 +7,11 @@ pbr>=1.6 # Apache-2.0 cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0 PrettyTable<0.8,>=0.7 # BSD openstacksdk>=0.8.6 # Apache-2.0 +osc-lib>=0.1.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.utils>=3.11.0 # Apache-2.0 python-heatclient>=1.1.0 # Apache-2.0 -python-openstackclient>=2.1.0 # Apache-2.0 PyYAML>=3.1.0 # MIT requests>=2.10.0 # Apache-2.0 six>=1.9.0 # MIT diff --git a/senlinclient/plugin.py b/senlinclient/plugin.py index bc92e30..d48865f 100644 --- a/senlinclient/plugin.py +++ b/senlinclient/plugin.py @@ -13,7 +13,7 @@ import logging from openstack import connection -from openstackclient.common import utils +from osc_lib import utils LOG = logging.getLogger(__name__) diff --git a/senlinclient/tests/unit/test_format_utils.py b/senlinclient/tests/unit/test_format_utils.py index f540c06..b4f4705 100644 --- a/senlinclient/tests/unit/test_format_utils.py +++ b/senlinclient/tests/unit/test_format_utils.py @@ -13,7 +13,7 @@ import json import yaml -from openstackclient.tests import utils +from osc_lib.tests import utils from senlinclient.common import format_utils diff --git a/senlinclient/tests/unit/v1/fakes.py b/senlinclient/tests/unit/v1/fakes.py index d591454..951594e 100644 --- a/senlinclient/tests/unit/v1/fakes.py +++ b/senlinclient/tests/unit/v1/fakes.py @@ -16,7 +16,7 @@ import requests import six import sys -from openstackclient.tests import utils +from osc_lib.tests import utils AUTH_TOKEN = "foobar" diff --git a/senlinclient/tests/unit/v1/test_action.py b/senlinclient/tests/unit/v1/test_action.py index 21927dc..c4f33fb 100644 --- a/senlinclient/tests/unit/v1/test_action.py +++ b/senlinclient/tests/unit/v1/test_action.py @@ -15,7 +15,7 @@ import mock from openstack.cluster.v1 import action as sdk_action from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc +from osc_lib import exceptions as exc from senlinclient.tests.unit.v1 import fakes from senlinclient.v1 import action as osc_action diff --git a/senlinclient/tests/unit/v1/test_cluster.py b/senlinclient/tests/unit/v1/test_cluster.py index bb741df..5ca088c 100644 --- a/senlinclient/tests/unit/v1/test_cluster.py +++ b/senlinclient/tests/unit/v1/test_cluster.py @@ -16,7 +16,7 @@ import six from openstack.cluster.v1 import cluster as sdk_cluster from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc +from osc_lib import exceptions as exc from senlinclient.tests.unit.v1 import fakes from senlinclient.v1 import cluster as osc_cluster diff --git a/senlinclient/tests/unit/v1/test_event.py b/senlinclient/tests/unit/v1/test_event.py index 7cd2f6a..b854e49 100644 --- a/senlinclient/tests/unit/v1/test_event.py +++ b/senlinclient/tests/unit/v1/test_event.py @@ -15,7 +15,7 @@ import mock from openstack.cluster.v1 import event as sdk_event from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc +from osc_lib import exceptions as exc from senlinclient.tests.unit.v1 import fakes from senlinclient.v1 import event as osc_event diff --git a/senlinclient/tests/unit/v1/test_node.py b/senlinclient/tests/unit/v1/test_node.py index 6bfdada..1acc23d 100644 --- a/senlinclient/tests/unit/v1/test_node.py +++ b/senlinclient/tests/unit/v1/test_node.py @@ -16,7 +16,7 @@ import six from openstack.cluster.v1 import node as sdk_node from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc +from osc_lib import exceptions as exc from senlinclient.tests.unit.v1 import fakes from senlinclient.v1 import node as osc_node diff --git a/senlinclient/tests/unit/v1/test_policy.py b/senlinclient/tests/unit/v1/test_policy.py index 350a7d9..cadfd6c 100644 --- a/senlinclient/tests/unit/v1/test_policy.py +++ b/senlinclient/tests/unit/v1/test_policy.py @@ -16,7 +16,7 @@ import six from openstack.cluster.v1 import policy as sdk_policy from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc +from osc_lib import exceptions as exc from senlinclient.tests.unit.v1 import fakes from senlinclient.v1 import policy as osc_policy diff --git a/senlinclient/tests/unit/v1/test_policy_type.py b/senlinclient/tests/unit/v1/test_policy_type.py index 956dc16..59c501b 100644 --- a/senlinclient/tests/unit/v1/test_policy_type.py +++ b/senlinclient/tests/unit/v1/test_policy_type.py @@ -14,7 +14,7 @@ import mock from openstack.cluster.v1 import policy_type as sdk_policy_type from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc +from osc_lib import exceptions as exc from senlinclient.tests.unit.v1 import fakes from senlinclient.v1 import policy_type as osc_policy_type diff --git a/senlinclient/tests/unit/v1/test_profile.py b/senlinclient/tests/unit/v1/test_profile.py index d84e0d0..a2c410c 100644 --- a/senlinclient/tests/unit/v1/test_profile.py +++ b/senlinclient/tests/unit/v1/test_profile.py @@ -16,8 +16,8 @@ import six from openstack.cluster.v1 import profile as sdk_profile from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc -from openstackclient.common import utils +from osc_lib import exceptions as exc +from osc_lib import utils from senlinclient.tests.unit.v1 import fakes from senlinclient.v1 import profile as osc_profile diff --git a/senlinclient/tests/unit/v1/test_profile_type.py b/senlinclient/tests/unit/v1/test_profile_type.py index 5a1fa0f..2d61d70 100644 --- a/senlinclient/tests/unit/v1/test_profile_type.py +++ b/senlinclient/tests/unit/v1/test_profile_type.py @@ -14,7 +14,7 @@ import mock from openstack.cluster.v1 import profile_type as sdk_profile_type from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc +from osc_lib import exceptions as exc from senlinclient.tests.unit.v1 import fakes from senlinclient.v1 import profile_type as osc_profile_type diff --git a/senlinclient/tests/unit/v1/test_receiver.py b/senlinclient/tests/unit/v1/test_receiver.py index 053bdc7..6982106 100644 --- a/senlinclient/tests/unit/v1/test_receiver.py +++ b/senlinclient/tests/unit/v1/test_receiver.py @@ -16,7 +16,7 @@ import six from openstack.cluster.v1 import receiver as sdk_receiver from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc +from osc_lib import exceptions as exc from senlinclient.tests.unit.v1 import fakes from senlinclient.v1 import receiver as osc_receiver diff --git a/senlinclient/v1/action.py b/senlinclient/v1/action.py index 2ab4a3a..1e0187b 100644 --- a/senlinclient/v1/action.py +++ b/senlinclient/v1/action.py @@ -18,8 +18,8 @@ import six from cliff import lister from cliff import show from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc -from openstackclient.common import utils +from osc_lib import exceptions as exc +from osc_lib import utils from senlinclient.common.i18n import _ from senlinclient.common import utils as senlin_utils diff --git a/senlinclient/v1/build_info.py b/senlinclient/v1/build_info.py index 9de5dca..9d1b9f3 100644 --- a/senlinclient/v1/build_info.py +++ b/senlinclient/v1/build_info.py @@ -16,7 +16,7 @@ import logging import six from cliff import show -from openstackclient.common import utils +from osc_lib import utils from senlinclient.common import utils as senlin_utils diff --git a/senlinclient/v1/cluster.py b/senlinclient/v1/cluster.py index 3ceef5f..3dc77a1 100644 --- a/senlinclient/v1/cluster.py +++ b/senlinclient/v1/cluster.py @@ -20,8 +20,8 @@ from cliff import command from cliff import lister from cliff import show from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc -from openstackclient.common import utils +from osc_lib import exceptions as exc +from osc_lib import utils from senlinclient.common.i18n import _ from senlinclient.common.i18n import _LI diff --git a/senlinclient/v1/cluster_policy.py b/senlinclient/v1/cluster_policy.py index e7462f2..21cc111 100644 --- a/senlinclient/v1/cluster_policy.py +++ b/senlinclient/v1/cluster_policy.py @@ -18,7 +18,7 @@ import six from cliff import command from cliff import lister from cliff import show -from openstackclient.common import utils +from osc_lib import utils from senlinclient.common.i18n import _ from senlinclient.common import utils as senlin_utils diff --git a/senlinclient/v1/event.py b/senlinclient/v1/event.py index cc2ee8b..8df137d 100644 --- a/senlinclient/v1/event.py +++ b/senlinclient/v1/event.py @@ -18,8 +18,8 @@ import six from cliff import lister from cliff import show from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc -from openstackclient.common import utils +from osc_lib import exceptions as exc +from osc_lib import utils from senlinclient.common.i18n import _ from senlinclient.common import utils as senlin_utils diff --git a/senlinclient/v1/node.py b/senlinclient/v1/node.py index 9e2ac63..c9d8813 100644 --- a/senlinclient/v1/node.py +++ b/senlinclient/v1/node.py @@ -20,8 +20,8 @@ from cliff import command from cliff import lister from cliff import show from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc -from openstackclient.common import utils +from osc_lib import exceptions as exc +from osc_lib import utils from senlinclient.common.i18n import _ from senlinclient.common.i18n import _LI diff --git a/senlinclient/v1/policy.py b/senlinclient/v1/policy.py index f4bd00d..e51bed3 100644 --- a/senlinclient/v1/policy.py +++ b/senlinclient/v1/policy.py @@ -19,8 +19,8 @@ from cliff import command from cliff import lister from cliff import show from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc -from openstackclient.common import utils +from osc_lib import exceptions as exc +from osc_lib import utils from senlinclient.common.i18n import _ from senlinclient.common.i18n import _LI diff --git a/senlinclient/v1/policy_type.py b/senlinclient/v1/policy_type.py index 5df67d4..465ecba 100644 --- a/senlinclient/v1/policy_type.py +++ b/senlinclient/v1/policy_type.py @@ -17,7 +17,8 @@ import six from cliff import lister from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc +from osc_lib import exceptions as exc + from senlinclient.common import format_utils from senlinclient.common.i18n import _ diff --git a/senlinclient/v1/profile.py b/senlinclient/v1/profile.py index cfd0602..6b6b0c1 100644 --- a/senlinclient/v1/profile.py +++ b/senlinclient/v1/profile.py @@ -19,8 +19,8 @@ from cliff import command from cliff import lister from cliff import show from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc -from openstackclient.common import utils +from osc_lib import exceptions as exc +from osc_lib import utils from senlinclient.common.i18n import _ from senlinclient.common.i18n import _LI diff --git a/senlinclient/v1/profile_type.py b/senlinclient/v1/profile_type.py index 563dbd8..b82043b 100644 --- a/senlinclient/v1/profile_type.py +++ b/senlinclient/v1/profile_type.py @@ -17,7 +17,7 @@ import six from cliff import lister from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc +from osc_lib import exceptions as exc from senlinclient.common import format_utils from senlinclient.common.i18n import _ diff --git a/senlinclient/v1/receiver.py b/senlinclient/v1/receiver.py index d8215bc..58d0758 100644 --- a/senlinclient/v1/receiver.py +++ b/senlinclient/v1/receiver.py @@ -20,8 +20,8 @@ from cliff import command from cliff import lister from cliff import show from openstack import exceptions as sdk_exc -from openstackclient.common import exceptions as exc -from openstackclient.common import utils +from osc_lib import exceptions as exc +from osc_lib import utils from senlinclient.common.i18n import _ from senlinclient.common.i18n import _LI