diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-05-18 19:30:58 -0400 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-05-18 19:30:58 -0400 |
| commit | 563a438df8c36fc351894f1695c4d533bf20f74e (patch) | |
| tree | e01c9013a0efb7f7ed671e509d23043ebed760f2 /bin | |
| parent | 79d505c015bff1598e8e896f6198d65d90095ba6 (diff) | |
| parent | 92db39bdb439f693ed59626d8c58f03e470d31f6 (diff) | |
merge lp:nova
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 09b89b0bb..ae168001b 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -526,8 +526,10 @@ class NetworkCommands(object): [network_size=FLAG], [vlan_start=FLAG], [vpn_start=FLAG], [fixed_range_v6=FLAG]""" if not fixed_range: - raise TypeError(_('Fixed range in the form of 10.0.0.0/8 is ' - 'required to create networks.')) + msg = _('Fixed range in the form of 10.0.0.0/8 is ' + 'required to create networks.') + print msg + raise TypeError(msg) if not num_networks: num_networks = FLAGS.num_networks if not network_size: @@ -539,14 +541,18 @@ class NetworkCommands(object): if not fixed_range_v6: fixed_range_v6 = FLAGS.fixed_range_v6 net_manager = utils.import_object(FLAGS.network_manager) - net_manager.create_networks(context.get_admin_context(), - cidr=fixed_range, - num_networks=int(num_networks), - network_size=int(network_size), - vlan_start=int(vlan_start), - vpn_start=int(vpn_start), - cidr_v6=fixed_range_v6, - label=label) + try: + net_manager.create_networks(context.get_admin_context(), + cidr=fixed_range, + num_networks=int(num_networks), + network_size=int(network_size), + vlan_start=int(vlan_start), + vpn_start=int(vpn_start), + cidr_v6=fixed_range_v6, + label=label) + except ValueError, e: + print e + raise e def list(self): """List all created networks""" |