From d45e67c5d3073d6b1087dd4e1b33de33a259aae8 Mon Sep 17 00:00:00 2001
From: Asma Syed Hameed <asyedham@redhat.com>
Date: Mon, 10 Feb 2020 19:16:06 +0530
Subject: [PATCH] Add more Cinder Scenarios

Change-Id: I5060f08169f72d79df00626f2baf3240f004e4f9
---
 browbeat-complete.yaml                        | 22 ++++++++++++++++
 browbeat-config.yaml                          | 15 +++++++++++
 .../cinder-create-and-attach-volume-cc.yml    |  4 +--
 .../cinder-create-and-list-snapshots.yml      | 25 +++++++++++++++++++
 .../cinder/cinder-create-and-list-volume.yml  | 23 +++++++++++++++++
 .../cinder-create-and-update-volume.yml       | 25 +++++++++++++++++++
 6 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 rally/cinder/cinder-create-and-list-snapshots.yml
 create mode 100644 rally/cinder/cinder-create-and-list-volume.yml
 create mode 100644 rally/cinder/cinder-create-and-update-volume.yml

diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml
index 740064344..6114ab7a1 100644
--- a/browbeat-complete.yaml
+++ b/browbeat-complete.yaml
@@ -104,6 +104,28 @@ workloads:
         flavor_name: m1.tiny
         sla_max_seconds: 30
         sla_max_failure: 0
+
+      - name: create-and-list-snapshots
+        enabled: true
+        size: 1
+        file: rally/cinder/cinder-create-and-list-snapshots.yml
+        sla_max_seconds: 30
+        sla_max_failure: 0
+
+      - name: create-and-list-volume
+        enabled: true
+        size: 1
+        file: rally/cinder/cinder-create-and-list-volume.yml
+        sla_max_seconds: 30
+        sla_max_failure: 0
+
+      - name: create-and-update-volume
+        enabled: true
+        size: 1
+        file: rally/cinder/cinder-create-and-update-volume.yml
+        sla_max_seconds: 30
+        sla_max_failure: 0
+
   - name: keystonebasic
     enabled: true
     type: rally
diff --git a/browbeat-config.yaml b/browbeat-config.yaml
index 32297c259..5c721b6a9 100644
--- a/browbeat-config.yaml
+++ b/browbeat-config.yaml
@@ -110,6 +110,21 @@ workloads:
         flavor_name: m1.tiny
         file: rally/cinder/cinder-create-and-attach-volume-cc.yml
 
+      - name: create-and-list-snapshots
+        enabled: true
+        size: 1
+        file: rally/cinder/cinder-create-and-list-snapshots.yml
+
+      - name: create-and-list-volume
+        enabled: true
+        size: 1
+        file: rally/cinder/cinder-create-and-list-volume.yml
+
+      - name: create-and-update-volume
+        enabled: true
+        size: 1
+        file: rally/cinder/cinder-create-and-update-volume.yml
+
   - name: keystonebasic
     enabled: true
     type: rally
diff --git a/rally/cinder/cinder-create-and-attach-volume-cc.yml b/rally/cinder/cinder-create-and-attach-volume-cc.yml
index 60cb830f9..c0ec60e4a 100644
--- a/rally/cinder/cinder-create-and-attach-volume-cc.yml
+++ b/rally/cinder/cinder-create-and-attach-volume-cc.yml
@@ -22,8 +22,8 @@
           start_cidr: "10.0.0.0/16"
           networks_per_tenant: 1
         users:
-          tenants: 2
-          users_per_tenant: 2
+          tenants: 10
+          users_per_tenant: 20
         quotas:
           neutron:
             network: -1
diff --git a/rally/cinder/cinder-create-and-list-snapshots.yml b/rally/cinder/cinder-create-and-list-snapshots.yml
new file mode 100644
index 000000000..027d37ed5
--- /dev/null
+++ b/rally/cinder/cinder-create-and-list-snapshots.yml
@@ -0,0 +1,25 @@
+{% set size = size or 1 %}
+{% set sla_max_avg_duration = sla_max_avg_duration or 60 %}
+{% set sla_max_failure = sla_max_failure or 0 %}
+{% set sla_max_seconds = sla_max_seconds or 60 %}
+---
+  CinderVolumes.create_and_list_snapshots:
+    -
+      args:
+        force: False
+        detailed: True
+      runner:
+        type: "constant"
+        times: {{ times }}
+        concurrency: {{ concurrency }}
+      context:
+        users:
+          tenants: 10
+          users_per_tenant: 20
+        volumes:
+          size: {{ size }}
+      sla:
+        max_avg_duration: {{ sla_max_avg_duration }}
+        max_seconds_per_iteration: {{ sla_max_seconds }}
+        failure_rate:
+          max: {{ sla_max_failure }}
diff --git a/rally/cinder/cinder-create-and-list-volume.yml b/rally/cinder/cinder-create-and-list-volume.yml
new file mode 100644
index 000000000..54ebced30
--- /dev/null
+++ b/rally/cinder/cinder-create-and-list-volume.yml
@@ -0,0 +1,23 @@
+{% set size = size or 1 %}
+{% set sla_max_avg_duration = sla_max_avg_duration or 60 %}
+{% set sla_max_failure = sla_max_failure or 0 %}
+{% set sla_max_seconds = sla_max_seconds or 60 %}
+---
+  CinderVolumes.create_and_list_volume:
+    -
+      args:
+        size: {{ size }}
+        detailed: True
+      runner:
+        type: "constant"
+        times: {{ times }}
+        concurrency: {{ concurrency }}
+      context:
+        users:
+          tenants: 10
+          users_per_tenant: 20
+      sla:
+        max_avg_duration: {{ sla_max_avg_duration }}
+        max_seconds_per_iteration: {{ sla_max_seconds }}
+        failure_rate:
+          max: {{ sla_max_failure }}
diff --git a/rally/cinder/cinder-create-and-update-volume.yml b/rally/cinder/cinder-create-and-update-volume.yml
new file mode 100644
index 000000000..85be701a7
--- /dev/null
+++ b/rally/cinder/cinder-create-and-update-volume.yml
@@ -0,0 +1,25 @@
+{% set size = size or 1 %}
+{% set sla_max_avg_duration = sla_max_avg_duration or 60 %}
+{% set sla_max_failure = sla_max_failure or 0 %}
+{% set sla_max_seconds = sla_max_seconds or 60 %}
+---
+  CinderVolumes.create_and_update_volume:
+    -
+      args:
+        update_volume_kwargs:
+           description: "desc_updated"
+        create_volume_kwargs: {}
+        size: {{ size }}
+      runner:
+        type: "constant"
+        times: {{ times }}
+        concurrency: {{ concurrency }}
+      context:
+        users:
+          tenants: 10
+          users_per_tenant: 20
+      sla:
+        max_avg_duration: {{ sla_max_avg_duration }}
+        max_seconds_per_iteration: {{ sla_max_seconds }}
+        failure_rate:
+          max: {{ sla_max_failure }}