From 87d0ca0d0ff7d843f02d48fc3ffc0ff922da8a9e Mon Sep 17 00:00:00 2001
From: chenhb <chen.haibing1@zte.com.cn>
Date: Wed, 8 Mar 2017 15:47:08 +0800
Subject: [PATCH] Fix rally job gate-rally-dsvm-cinder-ubuntu-xenial-nv

1.Rally job is often failed, the error is related with image not found.
Lets change image name and try to fix it.
2.The volume_type argument should specify type, True/False has not been
allowed in CinderVolumes.create_snapshot_and_attach_volume scenario.

Change-Id: Icba98641716e1bce3dbd28fe8b4551d21c49a216
---
 rally-jobs/cinder.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rally-jobs/cinder.yaml b/rally-jobs/cinder.yaml
index d0f9156be4f..663401728eb 100644
--- a/rally-jobs/cinder.yaml
+++ b/rally-jobs/cinder.yaml
@@ -1,4 +1,4 @@
-{% set image_name = "^cirros.*uec$" %}
+{% set image_name = "^(cirros.*-disk|TestVM)$" %}
 ---
   Authenticate.validate_cinder:
     -
@@ -333,7 +333,6 @@
   CinderVolumes.create_snapshot_and_attach_volume:
     -
       args:
-        volume_type: false
         size:
           min: 1
           max: 1
@@ -361,7 +360,7 @@
 
     -
       args:
-        volume_type: true
+        volume_type: "test"
         size:
           min: 1
           max: 1
@@ -379,6 +378,8 @@
           flavor:
             name: "m1.tiny"
           servers_per_tenant: 1
+        volume_types:
+          - "test"
         api_versions:
           cinder:
             version: 2