Skip to content

Commit 30612bf

Browse files
stephenfinstephenfin
committed
Remove 'get_osc_show_columns_for_sdk_resource' duplicates
There were a number of 'get_osc_show_columns_for_sdk_resource' defined in-tree. However, osc-lib has provided this method for some time (since 2.2.0, June 2020 [1] - our minimum version is currently 2.3.0) so there's no need to provide our own copies. Remove them. [1] openstack/osc-lib@29a0c5a5 Change-Id: I25695f4f9a379dd691b7eaa1e3247164668ae77e Signed-off-by: Stephen Finucane <[email protected]>
1 parent a797c9d commit 30612bf

30 files changed

Lines changed: 37 additions & 256 deletions

‎openstackclient/common/sdk_utils.py‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎openstackclient/image/v1/image.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from osc_lib.command import command
2929
from osc_lib import utils
3030

31-
from openstackclient.common import sdk_utils
3231
from openstackclient.i18n import _
3332

3433
if os.name == "nt":
@@ -48,15 +47,17 @@
4847

4948

5049
def _get_columns(item):
51-
# Trick sdk_utils to return URI attribute
5250
column_map = {
5351
'is_protected': 'protected',
5452
'owner_id': 'owner'
5553
}
56-
hidden_columns = ['location', 'checksum',
57-
'copy_from', 'created_at', 'status', 'updated_at']
58-
return sdk_utils.get_osc_show_columns_for_sdk_resource(
59-
item.to_dict(), column_map, hidden_columns)
54+
hidden_columns = [
55+
'location', 'checksum', 'copy_from', 'created_at', 'status',
56+
'updated_at',
57+
]
58+
return utils.get_osc_show_columns_for_sdk_resource(
59+
item.to_dict(), column_map, hidden_columns,
60+
)
6061

6162

6263
_formatters = {

‎openstackclient/image/v2/image.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
from osc_lib import utils
3232

3333
from openstackclient.common import progressbar
34-
from openstackclient.common import sdk_utils
3534
from openstackclient.i18n import _
3635
from openstackclient.identity import common
3736

@@ -99,13 +98,13 @@ def _format_image(image, human_readable=False):
9998

10099

101100
def _get_member_columns(item):
102-
# Trick sdk_utils to return URI attribute
103101
column_map = {
104102
'image_id': 'image_id'
105103
}
106104
hidden_columns = ['id', 'location', 'name']
107-
return sdk_utils.get_osc_show_columns_for_sdk_resource(
108-
item.to_dict(), column_map, hidden_columns)
105+
return utils.get_osc_show_columns_for_sdk_resource(
106+
item.to_dict(), column_map, hidden_columns,
107+
)
109108

110109

111110
def get_data_file(args):

‎openstackclient/network/sdk_utils.py‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎openstackclient/network/v2/address_group.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
from openstackclient.i18n import _
2424
from openstackclient.identity import common as identity_common
2525
from openstackclient.network import common
26-
from openstackclient.network import sdk_utils
27-
2826

2927
LOG = logging.getLogger(__name__)
3028

@@ -33,7 +31,7 @@ def _get_columns(item):
3331
column_map = {
3432
'tenant_id': 'project_id',
3533
}
36-
return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
34+
return utils.get_osc_show_columns_for_sdk_resource(item, column_map)
3735

3836

3937
def _format_addresses(addresses):

‎openstackclient/network/v2/address_scope.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
from openstackclient.i18n import _
2323
from openstackclient.identity import common as identity_common
2424
from openstackclient.network import common
25-
from openstackclient.network import sdk_utils
26-
2725

2826
LOG = logging.getLogger(__name__)
2927

@@ -33,7 +31,7 @@ def _get_columns(item):
3331
'is_shared': 'shared',
3432
'tenant_id': 'project_id',
3533
}
36-
return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
34+
return utils.get_osc_show_columns_for_sdk_resource(item, column_map)
3735

3836

3937
def _get_attrs(client_manager, parsed_args):

‎openstackclient/network/v2/floating_ip.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from openstackclient.i18n import _
2020
from openstackclient.identity import common as identity_common
2121
from openstackclient.network import common
22-
from openstackclient.network import sdk_utils
2322

2423

2524
_formatters = {
@@ -31,7 +30,7 @@ def _get_network_columns(item):
3130
column_map = {
3231
'tenant_id': 'project_id',
3332
}
34-
return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
33+
return utils.get_osc_show_columns_for_sdk_resource(item, column_map)
3534

3635

3736
def _get_columns(item):

‎openstackclient/network/v2/floating_ip_port_forwarding.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#
1313

1414
"""Floating IP Port Forwarding action implementations"""
15+
1516
import logging
1617

1718
from osc_lib.command import command
@@ -20,8 +21,6 @@
2021

2122
from openstackclient.i18n import _
2223
from openstackclient.network import common
23-
from openstackclient.network import sdk_utils
24-
2524

2625
LOG = logging.getLogger(__name__)
2726

@@ -30,7 +29,7 @@ def _get_columns(item):
3029
column_map = {
3130
'tenant_id': 'project_id',
3231
}
33-
return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
32+
return utils.get_osc_show_columns_for_sdk_resource(item, column_map)
3433

3534

3635
class CreateFloatingIPPortForwarding(command.ShowOne,

‎openstackclient/network/v2/ip_availability.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
from openstackclient.i18n import _
2121
from openstackclient.identity import common as identity_common
22-
from openstackclient.network import sdk_utils
2322

2423
_formatters = {
2524
'subnet_ip_availability': format_columns.ListDictColumn,
@@ -30,7 +29,7 @@ def _get_columns(item):
3029
column_map = {
3130
'tenant_id': 'project_id',
3231
}
33-
return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
32+
return utils.get_osc_show_columns_for_sdk_resource(item, column_map)
3433

3534

3635
# TODO(ankur-gupta-f): Use the SDK resource mapped attribute names once

‎openstackclient/network/v2/l3_conntrack_helper.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@
2020
from osc_lib import utils
2121

2222
from openstackclient.i18n import _
23-
from openstackclient.network import sdk_utils
24-
2523

2624
LOG = logging.getLogger(__name__)
2725

2826

2927
def _get_columns(item):
3028
column_map = {}
31-
return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
29+
return utils.get_osc_show_columns_for_sdk_resource(item, column_map)
3230

3331

3432
def _get_attrs(client, parsed_args):

0 commit comments

Comments
 (0)