diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-08-22 20:05:08 -0700 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-08-22 20:05:08 -0700 |
| commit | 2f304ecb74cced6d57dc4590f5bf41b7df88a504 (patch) | |
| tree | b6a6adbbcdb6e342a21112e5521f708cd0e3d8c7 /bin | |
| parent | af39051bd033e9e4017fec0fe1647aef582bc38e (diff) | |
| parent | c2fb9485f956482a5e6d628bb80e86d3e8d90d3a (diff) | |
| download | nova-2f304ecb74cced6d57dc4590f5bf41b7df88a504.tar.gz nova-2f304ecb74cced6d57dc4590f5bf41b7df88a504.tar.xz nova-2f304ecb74cced6d57dc4590f5bf41b7df88a504.zip | |
merge trunk, resolve conflicts, fix tests
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 8e6419c0b..1b29d7196 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -611,6 +611,8 @@ class FixedIpCommands(object): try: fixed_ip = db.fixed_ip_get_by_address(ctxt, address) + if fixed_ip is None: + raise exception.NotFound('Could not find address') db.fixed_ip_update(ctxt, fixed_ip['address'], {'reserved': reserved}) except exception.NotFound as ex: @@ -763,23 +765,26 @@ class NetworkCommands(object): def list(self): """List all created networks""" - print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % ( - _('IPv4'), - _('IPv6'), - _('start address'), - _('DNS1'), - _('DNS2'), - _('VlanID'), - 'project') + _fmt = "%-5s\t%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" + print _fmt % (_('id'), + _('IPv4'), + _('IPv6'), + _('start address'), + _('DNS1'), + _('DNS2'), + _('VlanID'), + _('project'), + _("uuid")) for network in db.network_get_all(context.get_admin_context()): - print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % ( - network.cidr, - network.cidr_v6, - network.dhcp_start, - network.dns1, - network.dns2, - network.vlan, - network.project_id) + print _fmt % (network.id, + network.cidr, + network.cidr_v6, + network.dhcp_start, + network.dns1, + network.dns2, + network.vlan, + network.project_id, + network.uuid) @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>', help='Network to delete') |