From f26e0856b62bee6352ffddac7a68131cc3c0d80d Mon Sep 17 00:00:00 2001
From: liyingjun <yingjun.li@kylin-cloud.com>
Date: Tue, 4 Jul 2017 15:39:40 +0800
Subject: [PATCH] Fix output for resource type list

The api for resource type list is returning alias-searching,
alias-indexing and type instead of name and type now, the output of the
osc command need to be updated either.

Change-Id: I272173e1efecbd9e7c059e545a95e9bf84e11e7a
Closes-bug: #1702234
---
 searchlightclient/osc/v1/resource_type.py        | 16 +++++++++++++---
 searchlightclient/tests/unit/osc/v1/fakes.py     |  6 +++---
 .../tests/unit/osc/v1/test_resource_type.py      |  6 ++++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/searchlightclient/osc/v1/resource_type.py b/searchlightclient/osc/v1/resource_type.py
index f110406..ba42b82 100644
--- a/searchlightclient/osc/v1/resource_type.py
+++ b/searchlightclient/osc/v1/resource_type.py
@@ -16,7 +16,6 @@
 import logging
 
 from osc_lib.command import command
-from osc_lib import utils
 
 
 class ListResourceType(command.Lister):
@@ -29,11 +28,22 @@ class ListResourceType(command.Lister):
 
         search_client = self.app.client_manager.search
         columns = (
-            "Name",
+            "Alias Searching",
+            "Alias Indexing",
             "Type"
         )
         data = search_client.resource_types.list()
         return (columns,
-                (utils.get_item_properties(
+                (self.get_item_properties(
                     s, columns,
                 ) for s in data))
+
+    def get_item_properties(self, item, fields):
+        # osc_lib.utils.get_item_properties doesn't work because
+        # the field names are using "-" instead of "_".
+        row = []
+        for field in fields:
+            field_name = field.lower().replace(' ', '-')
+            data = getattr(item, field_name, '')
+            row.append(data)
+        return tuple(row)
diff --git a/searchlightclient/tests/unit/osc/v1/fakes.py b/searchlightclient/tests/unit/osc/v1/fakes.py
index b74deba..61b9b72 100644
--- a/searchlightclient/tests/unit/osc/v1/fakes.py
+++ b/searchlightclient/tests/unit/osc/v1/fakes.py
@@ -20,9 +20,9 @@ from searchlightclient.tests.unit.osc import utils
 
 
 ResourceType = {
-    "index": "searchlight",
-    "type": "OS::Nova::Server",
-    "name": "OS::Nova::Server"
+    "alias-searching": "searchlight-search",
+    "alias-indexing": "searchlight-listener",
+    "type": "OS::Nova::Server"
 }
 
 
diff --git a/searchlightclient/tests/unit/osc/v1/test_resource_type.py b/searchlightclient/tests/unit/osc/v1/test_resource_type.py
index 32df2fc..f22e4b5 100644
--- a/searchlightclient/tests/unit/osc/v1/test_resource_type.py
+++ b/searchlightclient/tests/unit/osc/v1/test_resource_type.py
@@ -42,8 +42,10 @@ class TestResourceTypeList(TestResourceType):
         columns, data = self.cmd.take_action(parsed_args)
         self.rtype_client.list.assert_called_with()
 
-        collist = ('Name', 'Type')
+        collist = ('Alias Searching', 'Alias Indexing', 'Type')
         self.assertEqual(collist, columns)
 
-        datalist = (('OS::Nova::Server', 'OS::Nova::Server'),)
+        datalist = (('searchlight-search',
+                     'searchlight-listener',
+                     'OS::Nova::Server'),)
         self.assertEqual(datalist, tuple(data))