x/python-moganclient
Code Issues Proposed changes

Merge "Clean the duplicated formatter method definitions"

Browse Source
This commit is contained in:
Jenkins 2017-09-08 07:52:22 +00:00 committed by Gerrit Code Review
commit 640b5d4454
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
moganclient/osc/v1/server.py
View File

@ -332,21 +332,6 @@ class ListServer(command.Lister):
) )
return parser 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): def take_action(self, parsed_args):
bc_client = self.app.client_manager.baremetal_compute bc_client = self.app.client_manager.baremetal_compute
@ -408,7 +393,9 @@ class ListServer(command.Lister):
data = bc_client.server.list(detailed=True, data = bc_client.server.list(detailed=True,
all_projects=parsed_args.all_projects) 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 'metadata': utils.format_dict
} }