15 files changed, 93 insertions, 18 deletions
diff --git a/samples/fio-template.yaml b/samples/fio-template.yaml
new file mode 100644
index 000000000..395e4c417
--- /dev/null
+++ b/samples/fio-template.yaml
@@ -0,0 +1,39 @@
+# Sample benchmark task config file
+# measure storage performance using fio
+# Jinja2 Syntax is supported
+# using built-in functions ( Jinja2 for-endfor construct ) to test complex tasks
+# Test block sizes of 4KB, 8KB, 64KB, 1MB
+# Test 5 workloads: 4 corners and 1 mixed :read, write, randwrite, randread, rw
+schema: "yardstick:task:0.1"
+
+scenarios:
+{% for rw in ['read', 'write', 'randwrite', 'randread', 'rw'] %}
+  {% for bs in ['4k', '8k', '64k', '1024k'] %}
+-
+  type: Fio
+  options:
+    filename: /home/ec2-user/data.raw
+    bs: {{bs}}
+    rw: {{rw}}
+    ramp_time: 10
+    duration: 20
+  host: fio.demo
+  runner:
+    type: Iteration
+    iterations: 2
+    interval: 1
+  {% endfor %}
+{% endfor %}
+
+context:
+  name: demo
+  image: yardstick-trusty-server
+  flavor: yardstick-flavor
+  user: ec2-user
+  servers:
+    fio:
+      floating_ip: true
+  networks:
+    test:
+      cidr: "10.0.1.0/24"
+
diff --git a/samples/fio.yaml b/samples/fio.yaml
index f70912a15..44444c7cc 100644
--- a/samples/fio.yaml
+++ b/samples/fio.yaml
@@ -5,9 +5,10 @@
 # For this sample just like running the command below on the test vm and 
 # getting benchmark info back to the yardstick.
 #
-# sudo fio -filename=/home/ec2-user/data.raw -bs=4k -rw=write -ramp_time=10 \
-#          -runtime=60 -name=yardstick-fio -ioengine=libaio -direct=1 \
-#          -group_reporting -numjobs=1 -time_based --output=yardstick-fio.log
+# sudo fio -filename=/home/ec2-user/data.raw -bs=4k -ipdepth=1 -rw=write \
+#          -ramp_time=10 -runtime=60 -name=yardstick-fio -ioengine=libaio \
+#          -direct=1 -group_reporting -numjobs=1 -time_based \
+#          --output=yardstick-fio.log
 #
 # When the above fio command done, the yardstick-fio.log file will contain 
 # information like below and the benchmark script will take iops, throughput 
@@ -52,13 +53,14 @@ scenarios:
   options:
     filename: /home/ec2-user/data.raw
     bs: 4k
+    iodepth: 1
     rw: write
     ramp_time: 10
   host: fio.demo
   runner:
     type: Duration
     duration: 60
-    interval: 60
+    interval: 1
 
 context:
   name: demo
@@ -71,4 +73,3 @@ context:
   networks:
     test:
       cidr: "10.0.1.0/24"
-      external_network: "net04_ext"
diff --git a/samples/iperf3.yaml b/samples/iperf3.yaml
index b3a7a9f3b..8de44678c 100644
--- a/samples/iperf3.yaml
+++ b/samples/iperf3.yaml
@@ -40,5 +40,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
diff --git a/samples/lmbench.yaml b/samples/lmbench.yaml
index c7526c04c..256d8c67e 100644
--- a/samples/lmbench.yaml
+++ b/samples/lmbench.yaml
@@ -41,6 +41,5 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
 
diff --git a/samples/perf.yaml b/samples/perf.yaml
index e7ba2d0e7..b6ce2a226 100644
--- a/samples/perf.yaml
+++ b/samples/perf.yaml
@@ -40,4 +40,3 @@ context:
   networks:
     test:
       cidr: "10.0.1.0/24"
-      external_network: "net04_ext"
diff --git a/samples/ping-ext-ip.yaml b/samples/ping-ext-ip.yaml
index f2923f65f..d36c29544 100644
--- a/samples/ping-ext-ip.yaml
+++ b/samples/ping-ext-ip.yaml
@@ -32,5 +32,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
diff --git a/samples/ping-ext-stimuli.yaml b/samples/ping-ext-stimuli.yaml
index cfe791567..451f0105f 100644
--- a/samples/ping-ext-stimuli.yaml
+++ b/samples/ping-ext-stimuli.yaml
@@ -45,5 +45,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
diff --git a/samples/ping-iteration.yaml b/samples/ping-iteration.yaml
index 810530c82..a5e90941b 100755
--- a/samples/ping-iteration.yaml
+++ b/samples/ping-iteration.yaml
@@ -41,5 +41,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
diff --git a/samples/ping-multiple-context.yaml b/samples/ping-multiple-context.yaml
index c529fccb8..1c27e1bf1 100644
--- a/samples/ping-multiple-context.yaml
+++ b/samples/ping-multiple-context.yaml
@@ -36,7 +36,6 @@ contexts:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 -
   name: demo2
   image: cirros-0.3.3
@@ -52,5 +51,4 @@ contexts:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
diff --git a/samples/ping-option-list.yaml b/samples/ping-option-list.yaml
index 1fa95e6c2..30d133eb8 100644
--- a/samples/ping-option-list.yaml
+++ b/samples/ping-option-list.yaml
@@ -39,6 +39,5 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
 
diff --git a/samples/ping-parallel.yaml b/samples/ping-parallel.yaml
index f3f698993..00d261383 100644
--- a/samples/ping-parallel.yaml
+++ b/samples/ping-parallel.yaml
@@ -53,5 +53,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
diff --git a/samples/ping-serial.yaml b/samples/ping-serial.yaml
index ff281ee82..37ea715a2 100644
--- a/samples/ping-serial.yaml
+++ b/samples/ping-serial.yaml
@@ -45,5 +45,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
diff --git a/samples/ping-template.yaml b/samples/ping-template.yaml
new file mode 100644
index 000000000..cde6ddd7c
--- /dev/null
+++ b/samples/ping-template.yaml
@@ -0,0 +1,48 @@
+# Sample benchmark task config file
+# measure network latency using ping
+# Jinja2 Syntax is supported
+# parameterize this task, {{packetsize}} is passed to the scenario as an argument
+# If you don't pass the value for {{packetsize}} while starting a task,
+# the default one will be used.
+
+
+schema: "yardstick:task:0.1"
+{% set packetsize = packetsize or "100" %}
+scenarios:
+-
+  type: Ping
+  options:
+    packetsize: {{packetsize}}
+  host: athena.demo
+  target: ares.demo
+
+  runner:
+    type: Duration
+    duration: 60
+    interval: 1
+
+  sla:
+    max_rtt: 10
+    action: monitor
+
+context:
+  name: demo
+  image: cirros-0.3.3
+  flavor: m1.tiny
+  user: cirros
+
+  placement_groups:
+    pgrp1:
+      policy: "availability"
+
+  servers:
+    athena:
+      floating_ip: true
+      placement: "pgrp1"
+    ares:
+      placement: "pgrp1"
+
+  networks:
+    test:
+      cidr: '10.0.1.0/24'
+
diff --git a/samples/ping.yaml b/samples/ping.yaml
index f8b6a3167..845d10dcc 100644
--- a/samples/ping.yaml
+++ b/samples/ping.yaml
@@ -41,5 +41,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
diff --git a/samples/pktgen.yaml b/samples/pktgen.yaml
index 609730842..11d62795e 100644
--- a/samples/pktgen.yaml
+++ b/samples/pktgen.yaml
@@ -47,6 +47,5 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"