x/python-moganclient
Code Issues Proposed changes

Replace --detailed with --long parameter in "server list" command

Browse Source 
Change-Id: Iecd6160d4155363691bc39c35eb1aa378451564a
This commit is contained in:
liusheng 2017-01-10 16:27:19 +08:00
parent a3a5a6383f
commit f543533b1e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,10 +184,10 @@ class ListServer(command.Lister):
def get_parser(self, prog_name): def get_parser(self, prog_name):
parser = super(ListServer, self).get_parser(prog_name) parser = super(ListServer, self).get_parser(prog_name)
parser.add_argument( parser.add_argument(
'--detailed', '--long',
action='store_true', action='store_true',
default=False, default=False,
help=_("List additional with details.") help=_("List additional fields in output")
) )
parser.add_argument( parser.add_argument(
'--all-projects', '--all-projects',
@ -211,7 +211,7 @@ class ListServer(command.Lister):
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
if parsed_args.detailed: if parsed_args.long:
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 = {'network_info': self._networks_formatter} formatters = {'network_info': self._networks_formatter}

14
moganclient/tests/unit/osc/v1/test_server.py
View File

@ -300,7 +300,7 @@ class TestServerList(test_base.TestBaremetalComputeV1):
"Status", "Status",
) )
self.list_columns_detailed = ( self.list_columns_long = (
"UUID", "UUID",
"Name", "Name",
"Flavor", "Flavor",
@ -317,7 +317,7 @@ class TestServerList(test_base.TestBaremetalComputeV1):
self.fake_servers[i].status, self.fake_servers[i].status,
) for i in range(3)) ) for i in range(3))
self.list_data_detailed = tuple(( self.list_data_long = tuple((
self.fake_servers[i].uuid, self.fake_servers[i].uuid,
self.fake_servers[i].name, self.fake_servers[i].name,
self.fake_servers[i].instance_type_uuid, self.fake_servers[i].instance_type_uuid,
@ -339,20 +339,20 @@ class TestServerList(test_base.TestBaremetalComputeV1):
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_server_list_with_detailed(self, mock_list): def test_server_list_long(self, mock_list):
arglist = [ arglist = [
'--detailed', '--long',
] ]
verifylist = [ verifylist = [
('detailed', True), ('long', True),
] ]
mock_list.return_value = self.fake_servers mock_list.return_value = self.fake_servers
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
mock_list.assert_called_once_with('/instances/detail', mock_list.assert_called_once_with('/instances/detail',
response_key='instances') response_key='instances')
self.assertEqual(self.list_columns_detailed, columns) self.assertEqual(self.list_columns_long, columns)
self.assertEqual(self.list_data_detailed, tuple(data)) self.assertEqual(self.list_data_long, tuple(data))
def test_server_list_with_all_projects(self, mock_list): def test_server_list_with_all_projects(self, mock_list):
arglist = [ arglist = [