From b85cf134d9d7163d7f7527b3d308d602895f0d45 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Wed, 29 Nov 2017 16:32:16 -0500 Subject: [PATCH] Remove python-ironicclient After an epic battle with time, the python-ironicclient has been driven from the land of shade, and there will be joy! Change-Id: I234e2fc9d1800607c22eb447dd3e77428221695e --- extras/install-tips.sh | 1 - requirements.txt | 4 ---- shade/_legacy_clients.py | 2 +- shade/operatorcloud.py | 4 +--- shade/tests/unit/test_baremetal_node.py | 13 +++++-------- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/extras/install-tips.sh b/extras/install-tips.sh index d96773ac4..d5dd00bf7 100644 --- a/extras/install-tips.sh +++ b/extras/install-tips.sh @@ -16,7 +16,6 @@ for lib in \ python-keystoneclient \ - python-ironicclient \ os-client-config \ keystoneauth do diff --git a/requirements.txt b/requirements.txt index 2893f40ad..29cb6b847 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,9 +11,6 @@ ipaddress>=1.0.16;python_version<'3.3' # PSF os-client-config>=1.28.0 # Apache-2.0 # These two are here to prevent issues with version pin mismatches from our # client library transitive depends. -# Babel can be removed when ironicclient is removed (because of openstackclient -# transitive depend) -Babel!=2.4.0,>=2.3.4 # BSD requestsexceptions>=1.2.0 # Apache-2.0 six>=1.10.0 # MIT futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD @@ -21,6 +18,5 @@ iso8601>=0.1.11 # MIT keystoneauth1>=3.2.0 # Apache-2.0 netifaces>=0.10.4 # MIT -python-ironicclient>=1.14.0 # Apache-2.0 dogpile.cache>=0.6.2 # BSD diff --git a/shade/_legacy_clients.py b/shade/_legacy_clients.py index fa6f51776..a3aaae9cf 100644 --- a/shade/_legacy_clients.py +++ b/shade/_legacy_clients.py @@ -188,7 +188,7 @@ class LegacyClientFactoryMixin(object): endpoint_data.max_microversion))) return self._create_legacy_client( - 'ironic', 'baremetal', deprecated=False, + 'ironic', 'baremetal', module_name='ironicclient.client.Client', os_ironic_api_version=self._get_legacy_ironic_microversion()) diff --git a/shade/operatorcloud.py b/shade/operatorcloud.py index 64ed996ad..c6ed82fe0 100644 --- a/shade/operatorcloud.py +++ b/shade/operatorcloud.py @@ -415,9 +415,7 @@ class OperatorCloud(openstackcloud.OpenStackCloud): """Patch Machine Information This method allows for an interface to manipulate node entries - within Ironic. Specifically, it is a pass-through for the - ironicclient.nodes.update interface which allows the Ironic Node - properties to be updated. + within Ironic. :param node_id: The server object to attach to. :param patch: diff --git a/shade/tests/unit/test_baremetal_node.py b/shade/tests/unit/test_baremetal_node.py index c6f759abc..c0f54818b 100644 --- a/shade/tests/unit/test_baremetal_node.py +++ b/shade/tests/unit/test_baremetal_node.py @@ -882,9 +882,7 @@ class TestBaremetalNode(base.IronicTestCase): node_uuid = self.fake_baremetal_node['uuid'] # TODO(TheJulia): There is a lot of duplication # in testing creation. Surely this hsould be a helper - # or something. We should fix this, after we have - # ironicclient removed, as in the mean time visibility - # will be helpful. + # or something. We should fix this. node_to_post = { 'chassis_uuid': None, 'driver': None, @@ -915,11 +913,10 @@ class TestBaremetalNode(base.IronicTestCase): self.assertDictEqual(self.fake_baremetal_node, return_value) self.assert_calls() - # TODO(TheJulia): After we remove ironicclient, - # we need to de-duplicate these tests. Possibly - # a dedicated class, although we should do it then - # as we may find differences that need to be accounted - # for newer microversions. + # TODO(TheJulia): We need to de-duplicate these tests. + # Possibly a dedicated class, although we should do it + # then as we may find differences that need to be + # accounted for newer microversions. def test_register_machine_enroll(self): mac_address = '00:01:02:03:04:05' nics = [{'mac': mac_address}]