From a4bcfc83fb2629007ac619b2013a9deede0bad5b Mon Sep 17 00:00:00 2001
From: Linda Wang <wangwulin@huawei.com>
Date: Tue, 31 Oct 2017 07:10:17 +0000
Subject: Add new glance scenarios for rally 0.10

Some new glance scenarios have been added in Rally stable/0.10 [1].

[1]: https://github.com/openstack/rally/releases/tag/0.10.0

Co-Authored-By: Juha Kosonen <juha.kosonen@nokia.com>

Change-Id: I91ffe31b8cc5c94991c9bdd6e33b756c447d82ce
Signed-off-by: Linda Wang <wangwulin@huawei.com>
---
 .../rally/scenario/full/opnfv-glance.yaml          | 92 ++++++++++++++++++++++
 .../openstack/rally/scenario/opnfv-glance.yaml     | 49 ------------
 .../rally/scenario/sanity/opnfv-glance.yaml        | 48 +++++++++++
 3 files changed, 140 insertions(+), 49 deletions(-)
 create mode 100644 functest/opnfv_tests/openstack/rally/scenario/full/opnfv-glance.yaml
 delete mode 100644 functest/opnfv_tests/openstack/rally/scenario/opnfv-glance.yaml
 create mode 100644 functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-glance.yaml

diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-glance.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-glance.yaml
new file mode 100644
index 000000000..dfc1fc156
--- /dev/null
+++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-glance.yaml
@@ -0,0 +1,92 @@
+  GlanceImages.create_and_delete_image:
+    -
+      args:
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  GlanceImages.create_and_list_image:
+    -
+      args:
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  GlanceImages.list_images:
+    -
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  GlanceImages.create_image_and_boot_instances:
+    -
+      args:
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
+        flavor:
+            name: {{ flavor_name }}
+        number_instances: 2
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+        quotas:
+          {{ unlimited_nova() }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  GlanceImages.create_and_deactivate_image:
+    -
+      args:
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  GlanceImages.create_and_download_image:
+    -
+      args:
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  GlanceImages.create_and_get_image:
+    -
+      args:
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  GlanceImages.create_and_update_image:
+    -
+      args:
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
diff --git a/functest/opnfv_tests/openstack/rally/scenario/opnfv-glance.yaml b/functest/opnfv_tests/openstack/rally/scenario/opnfv-glance.yaml
deleted file mode 100644
index 3a67e7457..000000000
--- a/functest/opnfv_tests/openstack/rally/scenario/opnfv-glance.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-  GlanceImages.create_and_delete_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_and_list_image:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.list_images:
-    -
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
-  GlanceImages.create_image_and_boot_instances:
-    -
-      args:
-        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
-        flavor:
-            name: {{ flavor_name }}
-        number_instances: 2
-        nics:
-          - net-id: {{ netid }}
-      context:
-        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
-        quotas:
-          {{ unlimited_nova() }}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
-
diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-glance.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-glance.yaml
new file mode 100644
index 000000000..1b61762f9
--- /dev/null
+++ b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-glance.yaml
@@ -0,0 +1,48 @@
+  GlanceImages.create_and_delete_image:
+    -
+      args:
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  GlanceImages.create_and_list_image:
+    -
+      args:
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  GlanceImages.list_images:
+    -
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
+
+  GlanceImages.create_image_and_boot_instances:
+    -
+      args:
+        {{ glance_args(location=glance_image_location, type=glance_image_format) }}
+        flavor:
+            name: {{ flavor_name }}
+        number_instances: 2
+        nics:
+          - net-id: {{ netid }}
+      context:
+        {{ user_context(tenants_amount, users_amount, use_existing_users) }}
+        quotas:
+          {{ unlimited_nova() }}
+      runner:
+        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
+      sla:
+        {{ no_failures_sla() }}
-- 
cgit