Skip to content

Commit a041729

Browse files
jharbottjharbott
committed
Revert "Format location columns in network commands"
This reverts commit 6ee7b8d. Change-Id: I5f59959ba8a01aba49e29f4cb007397467344e58
1 parent 3e6874d commit a041729

22 files changed

Lines changed: 28 additions & 119 deletions

‎openstackclient/network/v2/address_scope.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import logging
1717

18-
from osc_lib.cli import format_columns
1918
from osc_lib.command import command
2019
from osc_lib import exceptions
2120
from osc_lib import utils
@@ -28,11 +27,6 @@
2827
LOG = logging.getLogger(__name__)
2928

3029

31-
_formatters = {
32-
'location': format_columns.DictColumn,
33-
}
34-
35-
3630
def _get_columns(item):
3731
column_map = {
3832
'is_shared': 'shared',
@@ -106,7 +100,7 @@ def take_action(self, parsed_args):
106100
attrs = _get_attrs(self.app.client_manager, parsed_args)
107101
obj = client.create_address_scope(**attrs)
108102
display_columns, columns = _get_columns(obj)
109-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
103+
data = utils.get_item_properties(obj, columns, formatters={})
110104

111105
return (display_columns, data)
112106

@@ -295,6 +289,6 @@ def take_action(self, parsed_args):
295289
parsed_args.address_scope,
296290
ignore_missing=False)
297291
display_columns, columns = _get_columns(obj)
298-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
292+
data = utils.get_item_properties(obj, columns, formatters={})
299293

300294
return (display_columns, data)

‎openstackclient/network/v2/floating_ip.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
"""IP Floating action implementations"""
1515

16-
from osc_lib.cli import format_columns
1716
from osc_lib.command import command
1817
from osc_lib import utils
1918
from osc_lib.utils import tags as _tag
@@ -25,7 +24,6 @@
2524

2625

2726
_formatters = {
28-
'location': format_columns.DictColumn,
2927
'port_details': utils.format_dict,
3028
}
3129

‎openstackclient/network/v2/ip_availability.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
from openstackclient.identity import common as identity_common
2222
from openstackclient.network import sdk_utils
2323

24-
2524
_formatters = {
26-
'location': format_columns.DictColumn,
2725
'subnet_ip_availability': format_columns.ListDictColumn,
2826
}
2927

‎openstackclient/network/v2/network.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ def human_readable(self):
4040
'subnet_ids': format_columns.ListColumn,
4141
'admin_state_up': AdminStateColumn,
4242
'is_admin_state_up': AdminStateColumn,
43-
'location': format_columns.DictColumn,
4443
'router:external': RouterExternalColumn,
4544
'is_router_external': RouterExternalColumn,
4645
'availability_zones': format_columns.ListColumn,

‎openstackclient/network/v2/network_agent.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ def human_readable(self):
4343
'alive': AliveColumn,
4444
'admin_state_up': AdminStateColumn,
4545
'is_admin_state_up': AdminStateColumn,
46-
'location': format_columns.DictColumn,
4746
'configurations': format_columns.DictColumn,
4847
}
4948

‎openstackclient/network/v2/network_auto_allocated_topology.py‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import logging
1717

18-
from osc_lib.cli import format_columns
1918
from osc_lib.command import command
2019
from osc_lib import utils
2120

@@ -26,11 +25,6 @@
2625
LOG = logging.getLogger(__name__)
2726

2827

29-
_formatters = {
30-
'location': format_columns.DictColumn,
31-
}
32-
33-
3428
def _get_columns(item):
3529
column_map = {
3630
'tenant_id': 'project_id',
@@ -99,17 +93,16 @@ def check_resource_topology(self, client, parsed_args):
9993
obj = client.validate_auto_allocated_topology(parsed_args.project)
10094

10195
columns = _format_check_resource_columns()
102-
data = utils.get_item_properties(
103-
_format_check_resource(obj),
104-
columns,
105-
formatters=_formatters,
106-
)
96+
data = utils.get_item_properties(_format_check_resource(obj),
97+
columns,
98+
formatters={})
99+
107100
return (columns, data)
108101

109102
def get_topology(self, client, parsed_args):
110103
obj = client.get_auto_allocated_topology(parsed_args.project)
111104
display_columns, columns = _get_columns(obj)
112-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
105+
data = utils.get_item_properties(obj, columns, formatters={})
113106
return (display_columns, data)
114107

115108
def take_action(self, parsed_args):

‎openstackclient/network/v2/network_flavor.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import logging
1717

18-
from osc_lib.cli import format_columns
1918
from osc_lib.command import command
2019
from osc_lib import exceptions
2120
from osc_lib import utils
@@ -28,11 +27,6 @@
2827
LOG = logging.getLogger(__name__)
2928

3029

31-
_formatters = {
32-
'location': format_columns.DictColumn,
33-
}
34-
35-
3630
def _get_columns(item):
3731
column_map = {
3832
'is_enabled': 'enabled',
@@ -142,7 +136,7 @@ def take_action(self, parsed_args):
142136
attrs = _get_attrs(self.app.client_manager, parsed_args)
143137
obj = client.create_flavor(**attrs)
144138
display_columns, columns = _get_columns(obj)
145-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
139+
data = utils.get_item_properties(obj, columns, formatters={})
146140

147141
return (display_columns, data)
148142

@@ -306,5 +300,5 @@ def take_action(self, parsed_args):
306300
client = self.app.client_manager.network
307301
obj = client.find_flavor(parsed_args.flavor, ignore_missing=False)
308302
display_columns, columns = _get_columns(obj)
309-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
303+
data = utils.get_item_properties(obj, columns)
310304
return display_columns, data

‎openstackclient/network/v2/network_flavor_profile.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
import logging
1515

16-
from osc_lib.cli import format_columns
1716
from osc_lib.command import command
1817
from osc_lib import exceptions
1918
from osc_lib import utils
@@ -26,11 +25,6 @@
2625
LOG = logging.getLogger(__name__)
2726

2827

29-
_formatters = {
30-
'location': format_columns.DictColumn,
31-
}
32-
33-
3428
def _get_columns(item):
3529
column_map = {
3630
'is_enabled': 'enabled',
@@ -116,7 +110,7 @@ def take_action(self, parsed_args):
116110

117111
obj = client.create_service_profile(**attrs)
118112
display_columns, columns = _get_columns(obj)
119-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
113+
data = utils.get_item_properties(obj, columns, formatters={})
120114

121115
return (display_columns, data)
122116

@@ -252,5 +246,5 @@ def take_action(self, parsed_args):
252246
obj = client.find_service_profile(parsed_args.flavor_profile,
253247
ignore_missing=False)
254248
display_columns, columns = _get_columns(obj)
255-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
249+
data = utils.get_item_properties(obj, columns)
256250
return (display_columns, data)

‎openstackclient/network/v2/network_meter.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import logging
1717

18-
from osc_lib.cli import format_columns
1918
from osc_lib.command import command
2019
from osc_lib import exceptions
2120
from osc_lib import utils
@@ -27,11 +26,6 @@
2726
LOG = logging.getLogger(__name__)
2827

2928

30-
_formatters = {
31-
'location': format_columns.DictColumn,
32-
}
33-
34-
3529
def _get_columns(item):
3630
column_map = {
3731
'is_shared': 'shared',
@@ -108,7 +102,7 @@ def take_action(self, parsed_args):
108102
attrs = _get_attrs(self.app.client_manager, parsed_args)
109103
obj = client.create_metering_label(**attrs)
110104
display_columns, columns = _get_columns(obj)
111-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
105+
data = utils.get_item_properties(obj, columns, formatters={})
112106

113107
return (display_columns, data)
114108

@@ -192,5 +186,5 @@ def take_action(self, parsed_args):
192186
obj = client.find_metering_label(parsed_args.meter,
193187
ignore_missing=False)
194188
display_columns, columns = _get_columns(obj)
195-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
189+
data = utils.get_item_properties(obj, columns)
196190
return display_columns, data

‎openstackclient/network/v2/network_meter_rule.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import logging
1717

18-
from osc_lib.cli import format_columns
1918
from osc_lib.command import command
2019
from osc_lib import exceptions
2120
from osc_lib import utils
@@ -27,11 +26,6 @@
2726
LOG = logging.getLogger(__name__)
2827

2928

30-
_formatters = {
31-
'location': format_columns.DictColumn,
32-
}
33-
34-
3529
def _get_columns(item):
3630
column_map = {
3731
'tenant_id': 'project_id',
@@ -122,7 +116,7 @@ def take_action(self, parsed_args):
122116
attrs = _get_attrs(self.app.client_manager, parsed_args)
123117
obj = client.create_metering_label_rule(**attrs)
124118
display_columns, columns = _get_columns(obj)
125-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
119+
data = utils.get_item_properties(obj, columns, formatters={})
126120

127121
return (display_columns, data)
128122

@@ -205,5 +199,5 @@ def take_action(self, parsed_args):
205199
obj = client.find_metering_label_rule(parsed_args.meter_rule_id,
206200
ignore_missing=False)
207201
display_columns, columns = _get_columns(obj)
208-
data = utils.get_item_properties(obj, columns, formatters=_formatters)
202+
data = utils.get_item_properties(obj, columns)
209203
return display_columns, data

0 commit comments

Comments
 (0)