From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Tue, 6 Sep 2016 14:15:31 +0000 (+0000)
Subject: Fix image format set for rally test cases
X-Git-Tag: danube.1.RC1~428^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F20469%2F1;p=functest.git

Fix image format set for rally test cases

Always use image format defined in config_functest.yaml when creating
glance images.

JIRA: FUNCTEST-460

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

diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index f12185451..7bd8b5356 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -163,6 +163,7 @@ def build_task_args(test_file_name):
     task_args['image_name'] = GLANCE_IMAGE_NAME
     task_args['flavor_name'] = FLAVOR_NAME
     task_args['glance_image_location'] = GLANCE_IMAGE_PATH
+    task_args['glance_image_format'] = GLANCE_IMAGE_FORMAT
     task_args['tmpl_dir'] = TEMPLATE_DIR
     task_args['sup_dir'] = SUPPORT_DIR
     task_args['users_amount'] = USERS_AMOUNT
diff --git a/testcases/OpenStack/rally/scenario/opnfv-glance.yaml b/testcases/OpenStack/rally/scenario/opnfv-glance.yaml
index adbf8b79a..3a67e7457 100644
--- a/testcases/OpenStack/rally/scenario/opnfv-glance.yaml
+++ b/testcases/OpenStack/rally/scenario/opnfv-glance.yaml
@@ -1,7 +1,7 @@
   GlanceImages.create_and_delete_image:
     -
       args:
-        {{ glance_args(location=glance_image_location) }}
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
       runner:
@@ -12,7 +12,7 @@
   GlanceImages.create_and_list_image:
     -
       args:
-        {{ glance_args(location=glance_image_location) }}
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
       context:
         {{ user_context(tenants_amount, users_amount, use_existing_users) }}
       runner:
@@ -32,7 +32,7 @@
   GlanceImages.create_image_and_boot_instances:
     -
       args:
-        {{ glance_args(location=glance_image_location) }}
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
         flavor:
             name: {{ flavor_name }}
         number_instances: 2