diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index 6f56c39183..a474c501d3 100644 --- a/ironic/dhcp/neutron.py +++ b/ironic/dhcp/neutron.py @@ -183,7 +183,7 @@ class NeutronDHCPApi(base.BaseDHCP): if isinstance(p_obj, objects.Port): obj_name = 'port' LOG.warning("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/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py index 32a8fdc6c0..615a9ac791 100644 --- a/ironic/drivers/modules/irmc/boot.py +++ b/ironic/drivers/modules/irmc/boot.py @@ -977,7 +977,7 @@ class IRMCVirtualMediaBoot(base.BootInterface, IRMCVolumeBootMixIn): :returns: None """ if task.node.driver_internal_info.get('boot_from_volume'): - LOG.debug('Node %(node) is configured for booting from a remote ' + LOG.debug('Node %(node)s is configured for booting from a remote ' 'volume.', {'node': task.node.uuid}) self._configure_boot_from_volume(task) diff --git a/ironic/drivers/modules/oneview/deploy_utils.py b/ironic/drivers/modules/oneview/deploy_utils.py index 66f2bdb581..ad6a711e0f 100644 --- a/ironic/drivers/modules/oneview/deploy_utils.py +++ b/ironic/drivers/modules/oneview/deploy_utils.py @@ -367,7 +367,7 @@ def deallocate_server_hardware_from_ironic(client, task): task.driver.power.set_power_state(task, states.POWER_OFF) client.server_profiles.delete(server_profile_uri) _del_applied_server_profile_uri_field(node) - LOG.info("Server Profile %(server_profile_uuid)s was deleted " + LOG.info("Server Profile %(server_profile_uri)s was deleted " "from node %(node_uuid)s in OneView.", {'server_profile_uri': server_profile_uri, 'node_uuid': node.uuid}) diff --git a/ironic/tests/unit/conductor/test_task_manager.py b/ironic/tests/unit/conductor/test_task_manager.py index 3b754ebc6b..732db381ac 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)