From bb6447dd6dd03f1406aa00698ca5ba4f347d02bd Mon Sep 17 00:00:00 2001
From: Lingxian Kong <anlin.kong@gmail.com>
Date: Sun, 22 Nov 2015 11:44:49 +0800
Subject: [PATCH] Show project id when retrieving workflow(s)

Change-Id: I2094e07d163c1306a554bf9fd3d8d019c75fc02e
Related-Bug: #1518276
Depends-On: Ie433b43c5d6e6e95cc3605c8d7a17fb30458fb31
---
 mistralclient/commands/v2/workflows.py           |  2 ++
 .../tests/unit/v2/test_cli_workflows.py          | 16 +++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/mistralclient/commands/v2/workflows.py b/mistralclient/commands/v2/workflows.py
index f3d8a3b9..66038c2a 100644
--- a/mistralclient/commands/v2/workflows.py
+++ b/mistralclient/commands/v2/workflows.py
@@ -35,6 +35,7 @@ def format(workflow=None, lister=False):
     columns = (
         'ID',
         'Name',
+        'Project ID',
         'Tags',
         'Input',
         'Created at',
@@ -47,6 +48,7 @@ def format(workflow=None, lister=False):
         data = (
             workflow.id,
             workflow.name,
+            workflow.project_id,
             base.wrap(', '.join(tags)) or '<none>',
             workflow.input if not lister else base.cut(workflow.input),
             workflow.created_at
diff --git a/mistralclient/tests/unit/v2/test_cli_workflows.py b/mistralclient/tests/unit/v2/test_cli_workflows.py
index 1861c4d6..27c43c79 100644
--- a/mistralclient/tests/unit/v2/test_cli_workflows.py
+++ b/mistralclient/tests/unit/v2/test_cli_workflows.py
@@ -25,6 +25,7 @@ from mistralclient.tests.unit import base
 WORKFLOW_DICT = {
     'id': '1-2-3-4',
     'name': 'a',
+    'project_id': '12345',
     'tags': ['a', 'b'],
     'input': 'param',
     'created_at': '1',
@@ -55,7 +56,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
         result = self.call(workflow_cmd.Create, app_args=['1.txt'])
 
         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]
         )
 
@@ -70,7 +71,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
         )
 
         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]
         )
 
@@ -90,7 +91,8 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
         result = self.call(workflow_cmd.Create, app_args=['1.txt'])
 
         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]
         )
 
@@ -102,7 +104,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
         result = self.call(workflow_cmd.Update, app_args=['1.txt'])
 
         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]
         )
 
@@ -117,7 +119,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
         )
 
         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]
         )
 
@@ -130,7 +132,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
         result = self.call(workflow_cmd.List)
 
         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]
         )
 
@@ -141,7 +143,7 @@ class TestCLIWorkflowsV2(base.BaseCommandTest):
         result = self.call(workflow_cmd.Get, app_args=['name'])
 
         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]
         )