diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2016-12-14 14:02:43 +0000 |
|---|---|---|
| committer | Martin Klozik <martinx.klozik@intel.com> | 2017-01-16 08:50:02 +0000 |
| commit | 4481df385ac03ece015ccb429201f96189dc5ae2 (patch) | |
| tree | a959a804e7b1efd663dbb24a447609421e339211 /yardstick/tests | |
| parent | cafcb9f24b422a4b3a0b19ba00c83fe2819dcbaa (diff) | |
traffic: Configurable traffic details
Traffic generated by traffic generator is based on default
values and their modifications specific to particular testing
scenario. Traffic default values were defined inside VSPERF
code and it was not possible to change them. This patch introduces
new TRAFFIC dictionary inside 03_traffic.conf. Thus user can
modify any of TRAFFIC values either in configuration file
or by CLI or by 'Parameters' section of testcase definition.
Following CLI options were obsoleted by this patch:
'bidirectional', 'traffic_type', 'iload', 'multistream',
'stream_type' and 'pre-installed_flows'
Following CLI option was renamed to be consistent with other options:
'tunnel_type' => 'TUNNEL_TYPE'
Following sections of testcase definition were obsoleted:
"Traffic Type", "biDirectional", "MultiStream", "Stream Type",
"Pre-installed Flows", "Flow Type" and "iLoad"
New TRAFFIC dictionary should be used instead of old CLI options
and old testcase definition sections. Testcase definitons,
yardstick sample testcases and documentation were updated to reflect
configuration changes.
JIRA: VSPERF-433
Change-Id: I03a388c766491d5688e715f6d7b51e8e0377ec27
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Bill Michalowski <bmichalo@redhat.com>
Reviewed-by: Antonio Fischetti <antonio.fischetti@intel.com>
Reviewed-by: <sridhar.rao@spirent.com>
Diffstat (limited to 'yardstick/tests')
| -rw-r--r-- | yardstick/tests/p2p_rfc2544_throughput_sample.yaml | 5 | ||||
| -rw-r--r-- | yardstick/tests/rfc2544_back2back_dummy.yaml | 9 | ||||
| -rw-r--r-- | yardstick/tests/rfc2544_continuous_dummy.yaml | 6 | ||||
| -rw-r--r-- | yardstick/tests/rfc2544_throughput_dummy.yaml | 6 |
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, |