openstack
/
shade
Code Issues Proposed changes

Merge "Baremetal NIC list should return a list"

This commit is contained in:
Zuul 2017-12-08 16:33:43 +00:00 committed by Gerrit Code Review
parent 3b3cc08d01 9bc4e1373b
commit cf47cf43dd
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shade/openstackcloud.py
View File

@ -8815,24 +8815,25 @@ class OpenStackCloud(
def list_nics(self):
msg = "Error fetching machine port list"
return self._baremetal_client.get("/ports",
data = self._baremetal_client.get("/ports",
microversion="1.6",
error_message=msg)
return data['ports']
def list_nics_for_machine(self, uuid):
"""Returns a list of ports present on the machine node.
:param uuid: String representing machine UUID value in
order to identify the machine.
:returns: A dictionary containing containing a list of ports,
associated with the label "ports".
:returns: A list of ports.
"""
msg = "Error fetching port list for node {node_id}".format(
node_id=uuid)
url = "/nodes/{node_id}/ports".format(node_id=uuid)
return self._baremetal_client.get(url,
data = self._baremetal_client.get(url,
microversion="1.6",
error_message=msg)
return data['ports']
def get_nic_by_mac(self, mac):
try:

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

@ -49,8 +49,8 @@ class TestBaremetalPort(base.IronicTestCase):
])
return_value = self.op_cloud.list_nics()
self.assertEqual(2, len(return_value['ports']))
self.assertEqual(self.fake_baremetal_port, return_value['ports'][0])
self.assertEqual(2, len(return_value))
self.assertEqual(self.fake_baremetal_port, return_value[0])
self.assert_calls()
def test_list_nics_failure(self):
@ -75,8 +75,8 @@ class TestBaremetalPort(base.IronicTestCase):
return_value = self.op_cloud.list_nics_for_machine(
self.fake_baremetal_node['uuid'])
self.assertEqual(2, len(return_value['ports']))
self.assertEqual(self.fake_baremetal_port, return_value['ports'][0])
self.assertEqual(2, len(return_value))
self.assertEqual(self.fake_baremetal_port, return_value[0])
self.assert_calls()
def test_list_nics_for_machine_failure(self):