diff --git a/ironic_inspector/plugins/base_physnet.py b/ironic_inspector/plugins/base_physnet.py index 2934caa8d..8548fca9e 100644 --- a/ironic_inspector/plugins/base_physnet.py +++ b/ironic_inspector/plugins/base_physnet.py @@ -99,5 +99,5 @@ class BasePhysnetHook(base.ProcessingHook): node_info.patch_port(port, [patch]) except exceptions.BadRequestException as e: LOG.warning("Failed to update port %(uuid)s: %(error)s", - {'uuid': port.uuid, 'error': e}, + {'uuid': port.id, 'error': e}, node_info=node_info) diff --git a/ironic_inspector/plugins/local_link_connection.py b/ironic_inspector/plugins/local_link_connection.py index 673c8f016..a9a6178a2 100644 --- a/ironic_inspector/plugins/local_link_connection.py +++ b/ironic_inspector/plugins/local_link_connection.py @@ -161,5 +161,5 @@ class GenericLocalLinkConnectionHook(base.ProcessingHook): node_info.patch_port(port, patches) except exceptions.BadRequestException as e: LOG.warning("Failed to update port %(uuid)s: %(error)s", - {'uuid': port.uuid, 'error': e}, + {'uuid': port.id, 'error': e}, node_info=node_info) diff --git a/ironic_inspector/test/unit/test_plugins_local_link_connection.py b/ironic_inspector/test/unit/test_plugins_local_link_connection.py index 54bcaeaf2..781309c11 100644 --- a/ironic_inspector/test/unit/test_plugins_local_link_connection.py +++ b/ironic_inspector/test/unit/test_plugins_local_link_connection.py @@ -51,7 +51,7 @@ class TestGenericLocalLinkConnectionHook(test_base.NodeTest): 'port_id': '56' } - ports = [mock.Mock(spec=['address', 'uuid', 'local_link_connection'], + ports = [mock.Mock(spec=['address', 'id', 'local_link_connection'], address=a, local_link_connection=llc) for a in ('11:11:11:11:11:11',)] self.node_info = node_cache.NodeInfo(uuid=self.uuid, started_at=0, diff --git a/ironic_inspector/test/unit/test_plugins_physnet_cidr_map.py b/ironic_inspector/test/unit/test_plugins_physnet_cidr_map.py index d1b4b7acf..11ac6c304 100644 --- a/ironic_inspector/test/unit/test_plugins_physnet_cidr_map.py +++ b/ironic_inspector/test/unit/test_plugins_physnet_cidr_map.py @@ -43,7 +43,7 @@ class TestPhysnetCidrMapHook(test_base.NodeTest): } } - ports = [mock.Mock(spec=['address', 'uuid', 'physical_network'], + ports = [mock.Mock(spec=['address', 'id', 'physical_network'], address=a) for a in ('11:11:11:11:11:11',)] self.node_info = node_cache.NodeInfo(uuid=self.uuid, started_at=0, node=self.node, ports=ports) @@ -113,7 +113,7 @@ class TestPhysnetCidrMapHook(test_base.NodeTest): @mock.patch.object(node_cache.NodeInfo, 'patch_port', autospec=True) def test_no_overwrite(self, mock_patch): - ports = [mock.Mock(spec=['address', 'uuid', 'physical_network'], + ports = [mock.Mock(spec=['address', 'id', 'physical_network'], address=a, physical_network='foo') for a in ('11:11:11:11:11:11',)] node_info = node_cache.NodeInfo(uuid=self.uuid, started_at=0,