conf:Traffic-type naming convention and consistency

Following changes are added following first review
1. Descriptions in integration/01_testcases.conf
2. Comment in conf/01_testcases.conf
3. Checking all cases of traffic types in traffic_controller_rfc2544.py
4. Removing whitespaces
5. Missing changes (throughput->rfc2544_throughput)
6. Syntax error in core/traffic_controller_rfc2544.py

Currently the traffic-type values that are provided as part of the
test case definition needs some fix to support additional traffic
- apart from rfc2544. The Current and the proposed changed is summarized
in the below table:

|--------------------------------------------------------------------|
|  Parameter  | Existing traffic_type value |    Changed to          |
----------------------------------------------------------------------
| Throughput  | rfc2544  OR throughput      |   rfc2544_throughput   |
----------------------------------------------------------------------
| Back2Back   | back2back                   |   rfc2544_back2back    |
----------------------------------------------------------------------
| Continuous  | continuous                  |   rfc2544_continuous   |
----------------------------------------------------------------------

JIRA: VSPERF-420

Change-Id: I22bd897f6389d2b568a6a3735c67f0003e813445
Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>

2 files changed, 15 insertions, 10 deletions

diff --git a/docs/userguide/teststeps.rst b/docs/userguide/teststeps.rst
index 65a25b0a..c00a2749 100644
--- a/docs/userguide/teststeps.rst
+++ b/docs/userguide/teststeps.rst
@@ -122,9 +122,9 @@ of supported objects and their most common functions follows:
 
         .. code-block:: python
 
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput'}]
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput'}]
 
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : 'True'}]
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', 'bidir' : 'True'}]
 
     * ``settings`` - reads or modifies VSPERF configuration
 
@@ -344,7 +344,8 @@ IP address = 90.90.90.90 will be forwarded to the port created at the STEP #2.
             ['vswitch', 'add_flow', 'int_br0', {'in_port': '#STEP[1][1]', \
                 'dl_type': '0x0800', 'nw_dst': '90.90.90.90', \
                 'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous'}],
+            ['trafficgen', 'send_traffic', \
+                {'traffic_type' : 'rfc2544_continuous'}],
             ['vswitch', 'dump_flows', 'int_br0'],   # STEP 5
             ['vswitch', 'del_flow', 'int_br0'],     # STEP 7 == del-flows
             ['vswitch', 'del_port', 'int_br0', '#STEP[1][0]'],
@@ -393,7 +394,8 @@ That is accomplished by using "Stream Type" and "MultiStream" keywords.
                 'dl_type': '0x0800', 'nw_proto': '17', 'udp_dst': '3', \
                 'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
             # Send mono-dir traffic
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', \
+            ['trafficgen', 'send_traffic', \
+                {'traffic_type' : 'rfc2544_continuous', \
                 'bidir' : 'False'}],
             # Clean up
             ['vswitch', 'del_flow', 'int_br0'],
@@ -505,7 +507,8 @@ loopback application by a configuration option ``GUEST_LOOPBACK``.
                 'actions': ['output:#STEP[2][1]'], 'idle_timeout': '0'}],
             # Start VMs
             ['vnf1', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', \
+            ['trafficgen', 'send_traffic', \
+                {'traffic_type' : 'rfc2544_continuous', \
                 'bidir' : 'False'}],
             ['vnf1', 'stop'],
             # Clean up
@@ -578,7 +581,8 @@ destination UDP port.
             # Start VMs
             ['vnf1', 'start'],                          # STEP 16
             ['vnf2', 'start'],                          # STEP 17
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', \
+            ['trafficgen', 'send_traffic', \
+                {'traffic_type' : 'rfc2544_continuous', \
                 'bidir' : 'False'}],
             ['vnf1', 'stop'],
             ['vnf2', 'stop'],
diff --git a/docs/userguide/testusage.rst b/docs/userguide/testusage.rst
index f446f261..46413f03 100755
--- a/docs/userguide/testusage.rst
+++ b/docs/userguide/testusage.rst
@@ -674,9 +674,10 @@ Supported CLI options useful for traffic generator configuration are:
 
 .. code-block:: console
 
-    'traffic_type'  - One of the supported traffic types. E.g. rfc2544,
-                      back2back or continuous
-                      Default value is "rfc2544".
+    'traffic_type'  - One of the supported traffic types. E.g.
+                      rfc2544_throughput,
+                      rfc2544_back2back or rfc2544_continuous
+                      Default value is "rfc2544_throughput".
     'bidirectional' - Specifies if generated traffic will be full-duplex (true)
                       or half-duplex (false)
                       Default value is "false".
@@ -697,7 +698,7 @@ Example of execution of VSPERF in "trafficgen" mode:
 .. code-block:: console
 
     $ ./vsperf -m trafficgen --trafficgen IxNet --conf-file vsperf.conf \
-        --test-params "traffic_type=continuous;bidirectional=True;iload=60"
+        --test-params "traffic_type=rfc2544_continuous;bidirectional=True;iload=60"
 
 Code change verification by pylint
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^