From 1aadd5e961a6f1983454f5f49f077f0be0d6cba8 Mon Sep 17 00:00:00 2001 From: Lvov Maxim Date: Fri, 20 May 2011 12:53:49 +0400 Subject: added support for reserving certain network for certain project --- bin/nova-manage | 7 ++++--- nova/network/manager.py | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index db964064d..c64f25c23 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -515,11 +515,11 @@ class NetworkCommands(object): """Class for managing networks.""" def create(self, fixed_range=None, num_networks=None, - network_size=None, vlan_start=None, + network_size=None, vlan_start=None, project_id=None, vpn_start=None, fixed_range_v6=None, label='public'): """Creates fixed ips for host by range arguments: fixed_range=FLAG, [num_networks=FLAG], - [network_size=FLAG], [vlan_start=FLAG], + [network_size=FLAG], [vlan_start=FLAG], [project_id=None], [vpn_start=FLAG], [fixed_range_v6=FLAG]""" if not fixed_range: msg = _('Fixed range in the form of 10.0.0.0/8 is ' @@ -545,7 +545,8 @@ class NetworkCommands(object): vlan_start=int(vlan_start), vpn_start=int(vpn_start), cidr_v6=fixed_range_v6, - label=label) + label=label, + project_id=project_id) except ValueError, e: print e raise e diff --git a/nova/network/manager.py b/nova/network/manager.py index 5a6fdde5a..3422b72c1 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -564,6 +564,8 @@ class VlanManager(NetworkManager): net['dhcp_start'] = str(project_net[3]) net['vlan'] = vlan net['bridge'] = 'br%s' % vlan + if kwargs.has_key('project_id'): + net['project_id'] = kwargs['project_id'] if(FLAGS.use_ipv6): cidr_v6 = '%s/%s' % (fixed_net_v6[start_v6], significant_bits_v6) -- cgit From 4c1fd8a303a8eb1287fd83b04bd767171221d117 Mon Sep 17 00:00:00 2001 From: Lvov Maxim Date: Mon, 30 May 2011 11:25:21 +0400 Subject: add support for keyword arguments --- bin/nova-manage | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/nova-manage b/bin/nova-manage index c64f25c23..3d09f9064 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -1132,9 +1132,18 @@ def main(): action = argv.pop(0) matches = lazy_match(action, actions) action, fn = matches[0] + + fn_args, fn_kwargs = [], {} + for arg in argv: + if '=' in arg: + key, value = arg.split('=') + fn_kwargs[key] = value + else: + fn_args.append(arg) + # call the action with the remaining arguments try: - fn(*argv) + fn(*fn_args, **fn_kwargs) sys.exit(0) except TypeError: print _("Possible wrong number of arguments supplied") -- cgit From b85e089f807249eacc66172e56a1a69d450fafba Mon Sep 17 00:00:00 2001 From: Lvov Maxim Date: Mon, 30 May 2011 11:30:22 +0400 Subject: project_id moved to be last --- bin/nova-manage | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index 3d09f9064..8faf072bc 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -515,12 +515,12 @@ class NetworkCommands(object): """Class for managing networks.""" def create(self, fixed_range=None, num_networks=None, - network_size=None, vlan_start=None, project_id=None, - vpn_start=None, fixed_range_v6=None, label='public'): + network_size=None, vlan_start=None, vpn_start=None, + fixed_range_v6=None, label='public', project_id=None): """Creates fixed ips for host by range arguments: fixed_range=FLAG, [num_networks=FLAG], - [network_size=FLAG], [vlan_start=FLAG], [project_id=None], - [vpn_start=FLAG], [fixed_range_v6=FLAG]""" + [network_size=FLAG], [vlan_start=FLAG], [vpn_start=FLAG], + [fixed_range_v6=FLAG], [project_id=None]""" if not fixed_range: msg = _('Fixed range in the form of 10.0.0.0/8 is ' 'required to create networks.') -- cgit From f53e7d16181e0a7141956d835f71c09d76508c2d Mon Sep 17 00:00:00 2001 From: Lvov Maxim Date: Thu, 9 Jun 2011 22:02:01 +0400 Subject: parse options with optparse, options prepended '--' --- bin/nova-manage | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/bin/nova-manage b/bin/nova-manage index 8faf072bc..76bed16f7 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -62,6 +62,8 @@ import sys import time import IPy +from inspect import getargspec +from optparse import OptionParser # If ../nova/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... @@ -1133,14 +1135,18 @@ def main(): matches = lazy_match(action, actions) action, fn = matches[0] - fn_args, fn_kwargs = [], {} - for arg in argv: - if '=' in arg: - key, value = arg.split('=') - fn_kwargs[key] = value - else: - fn_args.append(arg) - + func_args = getargspec(fn).args + parser = OptionParser() + for arg in func_args: + dasharg = "--%s" % arg + parser.add_option(dasharg) + + (opts, fn_args) = parser.parse_args(argv) + fn_kwargs = vars(opts) + for k, v in fn_kwargs.items(): + if v is None: + del fn_kwargs[k] + # call the action with the remaining arguments try: fn(*fn_args, **fn_kwargs) -- cgit From 3f69522284833a52373ccf1e1006d9b2f20ccb06 Mon Sep 17 00:00:00 2001 From: Lvov Maxim Date: Fri, 10 Jun 2011 17:33:54 +0400 Subject: decorators for action methods added --- .bzrignore | 3 +++ bin/nova-manage | 37 ++++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.bzrignore b/.bzrignore index 14d8028f7..351b2bef7 100644 --- a/.bzrignore +++ b/.bzrignore @@ -13,3 +13,6 @@ nova/vcsversion.py clean.sqlite run_tests.log tests.sqlite +nova/tests/instance-* +tags + diff --git a/bin/nova-manage b/bin/nova-manage index 76bed16f7..2903e411c 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -105,6 +105,21 @@ flags.DEFINE_flag(flags.HelpshortFlag()) flags.DEFINE_flag(flags.HelpXMLFlag()) +# Decorators for actions +def positionargs(*args, **kwargs): + def _decorator(func): + req = args[-1] + func.__dict__['arguments'] = ' '.join("%s" % i for i in args[:req]) + func.__dict__['optargs'] = ' '.join("%s" % i for i in args[req:-1]) + return func + return _decorator + +def optionargs(*args, **kwargs): + def _decorator(func): + func.__dict__.setdefault('options', []).insert(0, (args, kwargs)) + return func + return _decorator + def param2id(object_id): """Helper function to convert various id types to internal id. args: [object_id], e.g. 'vol-0000000a' or 'volume-0000000a' or '10' @@ -515,7 +530,11 @@ class FloatingIpCommands(object): class NetworkCommands(object): """Class for managing networks.""" - + @optionargs('--project', dest="project_id", help='Project for network') + @optionargs('--vlan', dest="vlan_start", help='VLAN ID') + @positionargs('fixed_range', 'num_networks', + 'network_size', 'vlan_start', 'vpn_start', + 'fixed_range_v6', 'label', 'project_id', 1) def create(self, fixed_range=None, num_networks=None, network_size=None, vlan_start=None, vpn_start=None, fixed_range_v6=None, label='public', project_id=None): @@ -1135,25 +1154,25 @@ def main(): matches = lazy_match(action, actions) action, fn = matches[0] - func_args = getargspec(fn).args - parser = OptionParser() - for arg in func_args: - dasharg = "--%s" % arg - parser.add_option(dasharg) - + usage = "%prog " + "%s %s %s [%s] [options]" % (sys.argv[2], + sys.argv[3], fn.arguments, fn.optargs) + parser = OptionParser(usage=usage) + for ar, kw in fn.options: + parser.add_option(*ar, **kw) (opts, fn_args) = parser.parse_args(argv) fn_kwargs = vars(opts) + for k, v in fn_kwargs.items(): if v is None: del fn_kwargs[k] - + # call the action with the remaining arguments try: fn(*fn_args, **fn_kwargs) sys.exit(0) except TypeError: print _("Possible wrong number of arguments supplied") - print "%s %s: %s" % (category, action, fn.__doc__) + print "" raise except Exception: print _("Command failed, please check log for more info") -- cgit