Merge "Introduce a sanity test mode for Rally test"

1 files changed, 74 insertions, 68 deletions

diff --git a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml
index b128ffb7..cb28ee84 100644
--- a/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml
+++ b/testcases/VIM/OpenStack/CI/rally_cert/scenario/opnfv-cinder.yaml
@@ -1,3 +1,7 @@
+{# all scenarios included only in full mode #}
+
+{% if full_mode %}
+
   CinderVolumes.create_and_attach_volume:
     -
       args:
@@ -14,9 +18,10 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_and_delete_snapshot:
+  CinderVolumes.create_and_list_snapshots:
     -
       args:
+        detailed: true
         force: false
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
@@ -29,12 +34,11 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_and_delete_volume:
+  CinderVolumes.create_and_list_volume:
     -
       args:
-        size:
-          max: 1
-          min: 1
+        detailed: true
+        {{ vm_params(image_name,none,1) }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
@@ -46,7 +50,8 @@
         {{ no_failures_sla() }}
     -
       args:
-        {{ vm_params(image_name,none,1) }}
+        detailed: true
+        size: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
@@ -56,8 +61,14 @@
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
+
+  CinderVolumes.create_and_upload_volume_to_image:
     -
       args:
+        container_format: "bare"
+        disk_format: "raw"
+        do_delete: true
+        force: false
         size: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
@@ -69,56 +80,84 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_and_extend_volume:
+  CinderVolumes.create_nested_snapshots_and_attach_volume:
     -
       args:
-        new_size: 2
-        size: 1
+        nested_level: 1
+        size:
+          max: 1
+          min: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        servers:
+          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
+          servers_per_tenant: 1
+          auto_assign_nic: true
+        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_and_list_snapshots:
+  CinderVolumes.create_snapshot_and_attach_volume:
     -
       args:
-        detailed: true
-        force: false
+        volume_type: false
+        size:
+          min: 1
+          max: 5
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        {{ volumes() }}
+        servers:
+          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
+          servers_per_tenant: 2
+          auto_assign_nic: true
+        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
-
-  CinderVolumes.create_and_list_volume:
     -
       args:
-        detailed: true
-        {{ vm_params(image_name,none,1) }}
+          volume_type: true
+          size:
+              min: 1
+              max: 5
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        servers:
+          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
+          servers_per_tenant: 2
+          auto_assign_nic: true
+        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
+
+  CinderVolumes.create_volume:
     -
       args:
-        detailed: true
         size: 1
       context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+    -
+      args:
+        size:
+          min: 1
+          max: 5
+      context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
@@ -128,28 +167,29 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_and_upload_volume_to_image:
+  CinderVolumes.list_volumes:
     -
       args:
-        container_format: "bare"
-        disk_format: "raw"
-        do_delete: true
-        force: false
-        size: 1
+        detailed: True
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        volumes:
+          size: 1
+          volumes_per_tenant: 4
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_from_volume_and_delete_volume:
+{% endif %}
+
+  CinderVolumes.create_and_delete_snapshot:
     -
       args:
-        size: 1
+        force: false
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
@@ -161,10 +201,9 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_nested_snapshots_and_attach_volume:
+  CinderVolumes.create_and_delete_volume:
     -
       args:
-        nested_level: 1
         size:
           max: 1
           min: 1
@@ -172,33 +211,18 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 1
-          auto_assign_nic: true
-        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
-
-  CinderVolumes.create_snapshot_and_attach_volume:
     -
       args:
-        volume_type: false
-        size:
-          min: 1
-          max: 5
+        {{ vm_params(image_name,none,1) }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 2
-          auto_assign_nic: true
-        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -206,39 +230,23 @@
         {{ no_failures_sla() }}
     -
       args:
-          volume_type: true
-          size:
-              min: 1
-              max: 5
+        size: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 2
-          auto_assign_nic: true
-        network: {}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.create_volume:
+  CinderVolumes.create_and_extend_volume:
     -
       args:
+        new_size: 2
         size: 1
       context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-    -
-      args:
-        size:
-          min: 1
-          max: 5
-      context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
@@ -248,17 +256,15 @@
       sla:
         {{ no_failures_sla() }}
 
-  CinderVolumes.list_volumes:
+  CinderVolumes.create_from_volume_and_delete_volume:
     -
       args:
-        detailed: True
+        size: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
-        volumes:
-          size: 1
-          volumes_per_tenant: 4
+        {{ volumes() }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}