From a1a470693e264e991b1dc9497512769bb8d510d8 Mon Sep 17 00:00:00 2001 From: Tang Chen Date: Wed, 23 Mar 2016 11:27:37 +0800 Subject: Add --project to "subnet pool create" This patch adds --project and --project-domain options to "subnet pool create" command. Change-Id: I2fe006013a194861299a9c77234a7cf988a8dad8 Partial-Bug: #1544586 --- openstackclient/network/v2/subnet_pool.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'openstackclient/network') diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py index 834760fb..8c90b955 100644 --- a/openstackclient/network/v2/subnet_pool.py +++ b/openstackclient/network/v2/subnet_pool.py @@ -17,6 +17,7 @@ from openstackclient.common import command from openstackclient.common import exceptions from openstackclient.common import parseractions from openstackclient.common import utils +from openstackclient.identity import common as identity_common def _get_columns(item): @@ -32,7 +33,7 @@ _formatters = { } -def _get_attrs(parsed_args): +def _get_attrs(client_manager, parsed_args): attrs = {} if parsed_args.name is not None: attrs['name'] = str(parsed_args.name) @@ -45,6 +46,16 @@ def _get_attrs(parsed_args): if parsed_args.max_prefix_length is not None: attrs['max_prefixlen'] = parsed_args.max_prefix_length + # "subnet pool set" command doesn't support setting project. + if 'project' in parsed_args and parsed_args.project is not None: + identity_client = client_manager.identity + project_id = identity_common.find_project( + identity_client, + parsed_args.project, + parsed_args.project_domain, + ).id + attrs['tenant_id'] = project_id + return attrs @@ -84,16 +95,22 @@ class CreateSubnetPool(command.ShowOne): parser = super(CreateSubnetPool, self).get_parser(prog_name) parser.add_argument( 'name', - metavar="", + metavar='', help='Name of the new subnet pool' ) _add_prefix_options(parser) + parser.add_argument( + '--project', + metavar='', + help="Owner's project (name or ID)", + ) + identity_common.add_project_domain_option_to_parser(parser) return parser def take_action(self, parsed_args): client = self.app.client_manager.network - attrs = _get_attrs(parsed_args) + attrs = _get_attrs(self.app.client_manager, parsed_args) obj = client.create_subnet_pool(**attrs) columns = _get_columns(obj) data = utils.get_item_properties(obj, columns, formatters=_formatters) @@ -192,7 +209,7 @@ class SetSubnetPool(command.Command): obj = client.find_subnet_pool(parsed_args.subnet_pool, ignore_missing=False) - attrs = _get_attrs(parsed_args) + attrs = _get_attrs(self.app.client_manager, parsed_args) if attrs == {}: msg = "Nothing specified to be set" raise exceptions.CommandError(msg) -- cgit v1.2.1