Show project id when retrieving workflow(s)

Change-Id: I2094e07d163c1306a554bf9fd3d8d019c75fc02e
Related-Bug: #1518276
Depends-On: Ie433b43c5d6e6e95cc3605c8d7a17fb30458fb31
This commit is contained in:
Lingxian Kong
2015-11-22 11:44:49 +08:00
committed by Nikolay Mahotkin
parent 32be1135ed
commit bb6447dd6d
2 changed files with 11 additions and 7 deletions

View File

@@ -35,6 +35,7 @@ def format(workflow=None, lister=False):
columns = ( columns = (
'ID', 'ID',
'Name', 'Name',
'Project ID',
'Tags', 'Tags',
'Input', 'Input',
'Created at', 'Created at',
@@ -47,6 +48,7 @@ def format(workflow=None, lister=False):
data = ( data = (
workflow.id, workflow.id,
workflow.name, workflow.name,
workflow.project_id,
base.wrap(', '.join(tags)) or '<none>', base.wrap(', '.join(tags)) or '<none>',
workflow.input if not lister else base.cut(workflow.input), workflow.input if not lister else base.cut(workflow.input),
workflow.created_at workflow.created_at

View File

@@ -25,6 +25,7 @@ from mistralclient.tests.unit import base
WORKFLOW_DICT = { WORKFLOW_DICT = {
'id': '1-2-3-4', 'id': '1-2-3-4',
'name': 'a', 'name': 'a',
'project_id': '12345',
'tags': ['a', 'b'], 'tags': ['a', 'b'],
'input': 'param', 'input': 'param',
'created_at': '1', 'created_at': '1',
@@ -55,7 +56,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
result = self.call(workflow_cmd.Create, app_args=['1.txt']) result = self.call(workflow_cmd.Create, app_args=['1.txt'])
self.assertEqual( self.assertEqual(
[('1-2-3-4', 'a', 'a, b', 'param', '1', '1')], [('1-2-3-4', 'a', '12345', 'a, b', 'param', '1', '1')],
result[1] result[1]
) )
@@ -70,7 +71,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
) )
self.assertEqual( self.assertEqual(
[('1-2-3-4', 'a', 'a, b', 'param', '1', '1')], [('1-2-3-4', 'a', '12345', 'a, b', 'param', '1', '1')],
result[1] result[1]
) )
@@ -90,7 +91,8 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
result = self.call(workflow_cmd.Create, app_args=['1.txt']) result = self.call(workflow_cmd.Create, app_args=['1.txt'])
self.assertEqual( self.assertEqual(
[('1-2-3-4', 'a', 'a, b', cmd_base.cut(long_input), '1', '1')], [('1-2-3-4', 'a', '12345', 'a, b', cmd_base.cut(long_input),
'1', '1')],
result[1] result[1]
) )
@@ -102,7 +104,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
result = self.call(workflow_cmd.Update, app_args=['1.txt']) result = self.call(workflow_cmd.Update, app_args=['1.txt'])
self.assertEqual( self.assertEqual(
[('1-2-3-4', 'a', 'a, b', 'param', '1', '1')], [('1-2-3-4', 'a', '12345', 'a, b', 'param', '1', '1')],
result[1] result[1]
) )
@@ -117,7 +119,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
) )
self.assertEqual( self.assertEqual(
[('1-2-3-4', 'a', 'a, b', 'param', '1', '1')], [('1-2-3-4', 'a', '12345', 'a, b', 'param', '1', '1')],
result[1] result[1]
) )
@@ -130,7 +132,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
result = self.call(workflow_cmd.List) result = self.call(workflow_cmd.List)
self.assertEqual( self.assertEqual(
[('1-2-3-4', 'a', 'a, b', 'param', '1', '1')], [('1-2-3-4', 'a', '12345', 'a, b', 'param', '1', '1')],
result[1] result[1]
) )
@@ -141,7 +143,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
result = self.call(workflow_cmd.Get, app_args=['name']) result = self.call(workflow_cmd.Get, app_args=['name'])
self.assertEqual( self.assertEqual(
('1-2-3-4', 'a', 'a, b', 'param', '1', '1'), ('1-2-3-4', 'a', '12345', 'a, b', 'param', '1', '1'),
result[1] result[1]
) )