Merge "Fix output for resource type list"

This commit is contained in:
Jenkins 2017-07-11 03:32:47 +00:00 committed by Gerrit Code Review
commit 910d9779c1
3 changed files with 20 additions and 8 deletions

View File

@ -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)

View File

@ -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"
}

View File

@ -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))