summaryrefslogtreecommitdiffstats
path: root/yardstick
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2017-01-17 11:37:49 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-01-17 11:37:49 +0000
commit8b75ee19407e542fa4b4153e3b6b23f678507575 (patch)
treebe0d19f3b7e41a5e65833cdca6e93ffac38f0392 /yardstick
parent7ed7b9683a2cc4c81fcabdffc945bf352263437f (diff)
parent4481df385ac03ece015ccb429201f96189dc5ae2 (diff)
Merge "traffic: Configurable traffic details"
Diffstat (limited to 'yardstick')
-rw-r--r--yardstick/tests/p2p_rfc2544_throughput_sample.yaml5
-rw-r--r--yardstick/tests/rfc2544_back2back_dummy.yaml9
-rw-r--r--yardstick/tests/rfc2544_continuous_dummy.yaml6
-rw-r--r--yardstick/tests/rfc2544_throughput_dummy.yaml6
4 files changed, 12 insertions, 14 deletions
diff --git a/yardstick/tests/p2p_rfc2544_throughput_sample.yaml b/yardstick/tests/p2p_rfc2544_throughput_sample.yaml
index 91aa5d00..32b42187 100644
--- a/yardstick/tests/p2p_rfc2544_throughput_sample.yaml
+++ b/yardstick/tests/p2p_rfc2544_throughput_sample.yaml
@@ -28,11 +28,8 @@ scenarios:
type: Vsperf
options:
testname: 'p2p_rfc2544_throughput'
- traffic_type: 'rfc2544_throughput'
frame_size: '64'
- bidirectional: 'True'
- iload: 100
- test_params: 'TRAFFICGEN_DURATION=30;'
+ test_params: 'TRAFFICGEN_DURATION=30;TRAFFIC={"traffic_type":"rfc2544_throughput"}'
trafficgen_port1: 'eth1'
trafficgen_port2: 'eth3'
external_bridge: 'br-ex'
diff --git a/yardstick/tests/rfc2544_back2back_dummy.yaml b/yardstick/tests/rfc2544_back2back_dummy.yaml
index 9fe834c5..a45c4f61 100644
--- a/yardstick/tests/rfc2544_back2back_dummy.yaml
+++ b/yardstick/tests/rfc2544_back2back_dummy.yaml
@@ -30,14 +30,15 @@ scenarios:
type: Vsperf
options:
testname: 'rfc2544_back2back'
- traffic_type: 'rfc2544_back2back'
frame_size: '64'
- bidirectional: 'True'
- iload: 100
test_params: 'TRAFFICGEN="Dummy";
+ TRAFFIC={
+ "traffic_type":"rfc2544_back2back"
+ };
TRAFFICGEN_DUMMY_RESULTS={
"b2b frames":"10000",
- "b2b frame loss %":"0.0"}'
+ "b2b frame loss %":"0.0",
+ }'
host: vsperf.demo
diff --git a/yardstick/tests/rfc2544_continuous_dummy.yaml b/yardstick/tests/rfc2544_continuous_dummy.yaml
index 9d189c80..2d02fce2 100644
--- a/yardstick/tests/rfc2544_continuous_dummy.yaml
+++ b/yardstick/tests/rfc2544_continuous_dummy.yaml
@@ -30,12 +30,12 @@ scenarios:
type: Vsperf
options:
testname: 'rfc2544_continuous'
- traffic_type: 'rfc2544_continuous'
frame_size: '64'
- bidirectional: 'True'
- iload: 100
test_params: 'TRAFFICGEN_DURATION=30;
TRAFFICGEN="Dummy";
+ TRAFFIC={
+ "traffic_type":"rfc2544_continuous"
+ };
TRAFFICGEN_DUMMY_RESULTS={
"frames tx":15000000,
"frames rx":15000000,
diff --git a/yardstick/tests/rfc2544_throughput_dummy.yaml b/yardstick/tests/rfc2544_throughput_dummy.yaml
index 9ebf28c4..1abbea63 100644
--- a/yardstick/tests/rfc2544_throughput_dummy.yaml
+++ b/yardstick/tests/rfc2544_throughput_dummy.yaml
@@ -30,12 +30,12 @@ scenarios:
type: Vsperf
options:
testname: 'rfc2544_throughput'
- traffic_type: 'rfc2544_throughput'
frame_size: '64'
- bidirectional: 'True'
- iload: 100
test_params: 'TRAFFICGEN_DURATION=30;
TRAFFICGEN="Dummy";
+ TRAFFIC={
+ "traffic_type":"rfc2544_throughput"
+ };
TRAFFICGEN_DUMMY_RESULTS={
"frames tx":15000000,
"frames rx":15000000,