summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEldar Nugaev <enugaev@griddynamics.com>2011-05-17 16:15:21 +0000
committerTarmac <>2011-05-17 16:15:21 +0000
commit0ac734f1387510042527c047feca5fa16a0beb3a (patch)
treea3ff61e19df52a9e01a0d6216e5455ee23badea0
parent0946bac5fa210dc9172bbd6ab73ffd77495ebe58 (diff)
parent21b84aae209a8e02910293f3adc60048e6ef9ce5 (diff)
Improved error notification in network create
-rwxr-xr-xbin/nova-manage26
1 files changed, 16 insertions, 10 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index c95b216ce..db964064d 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -522,8 +522,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:
@@ -535,14 +537,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"""