From 3018ab34720c25298b4c2f84711e33c45ec35556 Mon Sep 17 00:00:00 2001
From: Illia Khudoshyn <ikhudoshyn@mirantis.com>
Date: Mon, 10 Aug 2015 16:37:39 +0300
Subject: [PATCH] Add task format converter

Task and SubTask classes are introduced that
incapsulate differences in formats of task
configuration and perform corresponding conversion.

Change-Id: I93ccdcd51296ace64c1fb99059080d47e1853d93
---
 tests/functional/test_cli_task.py | 70 +++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/tests/functional/test_cli_task.py b/tests/functional/test_cli_task.py
index f46827fc..c8766c2b 100644
--- a/tests/functional/test_cli_task.py
+++ b/tests/functional/test_cli_task.py
@@ -43,6 +43,63 @@ class TaskTestCase(unittest.TestCase):
             ]
         }
 
+    def _get_sample_task_config_v2(self):
+        return {
+            "version": 2,
+            "title": "Dummy task",
+            "tags": ["dummy", "functional_test"],
+            "subtasks": [
+                {
+                    "title": "first-subtask",
+                    "group": "Dummy group",
+                    "description": "The first subtask in dummy task",
+                    "tags": ["dummy", "functional_test"],
+                    "run_in_parallel": False,
+                    "scenarios": [{
+                        "name": "Dummy.dummy",
+                        "args": {
+                            "sleep": 0
+                        },
+                        "runner": {
+                            "type": "constant",
+                            "times": 10,
+                            "concurrency": 2
+                        },
+                        "context": {
+                            "users": {
+                                "tenants": 3,
+                                "users_per_tenant": 2
+                            }
+                        }
+                    }]
+                },
+                {
+                    "title": "second-subtask",
+                    "group": "Dummy group",
+                    "description": "The second subtask in dummy task",
+                    "tags": ["dummy", "functional_test"],
+                    "run_in_parallel": False,
+                    "scenarios": [{
+                        "name": "Dummy.dummy",
+                        "args": {
+                            "sleep": 1
+                        },
+                        "runner": {
+                            "type": "constant",
+                            "times": 10,
+                            "concurrency": 2
+                        },
+                        "context": {
+                            "users": {
+                                "tenants": 3,
+                                "users_per_tenant": 2
+                            }
+                        }
+                    }]
+                }
+            ]
+        }
+
     def _get_deployment_uuid(self, output):
         return re.search(
             r"Using deployment: (?P<uuid>[0-9a-f\-]{36})",
@@ -643,6 +700,19 @@ class TaskTestCase(unittest.TestCase):
         current_task = utils.get_global("RALLY_TASK", rally.env)
         self.assertEqual(uuid, current_task)
 
+    def test_start_v2(self):
+        rally = utils.Rally()
+        deployment_id = utils.get_global("RALLY_DEPLOYMENT", rally.env)
+        cfg = self._get_sample_task_config_v2()
+        config = utils.TaskConfig(cfg)
+        output = rally(("task start --task %(task_file)s "
+                        "--deployment %(deployment_id)s") %
+                       {"task_file": config.filename,
+                        "deployment_id": deployment_id})
+        result = re.search(
+            r"(?P<task_id>[0-9a-f\-]{36}): started", output)
+        self.assertIsNotNone(result)
+
 
 class SLATestCase(unittest.TestCase):