openstack
/
ironic-inspector
Code Issues Proposed changes

Store discovery_timestamp in node extra (part of #4)

This commit is contained in:
Dmitry Tantsur 2014-10-24 17:03:38 +02:00
parent 759dd28482
commit d175d78867
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ironic_discoverd/discoverd.py
View File

@ -1,5 +1,6 @@
import logging
import re
import time
import eventlet
import six
@ -175,8 +176,6 @@ def discover(uuids):
_validate(ironic, node)
if not node.maintenance:
LOG.warning('Node %s will be put in maintenance mode', node.uuid)
if node.extra.get('on_discovery'):
LOG.warning('Node %s seems to be on discovery already', node.uuid)
@ -212,9 +211,16 @@ def _validate(ironic, node):
def _background_discover(ironic, nodes):
patch = [{'op': 'add', 'path': '/extra/on_discovery', 'value': 'true'},
{'op': 'replace', 'path': '/maintenance', 'value': 'true'}]
{'op': 'add', 'path': '/extra/discovery_timestamp',
'value': str(time.time())}]
for node in nodes:
ironic.node.update(node.uuid, patch)
node_patch = []
if not node.maintenance:
LOG.warning('Node %s will be put in maintenance mode', node.uuid)
node_patch.append(
{'op': 'replace', 'path': '/maintenance', 'value': 'true'})
ironic.node.update(node.uuid, patch + node_patch)
to_exclude = set()
for node in nodes:

10
ironic_discoverd/test.py
View File

@ -1,6 +1,7 @@
import eventlet
eventlet.monkey_patch(thread=False)
import time
import unittest
from ironicclient import exceptions
@ -136,6 +137,7 @@ class TestDiscover(unittest.TestCase):
firewall.MACS_DISCOVERY = set()
init_conf()
@patch.object(time, 'time', lambda: 42.0)
def test_ok(self, client_mock, filters_mock, spawn_mock):
cli = client_mock.return_value
cli.node.get.side_effect = [
@ -156,9 +158,13 @@ class TestDiscover(unittest.TestCase):
self.assertEqual(2, cli.node.set_power_state.call_count)
cli.node.set_power_state.assert_called_with(ANY, 'on')
patch = [{'op': 'add', 'path': '/extra/on_discovery', 'value': 'true'},
{'op': 'replace', 'path': '/maintenance', 'value': 'true'}]
{'op': 'add', 'path': '/extra/discovery_timestamp',
'value': '42.0'}]
cli.node.update.assert_any_call('uuid1', patch)
cli.node.update.assert_any_call('uuid2', patch)
cli.node.update.assert_any_call(
'uuid2',
patch +
[{'op': 'replace', 'path': '/maintenance', 'value': 'true'}])
self.assertEqual(2, cli.node.update.call_count)
spawn_mock.assert_called_once_with(discoverd._background_discover,
cli, ANY)