summaryrefslogtreecommitdiff
path: root/openstackclient/network/v2
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-10 02:52:15 +0000
committerGerrit Code Review <review@openstack.org>2017-03-10 02:52:15 +0000
commit9ffcd0dca73503f5385b2028de30290d086ae58e (patch)
tree981781b83af41463bec4f2fdb857cc9384c707ea /openstackclient/network/v2
parent1e739d7aebe53d38038b9f6172eb08916a7dd23c (diff)
parent3e6356a4d87351c84a29e3a44f60f0544e2947b6 (diff)
downloadpython-openstackclient-9ffcd0dca73503f5385b2028de30290d086ae58e.tar.gz
Merge "Fix handling the use_default_subnet_pool attribute"
Diffstat (limited to 'openstackclient/network/v2')
-rw-r--r--openstackclient/network/v2/subnet.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 2771858b..403b4cd2 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -132,7 +132,13 @@ def _get_columns(item):
'subnet_pool_id': 'subnetpool_id',
'tenant_id': 'project_id',
}
- return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
+ # Do not show this column when displaying a subnet
+ invisible_columns = ['use_default_subnetpool']
+ return sdk_utils.get_osc_show_columns_for_sdk_resource(
+ item,
+ column_map,
+ invisible_columns=invisible_columns
+ )
def convert_entries_to_nexthop(entries):
@@ -179,7 +185,7 @@ def _get_attrs(client_manager, parsed_args, is_create=True):
ignore_missing=False)
attrs['subnetpool_id'] = subnet_pool.id
if parsed_args.use_default_subnet_pool:
- attrs['use_default_subnetpool'] = True
+ attrs['use_default_subnet_pool'] = True
if parsed_args.prefix_length is not None:
attrs['prefixlen'] = parsed_args.prefix_length
if parsed_args.subnet_range is not None: