diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index a335cea7b7..f86081833f 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -204,7 +204,7 @@ class NeutronDHCPApi(base.BaseDHCP): if isinstance(p_obj, objects.Port): obj_name = 'port' LOG.warning(_LW("No VIFs found for node %(node)s when attempting " - "to get IP address for %(obj_name)s: %(obj_id)."), + "to get IP address for %(obj_name)s: %(obj_id)s."), {'node': task.node.uuid, 'obj_name': obj_name, 'obj_id': p_obj.uuid}) raise exception.FailedToGetIPAddressOnPort(port_id=p_obj.uuid) diff --git a/ironic/tests/unit/conductor/test_task_manager.py b/ironic/tests/unit/conductor/test_task_manager.py index fff06e1915..2e2b39e734 100644 --- a/ironic/tests/unit/conductor/test_task_manager.py +++ b/ironic/tests/unit/conductor/test_task_manager.py @@ -729,6 +729,7 @@ class TaskManagerStateModelTestCases(tests_base.TestCase): t.shared = True t._purpose = 'purpose' t._debug_timer = mock.Mock() + t._debug_timer.elapsed.return_value = 3.14 t.release_resources(t) self.assertIsNone(t.node)