diff options
| author | Zuul <zuul@review.opendev.org> | 2022-01-17 17:39:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-01-17 17:39:20 +0000 |
| commit | f00dce9e2f078cd7d77d8aee52fd63e891bdacd2 (patch) | |
| tree | 11608158a06cab2977000eb455f48065c6a67081 /openstackclient/network/v2/floating_ip.py | |
| parent | 7c7a30b3cd429962f791790d4a0015c6238e59c6 (diff) | |
| parent | 18dcd7c9f7bc4ca0909a1a29ae934ea7128c183a (diff) | |
| download | python-openstackclient-f00dce9e2f078cd7d77d8aee52fd63e891bdacd2.tar.gz | |
Merge "Get rid of tenant_id in the network commands"
Diffstat (limited to 'openstackclient/network/v2/floating_ip.py')
| -rw-r--r-- | openstackclient/network/v2/floating_ip.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py index 83d816eb..4c03074d 100644 --- a/openstackclient/network/v2/floating_ip.py +++ b/openstackclient/network/v2/floating_ip.py @@ -27,9 +27,7 @@ _formatters = { def _get_network_columns(item): - column_map = { - 'tenant_id': 'project_id', - } + column_map = {} hidden_columns = ['location'] return utils.get_osc_show_columns_for_sdk_resource( item, @@ -40,9 +38,6 @@ def _get_network_columns(item): def _get_columns(item): columns = list(item.keys()) - if 'tenant_id' in columns: - columns.remove('tenant_id') - columns.append('project_id') return tuple(sorted(columns)) @@ -86,7 +81,7 @@ def _get_attrs(client_manager, parsed_args): parsed_args.project, parsed_args.project_domain, ).id - attrs['tenant_id'] = project_id + attrs['project_id'] = project_id if parsed_args.dns_domain: attrs['dns_domain'] = parsed_args.dns_domain @@ -354,7 +349,6 @@ class ListFloatingIP(common.NetworkAndComputeLister): parsed_args.project, parsed_args.project_domain, ) - query['tenant_id'] = project.id query['project_id'] = project.id if parsed_args.router is not None: router = network_client.find_router(parsed_args.router, |