x/python-ganttclient
Code Issues Proposed changes

Improved error notification in network create

Browse Source
This commit is contained in:
Eldar Nugaev
2011-05-17 16:15:21 +00:00
committed by Tarmac
parent 4908be6bbb 3115f947f2
commit ecc1fcbbbd
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bin/nova-manage
View File

@@ -522,8 +522,10 @@ class NetworkCommands(object):
[network_size=FLAG], [vlan_start=FLAG], [network_size=FLAG], [vlan_start=FLAG],
[vpn_start=FLAG], [fixed_range_v6=FLAG]""" [vpn_start=FLAG], [fixed_range_v6=FLAG]"""
if not fixed_range: if not fixed_range:
raise TypeError(_('Fixed range in the form of 10.0.0.0/8 is ' msg = _('Fixed range in the form of 10.0.0.0/8 is '
'required to create networks.')) 'required to create networks.')
print msg
raise TypeError(msg)
if not num_networks: if not num_networks:
num_networks = FLAGS.num_networks num_networks = FLAGS.num_networks
if not network_size: if not network_size:
@@ -535,14 +537,18 @@ class NetworkCommands(object):
if not fixed_range_v6: if not fixed_range_v6:
fixed_range_v6 = FLAGS.fixed_range_v6 fixed_range_v6 = FLAGS.fixed_range_v6
net_manager = utils.import_object(FLAGS.network_manager) net_manager = utils.import_object(FLAGS.network_manager)
net_manager.create_networks(context.get_admin_context(), try:
cidr=fixed_range, net_manager.create_networks(context.get_admin_context(),
num_networks=int(num_networks), cidr=fixed_range,
network_size=int(network_size), num_networks=int(num_networks),
vlan_start=int(vlan_start), network_size=int(network_size),
vpn_start=int(vpn_start), vlan_start=int(vlan_start),
cidr_v6=fixed_range_v6, vpn_start=int(vpn_start),
label=label) cidr_v6=fixed_range_v6,
label=label)
except ValueError, e:
print e
raise e
def list(self): def list(self):
"""List all created networks""" """List all created networks"""