From bd5c0ff59646d6725f664a3d20eb4db29306d80c Mon Sep 17 00:00:00 2001
From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Mon, 8 Apr 2019 14:36:10 +0300
Subject: 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>
(cherry picked from commit ebc2b41505299846faeb2163d34d820a8ef2bdb2)
---
 .../rally/scenario/sanity/opnfv-cinder.yaml          | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml')

diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml
index 832358075..f94a5a1a4 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-cinder.yaml
@@ -6,6 +6,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:
@@ -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) }}
         {% endcall %}
       runner:
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
@@ -35,6 +39,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) }}
@@ -47,6 +53,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) }}
@@ -62,6 +70,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) }}
@@ -76,6 +86,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:
@@ -91,6 +103,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:
@@ -107,6 +121,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:
@@ -118,6 +134,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:
@@ -133,6 +151,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:
-- 
cgit 1.2.3-korg