From 133e8cf91a6dbef8c6de9051d16c8322e40dd72a Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 29 Jun 2016 12:55:58 +0100 Subject: [PATCH] Migrate to using osc-lib This new library provides the common logic used by openstack clients. Replacing the imports from openstackclient and cliff. Depends-On-External: https://review.rdoproject.org/r/#/c/2088/ Depends-On: I095209c241876c6ab48595962e07144fc5cc34a6 Closes-Bug: #1620964 Change-Id: I103a13ff6c0af94b82f5e48652380adfbf331d34 --- requirements.txt | 2 +- test-requirements.txt | 1 + tripleoclient/plugin.py | 2 +- tripleoclient/tests/base.py | 2 +- tripleoclient/tests/v1/baremetal/fakes.py | 2 +- tripleoclient/tests/v1/overcloud_deploy/fakes.py | 2 +- .../tests/v1/overcloud_deploy/test_overcloud_deploy.py | 2 +- .../overcloud_deploy/test_overcloud_deploy_validators.py | 2 +- .../tests/v1/overcloud_image/test_overcloud_image.py | 6 +++--- .../tests/v1/overcloud_netenv_validate/fakes.py | 2 +- tripleoclient/tests/v1/overcloud_node/fakes.py | 2 +- .../tests/v1/overcloud_node/test_overcloud_node.py | 2 +- tripleoclient/tests/v1/overcloud_update/fakes.py | 2 +- tripleoclient/tests/v1/overcloud_upgrade/fakes.py | 2 +- tripleoclient/tests/v1/test_overcloud_plan.py | 2 +- tripleoclient/tests/workflows/test_baremetal.py | 2 +- tripleoclient/utils.py | 2 +- tripleoclient/v1/baremetal.py | 9 ++++----- tripleoclient/v1/overcloud_deploy.py | 8 ++++---- tripleoclient/v1/overcloud_execute.py | 2 +- tripleoclient/v1/overcloud_image.py | 9 +++++---- tripleoclient/v1/overcloud_netenv_validate.py | 4 ++-- tripleoclient/v1/overcloud_node.py | 6 +++--- tripleoclient/v1/overcloud_plan.py | 7 +++---- tripleoclient/v1/overcloud_profiles.py | 7 +++---- tripleoclient/v1/overcloud_update.py | 8 ++++---- tripleoclient/v1/overcloud_upgrade.py | 6 +++--- tripleoclient/v1/undercloud.py | 2 +- 28 files changed, 52 insertions(+), 53 deletions(-) diff --git a/requirements.txt b/requirements.txt index 23bd47392..b51193f6c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ pbr>=1.6 # Apache-2.0 Babel>=2.3.4 # BSD -cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0 ipaddress>=1.0.7;python_version<'3.3' # PSF passlib>=1.6 # BSD python-ironic-inspector-client>=1.5.0 # Apache-2.0 @@ -14,6 +13,7 @@ python-mistralclient>=2.0.0 # Apache-2.0 python-openstackclient>=2.1.0 # Apache-2.0 six>=1.9.0 # MIT os-cloud-config # Apache-2.0 +osc-lib>=1.0.2 # Apache-2.0 websocket-client>=0.32.0 # LGPLv2+ # tripleoclient is tied to tripleo-common and expects to use the latest code. diff --git a/test-requirements.txt b/test-requirements.txt index 984b41e64..3433fea99 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,3 +10,4 @@ oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 sphinx!=1.3b1,<1.3,>=1.2.1 # BSD testrepository>=0.0.18 # Apache-2.0/BSD testtools>=1.4.0 # MIT +requests-mock>=1.0 # Apache-2.0 diff --git a/tripleoclient/plugin.py b/tripleoclient/plugin.py index 035d0b609..874f7b4a0 100644 --- a/tripleoclient/plugin.py +++ b/tripleoclient/plugin.py @@ -20,7 +20,7 @@ import logging import uuid import websocket -from openstackclient.common import utils +from osc_lib import utils from swiftclient import client as swift_client LOG = logging.getLogger(__name__) diff --git a/tripleoclient/tests/base.py b/tripleoclient/tests/base.py index 8f220f6e5..7f35f9eb1 100644 --- a/tripleoclient/tests/base.py +++ b/tripleoclient/tests/base.py @@ -57,7 +57,7 @@ class TestCase(testtools.TestCase): class TestCommand(TestCase): - """Test cliff command classes""" + """Test command classes""" def setUp(self): super(TestCommand, self).setUp() diff --git a/tripleoclient/tests/v1/baremetal/fakes.py b/tripleoclient/tests/v1/baremetal/fakes.py index b644b6b87..f9d8bdbfc 100644 --- a/tripleoclient/tests/v1/baremetal/fakes.py +++ b/tripleoclient/tests/v1/baremetal/fakes.py @@ -16,7 +16,7 @@ import mock import ironic_inspector_client -from openstackclient.tests import utils +from osc_lib.tests import utils class FakeBaremetalNodeClient(object): diff --git a/tripleoclient/tests/v1/overcloud_deploy/fakes.py b/tripleoclient/tests/v1/overcloud_deploy/fakes.py index c89bb7b6d..f5d3f8954 100644 --- a/tripleoclient/tests/v1/overcloud_deploy/fakes.py +++ b/tripleoclient/tests/v1/overcloud_deploy/fakes.py @@ -14,7 +14,7 @@ # import mock -from openstackclient.tests import utils +from osc_lib.tests import utils from tripleoclient.tests import fakes diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py index a7f69dcd4..5abe321c6 100644 --- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py +++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py @@ -23,7 +23,7 @@ import yaml from keystoneclient import exceptions as kscexc import mock -from openstackclient.common import exceptions as oscexc +from osc_lib import exceptions as oscexc from swiftclient.exceptions import ClientException as ObjectClientException from tripleoclient import constants diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy_validators.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy_validators.py index 17de3c6a5..ed52ddf9f 100644 --- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy_validators.py +++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy_validators.py @@ -16,7 +16,7 @@ import mock from uuid import uuid4 -from openstackclient.tests import utils +from osc_lib.tests import utils from tripleoclient.tests.v1.overcloud_deploy import fakes from tripleoclient.v1 import overcloud_deploy diff --git a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py index f8cd39535..a1a59d7ad 100644 --- a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py +++ b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py @@ -16,7 +16,7 @@ import mock import os -from openstackclient.common import exceptions +from osc_lib import exceptions from tripleoclient.tests.v1.test_plugin import TestPluginV1 from tripleoclient.v1 import overcloud_image @@ -304,13 +304,13 @@ class TestUploadOvercloudImage(TestPluginV1): self.cmd._read_image_file_pointer = mock.Mock(return_value=b'IMGDATA') self.cmd._check_file_exists = mock.Mock(return_value=True) - @mock.patch('openstackclient.common.utils.find_resource') + @mock.patch('osc_lib.utils.find_resource') def test_get_image_exists(self, mock_find_resource): image_mock = mock.Mock(name='imagename') mock_find_resource.return_value = image_mock self.assertEqual(self.cmd._get_image('imagename'), image_mock) - @mock.patch('openstackclient.common.utils.find_resource') + @mock.patch('osc_lib.utils.find_resource') def test_get_image_none(self, mock_find_resource): mock_find_resource.side_effect = exceptions.CommandError('') self.assertEqual(self.cmd._get_image('noimagename'), None) diff --git a/tripleoclient/tests/v1/overcloud_netenv_validate/fakes.py b/tripleoclient/tests/v1/overcloud_netenv_validate/fakes.py index 059871134..ed8537b16 100644 --- a/tripleoclient/tests/v1/overcloud_netenv_validate/fakes.py +++ b/tripleoclient/tests/v1/overcloud_netenv_validate/fakes.py @@ -13,7 +13,7 @@ # under the License. # -from openstackclient.tests import utils +from osc_lib.tests import utils class TestValidateOvercloudNetenv(utils.TestCommand): diff --git a/tripleoclient/tests/v1/overcloud_node/fakes.py b/tripleoclient/tests/v1/overcloud_node/fakes.py index 25fc1cba1..a84be4390 100644 --- a/tripleoclient/tests/v1/overcloud_node/fakes.py +++ b/tripleoclient/tests/v1/overcloud_node/fakes.py @@ -14,7 +14,7 @@ # import mock -from openstackclient.tests import utils +from osc_lib.tests import utils class FakeClientWrapper(object): diff --git a/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py b/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py index b921a8413..98ee3c286 100644 --- a/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py +++ b/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py @@ -19,7 +19,7 @@ import mock import os import tempfile -from openstackclient.tests import utils as test_utils +from osc_lib.tests import utils as test_utils from tripleoclient import exceptions from tripleoclient.tests.v1.overcloud_node import fakes diff --git a/tripleoclient/tests/v1/overcloud_update/fakes.py b/tripleoclient/tests/v1/overcloud_update/fakes.py index 1afcfa079..be2ec392b 100644 --- a/tripleoclient/tests/v1/overcloud_update/fakes.py +++ b/tripleoclient/tests/v1/overcloud_update/fakes.py @@ -14,7 +14,7 @@ # import mock -from openstackclient.tests import utils +from osc_lib.tests import utils class FakeClientWrapper(object): diff --git a/tripleoclient/tests/v1/overcloud_upgrade/fakes.py b/tripleoclient/tests/v1/overcloud_upgrade/fakes.py index ba2d4b301..810f130bc 100644 --- a/tripleoclient/tests/v1/overcloud_upgrade/fakes.py +++ b/tripleoclient/tests/v1/overcloud_upgrade/fakes.py @@ -14,7 +14,7 @@ # import mock -from openstackclient.tests import utils +from osc_lib.tests import utils class FakeClientWrapper(object): diff --git a/tripleoclient/tests/v1/test_overcloud_plan.py b/tripleoclient/tests/v1/test_overcloud_plan.py index e0be76a1e..602282152 100644 --- a/tripleoclient/tests/v1/test_overcloud_plan.py +++ b/tripleoclient/tests/v1/test_overcloud_plan.py @@ -12,7 +12,7 @@ import mock -from openstackclient.tests import utils +from osc_lib.tests import utils from tripleoclient import exceptions from tripleoclient.v1 import overcloud_plan diff --git a/tripleoclient/tests/workflows/test_baremetal.py b/tripleoclient/tests/workflows/test_baremetal.py index d1c406393..40e6dbd15 100644 --- a/tripleoclient/tests/workflows/test_baremetal.py +++ b/tripleoclient/tests/workflows/test_baremetal.py @@ -14,7 +14,7 @@ import mock -from openstackclient.tests import utils +from osc_lib.tests import utils from tripleoclient import exceptions from tripleoclient.workflows import baremetal diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py index b40e60903..96a2dd5fc 100644 --- a/tripleoclient/utils.py +++ b/tripleoclient/utils.py @@ -32,7 +32,7 @@ import yaml from heatclient.common import event_utils from heatclient.exc import HTTPNotFound -from openstackclient.i18n import _ +from osc_lib.i18n import _ from six.moves import configparser from six.moves import urllib diff --git a/tripleoclient/v1/baremetal.py b/tripleoclient/v1/baremetal.py index 14ccd7bd1..d10c29383 100644 --- a/tripleoclient/v1/baremetal.py +++ b/tripleoclient/v1/baremetal.py @@ -21,9 +21,8 @@ import logging import time import uuid -from cliff import command -from cliff import lister -from openstackclient.i18n import _ +from osc_lib.command import command +from osc_lib.i18n import _ from tripleoclient import exceptions from tripleoclient import utils @@ -237,7 +236,7 @@ class StartBaremetalIntrospectionBulk(command.Command): baremetal.provide_manageable_nodes(clients, queue_name=queue_name) -class StatusBaremetalIntrospectionBulk(lister.Lister): +class StatusBaremetalIntrospectionBulk(command.Lister): """Get the status of all baremetal nodes""" log = logging.getLogger(__name__ + ".StatusBaremetalIntrospectionBulk") @@ -427,7 +426,7 @@ class ConfigureBaremetalBoot(command.Command): ) -class ShowNodeCapabilities(lister.Lister): +class ShowNodeCapabilities(command.Lister): """List the capabilities for all Nodes""" log = logging.getLogger(__name__ + ".ShowNodeProfile") diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index a855cb510..dc3364746 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -28,16 +28,16 @@ import time import uuid import yaml -from cliff import command from heatclient.common import event_utils from heatclient.common import template_utils from keystoneclient import exceptions as kscexc -from openstackclient.common import exceptions as oscexc -from openstackclient.common import utils as osc_utils -from openstackclient.i18n import _ from os_cloud_config import keystone from os_cloud_config import keystone_pki from os_cloud_config.utils import clients +from osc_lib.command import command +from osc_lib import exceptions as oscexc +from osc_lib.i18n import _ +from osc_lib import utils as osc_utils from swiftclient.exceptions import ClientException from tripleo_common import update diff --git a/tripleoclient/v1/overcloud_execute.py b/tripleoclient/v1/overcloud_execute.py index 38a2d3d11..324d1a739 100644 --- a/tripleoclient/v1/overcloud_execute.py +++ b/tripleoclient/v1/overcloud_execute.py @@ -19,7 +19,7 @@ import os.path import re import uuid -from cliff import command +from osc_lib.command import command class RemoteExecute(command.Command): diff --git a/tripleoclient/v1/overcloud_image.py b/tripleoclient/v1/overcloud_image.py index b43e3a6b9..b01a4e77f 100644 --- a/tripleoclient/v1/overcloud_image.py +++ b/tripleoclient/v1/overcloud_image.py @@ -29,11 +29,12 @@ import sys import time import warnings -from cliff import command -from openstackclient.common import exceptions -from openstackclient.common import utils -from openstackclient.i18n import _ +from osc_lib.command import command +from osc_lib import exceptions +from osc_lib.i18n import _ +from osc_lib import utils from prettytable import PrettyTable + from tripleoclient import utils as plugin_utils diff --git a/tripleoclient/v1/overcloud_netenv_validate.py b/tripleoclient/v1/overcloud_netenv_validate.py index ddd7d28aa..03345cc33 100644 --- a/tripleoclient/v1/overcloud_netenv_validate.py +++ b/tripleoclient/v1/overcloud_netenv_validate.py @@ -18,9 +18,9 @@ import itertools import logging import os -from cliff import command import ipaddress -from openstackclient.i18n import _ +from osc_lib.command import command +from osc_lib.i18n import _ import six import yaml diff --git a/tripleoclient/v1/overcloud_node.py b/tripleoclient/v1/overcloud_node.py index cd62df794..ac3b5aa88 100644 --- a/tripleoclient/v1/overcloud_node.py +++ b/tripleoclient/v1/overcloud_node.py @@ -17,9 +17,9 @@ import argparse import logging import uuid -from cliff import command -from openstackclient.common import utils -from openstackclient.i18n import _ +from osc_lib.command import command +from osc_lib.i18n import _ +from osc_lib import utils from tripleo_common import scale from tripleoclient import constants diff --git a/tripleoclient/v1/overcloud_plan.py b/tripleoclient/v1/overcloud_plan.py index 52f56921e..fdd8ec8ac 100644 --- a/tripleoclient/v1/overcloud_plan.py +++ b/tripleoclient/v1/overcloud_plan.py @@ -14,14 +14,13 @@ import json import logging import uuid -from cliff import command -from cliff import lister -from openstackclient.i18n import _ +from osc_lib.command import command +from osc_lib.i18n import _ from tripleoclient.workflows import plan_management -class ListPlans(lister.Lister): +class ListPlans(command.Lister): """List overcloud deployment plans.""" log = logging.getLogger(__name__ + ".ListPlans") diff --git a/tripleoclient/v1/overcloud_profiles.py b/tripleoclient/v1/overcloud_profiles.py index 68d415b6c..e62ab53d2 100644 --- a/tripleoclient/v1/overcloud_profiles.py +++ b/tripleoclient/v1/overcloud_profiles.py @@ -14,9 +14,8 @@ import logging -from cliff import command -from cliff import lister -from openstackclient.i18n import _ +from osc_lib.command import command +from osc_lib.i18n import _ from tripleoclient import exceptions from tripleoclient import utils @@ -86,7 +85,7 @@ class MatchProfiles(command.Command): POSTFIX = '_profile' -class ListProfiles(lister.Lister): +class ListProfiles(command.Lister): """List overcloud node profiles""" log = logging.getLogger(__name__ + ".ListProfiles") diff --git a/tripleoclient/v1/overcloud_update.py b/tripleoclient/v1/overcloud_update.py index baf249a1f..0b79302c3 100644 --- a/tripleoclient/v1/overcloud_update.py +++ b/tripleoclient/v1/overcloud_update.py @@ -16,10 +16,10 @@ import logging import yaml -from cliff import command -from openstackclient.common import exceptions as oscexc -from openstackclient.common import utils -from openstackclient.i18n import _ +from osc_lib.command import command +from osc_lib import exceptions as oscexc +from osc_lib.i18n import _ +from osc_lib import utils from tripleo_common import update from tripleoclient import constants diff --git a/tripleoclient/v1/overcloud_upgrade.py b/tripleoclient/v1/overcloud_upgrade.py index 4522fb5e9..f1dbb544b 100644 --- a/tripleoclient/v1/overcloud_upgrade.py +++ b/tripleoclient/v1/overcloud_upgrade.py @@ -16,9 +16,9 @@ import logging import yaml -from cliff import command -from openstackclient.common import utils -from openstackclient.i18n import _ +from osc_lib.command import command +from osc_lib.i18n import _ +from osc_lib import utils from tripleo_common import upgrade from tripleoclient import constants diff --git a/tripleoclient/v1/undercloud.py b/tripleoclient/v1/undercloud.py index 4bdcd8efc..24c1c4267 100644 --- a/tripleoclient/v1/undercloud.py +++ b/tripleoclient/v1/undercloud.py @@ -18,7 +18,7 @@ import logging import subprocess -from cliff import command +from osc_lib.command import command from tripleoclient import utils