From 854be4815127fd703cd91f40fa7511c170351bbc Mon Sep 17 00:00:00 2001 From: Tong Li Date: Fri, 20 Jul 2012 22:48:42 -0400 Subject: fixes for nova-manage not returning a full list of fixed IPs This fix correct the problem reported in bug 930193 nova-manage does not return a full list of fixed IPs. The reason is that the call to fixed_ip['instance_id'] can throw exception when fixed_ip does not have instance_id as its member. The changes in this fix corrects the problem. rebase to resolve the automatic merge issue. Change-Id: Ic15a0a0f43f53b82f9d88a03803c96b44a8ddcb9 --- bin/nova-manage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index 24e095b92..da9d375e4 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -304,7 +304,7 @@ class FixedIpCommands(object): network = all_networks.get(fixed_ip['network_id']) if network: has_ip = True - if fixed_ip['instance_id']: + if fixed_ip.get('instance_id'): instance = instances_by_id.get(fixed_ip['instance_id']) if instance: hostname = instance['hostname'] -- cgit