diff options
| author | John L. Villalovos <john.l.villalovos@intel.com> | 2017-10-05 22:57:26 -0700 |
|---|---|---|
| committer | John L. Villalovos <john.l.villalovos@intel.com> | 2017-10-10 09:57:19 -0700 |
| commit | c029f4e823c87b73d2dbaa249040c035358fd80a (patch) | |
| tree | 1b8bb0aa34c24d160d5a576fdfd6e24fba3da4ab | |
| parent | 370ce2847deaf0b83c46769e2fe911b9f4b5f4c2 (diff) | |
| download | ironic-c029f4e823c87b73d2dbaa249040c035358fd80a.tar.gz | |
Fix mis-formatted log messages
Fix errors in log messages. These were detected by a patch that catches
these types of errors. Submitting these fixes first as the patch to
detect the errors will likely take more time to get merged.
Conflicts:
ironic/drivers/modules/oneview/deploy_utils.py
Closes-Bug: #1722597
Change-Id: Ibe451f9cd97971cb83366fdc6f7f5c31d2af4793
(cherry picked from commit df5da4ce7a32e64e34a489b741bd911f9c55ea34)
| -rw-r--r-- | ironic/dhcp/neutron.py | 2 | ||||
| -rw-r--r-- | ironic/drivers/modules/irmc/boot.py | 2 | ||||
| -rw-r--r-- | ironic/tests/unit/conductor/test_task_manager.py | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/ironic/dhcp/neutron.py b/ironic/dhcp/neutron.py index 6f56c3918..a474c501d 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 32a8fdc6c..615a9ac79 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/tests/unit/conductor/test_task_manager.py b/ironic/tests/unit/conductor/test_task_manager.py index 3b754ebc6..732db381a 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) |