conf: traffic type naming step2

Update of the rest of old traffic type names.

JIRA: VSPERF-420

Change-Id: Icf4bab7afad09f9b48ee25b9ff020c83cf2e02bd
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>

diff --git a/docs/userguide/yardstick.rst b/docs/userguide/yardstick.rst
index f118373..985a25a 100755 (executable)
--- a/docs/userguide/yardstick.rst
+++ b/docs/userguide/yardstick.rst
@@ -146,7 +146,7 @@ Example of yaml file:
       type: Vsperf
       options:
         testname: 'p2p_rfc2544_throughput'
-        traffic_type: 'rfc2544'
+        traffic_type: 'rfc2544_throughput'
         frame_size '64'
         bidirectional: 'True'
         iload: 100
@@ -183,7 +183,8 @@ are identical to the vswitchperf parameters passed through ``--test-params``
 argument. Following options are supported:
 
 - **traffic_type** - specifies the type of traffic executed by traffic generator;
-  valid values are "rfc2544", "continuous" and "back2back"; Default: 'rfc2544'
+  Valid values are ``rfc2544_throughput``, ``rfc2544_continuous`` and ``rfc2544_back2back``.
+  Default: ``rfc2544_throughput``
 - **frame_size** - a packet size for which test should be executed;
   Multiple packet sizes can be tested by modification of Sequence runner
   section inside YAML definition. Default: '64'

diff --git a/tools/pkt_gen/trafficgen/trafficgenhelper.py b/tools/pkt_gen/trafficgen/trafficgenhelper.py
index 90c77b0..47f8b26 100644 (file)
--- a/tools/pkt_gen/trafficgen/trafficgenhelper.py
+++ b/tools/pkt_gen/trafficgen/trafficgenhelper.py
@@ -21,7 +21,7 @@ from collections import namedtuple
 
 CMD_PREFIX = 'gencmd : '
 TRAFFIC_DEFAULTS = {
-    'traffic_type' : 'rfc2544',
+    'traffic_type' : 'rfc2544_throughput',
     'frame_rate' : 100,
     'bidir' : 'False',  # will be passed as string in title format to tgen
     'multistream' : 0,

diff --git a/vsperf b/vsperf
index 385f792..44e4542 100755 (executable)
--- a/vsperf
+++ b/vsperf
@@ -506,7 +506,7 @@ def main():
 
     settings.setValue('mode', args['mode'])
 
-    # set dpdk and ovs paths accorfing to VNF and VSWITCH
+    # set dpdk and ovs paths according to VNF and VSWITCH
     if settings.getValue('mode') != 'trafficgen':
         functions.settings_update_paths()
 

diff --git a/yardstick/tests/p2p_rfc2544_throughput_sample.yaml b/yardstick/tests/p2p_rfc2544_throughput_sample.yaml
index b633732..91aa5d0 100644 (file)
--- a/yardstick/tests/p2p_rfc2544_throughput_sample.yaml
+++ b/yardstick/tests/p2p_rfc2544_throughput_sample.yaml
@@ -28,7 +28,7 @@ scenarios:
   type: Vsperf
   options:
     testname: 'p2p_rfc2544_throughput'
-    traffic_type: 'rfc2544'
+    traffic_type: 'rfc2544_throughput'
     frame_size: '64'
     bidirectional: 'True'
     iload: 100

diff --git a/yardstick/tests/rfc2544_back2back_dummy.yaml b/yardstick/tests/rfc2544_back2back_dummy.yaml
index a3265c5..9fe834c 100644 (file)
--- a/yardstick/tests/rfc2544_back2back_dummy.yaml
+++ b/yardstick/tests/rfc2544_back2back_dummy.yaml
@@ -30,7 +30,7 @@ scenarios:
   type: Vsperf
   options:
     testname: 'rfc2544_back2back'
-    traffic_type: 'back2back'
+    traffic_type: 'rfc2544_back2back'
     frame_size: '64'
     bidirectional: 'True'
     iload: 100

diff --git a/yardstick/tests/rfc2544_continuous_dummy.yaml b/yardstick/tests/rfc2544_continuous_dummy.yaml
index fea0af3..9d189c8 100644 (file)
--- a/yardstick/tests/rfc2544_continuous_dummy.yaml
+++ b/yardstick/tests/rfc2544_continuous_dummy.yaml
@@ -30,7 +30,7 @@ scenarios:
   type: Vsperf
   options:
     testname: 'rfc2544_continuous'
-    traffic_type: 'continuous'
+    traffic_type: 'rfc2544_continuous'
     frame_size: '64'
     bidirectional: 'True'
     iload: 100

diff --git a/yardstick/tests/rfc2544_throughput_dummy.yaml b/yardstick/tests/rfc2544_throughput_dummy.yaml
index 81755c5..9ebf28c 100644 (file)
--- a/yardstick/tests/rfc2544_throughput_dummy.yaml
+++ b/yardstick/tests/rfc2544_throughput_dummy.yaml
@@ -30,7 +30,7 @@ scenarios:
   type: Vsperf
   options:
     testname: 'rfc2544_throughput'
-    traffic_type: 'rfc2544'
+    traffic_type: 'rfc2544_throughput'
     frame_size: '64'
     bidirectional: 'True'
     iload: 100