From 934d3eb98f99ecf10fff876988d759e3a024e11c Mon Sep 17 00:00:00 2001
From: Anton Arefiev <aarefiev@mirantis.com>
Date: Mon, 27 Apr 2015 19:50:02 +0300
Subject: [PATCH] Support size range in Cinder create_volume and extend_volume

It is useful for some test cases to set up volume size from some
range, not only specific value. This change add such possibility
to create_volume and extend_volume.

Change-Id: Ic7cc9270eb8d31dcbe3d30acf6f24cf9c41a6fd1
---
 rally-jobs/rally-neutron.yaml                 | 86 +++++++++++++++++++
 .../cinder/create-and-attach-volume.json      | 22 +++++
 .../cinder/create-and-attach-volume.yaml      | 15 ++++
 .../cinder/create-and-delete-volume.json      | 19 ++++
 .../cinder/create-and-delete-volume.yaml      | 13 +++
 .../cinder/create-and-extend-volume.json      | 23 +++++
 .../cinder/create-and-extend-volume.yaml      | 16 ++++
 .../cinder/create-and-list-volume.json        | 20 +++++
 .../cinder/create-and-list-volume.yaml        | 14 +++
 .../create-and-upload-volume-to-image.json    | 23 +++++
 .../create-and-upload-volume-to-image.yaml    | 17 ++++
 .../create-from-volume-and-delete-volume.json | 22 +++++
 .../create-from-volume-and-delete-volume.yaml | 15 ++++
 .../tasks/scenarios/cinder/create-volume.json | 19 ++++
 .../tasks/scenarios/cinder/create-volume.yaml | 13 +++
 15 files changed, 337 insertions(+)

diff --git a/rally-jobs/rally-neutron.yaml b/rally-jobs/rally-neutron.yaml
index 01cda77f..0ba4b29e 100644
--- a/rally-jobs/rally-neutron.yaml
+++ b/rally-jobs/rally-neutron.yaml
@@ -560,6 +560,22 @@
       sla:
         failure_rate:
           max: 0
+    -
+      args:
+        size:
+          min: 1
+          max: 3
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 3
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+      sla:
+        failure_rate:
+          max: 0
 
   CinderVolumes.create_and_list_volume:
     -
@@ -577,6 +593,23 @@
       sla:
         failure_rate:
           max: 0
+    -
+      args:
+        size:
+          min: 1
+          max: 3
+        detailed: True
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 3
+      context:
+        users:
+          tenants: 1
+          users_per_tenant: 1
+      sla:
+        failure_rate:
+          max: 0
     -
       args:
         size: 1
@@ -629,6 +662,22 @@
       sla:
         failure_rate:
           max: 0
+    -
+      args:
+        size:
+          min: 1
+          max: 3
+      runner:
+        type: "constant"
+        times: 2
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+      sla:
+        failure_rate:
+          max: 0
     -
       args:
         size: 1
@@ -662,6 +711,25 @@
       sla:
         failure_rate:
           max: 0
+    -
+      args:
+        size:
+          min: 1
+          max: 2
+        new_size:
+          min: 3
+          max: 4
+      runner:
+        type: "constant"
+        times: 2
+        concurrency: 2
+      context:
+        users:
+          tenants: 1
+          users_per_tenant: 1
+      sla:
+        failure_rate:
+          max: 0
 
   CinderVolumes.create_from_volume_and_delete_volume:
     -
@@ -680,6 +748,24 @@
       sla:
         failure_rate:
           max: 0
+    -
+      args:
+        size:
+          min: 1
+          max: 2
+      runner:
+        type: "constant"
+        times: 2
+        concurrency: 2
+      context:
+        users:
+          tenants: 1
+          users_per_tenant: 1
+        volumes:
+          size: 1
+      sla:
+        failure_rate:
+          max: 0
 
   CinderVolumes.create_and_delete_snapshot:
     -
diff --git a/samples/tasks/scenarios/cinder/create-and-attach-volume.json b/samples/tasks/scenarios/cinder/create-and-attach-volume.json
index b7049f34..b30cc7a1 100644
--- a/samples/tasks/scenarios/cinder/create-and-attach-volume.json
+++ b/samples/tasks/scenarios/cinder/create-and-attach-volume.json
@@ -21,6 +21,28 @@
                     "users_per_tenant": 2
                 }
             }
+        },
+        {
+            "args": {
+                "size": {
+                    "min": 1,
+                    "max": 5
+                },
+                "flavor": {
+                    "name": "m1.nano"
+                }
+            },
+            "runner": {
+                "type": "constant",
+                "times": 5,
+                "concurrency": 1
+            },
+            "context": {
+                "users": {
+                    "tenants": 2,
+                    "users_per_tenant": 2
+                }
+            }
         }
     ]
 }
diff --git a/samples/tasks/scenarios/cinder/create-and-attach-volume.yaml b/samples/tasks/scenarios/cinder/create-and-attach-volume.yaml
index 62410e31..aa4fe20c 100644
--- a/samples/tasks/scenarios/cinder/create-and-attach-volume.yaml
+++ b/samples/tasks/scenarios/cinder/create-and-attach-volume.yaml
@@ -15,3 +15,18 @@
         users:
           tenants: 2
           users_per_tenant: 2
+    -
+      args:
+        size:
+          min: 1
+          max: 5
+        flavor:
+            name: "m1.nano"
+      runner:
+        type: "constant"
+        times: 5
+        concurrency: 1
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
\ No newline at end of file
diff --git a/samples/tasks/scenarios/cinder/create-and-delete-volume.json b/samples/tasks/scenarios/cinder/create-and-delete-volume.json
index 28f7eec4..9c096aac 100644
--- a/samples/tasks/scenarios/cinder/create-and-delete-volume.json
+++ b/samples/tasks/scenarios/cinder/create-and-delete-volume.json
@@ -15,6 +15,25 @@
                     "users_per_tenant": 2
                 }
             }
+        },
+        {
+            "args": {
+                "size": {
+                    "min": 1,
+                    "max": 5
+                }
+            },
+            "runner": {
+                "type": "constant",
+                "times": 3,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 2,
+                    "users_per_tenant": 2
+                }
+            }
         }
     ]
 }
diff --git a/samples/tasks/scenarios/cinder/create-and-delete-volume.yaml b/samples/tasks/scenarios/cinder/create-and-delete-volume.yaml
index 9e68e8c2..957c86b5 100644
--- a/samples/tasks/scenarios/cinder/create-and-delete-volume.yaml
+++ b/samples/tasks/scenarios/cinder/create-and-delete-volume.yaml
@@ -11,3 +11,16 @@
         users:
           tenants: 2
           users_per_tenant: 2
+    -
+      args:
+        size:
+          min: 1
+          max: 5
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
\ No newline at end of file
diff --git a/samples/tasks/scenarios/cinder/create-and-extend-volume.json b/samples/tasks/scenarios/cinder/create-and-extend-volume.json
index 4794c96e..18231757 100644
--- a/samples/tasks/scenarios/cinder/create-and-extend-volume.json
+++ b/samples/tasks/scenarios/cinder/create-and-extend-volume.json
@@ -16,6 +16,29 @@
                     "users_per_tenant": 1
                 }
             }
+        },
+        {
+            "args": {
+                "size": {
+                    "min": 1,
+                    "max": 5
+                },
+                "new_size": {
+                    "min": 6,
+                    "max": 10
+                }
+            },
+            "runner": {
+                "type": "constant",
+                "times": 2,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 1,
+                    "users_per_tenant": 1
+                }
+            }
         }
     ]
 }
diff --git a/samples/tasks/scenarios/cinder/create-and-extend-volume.yaml b/samples/tasks/scenarios/cinder/create-and-extend-volume.yaml
index 781e692f..1caa2a34 100644
--- a/samples/tasks/scenarios/cinder/create-and-extend-volume.yaml
+++ b/samples/tasks/scenarios/cinder/create-and-extend-volume.yaml
@@ -12,3 +12,19 @@
         users:
           tenants: 1
           users_per_tenant: 1
+    -
+      args:
+        size:
+          min: 1
+          max: 5
+        new_size:
+          min: 6
+          max: 10
+      runner:
+        type: "constant"
+        times: 2
+        concurrency: 2
+      context:
+        users:
+          tenants: 1
+          users_per_tenant: 1
\ No newline at end of file
diff --git a/samples/tasks/scenarios/cinder/create-and-list-volume.json b/samples/tasks/scenarios/cinder/create-and-list-volume.json
index 4a3cb6ad..baacf7c2 100644
--- a/samples/tasks/scenarios/cinder/create-and-list-volume.json
+++ b/samples/tasks/scenarios/cinder/create-and-list-volume.json
@@ -16,6 +16,26 @@
                     "users_per_tenant": 1
                 }
             }
+        },
+        {
+            "args": {
+                "size": {
+                    "min": 1,
+                    "max": 5
+                },
+                "detailed": true
+            },
+            "runner": {
+                "type": "constant",
+                "times": 3,
+                "concurrency": 1
+            },
+            "context": {
+                "users": {
+                    "tenants": 1,
+                    "users_per_tenant": 1
+                }
+            }
         }
     ]
 }
diff --git a/samples/tasks/scenarios/cinder/create-and-list-volume.yaml b/samples/tasks/scenarios/cinder/create-and-list-volume.yaml
index 3ff7193c..e209baa3 100644
--- a/samples/tasks/scenarios/cinder/create-and-list-volume.yaml
+++ b/samples/tasks/scenarios/cinder/create-and-list-volume.yaml
@@ -12,3 +12,17 @@
         users:
           tenants: 1
           users_per_tenant: 1
+    -
+      args:
+        size:
+          min: 1
+          max: 5
+        detailed: True
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 1
+      context:
+        users:
+          tenants: 1
+          users_per_tenant: 1
\ No newline at end of file
diff --git a/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.json b/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.json
index ee9344a9..a721bdf2 100644
--- a/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.json
+++ b/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.json
@@ -19,6 +19,29 @@
                     "users_per_tenant": 2
                 }
             }
+        },
+        {
+            "args": {
+                "size": {
+                    "min": 1,
+                    "max": 5
+                },
+                "force": false,
+                "container_format": "bare",
+                "disk_format": "raw",
+                "do_delete": true
+            },
+            "runner": {
+                "type": "constant",
+                "times": 3,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 2,
+                    "users_per_tenant": 2
+                }
+            }
         }
     ]
 }
diff --git a/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.yaml b/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.yaml
index 42f631e7..07b93487 100644
--- a/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.yaml
+++ b/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.yaml
@@ -15,3 +15,20 @@
         users:
           tenants: 2
           users_per_tenant: 2
+    -
+      args:
+        size:
+          min: 1
+          max: 5
+        force: false
+        container_format: "bare"
+        disk_format: "raw"
+        do_delete: true
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
\ No newline at end of file
diff --git a/samples/tasks/scenarios/cinder/create-from-volume-and-delete-volume.json b/samples/tasks/scenarios/cinder/create-from-volume-and-delete-volume.json
index becd52db..43a439c7 100644
--- a/samples/tasks/scenarios/cinder/create-from-volume-and-delete-volume.json
+++ b/samples/tasks/scenarios/cinder/create-from-volume-and-delete-volume.json
@@ -18,6 +18,28 @@
                     "size": 1
                 }
             }
+        },
+        {
+            "args": {
+                "size": {
+                    "min": 1,
+                    "max": 5
+                }
+            },
+            "runner": {
+                "type": "constant",
+                "times": 2,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 1,
+                    "users_per_tenant": 1
+                },
+                "volumes": {
+                    "size": 1
+                }
+            }
         }
     ]
 }
\ No newline at end of file
diff --git a/samples/tasks/scenarios/cinder/create-from-volume-and-delete-volume.yaml b/samples/tasks/scenarios/cinder/create-from-volume-and-delete-volume.yaml
index 78285b15..7af1f22e 100644
--- a/samples/tasks/scenarios/cinder/create-from-volume-and-delete-volume.yaml
+++ b/samples/tasks/scenarios/cinder/create-from-volume-and-delete-volume.yaml
@@ -7,6 +7,21 @@
         type: "constant"
         times: 2
         concurrency: 2
+      context:
+        users:
+          tenants: 1
+          users_per_tenant: 1
+        volumes:
+          size: 1
+    -
+      args:
+        size:
+          min: 1
+          max: 5
+      runner:
+        type: "constant"
+        times: 2
+        concurrency: 2
       context:
         users:
           tenants: 1
diff --git a/samples/tasks/scenarios/cinder/create-volume.json b/samples/tasks/scenarios/cinder/create-volume.json
index 41dfd233..fb897d42 100644
--- a/samples/tasks/scenarios/cinder/create-volume.json
+++ b/samples/tasks/scenarios/cinder/create-volume.json
@@ -15,6 +15,25 @@
                     "users_per_tenant": 2
                 }
             }
+        },
+        {
+            "args": {
+                "size": {
+                    "min": 1,
+                    "max": 5
+                }
+            },
+            "runner": {
+                "type": "constant",
+                "times": 3,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 2,
+                    "users_per_tenant": 2
+                }
+            }
         }
     ]
 }
diff --git a/samples/tasks/scenarios/cinder/create-volume.yaml b/samples/tasks/scenarios/cinder/create-volume.yaml
index 31987729..e63c10fc 100644
--- a/samples/tasks/scenarios/cinder/create-volume.yaml
+++ b/samples/tasks/scenarios/cinder/create-volume.yaml
@@ -11,3 +11,16 @@
         users:
           tenants: 2
           users_per_tenant: 2
+    -
+      args:
+        size:
+          min: 1
+          max: 5
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
\ No newline at end of file