Set cinder service type in rally tests

As a precondition for executing scenarios requiring volume, Rally
expects the presence of service named as "cinder". In a case when
there is only cinderv2 and cinderv3 configured in the system, Rally
fails to validate a testcase even the volume service is working ok.

Testcases in question changed to use v3.

Change-Id: I42e7f846e80d3647df274b2e03add94c9f0a34d6
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>

2 files changed, 58 insertions, 0 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 bb9cbfb85..4b3c22ebd 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) }}
@@ -91,6 +101,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) }}
@@ -111,6 +123,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) }}
@@ -123,6 +137,8 @@
         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) }}
     -
@@ -134,6 +150,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) }}
@@ -148,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
@@ -165,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:
@@ -182,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) }}
@@ -194,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) }}
@@ -206,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) }}
@@ -221,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) }}
@@ -235,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:
@@ -250,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:
@@ -263,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:
@@ -279,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:
@@ -290,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:
@@ -301,6 +341,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:
@@ -313,6 +355,8 @@
         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:
@@ -328,6 +372,8 @@
         control_location: "front-end"
       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:
@@ -339,6 +385,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:
diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
index ab2f11443..0f4e7b26e 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
@@ -145,6 +145,8 @@
           - net-id: {{ netid }}
       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:
@@ -221,6 +223,8 @@
               - net-id: {{ netid }}
       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:
@@ -236,6 +240,8 @@
           - net-id: {{ netid }}
       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:
@@ -278,6 +284,8 @@
           {{ unlimited_volumes() }}
           {{ unlimited_neutron() }}
           {{ unlimited_nova() }}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -375,6 +383,8 @@
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
         network: {}
+        api_versions:
+          {{ volume_service(version=volume_version, service_type=volume_service_type) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}