openstack/nova
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2012-02-22 20:58:47 +00:00
committed by Gerrit Code Review
parent 160e6b6eee 74396d5881
commit 7427454d71
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/nova-manage
View File

@@ -650,12 +650,14 @@ class FixedIpCommands(object):
hostname = None hostname = None
host = None host = None
mac_address = 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']] instance = instances_by_id[fixed_ip['instance_id']]
hostname = instance['hostname'] hostname = instance['hostname']
host = instance['host'] host = instance['host']
print "%-18s\t%-15s\t%-15s\t%s" % ( print "%-18s\t%-15s\t%-15s\t%s" % (
fixed_ip['network']['cidr'], network['cidr'],
fixed_ip['address'], fixed_ip['address'],
hostname, host) hostname, host)