diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-05-18 11:56:55 -0500 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-05-18 11:56:55 -0500 |
| commit | bb4f5bb4cb3a56fb066395f74781010d16d658c6 (patch) | |
| tree | c30225987da31b2ddd97b322ed4365e4358d5b04 /bin | |
| parent | 88b3fa4513ed5cfe2befab692dc3371095f99d98 (diff) | |
| parent | d9a87dd0dcb703a84c5f642c323d7b2ff68410a6 (diff) | |
| download | nova-bb4f5bb4cb3a56fb066395f74781010d16d658c6.tar.gz nova-bb4f5bb4cb3a56fb066395f74781010d16d658c6.tar.xz nova-bb4f5bb4cb3a56fb066395f74781010d16d658c6.zip | |
Merging trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index a36ec86d0..db964064d 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -397,11 +397,10 @@ class ProjectCommands(object): arguments: project_id [key] [value]""" ctxt = context.get_admin_context() if key: - quo = {'project_id': project_id, key: value} try: - db.quota_update(ctxt, project_id, quo) + db.quota_update(ctxt, project_id, key, value) except exception.NotFound: - db.quota_create(ctxt, quo) + db.quota_create(ctxt, project_id, key, value) project_quota = quota.get_quota(ctxt, project_id) for key, value in project_quota.iteritems(): print '%s: %s' % (key, value) @@ -523,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: @@ -536,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""" |