From 0560f85616f9a635762b0245b8f4b196d3d75527 Mon Sep 17 00:00:00 2001 From: liu-sheng Date: Wed, 10 Dec 2014 10:18:45 +0800 Subject: Fix columns setup base on csv formatter In setup_columns() method of ListCommand class, if parsed_args.formatter is "csv", the method will don't handle this case for returning before the if-else statement. Change-Id: Ic689228c722aa12a7671857797c606d0960b3d7e --- neutronclient/neutron/v2_0/__init__.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/neutronclient/neutron/v2_0/__init__.py b/neutronclient/neutron/v2_0/__init__.py index 2cda5d6..9c9667c 100644 --- a/neutronclient/neutron/v2_0/__init__.py +++ b/neutronclient/neutron/v2_0/__init__.py @@ -660,9 +660,6 @@ class ListCommand(NeutronCommand, lister.Lister): # both list_columns and returned resource. # Also Keep their order the same as in list_columns _columns = [x for x in self.list_columns if x in _columns] - return (_columns, (utils.get_item_properties( - s, _columns, formatters=self._formatters, ) - for s in info), ) if parsed_args.formatter == 'csv': return (_columns, (utils.get_item_properties( s, _columns, formatters=self._formatters_csv) -- cgit v1.2.1