x/mogan
Code Issues Proposed changes

Fix node NotFound issue when getting an instance

Browse Source 
We should check whether an instance is really associate with a
ironic node before issuing a request to get the node.

Change-Id: Icd416107f486c285339edbdece104bf87ab72ba4
Closes-Bug: #1649767
This commit is contained in:
Zhenguo Niu 2016-12-19 14:52:34 +08:00
parent 57c4f4ad3f
commit b0e61917d1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nimble/api/controllers/v1/instances.py
View File

@ -310,7 +310,8 @@ class InstanceController(rest.RestController):
node_list = []
if node_list:
node_dict = {node['instance_uuid']: node for node in node_list}
node_dict = {node['instance_uuid']: node for node in node_list
if node['instance_uuid']}
# Merge nimble instance info with ironic node power state
for instance_data in instances_data:
uuid = instance_data['uuid']
@ -348,9 +349,11 @@ class InstanceController(rest.RestController):
"""
rpc_instance = self._resource or self._get_resource(instance_uuid)
instance_data = rpc_instance.as_dict()
if fields is None or 'power_state' in fields:
if (fields is None or 'power_state' in fields and
instance_data['node_uuid']):
# Only fetch node info if fields parameter is not specified
# or node fields is not requested.
# or node fields is not requested and when instance is really
# associated with a ironic node.
try:
node = self.engine_api.get_ironic_node(pecan.request.context,
instance_uuid,