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>

1 files changed, 5 insertions, 4 deletions

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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^