openstack/python-mistralclient
Code Issues Proposed changes

Show workflow_id when getting workflow(s)

Browse Source 
Change-Id: Idc6bbd45a04b7e1d7b4750048fecf914674e55d4
Closes-Bug: #1518276
This commit is contained in:
Lingxian Kong
2015-11-20 19:32:29 +08:00
parent 2b8c65be76
commit bdaeda17bf
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mistralclient/commands/v2/workflows.py
View File

@@ -33,6 +33,7 @@ def format_list(workflow=None):
def format(workflow=None, lister=False):
columns = (
'ID',
'Name',
'Tags',
'Input',
@@ -44,6 +45,7 @@ def format(workflow=None, lister=False):
tags = getattr(workflow, 'tags', None) or []
data = (
workflow.id,
workflow.name,
base.wrap(', '.join(tags)) or '<none>',
workflow.input if not lister else base.cut(workflow.input),

2
mistralclient/tests/functional/cli/v2/cli_tests_v2.py
View File

@@ -42,7 +42,7 @@ class SimpleMistralCLITests(base.MistralCLIAuth):
self.mistral('workflow-list'))
self.assertTableStruct(
workflows,
['Name', 'Tags', 'Input', 'Created at', 'Updated at']
['ID', 'Name', 'Tags', 'Input', 'Created at', 'Updated at']
)
def test_executions_list(self):

33
mistralclient/tests/unit/v2/test_cli_workflows.py
View File

@@ -23,6 +23,7 @@ from mistralclient.tests.unit import base
WORKFLOW_DICT = {
'id': '1-2-3-4',
'name': 'a',
'tags': ['a', 'b'],
'input': 'param',
@@ -53,7 +54,10 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
result = self.call(workflow_cmd.Create, app_args=['1.txt'])
self.assertEqual([('a', 'a, b', 'param', '1', '1')], result[1])
self.assertEqual(
[('1-2-3-4', 'a', 'a, b', 'param', '1', '1')],
result[1]
)
@mock.patch('argparse.open', create=True)
@mock.patch('mistralclient.api.v2.workflows.WorkflowManager.create')
@@ -65,7 +69,10 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
app_args=['1.txt', '--public']
)
self.assertEqual([('a', 'a, b', 'param', '1', '1')], result[1])
self.assertEqual(
[('1-2-3-4', 'a', 'a, b', 'param', '1', '1')],
result[1]
)
self.assertEqual('public', mock.call_args[1]['scope'])
@@ -83,7 +90,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
result = self.call(workflow_cmd.Create, app_args=['1.txt'])
self.assertEqual(
[('a', 'a, b', cmd_base.cut(long_input), '1', '1')],
[('1-2-3-4', 'a', 'a, b', cmd_base.cut(long_input), '1', '1')],
result[1]
)
@@ -94,7 +101,10 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
result = self.call(workflow_cmd.Update, app_args=['1.txt'])
self.assertEqual([('a', 'a, b', 'param', '1', '1')], result[1])
self.assertEqual(
[('1-2-3-4', 'a', 'a, b', 'param', '1', '1')],
result[1]
)
@mock.patch('argparse.open', create=True)
@mock.patch('mistralclient.api.v2.workflows.WorkflowManager.update')
@@ -106,7 +116,10 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
app_args=['1.txt', '--public']
)
self.assertEqual([('a', 'a, b', 'param', '1', '1')], result[1])
self.assertEqual(
[('1-2-3-4', 'a', 'a, b', 'param', '1', '1')],
result[1]
)
self.assertEqual('public', mock.call_args[1]['scope'])
@@ -116,7 +129,10 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
result = self.call(workflow_cmd.List)
self.assertEqual([('a', 'a, b', 'param', '1', '1')], result[1])
self.assertEqual(
[('1-2-3-4', 'a', 'a, b', 'param', '1', '1')],
result[1]
)
@mock.patch('mistralclient.api.v2.workflows.WorkflowManager.get')
def test_get(self, mock):
@@ -124,7 +140,10 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
result = self.call(workflow_cmd.Get, app_args=['name'])
self.assertEqual(('a', 'a, b', 'param', '1', '1'), result[1])
self.assertEqual(
('1-2-3-4', 'a', 'a, b', 'param', '1', '1'),
result[1]
)
@mock.patch('mistralclient.api.v2.workflows.WorkflowManager.delete')
def test_delete(self, del_mock):