From f543533b1e57fa10675f727c9744163a65b198a1 Mon Sep 17 00:00:00 2001
From: liusheng <liusheng@huawei.com>
Date: Tue, 10 Jan 2017 16:27:19 +0800
Subject: [PATCH] Replace --detailed with --long parameter in "server list"
 command

Change-Id: Iecd6160d4155363691bc39c35eb1aa378451564a
---
 moganclient/osc/v1/server.py                 |  6 +++---
 moganclient/tests/unit/osc/v1/test_server.py | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/moganclient/osc/v1/server.py b/moganclient/osc/v1/server.py
index b13db37..079a213 100644
--- a/moganclient/osc/v1/server.py
+++ b/moganclient/osc/v1/server.py
@@ -184,10 +184,10 @@ class ListServer(command.Lister):
     def get_parser(self, prog_name):
         parser = super(ListServer, self).get_parser(prog_name)
         parser.add_argument(
-            '--detailed',
+            '--long',
             action='store_true',
             default=False,
-            help=_("List additional with details.")
+            help=_("List additional fields in output")
         )
         parser.add_argument(
             '--all-projects',
@@ -211,7 +211,7 @@ class ListServer(command.Lister):
     def take_action(self, parsed_args):
         bc_client = self.app.client_manager.baremetal_compute
 
-        if parsed_args.detailed:
+        if parsed_args.long:
             data = bc_client.server.list(detailed=True,
                                          all_projects=parsed_args.all_projects)
             formatters = {'network_info': self._networks_formatter}
diff --git a/moganclient/tests/unit/osc/v1/test_server.py b/moganclient/tests/unit/osc/v1/test_server.py
index 92de02f..c796bfa 100644
--- a/moganclient/tests/unit/osc/v1/test_server.py
+++ b/moganclient/tests/unit/osc/v1/test_server.py
@@ -300,7 +300,7 @@ class TestServerList(test_base.TestBaremetalComputeV1):
             "Status",
         )
 
-        self.list_columns_detailed = (
+        self.list_columns_long = (
             "UUID",
             "Name",
             "Flavor",
@@ -317,7 +317,7 @@ class TestServerList(test_base.TestBaremetalComputeV1):
             self.fake_servers[i].status,
             ) for i in range(3))
 
-        self.list_data_detailed = tuple((
+        self.list_data_long = tuple((
             self.fake_servers[i].uuid,
             self.fake_servers[i].name,
             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_data, tuple(data))
 
-    def test_server_list_with_detailed(self, mock_list):
+    def test_server_list_long(self, mock_list):
         arglist = [
-            '--detailed',
+            '--long',
         ]
         verifylist = [
-            ('detailed', True),
+            ('long', True),
         ]
         mock_list.return_value = self.fake_servers
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
         mock_list.assert_called_once_with('/instances/detail',
                                           response_key='instances')
-        self.assertEqual(self.list_columns_detailed, columns)
-        self.assertEqual(self.list_data_detailed, tuple(data))
+        self.assertEqual(self.list_columns_long, columns)
+        self.assertEqual(self.list_data_long, tuple(data))
 
     def test_server_list_with_all_projects(self, mock_list):
         arglist = [