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>

diff --git a/conf/01_testcases.conf b/conf/01_testcases.conf
index f30c191..a8d7a13 100755 (executable)
--- a/conf/01_testcases.conf
+++ b/conf/01_testcases.conf
@@ -19,9 +19,9 @@
 #
 # "Name": "phy2phy_burst",         # A human-readable string identifying the
 #                                  # test.
-# "Traffic Type": "rfc2544",       # One of the supported traffic types.
+# "Traffic Type": "rfc2544_throughput",
+#                                  # One of the supported traffic types.
 #                                  # It can be overridden by cli option traffic_type.
-#                                  # Default value is "rfc2544".
 # "Deployment": "p2p",             # One of the supported deployment scenarios.
 # "Description": "Lorem ipsum..."  # Optional. A human-readable string
 #                                  # describing the test.
@@ -129,7 +129,7 @@
 PERFORMANCE_TESTS = [
     {
         "Name": "phy2phy_tput",
-        "Traffic Type": "rfc2544",
+        "Traffic Type": "rfc2544_throughput",
         "Deployment": "p2p",
         "biDirectional": "True",
         "Description": "LTD.Throughput.RFC2544.PacketLossRatio",
@@ -143,14 +143,14 @@ PERFORMANCE_TESTS = [
     },
     {
         "Name": "back2back",
-        "Traffic Type": "back2back",
+        "Traffic Type": "rfc2544_back2back",
         "Deployment": "p2p",
         "biDirectional": "True",
         "Description": "LTD.Throughput.RFC2544.BackToBackFrames",
     },
     {
         "Name": "phy2phy_tput_mod_vlan",
-        "Traffic Type": "rfc2544",
+        "Traffic Type": "rfc2544_throughput",
         "Deployment": "p2p",
         "Frame Modification": "vlan",
         "biDirectional": "False",
@@ -158,7 +158,7 @@ PERFORMANCE_TESTS = [
     },
     {
         "Name": "phy2phy_cont",
-        "Traffic Type": "continuous",
+        "Traffic Type": "rfc2544_continuous",
         "Deployment": "p2p",
         "Description": "Phy2Phy Continuous Stream",
         "biDirectional": "True",
@@ -166,7 +166,7 @@ PERFORMANCE_TESTS = [
     },
     {
         "Name": "pvp_cont",
-        "Traffic Type": "continuous",
+        "Traffic Type": "rfc2544_continuous",
         "Deployment": "pvp",
         "Description": "PVP Continuous Stream",
         "biDirectional": "True",
@@ -174,7 +174,7 @@ PERFORMANCE_TESTS = [
     },
     {
         "Name": "pvvp_cont",
-        "Traffic Type": "continuous",
+        "Traffic Type": "rfc2544_continuous",
         "Deployment": "pvvp",
         "Description": "PVVP Continuous Stream",
         "biDirectional": "True",
@@ -182,7 +182,7 @@ PERFORMANCE_TESTS = [
     },
     {
         "Name": "pvpv_cont",
-        "Traffic Type": "continuous",
+        "Traffic Type": "rfc2544_continuous",
         "Deployment": "pvpv",
         "Description": "Two VMs in parallel with Continuous Stream",
         "biDirectional": "True",
@@ -190,7 +190,7 @@ PERFORMANCE_TESTS = [
     },
     {
         "Name": "phy2phy_scalability",
-        "Traffic Type": "rfc2544",
+        "Traffic Type": "rfc2544_throughput",
         "Deployment": "p2p",
         "biDirectional": "True",
         "Description": "LTD.Scalability.Flows.RFC2544.0PacketLoss",
@@ -198,21 +198,21 @@ PERFORMANCE_TESTS = [
     },
     {
         "Name": "pvp_tput",
-        "Traffic Type": "rfc2544",
+        "Traffic Type": "rfc2544_throughput",
         "Deployment": "pvp",
         "Description": "LTD.Throughput.RFC2544.PacketLossRatio",
         "biDirectional": "True",
     },
     {
         "Name": "pvp_back2back",
-        "Traffic Type": "back2back",
+        "Traffic Type": "rfc2544_back2back",
         "Deployment": "pvp",
         "Description": "LTD.Throughput.RFC2544.BackToBackFrames",
         "biDirectional": "True",
     },
     {
         "Name": "pvvp_tput",
-        "Traffic Type": "rfc2544",
+        "Traffic Type": "rfc2544_throughput",
         "Collector": "cpu",
         "Deployment": "pvvp",
         "Description": "LTD.Throughput.RFC2544.PacketLossRatio",
@@ -220,7 +220,7 @@ PERFORMANCE_TESTS = [
     },
     {
         "Name": "pvvp_back2back",
-        "Traffic Type": "back2back",
+        "Traffic Type": "rfc2544_back2back",
         "Collector": "cpu",
         "Deployment": "pvvp",
         "Description": "LTD.Throughput.RFC2544.BackToBackFrames",
@@ -228,7 +228,7 @@ PERFORMANCE_TESTS = [
     },
     {
         "Name": "phy2phy_cpu_load",
-        "Traffic Type": "rfc2544",
+        "Traffic Type": "rfc2544_throughput",
         "Deployment": "p2p",
         "biDirectional": "True",
         "Description": "LTD.CPU.RFC2544.0PacketLoss",
@@ -241,7 +241,7 @@ PERFORMANCE_TESTS = [
     },
     {
         "Name": "phy2phy_mem_load",
-        "Traffic Type": "rfc2544",
+        "Traffic Type": "rfc2544_throughput",
         "Deployment": "p2p",
         "biDirectional": "True",
         "Description": "LTD.Memory.RFC2544.0PacketLoss",

diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf
index a584845..ff05186 100644 (file)
--- a/conf/integration/01_testcases.conf
+++ b/conf/integration/01_testcases.conf
@@ -320,7 +320,7 @@ STEP_VSWITCH_2PHY_6VM_FINIT = [
 INTEGRATION_TESTS = [
     {
         "Name": "overlay_p2p_mod_tput",
-        "Traffic Type": "rfc2544",
+        "Traffic Type": "rfc2544_throughput",
         "Deployment": "ptunp",
         "biDirectional": 'True',
         "Tunnel Type": "vxlan",
@@ -332,7 +332,7 @@ INTEGRATION_TESTS = [
     },
     {
         "Name": "overlay_p2p_tput",
-        "Traffic Type": "rfc2544",
+        "Traffic Type": "rfc2544_throughput",
         "Deployment": "op2p",
         "biDirectional": 'False',
         "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0],
@@ -342,17 +342,17 @@ INTEGRATION_TESTS = [
     },
     {
         "Name": "overlay_p2p_cont",
-        "Traffic Type": "continuous",
+        "Traffic Type": "rfc2544_continuous",
         "Deployment": "op2p",
         "biDirectional": 'False',
         "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0],
         "Tunnel Operation": "encapsulation",
-        "Description": "Overlay Encapsulation Continuous Stream",
+        "Description": "Overlay Encapsulation RFC2544 Continuous Stream",
         "Parameters": {'TRAFFICGEN_IXNET_TCL_SCRIPT' : 'ixnetrfc2544v2.tcl'},
     },
     {
         "Name": "overlay_p2p_decap_tput",
-        "Traffic Type": "rfc2544",
+        "Traffic Type": "rfc2544_throughput",
         "Deployment": "op2p",
         "biDirectional": 'False',
         "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0],
@@ -362,12 +362,12 @@ INTEGRATION_TESTS = [
     },
     {
         "Name": "overlay_p2p_decap_cont",
-        "Traffic Type": "continuous",
+        "Traffic Type": "rfc2544_continuous",
         "Deployment": "op2p",
         "biDirectional": 'False',
         "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0],
         "Tunnel Operation": "decapsulation",
-        "Description": "Overlay Decapsulation Continuous Stream",
+        "Description": "Overlay Decapsulation RFC2544 Continuous Stream",
         "Parameters": {'TRAFFICGEN_IXNET_TCL_SCRIPT' : 'ixnetrfc2544v2.tcl'},
     },
     {
@@ -481,7 +481,7 @@ INTEGRATION_TESTS = [
         "Description": "vSwitch - configure switch and execute RFC2544 throughput test",
         "TestSteps": STEP_VSWITCH_P2P_FLOWS_INIT +
                      [
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', 'bidir' : 'True'}],
                      ] +
                      STEP_VSWITCH_P2P_FLOWS_FINIT
     },
@@ -491,17 +491,17 @@ INTEGRATION_TESTS = [
         "Description": "vSwitch - configure switch and execute RFC2544 back2back test",
         "TestSteps": STEP_VSWITCH_P2P_FLOWS_INIT +
                      [
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', 'bidir' : 'True'}],
                      ] +
                      STEP_VSWITCH_P2P_FLOWS_FINIT
     },
     {
         "Name": "vswitch_p2p_cont",
         "Deployment": "clean",
-        "Description": "vSwitch - configure switch and execute continuous stream test",
+        "Description": "vSwitch - configure switch and execute RFC2544 continuous stream test",
         "TestSteps": STEP_VSWITCH_P2P_FLOWS_INIT +
                      [
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'True'}],
                      ] +
                      STEP_VSWITCH_P2P_FLOWS_FINIT
     },
@@ -538,7 +538,7 @@ INTEGRATION_TESTS = [
         "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
                      [
                         ['vnf', 'start'],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', 'bidir' : 'True'}],
                         ['vnf', 'stop'],
                      ] +
                      STEP_VSWITCH_PVP_FLOWS_FINIT
@@ -550,7 +550,7 @@ INTEGRATION_TESTS = [
         "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
                      [
                         ['vnf', 'start'],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', 'bidir' : 'True'}],
                         ['vnf', 'stop'],
                      ] +
                      STEP_VSWITCH_PVP_FLOWS_FINIT
@@ -558,11 +558,11 @@ INTEGRATION_TESTS = [
     {
         "Name": "vswitch_pvp_cont",
         "Deployment": "clean",
-        "Description": "vSwitch - configure switch, vnf and execute continuous stream test",
+        "Description": "vSwitch - configure switch, vnf and execute RFC2544 continuous stream test",
         "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
                      [
                         ['vnf', 'start'],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'True'}],
                         ['vnf', 'stop'],
                      ] +
                      STEP_VSWITCH_PVP_FLOWS_FINIT
@@ -574,9 +574,9 @@ INTEGRATION_TESTS = [
         "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
                      [
                         ['vnf', 'start'],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', 'bidir' : 'True'}],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : 'True'}],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'True'}],
                         ['vnf', 'stop'],
                      ] +
                      STEP_VSWITCH_PVP_FLOWS_FINIT
@@ -602,7 +602,7 @@ INTEGRATION_TESTS = [
                      [
                         ['vnf1', 'start'],
                         ['vnf2', 'start'],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', 'bidir' : 'True'}],
                         ['vnf1', 'stop'],
                         ['vnf2', 'stop'],
                      ] +
@@ -616,7 +616,7 @@ INTEGRATION_TESTS = [
                      [
                         ['vnf1', 'start'],
                         ['vnf2', 'start'],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', 'bidir' : 'True'}],
                         ['vnf1', 'stop'],
                         ['vnf2', 'stop'],
                      ] +
@@ -625,12 +625,12 @@ INTEGRATION_TESTS = [
     {
         "Name": "vswitch_pvvp_cont",
         "Deployment": "clean",
-        "Description": "vSwitch - configure switch, two chained vnfs and execute continuous stream test",
+        "Description": "vSwitch - configure switch, two chained vnfs and execute RFC2544 continuous stream test",
         "TestSteps": STEP_VSWITCH_PVVP_FLOWS_INIT +
                      [
                         ['vnf1', 'start'],
                         ['vnf2', 'start'],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'True'}],
                         ['vnf1', 'stop'],
                         ['vnf2', 'stop'],
                      ] +
@@ -644,9 +644,9 @@ INTEGRATION_TESTS = [
                      [
                         ['vnf1', 'start'],
                         ['vnf2', 'start'],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', 'bidir' : 'True'}],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : 'True'}],
-                        ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', 'bidir' : 'True'}],
+                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'True'}],
                         ['vnf1', 'stop'],
                         ['vnf2', 'stop'],
                      ] +
@@ -679,7 +679,7 @@ INTEGRATION_TESTS = [
             ['vnf2', 'start'],
             ['vnf3', 'start'],
             ['vnf4', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', \
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', \
                 'bidir' : 'True'}],
             ['vnf1', 'stop'],
             ['vnf2', 'stop'],
@@ -698,7 +698,7 @@ INTEGRATION_TESTS = [
             ['vnf2', 'start'],
             ['vnf3', 'start'],
             ['vnf4', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', \
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', \
                 'bidir' : 'True'}],
             ['vnf1', 'stop'],
             ['vnf2', 'stop'],
@@ -709,7 +709,7 @@ INTEGRATION_TESTS = [
     },
     {
         "Name": "vswitch_p4vp_cont",
-        "Description": "4 chained vnfs, execute continuous stream test",
+        "Description": "4 chained vnfs, execute RFC2544 continuous stream test",
         "Deployment": "clean",
         "TestSteps": STEP_VSWITCH_P4VP_FLOWS_INIT +
         [
@@ -717,7 +717,7 @@ INTEGRATION_TESTS = [
             ['vnf2', 'start'],
             ['vnf3', 'start'],
             ['vnf4', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', \
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', \
                 'bidir' : 'True'}],
             ['vnf1', 'stop'],
             ['vnf2', 'stop'],
@@ -736,11 +736,11 @@ INTEGRATION_TESTS = [
             ['vnf2', 'start'],
             ['vnf3', 'start'],
             ['vnf4', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', \
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_throughput', \
                 'bidir' : 'True'}],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', \
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_back2back', \
                 'bidir' : 'True'}],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', \
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', \
                 'bidir' : 'True'}],
             ['vnf1', 'stop'],
             ['vnf2', 'stop'],
@@ -756,7 +756,7 @@ INTEGRATION_TESTS = [
       # or add "Parameters" option to the test definition:
       #     "Parameters" : {'GUEST_LOOPBACK' : ['linux_bridge'],},
         "Name": "2pvp_udp_dest_flows",
-        "Description": "Continuous TC with 2 Parallel VMs, flows on UDP Dest Port",
+        "Description": "RFC2544 Continuous TC with 2 Parallel VMs, flows on UDP Dest Port",
         "Deployment": "clean",
         "Stream Type": "L4",
         "MultiStream": 2,
@@ -765,7 +765,7 @@ INTEGRATION_TESTS = [
             # Start 2 VMs
             ['vnf1', 'start'],
             ['vnf2', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'False'}],
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'False'}],
             ['vnf1', 'stop'],
             ['vnf2', 'stop'],
             # Clean up
@@ -779,7 +779,7 @@ INTEGRATION_TESTS = [
       # or add "Parameters" option to the test definition:
       #     "Parameters" : {'GUEST_LOOPBACK' : ['linux_bridge'],},
         "Name": "4pvp_udp_dest_flows",
-        "Description": "Continuous TC with 4 Parallel VMs, flows on UDP Dest Port",
+        "Description": "RFC2544 Continuous TC with 4 Parallel VMs, flows on UDP Dest Port",
         "Deployment": "clean",
         "Stream Type": "L4",
         "MultiStream": 4,
@@ -790,7 +790,7 @@ INTEGRATION_TESTS = [
             ['vnf2', 'start'],
             ['vnf3', 'start'],
             ['vnf4', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'False'}],
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'False'}],
             ['vnf1', 'stop'],
             ['vnf2', 'stop'],
             ['vnf3', 'stop'],
@@ -806,7 +806,7 @@ INTEGRATION_TESTS = [
       # or add "Parameters" option to the test definition:
       #     "Parameters" : {'GUEST_LOOPBACK' : ['linux_bridge'],},
         "Name": "6pvp_udp_dest_flows",
-        "Description": "Continuous TC with 6 Parallel VMs, flows on UDP Dest Port",
+        "Description": "RFC2544 Continuous TC with 6 Parallel VMs, flows on UDP Dest Port",
         "Deployment": "clean",
         "Stream Type": "L4",
         "MultiStream": 6,
@@ -819,7 +819,7 @@ INTEGRATION_TESTS = [
             ['vnf4', 'start'],
             ['vnf5', 'start'],
             ['vnf6', 'start'],
-            ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'False'}],
+            ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'False'}],
             ['vnf1', 'stop'],
             ['vnf2', 'stop'],
             ['vnf3', 'stop'],
@@ -916,7 +916,7 @@ INTEGRATION_TESTS = [
 #        "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT +
 #                     [
 #                        ['vnf', 'start'],
-#                        ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}],
+#                        ['trafficgen', 'send_traffic', {'traffic_type' : 'rfc2544_continuous', 'bidir' : 'True'}],
 #                        ['vnf', 'stop'],
 #                     ] +
 #                     STEP_VSWITCH_PVP_FLOWS_FINIT

diff --git a/core/traffic_controller_rfc2544.py b/core/traffic_controller_rfc2544.py
index 980205f..e230c83 100644 (file)
--- a/core/traffic_controller_rfc2544.py
+++ b/core/traffic_controller_rfc2544.py
@@ -50,15 +50,18 @@ class TrafficControllerRFC2544(TrafficController, IResults):
             else:
                 traffic['l2'] = {'framesize': packet_size}
 
-            if traffic['traffic_type'] == 'back2back':
+            if traffic['traffic_type'] == 'rfc2544_back2back':
                 result = self._traffic_gen_class.send_rfc2544_back2back(
                     traffic, tests=self._tests, duration=self._duration, lossrate=self._lossrate)
-            elif traffic['traffic_type'] == 'continuous':
+            elif traffic['traffic_type'] == 'rfc2544_continuous':
                 result = self._traffic_gen_class.send_cont_traffic(
                     traffic, duration=self._duration)
-            else:
+            elif traffic['traffic_type'] == 'rfc2544_throughput':
                 result = self._traffic_gen_class.send_rfc2544_throughput(
                     traffic, tests=self._tests, duration=self._duration, lossrate=self._lossrate)
+            else:
+                raise RuntimeError("Unsupported traffic type {} was \
+                                   detected".format(traffic['traffic_type']))
 
             result = self._append_results(result, packet_size)
             self._results.append(result)

diff --git a/docs/configguide/trafficgen.rst b/docs/configguide/trafficgen.rst
index efcc4d8..0431b34 100644 (file)
--- a/docs/configguide/trafficgen.rst
+++ b/docs/configguide/trafficgen.rst
@@ -113,7 +113,7 @@ when the setup is complete.
             "proto": "tcp",
             "dstip": "90.90.90.90"
         },
-        "traffic_type": "continuous",
+        "traffic_type": "rfc2544_continuous",
         "multistream": 0,
         "bidir": "True",
         "vlan": {

diff --git a/docs/design/trafficgen_integration_guide.rst b/docs/design/trafficgen_integration_guide.rst
index 266c6bc..9bb0e82 100644 (file)
--- a/docs/design/trafficgen_integration_guide.rst
+++ b/docs/design/trafficgen_integration_guide.rst
@@ -196,7 +196,8 @@ functions:
       which are discussed in detail at `integration tests userguide`_
 
       * param **traffic_type**: One of the supported traffic types,
-        e.g. **rfc2544**, **continuous** or **back2back**.
+        e.g. **rfc2544_throughput**, **rfc2544_continuous**
+        or **rfc2544_back2back**.
       * param **frame_rate**: Defines desired percentage of frame
         rate used during continuous stream tests. It can be set by test
         parameter iLoad or by CLI parameter iload.

diff --git a/docs/userguide/teststeps.rst b/docs/userguide/teststeps.rst
index 65a25b0..c00a274 100644 (file)
--- 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 f446f26..46413f0 100755 (executable)
--- 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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^