From 5dc9935f7e6b68b1e37aa7a62587e4573da67b49 Mon Sep 17 00:00:00 2001 From: pengdake <19921207pq@gmail.com> Date: Mon, 14 May 2018 10:42:20 +0800 Subject: [PATCH] Update task columns info There are two execution_ids, workflow_execution_id and task_execution_id. To avoid misread, we need this change. Change-Id: I4ab23f729a634a4ab5af6bfe5adbd042a51ffd43 Signed-off-by: pengdake <19921207pq@gmail.com> --- mistralclient/commands/v2/tasks.py | 2 +- .../tests/functional/cli/v2/cli_tests_v2.py | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mistralclient/commands/v2/tasks.py b/mistralclient/commands/v2/tasks.py index c25c1013..bb48e345 100644 --- a/mistralclient/commands/v2/tasks.py +++ b/mistralclient/commands/v2/tasks.py @@ -33,7 +33,7 @@ class TaskFormatter(object): ('name', 'Name'), ('workflow_name', 'Workflow name'), ('workflow_namespace', 'Workflow namespace'), - ('workflow_execution_id', 'Execution ID'), + ('workflow_execution_id', 'Workflow Execution ID'), ('state', 'State'), ('state_info', 'State info'), ('created_at', 'Created at'), diff --git a/mistralclient/tests/functional/cli/v2/cli_tests_v2.py b/mistralclient/tests/functional/cli/v2/cli_tests_v2.py index 7e583364..02997053 100644 --- a/mistralclient/tests/functional/cli/v2/cli_tests_v2.py +++ b/mistralclient/tests/functional/cli/v2/cli_tests_v2.py @@ -61,7 +61,7 @@ class SimpleMistralCLITests(base.MistralCLIAuth): self.assertTableStruct( tasks, - ['ID', 'Name', 'Workflow name', 'Execution ID', 'State'] + ['ID', 'Name', 'Workflow name', 'Workflow Execution ID', 'State'] ) def test_cron_trigger_list(self): @@ -1101,7 +1101,8 @@ class TaskCLITests(base_v2.MistralClientTestBase): fetched_task, 'Workflow namespace' ) - task_execution_id = self.get_field_value(fetched_task, 'Execution ID') + task_execution_id = self.get_field_value(fetched_task, + 'Workflow Execution ID') self.assertEqual(created_task_id, fetched_task_id) self.assertEqual('', fetched_task_wf_namespace) @@ -1127,7 +1128,8 @@ class TaskCLITests(base_v2.MistralClientTestBase): fetched_task, 'Workflow namespace' ) - task_execution_id = self.get_field_value(fetched_task, 'Execution ID') + task_execution_id = self.get_field_value(fetched_task, + 'Workflow Execution ID') self.assertEqual(created_task_id, fetched_task_id) self.assertEqual(namespace, created_wf_namespace) @@ -1148,7 +1150,7 @@ class TaskCLITests(base_v2.MistralClientTestBase): self.assertTableStruct( tasks, - ['ID', 'Name', 'Workflow name', 'Execution ID', 'State'] + ['ID', 'Name', 'Workflow name', 'Workflow Execution ID', 'State'] ) self.assertEqual(2, len(tasks)) @@ -1163,7 +1165,7 @@ class TaskCLITests(base_v2.MistralClientTestBase): self.assertTableStruct( tasks, - ['ID', 'Name', 'Workflow name', 'Execution ID', 'State'] + ['ID', 'Name', 'Workflow name', 'Workflow Execution ID', 'State'] ) self.assertEqual(1, len(tasks))