diff options
20 files changed, 27 insertions, 27 deletions
diff --git a/requirements.txt b/requirements.txt index 5c6873d..6c48f54 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,12 +7,12 @@ pbr>=1.6 # Apache-2.0 Babel>=2.3.4 # BSD cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0 keystoneauth1>=2.7.0 # Apache-2.0 +osc-lib>=0.1.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 oslo.utils>=3.11.0 # Apache-2.0 python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0 -python-openstackclient>=2.1.0 # Apache-2.0 requests>=2.10.0 # Apache-2.0 six>=1.9.0 # MIT PrettyTable<0.8,>=0.7 # BSD diff --git a/saharaclient/osc/plugin.py b/saharaclient/osc/plugin.py index e93968e..0cef052 100644 --- a/saharaclient/osc/plugin.py +++ b/saharaclient/osc/plugin.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from openstackclient.common import utils +from osc_lib import utils from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/saharaclient/osc/v1/cluster_templates.py b/saharaclient/osc/v1/cluster_templates.py index 2396610..e706f8c 100644 --- a/saharaclient/osc/v1/cluster_templates.py +++ b/saharaclient/osc/v1/cluster_templates.py @@ -19,8 +19,8 @@ import sys from cliff import command from cliff import lister from cliff import show -from openstackclient.common import exceptions -from openstackclient.common import utils as osc_utils +from osc_lib import exceptions +from osc_lib import utils as osc_utils from oslo_log import log as logging from saharaclient.osc.v1 import utils diff --git a/saharaclient/osc/v1/clusters.py b/saharaclient/osc/v1/clusters.py index 05ec51f..7f44693 100644 --- a/saharaclient/osc/v1/clusters.py +++ b/saharaclient/osc/v1/clusters.py @@ -19,8 +19,8 @@ import sys from cliff import command from cliff import lister from cliff import show -from openstackclient.common import exceptions -from openstackclient.common import utils as osc_utils +from osc_lib import exceptions +from osc_lib import utils as osc_utils from oslo_log import log as logging from saharaclient.osc.v1 import utils diff --git a/saharaclient/osc/v1/data_sources.py b/saharaclient/osc/v1/data_sources.py index ce6bcc2..b6961f3 100644 --- a/saharaclient/osc/v1/data_sources.py +++ b/saharaclient/osc/v1/data_sources.py @@ -18,7 +18,7 @@ import sys from cliff import command from cliff import lister from cliff import show -from openstackclient.common import utils as osc_utils +from osc_lib import utils as osc_utils from oslo_log import log as logging from saharaclient.osc.v1 import utils diff --git a/saharaclient/osc/v1/images.py b/saharaclient/osc/v1/images.py index 4031221..280230e 100644 --- a/saharaclient/osc/v1/images.py +++ b/saharaclient/osc/v1/images.py @@ -18,7 +18,7 @@ import sys from cliff import command from cliff import lister from cliff import show -from openstackclient.common import utils as osc_utils +from osc_lib import utils as osc_utils from oslo_log import log as logging from saharaclient.osc.v1 import utils diff --git a/saharaclient/osc/v1/job_binaries.py b/saharaclient/osc/v1/job_binaries.py index 9751fdf..e369ded 100644 --- a/saharaclient/osc/v1/job_binaries.py +++ b/saharaclient/osc/v1/job_binaries.py @@ -19,8 +19,8 @@ import sys from cliff import command from cliff import lister from cliff import show -from openstackclient.common import exceptions -from openstackclient.common import utils as osc_utils +from osc_lib import exceptions +from osc_lib import utils as osc_utils from oslo_log import log as logging from oslo_serialization import jsonutils diff --git a/saharaclient/osc/v1/job_templates.py b/saharaclient/osc/v1/job_templates.py index 952666f..1d8ec9f 100644 --- a/saharaclient/osc/v1/job_templates.py +++ b/saharaclient/osc/v1/job_templates.py @@ -18,8 +18,8 @@ import sys from cliff import command from cliff import lister from cliff import show -from openstackclient.common import exceptions -from openstackclient.common import utils as osc_utils +from osc_lib import exceptions +from osc_lib import utils as osc_utils from oslo_log import log as logging from oslo_serialization import jsonutils diff --git a/saharaclient/osc/v1/job_types.py b/saharaclient/osc/v1/job_types.py index 08f4013..15cd410 100644 --- a/saharaclient/osc/v1/job_types.py +++ b/saharaclient/osc/v1/job_types.py @@ -18,8 +18,8 @@ import sys from cliff import command from cliff import lister -from openstackclient.common import exceptions -from openstackclient.common import utils as osc_utils +from osc_lib import exceptions +from osc_lib import utils as osc_utils from oslo_log import log as logging from oslo_serialization import jsonutils diff --git a/saharaclient/osc/v1/jobs.py b/saharaclient/osc/v1/jobs.py index 576c7ff..73b89bb 100644 --- a/saharaclient/osc/v1/jobs.py +++ b/saharaclient/osc/v1/jobs.py @@ -18,8 +18,8 @@ import sys from cliff import command from cliff import lister from cliff import show -from openstackclient.common import exceptions -from openstackclient.common import utils as osc_utils +from osc_lib import exceptions +from osc_lib import utils as osc_utils from oslo_log import log as logging from oslo_serialization import jsonutils diff --git a/saharaclient/osc/v1/node_group_templates.py b/saharaclient/osc/v1/node_group_templates.py index 1d08097..400b3ec 100644 --- a/saharaclient/osc/v1/node_group_templates.py +++ b/saharaclient/osc/v1/node_group_templates.py @@ -19,8 +19,8 @@ import sys from cliff import command from cliff import lister from cliff import show -from openstackclient.common import exceptions -from openstackclient.common import utils as osc_utils +from osc_lib import exceptions +from osc_lib import utils as osc_utils from oslo_log import log as logging from saharaclient.osc.v1 import utils diff --git a/saharaclient/osc/v1/plugins.py b/saharaclient/osc/v1/plugins.py index 21f5726..71dfc39 100644 --- a/saharaclient/osc/v1/plugins.py +++ b/saharaclient/osc/v1/plugins.py @@ -19,7 +19,7 @@ import sys from cliff import command from cliff import lister from cliff import show -from openstackclient.common import utils as osc_utils +from osc_lib import utils as osc_utils from oslo_log import log as logging from oslo_serialization import jsonutils diff --git a/saharaclient/tests/unit/osc/v1/fakes.py b/saharaclient/tests/unit/osc/v1/fakes.py index 2c48f24..af374b8 100644 --- a/saharaclient/tests/unit/osc/v1/fakes.py +++ b/saharaclient/tests/unit/osc/v1/fakes.py @@ -15,7 +15,7 @@ import mock -from openstackclient.tests import utils +from osc_lib.tests import utils class TestDataProcessing(utils.TestCommand): diff --git a/saharaclient/tests/unit/osc/v1/test_cluster_templates.py b/saharaclient/tests/unit/osc/v1/test_cluster_templates.py index 7bbaea7..b9e9533 100644 --- a/saharaclient/tests/unit/osc/v1/test_cluster_templates.py +++ b/saharaclient/tests/unit/osc/v1/test_cluster_templates.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from openstackclient.tests import utils as osc_utils +from osc_lib.tests import utils as osc_utils from saharaclient.api import cluster_templates as api_ct from saharaclient.api import node_group_templates as api_ngt diff --git a/saharaclient/tests/unit/osc/v1/test_clusters.py b/saharaclient/tests/unit/osc/v1/test_clusters.py index 67c6b8a..9564e3f 100644 --- a/saharaclient/tests/unit/osc/v1/test_clusters.py +++ b/saharaclient/tests/unit/osc/v1/test_clusters.py @@ -15,7 +15,7 @@ import mock -from openstackclient.tests import utils as osc_utils +from osc_lib.tests import utils as osc_utils from saharaclient.api import cluster_templates as api_ct from saharaclient.api import clusters as api_cl diff --git a/saharaclient/tests/unit/osc/v1/test_data_sources.py b/saharaclient/tests/unit/osc/v1/test_data_sources.py index f0e8013..cae2e3c 100644 --- a/saharaclient/tests/unit/osc/v1/test_data_sources.py +++ b/saharaclient/tests/unit/osc/v1/test_data_sources.py @@ -15,7 +15,7 @@ import mock -from openstackclient.tests import utils as osc_utils +from osc_lib.tests import utils as osc_utils from saharaclient.api import data_sources as api_ds from saharaclient.osc.v1 import data_sources as osc_ds diff --git a/saharaclient/tests/unit/osc/v1/test_images.py b/saharaclient/tests/unit/osc/v1/test_images.py index e94a1d0..9c59bdf 100644 --- a/saharaclient/tests/unit/osc/v1/test_images.py +++ b/saharaclient/tests/unit/osc/v1/test_images.py @@ -15,7 +15,7 @@ import mock -from openstackclient.tests import utils as osc_utils +from osc_lib.tests import utils as osc_utils from saharaclient.api import images as api_images from saharaclient.osc.v1 import images as osc_images diff --git a/saharaclient/tests/unit/osc/v1/test_job_templates.py b/saharaclient/tests/unit/osc/v1/test_job_templates.py index dc6bb23..10b65b3 100644 --- a/saharaclient/tests/unit/osc/v1/test_job_templates.py +++ b/saharaclient/tests/unit/osc/v1/test_job_templates.py @@ -15,7 +15,7 @@ import mock -from openstackclient.tests import utils as osc_utils +from osc_lib.tests import utils as osc_utils from saharaclient.api import jobs as api_j from saharaclient.osc.v1 import job_templates as osc_j diff --git a/saharaclient/tests/unit/osc/v1/test_jobs.py b/saharaclient/tests/unit/osc/v1/test_jobs.py index 7a97737..edbead9 100644 --- a/saharaclient/tests/unit/osc/v1/test_jobs.py +++ b/saharaclient/tests/unit/osc/v1/test_jobs.py @@ -15,7 +15,7 @@ import mock -from openstackclient.tests import utils as osc_utils +from osc_lib.tests import utils as osc_utils from saharaclient.api import job_executions as api_je from saharaclient.osc.v1 import jobs as osc_je diff --git a/saharaclient/tests/unit/osc/v1/test_node_group_templates.py b/saharaclient/tests/unit/osc/v1/test_node_group_templates.py index 3c75b77..8e23f42 100644 --- a/saharaclient/tests/unit/osc/v1/test_node_group_templates.py +++ b/saharaclient/tests/unit/osc/v1/test_node_group_templates.py @@ -15,7 +15,7 @@ import mock -from openstackclient.tests import utils as osc_utils +from osc_lib.tests import utils as osc_utils from saharaclient.api import node_group_templates as api_ngt from saharaclient.osc.v1 import node_group_templates as osc_ngt |