openstack/ironic
Code Issues Proposed changes

Merge "Use node uuid in some exception log"

Browse Source
This commit is contained in:
Jenkins
2016-02-02 12:10:39 +00:00
committed by Gerrit Code Review
parent eeda92c36d 93ca514b7c
commit a7c1038b0f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/conductor/manager.py
View File

@@ -1538,7 +1538,7 @@ class ConductorManager(base_manager.BaseConductorManager):
raise exception.UnsupportedDriverExtension(driver=node.driver,
extension='console')
if not node.console_enabled:
raise exception.NodeConsoleNotEnabled(node=node_id)
raise exception.NodeConsoleNotEnabled(node=node.uuid)
task.driver.console.validate(task)
return task.driver.console.get_console(task)

2
ironic/conductor/task_manager.py
View File

@@ -236,7 +236,7 @@ class TaskManager(object):
self.node_id)
LOG.debug("Node %(node)s successfully reserved for %(purpose)s "
"(took %(time).2f seconds)",
{'node': self.node_id, 'purpose': self._purpose,
{'node': self.node.uuid, 'purpose': self._purpose,
'time': self._debug_timer.elapsed()})
self._debug_timer.restart()

8
ironic/db/sqlalchemy/api.py
View File

@@ -222,7 +222,7 @@ class Connection(api.Connection):
if count != 1:
# Nothing updated and node exists. Must already be
# locked.
raise exception.NodeLocked(node=node_id,
raise exception.NodeLocked(node=node.uuid,
host=node['reservation'])
return node
except NoResultFound:
@@ -239,9 +239,9 @@ class Connection(api.Connection):
if count != 1:
node = query.one()
if node['reservation'] is None:
raise exception.NodeNotLocked(node=node_id)
raise exception.NodeNotLocked(node=node.uuid)
else:
raise exception.NodeLocked(node=node_id,
raise exception.NodeLocked(node=node.uuid,
host=node['reservation'])
except NoResultFound:
raise exception.NodeNotFound(node_id)
@@ -359,7 +359,7 @@ class Connection(api.Connection):
# Prevent instance_uuid overwriting
if values.get("instance_uuid") and ref.instance_uuid:
raise exception.NodeAssociated(
node=node_id, instance=ref.instance_uuid)
node=ref.uuid, instance=ref.instance_uuid)
if 'provision_state' in values:
values['provision_updated_at'] = timeutils.utcnow()