From 6b7bbecd81c000316cc3795953a21f0b41f9644e Mon Sep 17 00:00:00 2001 From: liusheng Date: Fri, 8 Sep 2017 11:02:47 +0800 Subject: [PATCH] Clean the duplicated formatter method definitions Change-Id: Iec4ed156810e3b4e871b81e5127af6bc095fb636 --- moganclient/osc/v1/server.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/moganclient/osc/v1/server.py b/moganclient/osc/v1/server.py index f158452..c9a59ef 100644 --- a/moganclient/osc/v1/server.py +++ b/moganclient/osc/v1/server.py @@ -324,21 +324,6 @@ class ListServer(command.Lister): ) return parser - def _addresses_formatter(self, networks): - output = [] - network_client = self.app.client_manager.network - for (network, addresses) in networks.items(): - if not addresses: - continue - addrs = [addr['addr'] for addr in addresses] - network_data = network_client.find_network( - network, ignore_missing=False) - net_ident = network_data.name or network_data.id - addresses_csv = ', '.join(addrs) - group = "%s=%s" % (net_ident, addresses_csv) - output.append(group) - return '; '.join(output) - def take_action(self, parsed_args): bc_client = self.app.client_manager.baremetal_compute @@ -400,7 +385,9 @@ class ListServer(command.Lister): data = bc_client.server.list(detailed=True, all_projects=parsed_args.all_projects) - formatters = {'addresses': self._addresses_formatter, + net_client = self.app.client_manager.network + addr_formatter = lambda addr: _addresses_formatter(net_client, addr) + formatters = {'addresses': addr_formatter, 'metadata': utils.format_dict }