openstack/python-mistralclient
Code Issues Proposed changes

Adjust action commands (CLI)

Browse Source 
* Provide 'input' property (aka parameters string)
 * Cut big string values in list output table

Change-Id: I7229f6fcd8dddc8db220ebb42aad1baa3c03005a
This commit is contained in:
Nikolay Mahotkin
2014-10-06 12:07:37 +04:00
parent d2e50e8736
commit 1eade1af46
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mistralclient/commands/v2/actions.py
View File

@@ -26,10 +26,22 @@ from mistralclient.commands.v2 import base
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
def format(action=None): def _cut(string, length=25):
if string and len(string) > length:
return "%s..." % string[:length]
else:
return string
def format_list(action=None):
return format(action, lister=True)
def format(action=None, lister=False):
columns = ( columns = (
'Name', 'Name',
'Is system', 'Is system',
'Input',
'Description', 'Description',
'Tags', 'Tags',
'Created at', 'Created at',
@@ -38,11 +50,14 @@ def format(action=None):
if action: if action:
tags = getattr(action, 'tags', None) or [] tags = getattr(action, 'tags', None) or []
input = action.input if not lister else _cut(action.input)
desc = action.description if not lister else _cut(action.description)
data = ( data = (
action.name, action.name,
action.is_system, action.is_system,
getattr(action, 'description', '<none>'), input,
desc,
', '.join(tags) or '<none>', ', '.join(tags) or '<none>',
action.created_at, action.created_at,
) )
@@ -61,7 +76,7 @@ class List(base.MistralLister):
"""List all actions.""" """List all actions."""
def _get_format_function(self): def _get_format_function(self):
return format return format_list
def _get_resources(self, parsed_args): def _get_resources(self, parsed_args):
return actions.ActionManager(self.app.client).list() return actions.ActionManager(self.app.client).list()

9
mistralclient/tests/unit/v2/test_cli_actions.py
View File

@@ -25,6 +25,7 @@ from mistralclient.api.v2 import actions
ACTION_DICT = { ACTION_DICT = {
'name': 'a', 'name': 'a',
'is_system': True, 'is_system': True,
'input': "param1",
'description': 'My cool action', 'description': 'My cool action',
'tags': ['test'], 'tags': ['test'],
'created_at': '1', 'created_at': '1',
@@ -56,7 +57,7 @@ class TestCLIActionsV2(base.BaseCommandTest):
result = self.call(action_cmd.Create, app_args=['1.txt']) result = self.call(action_cmd.Create, app_args=['1.txt'])
self.assertEqual( self.assertEqual(
[('a', True, 'My cool action', 'test', '1', '1')], [('a', True, "param1", 'My cool action', 'test', '1', '1')],
result[1] result[1]
) )
@@ -68,7 +69,7 @@ class TestCLIActionsV2(base.BaseCommandTest):
result = self.call(action_cmd.Update, app_args=['my_action.yaml']) result = self.call(action_cmd.Update, app_args=['my_action.yaml'])
self.assertEqual( self.assertEqual(
[('a', True, 'My cool action', 'test', '1', '1')], [('a', True, "param1", 'My cool action', 'test', '1', '1')],
result[1] result[1]
) )
@@ -79,7 +80,7 @@ class TestCLIActionsV2(base.BaseCommandTest):
result = self.call(action_cmd.List) result = self.call(action_cmd.List)
self.assertEqual( self.assertEqual(
[('a', True, 'My cool action', 'test', '1', '1')], [('a', True, "param1", 'My cool action', 'test', '1', '1')],
result[1] result[1]
) )
@@ -90,7 +91,7 @@ class TestCLIActionsV2(base.BaseCommandTest):
result = self.call(action_cmd.Get, app_args=['name']) result = self.call(action_cmd.Get, app_args=['name'])
self.assertEqual( self.assertEqual(
('a', True, 'My cool action', 'test', '1', '1'), ('a', True, "param1", 'My cool action', 'test', '1', '1'),
result[1] result[1]
) )