openstack
/
shade
Code Issues Proposed changes

De-client-ify baremetal machine port list 

Change-Id: Iccf27ec9431d00a2f76ac59864d4cd4d57f6e624
This commit is contained in:
Julia Kreger 2017-09-01 14:27:51 +00:00
parent 3767e31c0d
commit c447d2e840
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shade/_tasks.py
View File

@ -42,11 +42,6 @@ class MachinePortDelete(task_manager.Task):
return client.ironic_client.port.delete(**self.args)
class MachinePortList(task_manager.Task):
def main(self, client):
return client.ironic_client.port.list()
class MachineNodeList(task_manager.Task):
def main(self, client):
return client.ironic_client.node.list(**self.args)

7
shade/operatorcloud.py
View File

@ -33,9 +33,10 @@ class OperatorCloud(openstackcloud.OpenStackCloud):
"""
def list_nics(self):
with _utils.shade_exceptions("Error fetching machine port list"):
return self._normalize_machines(
self.manager.submit_task(_tasks.MachinePortList()))
msg = "Error fetching machine port list"
return self._baremetal_client.get("/ports",
microversion="1.6",
error_message=msg)
def list_nics_for_machine(self, uuid):
with _utils.shade_exceptions(

5
shade/tests/unit/test_baremetal_ports.py
View File

@ -41,8 +41,6 @@ class TestBaremetalPort(base.IronicTestCase):
node_id=self.uuid)
def test_list_nics(self):
port_list = [self.fake_baremetal_port,
self.fake_baremetal_port2]
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(resource='ports'),
@ -51,7 +49,8 @@ class TestBaremetalPort(base.IronicTestCase):
])
return_value = self.op_cloud.list_nics()
self.assertEqual(port_list, return_value)
self.assertEqual(2, len(return_value['ports']))
self.assertEqual(self.fake_baremetal_port, return_value['ports'][0])
self.assert_calls()
def test_list_nics_failure(self):