openstack/ironic-inspector
Code Issues Proposed changes

Merge "Follow up to incorrect pxe-enabled was set"

Browse Source
This commit is contained in:
Zuul 2020-08-17 14:51:19 +00:00 committed by Gerrit Code Review
commit 5a9221459e
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic_inspector/node_cache.py
View File

@ -347,7 +347,8 @@ class NodeInfo(object):
client_id = port.get('client_id')
if client_id:
extra = {'client-id': client_id}
is_pxe_enabled = port.get('pxe', True)
if CONF.processing.update_pxe_enabled:
is_pxe_enabled = port.get('pxe', True)
if mac not in self.ports():
self._create_port(mac, ironic=ironic, extra=extra,

2
ironic_inspector/test/functional.py
View File

@ -347,7 +347,7 @@ class Test(Base):
calls = [
mock.call(node_uuid=self.uuid, address=self.macs[2],
extra={'client-id': self.client_id},
is_pxe_enabled=False),
is_pxe_enabled=True),
]
self.assertFalse(self.cli.patch_port.called)
self.cli.create_port.assert_has_calls(calls, any_order=True)

26
ironic_inspector/test/unit/test_node_cache.py
View File

@ -791,6 +791,32 @@ class TestUpdate(test_base.NodeTest):
self.assertFalse(mock_warn.called)
self.assertFalse(self.ironic.port.list.called)
@mock.patch.object(node_cache.LOG, 'warning', autospec=True)
def test_create_ports_not_update_pxe(self, mock_warn):
CONF.set_override('update_pxe_enabled', False, 'processing')
ports = [
'mac2',
{'mac': 'mac3', 'client_id': '42', 'pxe': False},
{'mac': 'mac4', 'pxe': True}
]
self.node_info.create_ports(ports)
self.assertEqual({'mac0', 'mac1', 'mac2', 'mac3', 'mac4'},
set(self.node_info.ports()))
create_calls = [
mock.call(node_uuid=self.uuid, address='mac2', extra={},
is_pxe_enabled=True),
mock.call(node_uuid=self.uuid, address='mac3',
extra={'client-id': '42'}, is_pxe_enabled=True),
mock.call(node_uuid=self.uuid, address='mac4', extra={},
is_pxe_enabled=True),
]
self.assertEqual(create_calls, self.ironic.create_port.call_args_list)
# No conflicts - cache was not cleared - no calls to port.list
self.assertFalse(mock_warn.called)
self.assertFalse(self.ironic.port.list.called)
@mock.patch.object(node_cache.LOG, 'info', autospec=True)
def test__create_port(self, mock_info):
uuid = uuidutils.generate_uuid()