openstack/ironic
Code Issues Proposed changes

Merge "Fix mis-formatted log messages"

Browse Source
This commit is contained in:
Jenkins
2017-10-06 17:36:52 +00:00
committed by Gerrit Code Review
parent adcd981f50 df5da4ce7a
commit f6fb6b68f2
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/dhcp/neutron.py
View File

@@ -183,7 +183,7 @@ class NeutronDHCPApi(base.BaseDHCP):
if isinstance(p_obj, objects.Port): if isinstance(p_obj, objects.Port):
obj_name = 'port' obj_name = 'port'
LOG.warning("No VIFs found for node %(node)s when attempting " 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, {'node': task.node.uuid, 'obj_name': obj_name,
'obj_id': p_obj.uuid}) 'obj_id': p_obj.uuid})
raise exception.FailedToGetIPAddressOnPort(port_id=p_obj.uuid) raise exception.FailedToGetIPAddressOnPort(port_id=p_obj.uuid)

2
ironic/drivers/modules/irmc/boot.py
View File

@@ -977,7 +977,7 @@ class IRMCVirtualMediaBoot(base.BootInterface, IRMCVolumeBootMixIn):
:returns: None :returns: None
""" """
if task.node.driver_internal_info.get('boot_from_volume'): 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.', 'volume.',
{'node': task.node.uuid}) {'node': task.node.uuid})
self._configure_boot_from_volume(task) self._configure_boot_from_volume(task)

2
ironic/drivers/modules/oneview/deploy_utils.py
View File

@@ -367,7 +367,7 @@ def deallocate_server_hardware_from_ironic(client, task):
task.driver.power.set_power_state(task, states.POWER_OFF) task.driver.power.set_power_state(task, states.POWER_OFF)
client.server_profiles.delete(server_profile_uri) client.server_profiles.delete(server_profile_uri)
_del_applied_server_profile_uri_field(node) _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.", "from node %(node_uuid)s in OneView.",
{'server_profile_uri': server_profile_uri, {'server_profile_uri': server_profile_uri,
'node_uuid': node.uuid}) 'node_uuid': node.uuid})

1
ironic/tests/unit/conductor/test_task_manager.py
View File

@@ -729,6 +729,7 @@ class TaskManagerStateModelTestCases(tests_base.TestCase):
t.shared = True t.shared = True
t._purpose = 'purpose' t._purpose = 'purpose'
t._debug_timer = mock.Mock() t._debug_timer = mock.Mock()
t._debug_timer.elapsed.return_value = 3.14
t.release_resources(t) t.release_resources(t)
self.assertIsNone(t.node) self.assertIsNone(t.node)