Adds option parameters to TC074

Add option parameters to TC074 to allow the user to specify
volume type, volume count, availability zone, stack name,
and subnet cidr.

JIRA:YARDSTICK-1294
Change-Id: I161f44b5f2c7e70fcfb80a3b916efc34bd06824c
Signed-off-by: Ameed Ashour <Ameed.Ashour.Ext@nokia.com>

diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc074.rst b/docs/testing/user/userguide/opnfv_yardstick_tc074.rst
index 261a8bd..d6beeaf 100644 (file)
--- a/docs/testing/user/userguide/opnfv_yardstick_tc074.rst
+++ b/docs/testing/user/userguide/opnfv_yardstick_tc074.rst
@@ -111,6 +111,17 @@ Yardstick Test Case Description TC074
 |              |   Query the status of the supplied job_id and report on      |
 |              |   metrics. If a workload is supplied, will report on only    |
 |              |   that subset.                                               |
+|              | * availability_zone: Specify the availability zone which     |
+|              |   the stack will use to create instances.                    |
+|              | * volume_type:                                               |
+|              |   Cinder volumes can have different types, for example       |
+|              |   encrypted vs. not encrypted.                               |
+|              |   To be able to profile the difference between the two.      |
+|              | * subnet_CIDR: Specify subnet CIDR of private network        |
+|              | * stack_name: Specify the name of the stack that will be     |
+|              |   created, the default: "StorperfAgentGroup"                 |
+|              | * volume_count: Specify the number of volumes per            |
+|              |   virtual machines                                           |
 |              |                                                              |
 |              |   There are default values for each above-mentioned option.  |
 |              |                                                              |

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc074.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc074.yaml
index d08dbaa..e4f715c 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc074.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc074.yaml
@@ -22,6 +22,11 @@ description: >
 {% set queue_depths = queue_depths or "4" %}
 {% set steady_state_samples = steady_state_samples or 10 %}
 {% set volume_size = volume_size or 4 %}
+{% set volume_count = volume_count or 1 %}
+{% set volume_type = volume_type or "" %}
+{% set availability_zone = availability_zone or "nova" %}
+{% set subnet_CIDR = subnet_CIDR or "172.16.0.0/16" %}
+{% set stack_name = stack_name or "StorperfAgentGroup" %}
 scenarios:
 -
   type: StorPerf
@@ -39,6 +44,11 @@ scenarios:
     workload: {{workload}}
     workloads: {{workloads}}
     steady_state_samples: {{steady_state_samples}}
+    volume_count: {{volume_count}}
+    volume_type: {{volume_type}}
+    availability_zone: {{availability_zone}}
+    subnet_CIDR: {{subnet_CIDR}}
+    stack_name: {{stack_name}}
 
   runner:
     type: Iteration

diff --git a/yardstick/benchmark/scenarios/storage/storperf.py b/yardstick/benchmark/scenarios/storage/storperf.py
index 8093cd2..f2fcce6 100644 (file)
--- a/yardstick/benchmark/scenarios/storage/storperf.py
+++ b/yardstick/benchmark/scenarios/storage/storperf.py
@@ -87,7 +87,9 @@ class StorPerf(base.Scenario):
         env_args = {}
         env_args_payload_list = ["agent_count", "agent_flavor",
                                  "public_network", "agent_image",
-                                 "volume_size"]
+                                 "volume_size", "volume_type",
+                                 "volume_count", "availability_zone",
+                                 "stack_name", "subnet_CIDR"]
 
         for env_argument in env_args_payload_list:
             try: