openstack
/
ironic-inspector
Code Issues Proposed changes

Merge "Fail introspection early if no lookup attributes can be detected"

This commit is contained in:
Jenkins 2015-08-27 15:25:02 +00:00 committed by Gerrit Code Review
parent 4597919c9f 0d113098e1
commit e6016f0fa2
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ironic_inspector/introspect.py
View File

@ -131,6 +131,12 @@ def _background_introspect(ironic, node_info):
{'macs': macs, 'node': node_info.uuid})
firewall.update_filters(ironic)
if not node_info.attributes:
raise utils.Error(
_('No lookup attributes were found for node %s, inspector won\'t '
'be able to find it after introspection. Consider creating '
'ironic ports or providing an IPMI address.') % node_info.uuid)
LOG.info(_LI('The following attributes will be used for looking up '
'node %(uuid)s: %(attrs)s'),
{'attrs': node_info.attributes, 'uuid': node_info.uuid})

13
ironic_inspector/test/test_introspect.py
View File

@ -176,6 +176,19 @@ class TestIntrospect(BaseTest):
cli.node.set_power_state.assert_called_once_with(self.uuid,
'reboot')
def test_no_lookup_attrs(self, client_mock, add_mock, filters_mock):
cli = self._prepare(client_mock)
self.node_info.ports.return_value = []
add_mock.return_value = self.node_info
self.node_info.attributes = {}
introspect.introspect(self.uuid)
self.node_info.ports.assert_called_once_with(cli)
self.node_info.finished.assert_called_once_with(error=mock.ANY)
self.assertEqual(0, filters_mock.call_count)
self.assertEqual(0, cli.node.set_power_state.call_count)
def test_failed_to_get_node(self, client_mock, add_mock, filters_mock):
cli = client_mock.return_value
cli.node.get.side_effect = exceptions.NotFound()