openstack/shade
Code Issues Proposed changes

Remove python-ironicclient

Browse Source 
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
This commit is contained in:
Julia Kreger 2017-11-29 16:32:16 -05:00
parent 6f5bfd16a1
commit b85cf134d9
5 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extras/install-tips.sh
View File

@ -16,7 +16,6 @@
for lib in \ for lib in \
python-keystoneclient \ python-keystoneclient \
python-ironicclient \
os-client-config \ os-client-config \
keystoneauth keystoneauth
do do

4
requirements.txt
View File

@ -11,9 +11,6 @@ ipaddress>=1.0.16;python_version<'3.3' # PSF
os-client-config>=1.28.0 # Apache-2.0 os-client-config>=1.28.0 # Apache-2.0
# These two are here to prevent issues with version pin mismatches from our # These two are here to prevent issues with version pin mismatches from our
# client library transitive depends. # 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 requestsexceptions>=1.2.0 # Apache-2.0
six>=1.10.0 # MIT six>=1.10.0 # MIT
futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD 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 keystoneauth1>=3.2.0 # Apache-2.0
netifaces>=0.10.4 # MIT netifaces>=0.10.4 # MIT
python-ironicclient>=1.14.0 # Apache-2.0
dogpile.cache>=0.6.2 # BSD dogpile.cache>=0.6.2 # BSD

2
shade/_legacy_clients.py
View File

@ -188,7 +188,7 @@ class LegacyClientFactoryMixin(object):
endpoint_data.max_microversion))) endpoint_data.max_microversion)))
return self._create_legacy_client( return self._create_legacy_client(
'ironic', 'baremetal', deprecated=False, 'ironic', 'baremetal',
module_name='ironicclient.client.Client', module_name='ironicclient.client.Client',
os_ironic_api_version=self._get_legacy_ironic_microversion()) os_ironic_api_version=self._get_legacy_ironic_microversion())

4
shade/operatorcloud.py
View File

@ -415,9 +415,7 @@ class OperatorCloud(openstackcloud.OpenStackCloud):
"""Patch Machine Information """Patch Machine Information
This method allows for an interface to manipulate node entries This method allows for an interface to manipulate node entries
within Ironic. Specifically, it is a pass-through for the within Ironic.
ironicclient.nodes.update interface which allows the Ironic Node
properties to be updated.
:param node_id: The server object to attach to. :param node_id: The server object to attach to.
:param patch: :param patch:

13
shade/tests/unit/test_baremetal_node.py
View File

@ -882,9 +882,7 @@ class TestBaremetalNode(base.IronicTestCase):
node_uuid = self.fake_baremetal_node['uuid'] node_uuid = self.fake_baremetal_node['uuid']
# TODO(TheJulia): There is a lot of duplication # TODO(TheJulia): There is a lot of duplication
# in testing creation. Surely this hsould be a helper # in testing creation. Surely this hsould be a helper
# or something. We should fix this, after we have # or something. We should fix this.
# ironicclient removed, as in the mean time visibility
# will be helpful.
node_to_post = { node_to_post = {
'chassis_uuid': None, 'chassis_uuid': None,
'driver': None, 'driver': None,
@ -915,11 +913,10 @@ class TestBaremetalNode(base.IronicTestCase):
self.assertDictEqual(self.fake_baremetal_node, return_value) self.assertDictEqual(self.fake_baremetal_node, return_value)
self.assert_calls() self.assert_calls()
# TODO(TheJulia): After we remove ironicclient, # TODO(TheJulia): We need to de-duplicate these tests.
# we need to de-duplicate these tests. Possibly # Possibly a dedicated class, although we should do it
# a dedicated class, although we should do it then # then as we may find differences that need to be
# as we may find differences that need to be accounted # accounted for newer microversions.
# for newer microversions.
def test_register_machine_enroll(self): def test_register_machine_enroll(self):
mac_address = '00:01:02:03:04:05' mac_address = '00:01:02:03:04:05'
nics = [{'mac': mac_address}] nics = [{'mac': mac_address}]