From 0c98e8f83d3548f4f2dc91cfc6e743833fb635c9 Mon Sep 17 00:00:00 2001
From: Per Holmgren <per.q.holmgren@ericsson.com>
Date: Thu, 17 Dec 2015 09:29:21 +0100
Subject: Changes Arithmetic runner to accept several step parameters

The Arithmetic runner is modified to accept several named
parameters to iterate over in each scenario. Possible to chose
either to iterate through them in a nested-for-loop fashion
(default) or in a tupled loop fashion (combine i:th element
of each input). Still possible to only provide one parameter
to step/iterate over, as before.

All existing yaml files with Arithmetic types have been modified
to run the tests as before, and to provide same results as before
this change. The only change is in sample file pktgen.yaml to
provide a valid example of how to use this modification.

It is also possible to step backwards, i.e. start > stop, with
a negative step parameter value.

(Noticed that tests are terminated when there is SLA error
problems in "monitor" mode. Should be fixed in another commit)

Change-Id: Ib2ebd24b71dd55d6817cee8e67026a0dd13a9e17
JIRA: -
---
 samples/lmbench.yaml     | 20 ++++++++++++--------
 samples/ping-serial.yaml | 11 ++++++-----
 samples/pktgen.yaml      | 22 ++++++++++++++++------
 3 files changed, 34 insertions(+), 19 deletions(-)

(limited to 'samples')

diff --git a/samples/lmbench.yaml b/samples/lmbench.yaml
index 2b8e99084..8baa81477 100644
--- a/samples/lmbench.yaml
+++ b/samples/lmbench.yaml
@@ -9,16 +9,18 @@ scenarios:
   type: Lmbench
   options:
     test_type: "latency"
-    stride: 64
     stop_size: 32
 
   host: demeter.demo
 
   runner:
     type: Arithmetic
-    name: stride
-    stop: 128
-    step: 64
+    iterators:
+    -
+      name: stride
+      start: 64
+      stop: 128
+      step: 64
 
   sla:
     max_latency: 35
@@ -27,16 +29,18 @@ scenarios:
   type: Lmbench
   options:
     test_type: "bandwidth"
-    size: 500
     benchmark: "wr"
 
   host: demeter.demo
 
   runner:
     type: Arithmetic
-    name: size
-    stop: 2000
-    step: 500
+    iterators:
+    -
+      name: size
+      start: 500
+      stop: 2000
+      step: 500
 
   sla:
     min_bandwidth: 10000
diff --git a/samples/ping-serial.yaml b/samples/ping-serial.yaml
index 37ea715a2..9c492e481 100644
--- a/samples/ping-serial.yaml
+++ b/samples/ping-serial.yaml
@@ -20,16 +20,17 @@ scenarios:
     action: monitor
 -
   type: Ping
-  options:
-    packetsize: 100
   host: apollo.demo
   target: artemis.demo
   runner:
     type: Arithmetic
-    name: packetsize
     interval: 0.2
-    stop: 6000
-    step: 100
+    iterators:
+    -
+      name: packetsize
+      start: 100
+      stop: 6000
+      step: 100
 
 context:
   name: demo
diff --git a/samples/pktgen.yaml b/samples/pktgen.yaml
index 11d62795e..d621cb730 100644
--- a/samples/pktgen.yaml
+++ b/samples/pktgen.yaml
@@ -1,6 +1,8 @@
 ---
 # Sample benchmark task config file
 # measure network throughput using pktgen
+# with 2 stepping parameters. One stepping
+# in positive and the other in negative direction
 
 schema: "yardstick:task:0.1"
 
@@ -8,8 +10,6 @@ scenarios:
 -
   type: Pktgen
   options:
-    packetsize: 60
-    number_of_ports: 10
     duration: 20
 
   host: demeter.demo
@@ -17,10 +17,20 @@ scenarios:
 
   runner:
     type: Arithmetic
-    name: number_of_ports
-    # run twice with values 10 and 20
-    stop: 20
-    step: 10
+    interval: 2
+    iter_type: nested_for_loops
+    # run with packetsize/number_of_ports: 60,20; 60,10; ... 70,10
+    iterators:
+      -
+       name: packetsize
+       start: 60
+       stop: 70
+       step: 5
+      -
+       name: number_of_ports
+       start: 20
+       stop: 10
+       step: -10
 
   sla:
     max_ppm: 1000
-- 
cgit 1.2.3-korg