x/python-ganttclient
Code Issues Proposed changes

Merge "Print friendly message if no floating IPs exist."

Browse Source
This commit is contained in:
Jenkins
2012-02-17 18:57:51 +00:00
committed by Gerrit Code Review
parent 3281c50c0c f239681d25
commit b62581de32
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/nova-manage
View File

@@ -721,10 +721,14 @@ class FloatingIpCommands(object):
"""Lists all floating ips (optionally by host)
Note: if host is given, only active floating IPs are returned"""
ctxt = context.get_admin_context()
if host is None:
floating_ips = db.floating_ip_get_all(ctxt)
else:
floating_ips = db.floating_ip_get_all_by_host(ctxt, host)
try:
if host is None:
floating_ips = db.floating_ip_get_all(ctxt)
else:
floating_ips = db.floating_ip_get_all_by_host(ctxt, host)
except exception.NoFloatingIpsDefined:
print _("No floating IP addresses have been defined.")
return
for floating_ip in floating_ips:
instance_id = None
if floating_ip['fixed_ip_id']: