x/python-moganclient
Code Issues Proposed changes

Merge "Remove the --long parameter when listing flavors"

Browse Source
This commit is contained in:
Jenkins 2017-01-09 17:33:01 +00:00 committed by Gerrit Code Review
commit a3a5a6383f
2 changed files with 14 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
moganclient/osc/v1/flavor.py
View File

@ -128,23 +128,11 @@ class DeleteFlavor(command.Command):
class ListFlavor(command.Lister): class ListFlavor(command.Lister):
"""List all baremetal flavors""" """List all baremetal flavors"""
def get_parser(self, prog_name):
parser = super(ListFlavor, self).get_parser(prog_name)
parser.add_argument(
'--long',
action='store_true',
default=False,
help=_("List additional fields in output")
)
return parser
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
data = bc_client.flavor.list() data = bc_client.flavor.list()
if parsed_args.long:
# This is the easiest way to change column headers
column_headers = ( column_headers = (
"UUID", "UUID",
"Name", "Name",
@ -159,12 +147,6 @@ class ListFlavor(command.Lister):
"Description", "Description",
"Extra Specs", "Extra Specs",
) )
else:
column_headers = columns = (
"UUID",
"Name",
"Is Public",
)
return (column_headers, return (column_headers,
(utils.get_item_properties( (utils.get_item_properties(

26
moganclient/tests/unit/osc/v1/test_flavor.py
View File

@ -219,23 +219,11 @@ class TestFlavorList(TestFlavor):
"UUID", "UUID",
"Name", "Name",
"Is Public", "Is Public",
)
list_columns_long = (
"UUID",
"Name",
"Is Public",
"Description", "Description",
"Properties", "Properties",
) )
list_data = (( list_data = ((
TestFlavor.fake_flavor.uuid,
TestFlavor.fake_flavor.name,
TestFlavor.fake_flavor.is_public,
),)
list_data_long = ((
TestFlavor.fake_flavor.uuid, TestFlavor.fake_flavor.uuid,
TestFlavor.fake_flavor.name, TestFlavor.fake_flavor.name,
TestFlavor.fake_flavor.is_public, TestFlavor.fake_flavor.is_public,
@ -257,20 +245,6 @@ class TestFlavorList(TestFlavor):
self.assertEqual(self.list_columns, columns) self.assertEqual(self.list_columns, columns)
self.assertEqual(self.list_data, tuple(data)) self.assertEqual(self.list_data, tuple(data))
def test_flavor_list_with_long(self, mock_list):
arglist = [
'--long',
]
verifylist = [
('long', True),
]
mock_list.return_value = [self.fake_flavor]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args)
mock_list.assert_called_once_with('/types', response_key='types')
self.assertEqual(self.list_columns_long, columns)
self.assertEqual(self.list_data_long, tuple(data))
@mock.patch.object(utils, 'find_resource') @mock.patch.object(utils, 'find_resource')
@mock.patch.object(flavor_mgr.FlavorManager, '_delete') @mock.patch.object(flavor_mgr.FlavorManager, '_delete')