Merge "nova-manage: Fix 'fixed list'"

2012-02-22 20:58:47 +00:00
parent 160e6b6eee 74396d5881
commit 7427454d71
1 changed files with 4 additions and 2 deletions
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -650,12 +650,14 @@ class FixedIpCommands(object):
            hostname = None
            host = None
            mac_address = None
-            if fixed_ip['instance']:
+            network = db.network_get(context.get_admin_context(),
+                                     fixed_ip['network_id'])
+            if fixed_ip['instance_id']:
                instance = instances_by_id[fixed_ip['instance_id']]
                hostname = instance['hostname']
                host = instance['host']
            print "%-18s\t%-15s\t%-15s\t%s" % (
-                    fixed_ip['network']['cidr'],
+                    network['cidr'],
                    fixed_ip['address'],
                    hostname, host)