Skip to content

Commit f00dce9

Browse files
Zuulopenstack-gerrit
Zuul
authored and
openstack-gerrit
committed
Merge "Get rid of tenant_id in the network commands"
2 parents 7c7a30b + 18dcd7c commit f00dce9

39 files changed

+103
-202
lines changed

‎openstackclient/network/v2/address_group.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828

2929

3030
def _get_columns(item):
31-
column_map = {
32-
'tenant_id': 'project_id',
33-
}
31+
column_map = {}
3432
hidden_columns = ['location']
3533
return utils.get_osc_show_columns_for_sdk_resource(
3634
item,
@@ -56,7 +54,7 @@ def _get_attrs(client_manager, parsed_args):
5654
parsed_args.project,
5755
parsed_args.project_domain,
5856
).id
59-
attrs['tenant_id'] = project_id
57+
attrs['project_id'] = project_id
6058

6159
return attrs
6260

‎openstackclient/network/v2/address_scope.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
def _get_columns(item):
3030
column_map = {
3131
'is_shared': 'shared',
32-
'tenant_id': 'project_id',
3332
}
3433
hidden_columns = ['location']
3534
return utils.get_osc_show_columns_for_sdk_resource(
@@ -54,7 +53,7 @@ def _get_attrs(client_manager, parsed_args):
5453
parsed_args.project,
5554
parsed_args.project_domain,
5655
).id
57-
attrs['tenant_id'] = project_id
56+
attrs['project_id'] = project_id
5857

5958
return attrs
6059

@@ -220,7 +219,6 @@ def take_action(self, parsed_args):
220219
parsed_args.project,
221220
parsed_args.project_domain,
222221
).id
223-
attrs['tenant_id'] = project_id
224222
attrs['project_id'] = project_id
225223
data = client.address_scopes(**attrs)
226224

‎openstackclient/network/v2/floating_ip.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727

2828

2929
def _get_network_columns(item):
30-
column_map = {
31-
'tenant_id': 'project_id',
32-
}
30+
column_map = {}
3331
hidden_columns = ['location']
3432
return utils.get_osc_show_columns_for_sdk_resource(
3533
item,
@@ -40,9 +38,6 @@ def _get_network_columns(item):
4038

4139
def _get_columns(item):
4240
columns = list(item.keys())
43-
if 'tenant_id' in columns:
44-
columns.remove('tenant_id')
45-
columns.append('project_id')
4641
return tuple(sorted(columns))
4742

4843

@@ -86,7 +81,7 @@ def _get_attrs(client_manager, parsed_args):
8681
parsed_args.project,
8782
parsed_args.project_domain,
8883
).id
89-
attrs['tenant_id'] = project_id
84+
attrs['project_id'] = project_id
9085

9186
if parsed_args.dns_domain:
9287
attrs['dns_domain'] = parsed_args.dns_domain
@@ -354,7 +349,6 @@ def take_action_network(self, client, parsed_args):
354349
parsed_args.project,
355350
parsed_args.project_domain,
356351
)
357-
query['tenant_id'] = project.id
358352
query['project_id'] = project.id
359353
if parsed_args.router is not None:
360354
router = network_client.find_router(parsed_args.router,

‎openstackclient/network/v2/floating_ip_port_forwarding.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626

2727

2828
def _get_columns(item):
29-
column_map = {
30-
'tenant_id': 'project_id',
31-
}
29+
column_map = {}
3230
hidden_columns = ['location']
3331
return utils.get_osc_show_columns_for_sdk_resource(
3432
item,

‎openstackclient/network/v2/ip_availability.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626

2727

2828
def _get_columns(item):
29-
column_map = {
30-
'tenant_id': 'project_id',
31-
}
29+
column_map = {}
3230
hidden_columns = ['location']
3331
return utils.get_osc_show_columns_for_sdk_resource(
3432
item,
@@ -89,7 +87,6 @@ def take_action(self, parsed_args):
8987
parsed_args.project,
9088
parsed_args.project_domain,
9189
).id
92-
filters['tenant_id'] = project_id
9390
filters['project_id'] = project_id
9491
data = client.network_ip_availabilities(**filters)
9592
return (column_headers,

‎openstackclient/network/v2/network.py‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ def _get_columns_network(item):
5858
'is_shared': 'shared',
5959
'ipv4_address_scope_id': 'ipv4_address_scope',
6060
'ipv6_address_scope_id': 'ipv6_address_scope',
61-
'tenant_id': 'project_id',
6261
'tags': 'tags',
6362
}
6463
hidden_columns = ['location']
@@ -70,9 +69,7 @@ def _get_columns_network(item):
7069

7170

7271
def _get_columns_compute(item):
73-
column_map = {
74-
'tenant_id': 'project_id',
75-
}
72+
column_map = {}
7673
return utils.get_osc_show_columns_for_sdk_resource(item, column_map)
7774

7875

@@ -101,8 +98,6 @@ def _get_attrs_network(client_manager, parsed_args):
10198
parsed_args.project,
10299
parsed_args.project_domain,
103100
).id
104-
# TODO(dtroyer): Remove tenant_id when we clean up the SDK refactor
105-
attrs['tenant_id'] = project_id
106101
attrs['project_id'] = project_id
107102

108103
# "network set" command doesn't support setting availability zone hints.
@@ -573,7 +568,6 @@ def take_action_network(self, client, parsed_args):
573568
parsed_args.project,
574569
parsed_args.project_domain,
575570
)
576-
args['tenant_id'] = project.id
577571
args['project_id'] = project.id
578572

579573
if parsed_args.share:

‎openstackclient/network/v2/network_auto_allocated_topology.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525

2626

2727
def _get_columns(item):
28-
column_map = {
29-
'tenant_id': 'project_id',
30-
}
28+
column_map = {}
3129
hidden_columns = ['location']
3230
return utils.get_osc_show_columns_for_sdk_resource(
3331
item,
@@ -56,7 +54,7 @@ def _get_attrs(client_manager, parsed_args):
5654
parsed_args.project,
5755
parsed_args.project_domain,
5856
).id
59-
attrs['tenant_id'] = project_id
57+
attrs['project_id'] = project_id
6058
if parsed_args.check_resources:
6159
attrs['check_resources'] = True
6260

‎openstackclient/network/v2/network_flavor.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
def _get_columns(item):
3030
column_map = {
3131
'is_enabled': 'enabled',
32-
'tenant_id': 'project_id',
3332
}
3433

3534
hidden_columns = ['location']
@@ -57,7 +56,7 @@ def _get_attrs(client_manager, parsed_args):
5756
parsed_args.project,
5857
parsed_args.project_domain,
5958
).id
60-
attrs['tenant_id'] = project_id
59+
attrs['project_id'] = project_id
6160

6261
return attrs
6362

‎openstackclient/network/v2/network_flavor_profile.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
def _get_columns(item):
2828
column_map = {
2929
'is_enabled': 'enabled',
30-
'tenant_id': 'project_id',
3130
}
3231

3332
hidden_columns = ['location']
@@ -57,7 +56,7 @@ def _get_attrs(client_manager, parsed_args):
5756
parsed_args.project,
5857
parsed_args.project_domain,
5958
).id
60-
attrs['tenant_id'] = project_id
59+
attrs['project_id'] = project_id
6160

6261
return attrs
6362

‎openstackclient/network/v2/network_meter.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
def _get_columns(item):
3030
column_map = {
3131
'is_shared': 'shared',
32-
'tenant_id': 'project_id',
3332
}
3433
hidden_columns = ['location']
3534
return utils.get_osc_show_columns_for_sdk_resource(
@@ -51,7 +50,7 @@ def _get_attrs(client_manager, parsed_args):
5150
parsed_args.project,
5251
parsed_args.project_domain,
5352
).id
54-
attrs['tenant_id'] = project_id
53+
attrs['project_id'] = project_id
5554
if parsed_args.share:
5655
attrs['shared'] = True
5756
if parsed_args.no_share:

0 commit comments

Comments
 (0)