openstack/ironic-inspector
Code Issues Proposed changes

Merge "Logging ironic port creation"

Browse Source
This commit is contained in:
Jenkins 2017-05-10 14:20:17 +00:00 committed by Gerrit Code Review
commit f5791da9e2
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic_inspector/node_cache.py
View File

@ -385,6 +385,11 @@ class NodeInfo(object):
try:
port = ironic.port.create(
node_uuid=self.uuid, address=mac, **kwargs)
LOG.info('Port %(uuid)s was created successfully, MAC: %(mac)s,'
'attributes: %(attrs)s',
{'uuid': port.uuid, 'mac': port.address,
'attrs': kwargs},
node_info=self)
except exceptions.Conflict:
LOG.warning('Port %s already exists, skipping',
mac, node_info=self)

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

@ -766,9 +766,26 @@ class TestUpdate(test_base.NodeTest):
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()
address = 'mac1'
self.ironic.port.create.return_value = mock.Mock(uuid=uuid,
address=address)
self.node_info._create_port(address, client_id='42')
self.ironic.port.create.assert_called_once_with(
node_uuid=self.uuid, address='mac1', client_id='42')
mock_info.assert_called_once_with(
mock.ANY, {'uuid': uuid, 'mac': address,
'attrs': {'client_id': '42'}},
node_info=self.node_info)
@mock.patch.object(node_cache.LOG, 'warning', autospec=True)
def test_create_ports_with_conflicts(self, mock_warn):
self.ironic.port.create.return_value = mock.sentinel.port
self.ironic.port.create.return_value = mock.Mock(
uuid='fake', address='mac')
ports = [
'mac',