De-client-ify baremetal machine port list
Change-Id: Iccf27ec9431d00a2f76ac59864d4cd4d57f6e624
This commit is contained in:
parent
3767e31c0d
commit
c447d2e840
|
@ -42,11 +42,6 @@ class MachinePortDelete(task_manager.Task):
|
||||||
return client.ironic_client.port.delete(**self.args)
|
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):
|
class MachineNodeList(task_manager.Task):
|
||||||
def main(self, client):
|
def main(self, client):
|
||||||
return client.ironic_client.node.list(**self.args)
|
return client.ironic_client.node.list(**self.args)
|
||||||
|
|
|
@ -33,9 +33,10 @@ class OperatorCloud(openstackcloud.OpenStackCloud):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def list_nics(self):
|
def list_nics(self):
|
||||||
with _utils.shade_exceptions("Error fetching machine port list"):
|
msg = "Error fetching machine port list"
|
||||||
return self._normalize_machines(
|
return self._baremetal_client.get("/ports",
|
||||||
self.manager.submit_task(_tasks.MachinePortList()))
|
microversion="1.6",
|
||||||
|
error_message=msg)
|
||||||
|
|
||||||
def list_nics_for_machine(self, uuid):
|
def list_nics_for_machine(self, uuid):
|
||||||
with _utils.shade_exceptions(
|
with _utils.shade_exceptions(
|
||||||
|
|
|
@ -41,8 +41,6 @@ class TestBaremetalPort(base.IronicTestCase):
|
||||||
node_id=self.uuid)
|
node_id=self.uuid)
|
||||||
|
|
||||||
def test_list_nics(self):
|
def test_list_nics(self):
|
||||||
port_list = [self.fake_baremetal_port,
|
|
||||||
self.fake_baremetal_port2]
|
|
||||||
self.register_uris([
|
self.register_uris([
|
||||||
dict(method='GET',
|
dict(method='GET',
|
||||||
uri=self.get_mock_url(resource='ports'),
|
uri=self.get_mock_url(resource='ports'),
|
||||||
|
@ -51,7 +49,8 @@ class TestBaremetalPort(base.IronicTestCase):
|
||||||
])
|
])
|
||||||
|
|
||||||
return_value = self.op_cloud.list_nics()
|
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()
|
self.assert_calls()
|
||||||
|
|
||||||
def test_list_nics_failure(self):
|
def test_list_nics_failure(self):
|
||||||
|
|
Loading…
Reference in New Issue