Switch Rally Task To format V2

- Format V1 was deprecated
- rally-jobs/cinder-fake.yaml is not used

Change-Id: Idf69e0084334d25ccd73730428e36809573e2146

2 files changed, 365 insertions, 428 deletions

diff --git a/rally-jobs/cinder-fake.yaml b/rally-jobs/cinder-fake.yaml
deleted file mode 100644
index c42cc753e..000000000
--- a/rally-jobs/cinder-fake.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-  CinderVolumes.create_and_list_volume:
-    -
-      args:
-        size: 1
-        detailed: True
-      runner:
-        type: "constant"
-        times: 200
-        concurrency: 20
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
diff --git a/rally-jobs/cinder.yaml b/rally-jobs/cinder.yaml
index 9b94b8935..d93966fc6 100644
--- a/rally-jobs/cinder.yaml
+++ b/rally-jobs/cinder.yaml
@@ -1,30 +1,31 @@
 {% set image_name = "^(cirros.*-disk|TestVM)$" %}
 ---
-  Authenticate.validate_cinder:
+  version: 2
+  title: Rally task for gate-rally-dsvm-cinder-ubuntu-xenial-nv job
+  subtasks:
     -
-      args:
-        repetitions: 2
+      title: Validate cinder client
+      scenario:
+        Authenticate.validate_cinder:
+          repetitions: 2
       runner:
-        type: "constant"
-        times: 10
-        concurrency: 5
-      context:
+        constant:
+          times: 10
+          concurrency: 5
+      contexts:
         users:
           tenants: 3
           users_per_tenant: 5
-      sla:
-        failure_rate:
-          max: 0
-
-  Quotas.cinder_update_and_delete:
     -
-      args:
-        max_quota: 1024
+      title: Update and delete cinder Quotas
+      scenario:
+        Quotas.cinder_update_and_delete:
+          max_quota: 1024
       runner:
-        type: "constant"
-        times: 4
-        concurrency: 1
-      context:
+        constant:
+          times: 4
+          concurrency: 1
+      contexts:
         users:
           tenants: 3
           users_per_tenant: 2
@@ -32,19 +33,16 @@
           cinder:
             version: 2
             service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  Quotas.cinder_update:
     -
-      args:
-        max_quota: 1024
+      title: Update cinder Quotas
+      scenario:
+        Quotas.cinder_update:
+          max_quota: 1024
       runner:
-        type: "constant"
-        times: 10
-        concurrency: 2
-      context:
+        constant:
+          times: 10
+          concurrency: 2
+      contexts:
         users:
           tenants: 3
           users_per_tenant: 2
@@ -52,142 +50,129 @@
           cinder:
             version: 2
             service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_and_delete_volume:
     -
-      args:
-        size: 1
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-    -
-      args:
-        size: 1
-        image:
-          name: {{image_name}}
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-    -
-      args:
-        size:
-          min: 1
-          max: 3
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_and_list_volume:
-    -
-      args:
-        size: 1
-        detailed: True
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
+      title: Create and Delete Volume
+      workloads:
+        -
+          scenario:
+            CinderVolumes.create_and_delete_volume:
+              size: 1
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 2
+              users_per_tenant: 2
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
+        -
+          scenario:
+            CinderVolumes.create_and_delete_volume:
+              size: 1
+              image:
+                name: {{image_name}}
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 2
+              users_per_tenant: 2
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
+        -
+          scenario:
+            CinderVolumes.create_and_delete_volume:
+              size:
+                min: 1
+                max: 3
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 2
+              users_per_tenant: 2
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
     -
-      args:
-        size:
-          min: 1
-          max: 3
-        detailed: True
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-    -
-      args:
-        size: 1
-        detailed: True
-        image:
-          name: {{image_name}}
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.list_volumes:
+      title: Create and List Volume
+      workloads:
+        -
+          scenario:
+            CinderVolumes.create_and_list_volume:
+              size: 1
+              detailed: True
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
+        -
+          scenario:
+            CinderVolumes.create_and_list_volume:
+              size:
+                min: 1
+                max: 3
+              detailed: True
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
+        -
+          scenario:
+            CinderVolumes.create_and_list_volume:
+              size: 1
+              detailed: True
+              image:
+                name: {{image_name}}
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
     -
-      args:
-        detailed: True
+      title: List volumes
+      scenario:
+        CinderVolumes.list_volumes:
+          detailed: True
       runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
+        constant:
+          times: 2
+          concurrency: 2
+      contexts:
         users:
           tenants: 2
           users_per_tenant: 1
@@ -198,252 +183,227 @@
           cinder:
             version: 2
             service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_volume:
     -
-      args:
-        size: 1
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
+      title: Create volume
+      workloads:
+        -
+          scenario:
+            CinderVolumes.create_volume:
+              size: 1
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 2
+              users_per_tenant: 2
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
+        -
+          scenario:
+            CinderVolumes.create_volume:
+              size:
+                min: 1
+                max: 3
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 2
+              users_per_tenant: 2
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
+        -
+          scenario:
+            CinderVolumes.create_volume:
+              size: 1
+              image:
+                name: {{image_name}}
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 2
+              users_per_tenant: 2
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
     -
-      args:
-        size:
-          min: 1
-          max: 3
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
+      title: Create and Extend volume
+      workloads:
+        -
+          scenario:
+            CinderVolumes.create_and_extend_volume:
+              size: 1
+              new_size: 2
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
+        -
+          scenario:
+            CinderVolumes.create_and_extend_volume:
+              size:
+                min: 1
+                max: 2
+              new_size:
+                min: 3
+                max: 4
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
     -
-      args:
-        size: 1
-        image:
-          name: {{image_name}}
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_and_extend_volume:
-    -
-      args:
-        size: 1
-        new_size: 2
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-    -
-      args:
-        size:
-          min: 1
-          max: 2
-        new_size:
-          min: 3
-          max: 4
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_and_attach_volume:
-    -
-      args:
-        size: 1
-        image:
-          name: {{image_name}}
-        flavor:
-          name: "m1.tiny"
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_snapshot_and_attach_volume:
-    -
-      args:
-        size:
-          min: 1
-          max: 1
-        volume_type: "test"
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-        servers:
+      title: Create and attach volume
+      scenario:
+        CinderVolumes.create_and_attach_volume:
+          size: 1
           image:
             name: {{image_name}}
           flavor:
             name: "m1.tiny"
-          servers_per_tenant: 1
-        volume_types:
-          - "test"
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-    -
-      args:
-        volume_type: "test"
-        size:
-          min: 1
-          max: 1
       runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
+        constant:
+          times: 2
+          concurrency: 2
+      contexts:
         users:
           tenants: 2
           users_per_tenant: 2
-        servers:
-          image:
-            name: {{image_name}}
-          flavor:
-            name: "m1.tiny"
-          servers_per_tenant: 1
-        volume_types:
-          - "test"
         api_versions:
           cinder:
             version: 2
             service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_from_volume_and_delete_volume:
     -
-      args:
-        size: 1
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        volumes:
-          size: 1
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
+      title: Create volume and snapshot attach and detach volume and delete them
+      workloads:
+        -
+          scenario:
+            CinderVolumes.create_snapshot_and_attach_volume:
+              image:
+                name: {{image_name}}
+              flavor:
+                name: "m1.tiny"
+              size:
+                min: 1
+                max: 1
+              volume_type: "test"
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 2
+              users_per_tenant: 2
+            volume_types:
+              - "test"
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
+        -
+          scenario:
+            CinderVolumes.create_snapshot_and_attach_volume:
+              image:
+                name: {{image_name}}
+              flavor:
+                name: "m1.tiny"
+              volume_type: "test"
+              size:
+                min: 1
+                max: 1
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 2
+              users_per_tenant: 2
+            volume_types:
+              - "test"
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
     -
-      args:
-        size:
-          min: 1
-          max: 2
-      runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        volumes:
-          size: 1
-        api_versions:
-          cinder:
-            version: 2
-            service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_and_delete_snapshot:
+      title: Create volume from volume and then delete it
+      workloads:
+        -
+          scenario:
+            CinderVolumes.create_from_volume_and_delete_volume:
+              size: 1
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+            volumes:
+              size: 1
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
+        -
+          scenario:
+            CinderVolumes.create_from_volume_and_delete_volume:
+              size:
+                min: 1
+                max: 2
+          runner:
+            constant:
+              times: 2
+              concurrency: 2
+          contexts:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+            volumes:
+              size: 1
+            api_versions:
+              cinder:
+                version: 2
+                service_name: cinderv2
     -
-      args:
-        force: false
+      title: Create and delete snapshot
+      scenario:
+        CinderVolumes.create_and_delete_snapshot:
+          force: false
       runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
+        constant:
+          times: 2
+          concurrency: 2
+      contexts:
         users:
           tenants: 2
           users_per_tenant: 2
@@ -453,20 +413,17 @@
           cinder:
             version: 2
             service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_and_list_snapshots:
     -
-      args:
-        force: False
-        detailed: True
+      title: Create and list snapshots
+      scenario:
+        CinderVolumes.create_and_list_snapshots:
+          force: False
+          detailed: True
       runner:
-        type: "constant"
-        times: 2
-        concurrency: 2
-      context:
+        constant:
+          times: 2
+          concurrency: 2
+      contexts:
         users:
           tenants: 1
           users_per_tenant: 1
@@ -476,19 +433,16 @@
           cinder:
             version: 2
             service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0
-
-  CinderVolumes.create_and_upload_volume_to_image:
     -
-      args:
-        size: 1
+      title: Create and upload a volume to image
+      scenario:
+        CinderVolumes.create_and_upload_volume_to_image:
+          size: 1
       runner:
-        type: "constant"
-        times: 1
-        concurrency: 1
-      context:
+        constant:
+          times: 1
+          concurrency: 1
+      contexts:
         users:
           tenants: 1
           users_per_tenant: 1
@@ -496,6 +450,3 @@
           cinder:
             version: 2
             service_name: cinderv2
-      sla:
-        failure_rate:
-          max: 0