1 files changed, 52 insertions, 25 deletions
diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
index 87fae11a3..7abeeac68 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
@@ -8,6 +8,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -23,6 +25,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {{ volumes() }}
         {% endcall %}
       runner:
@@ -39,6 +43,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -52,6 +58,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -70,6 +78,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -84,10 +94,15 @@
         size:
           max: 1
           min: 1
+        create_vm_params:
+            nics:
+              - net-id: {{ netid }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -100,11 +115,16 @@
         {{ vm_params(image_name,flavor_name) }}
         size:
           min: 1
-          max: 5
+          max: 1
+        create_vm_params:
+            nics:
+              - net-id: {{ netid }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -117,17 +137,21 @@
         size: 1
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
     -
       args:
         size:
           min: 1
-          max: 5
+          max: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -142,6 +166,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         volumes:
           size: 1
           volumes_per_tenant: 4
@@ -159,6 +185,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {{ volumes() }}
         {% endcall %}
       runner:
@@ -176,6 +204,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -188,6 +218,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -200,6 +232,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -215,6 +249,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -229,6 +265,8 @@
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         quotas:
           {{ unlimited_volumes() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {{ volumes() }}
         {% endcall %}
       runner:
@@ -244,6 +282,8 @@
         read_iops_sec: "1000"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
@@ -257,6 +297,8 @@
         read_iops_sec: "1000"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
@@ -273,6 +315,8 @@
         set_read_iops_sec: "1001"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
@@ -284,6 +328,8 @@
         description: "rally tests creating types"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
@@ -295,18 +341,8 @@
         description: "rally tests creating types"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumeTypes.create_and_update_volume_type:
-    -
-      args:
-        description: "test"
-        update_description: "test update"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
@@ -322,17 +358,8 @@
         control_location: "front-end"
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  CinderVolumeTypes.create_volume_type_add_and_list_type_access:
-    -
-      args:
-        description: "rally tests creating types"
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla: