From 74396d58810e9851a6d33aef3dc3b2185154abcb Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@canonical.com>
Date: Wed, 22 Feb 2012 10:58:12 -0800
Subject: [PATCH] nova-manage: Fix 'fixed list'

Fix  'nova-manage fixed list'

Fixes bug 938702

Change-Id: I65a0a57ac8e16b605eeee963146d4dba582dc077
---
 bin/nova-manage | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 35f6f197f76b..74bc7899e3e8 100755
--- 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)