summaryrefslogtreecommitdiff
path: root/openstackclient/network/v2
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2017-09-14 11:06:51 -0500
committerDean Troyer <dtroyer@gmail.com>2017-09-14 11:16:11 -0500
commit5309bf5f873aba4e994c9011a893987c40d56eda (patch)
tree9e1bf90f6bb27cc6e0a5f9b4ef81ef8431d21599 /openstackclient/network/v2
parent5e5239d5eb635470b0c3bc63c4a6263808c41c9b (diff)
parentf63bb180036c0f2d096eefaaaf2fbdd60a427343 (diff)
downloadpython-openstackclient-5309bf5f873aba4e994c9011a893987c40d56eda.tar.gz
Merge remote-tracking branch 'origin/master' into f4-merge-branch
Change-Id: Ie6c321e67aa9338334e4649879e60847a5d1eb56
Diffstat (limited to 'openstackclient/network/v2')
-rw-r--r--openstackclient/network/v2/subnet.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 3470d24e..6a50f503 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -141,7 +141,7 @@ def _get_columns(item):
'tenant_id': 'project_id',
}
# Do not show this column when displaying a subnet
- invisible_columns = ['use_default_subnetpool']
+ invisible_columns = ['use_default_subnet_pool']
return sdk_utils.get_osc_show_columns_for_sdk_resource(
item,
column_map,
@@ -192,6 +192,8 @@ def _get_attrs(client_manager, parsed_args, is_create=True):
subnet_pool = client.find_subnet_pool(parsed_args.subnet_pool,
ignore_missing=False)
attrs['subnetpool_id'] = subnet_pool.id
+ if parsed_args.use_prefix_delegation:
+ attrs['subnetpool_id'] = "prefix_delegation"
if parsed_args.use_default_subnet_pool:
attrs['use_default_subnet_pool'] = True
if parsed_args.prefix_length is not None:
@@ -267,6 +269,11 @@ class CreateSubnet(command.ShowOne):
"(Name or ID)")
)
subnet_pool_group.add_argument(
+ '--use-prefix-delegation',
+ help=_("Use 'prefix-delegation' if IP is IPv6 format "
+ "and IP would be delegated externally")
+ )
+ subnet_pool_group.add_argument(
'--use-default-subnet-pool',
action='store_true',
help=_("Use default subnet pool for --ip-version")