aboutsummaryrefslogtreecommitdiffstats
path: root/conf/integration
diff options
context:
space:
mode:
authorSridhar K. N. Rao <sridhar.rao@spirent.com>2016-11-23 20:28:13 +0530
committerSridhar K. N. Rao <sridhar.rao@spirent.com>2016-12-07 14:37:32 +0530
commitdba37f2ec6b915649a10d8dae550bfd0291e4584 (patch)
treeeea8bdf6033d918210a25822865f0ab014f1ca63 /conf/integration
parent1356d7c2bccabdd6239d1ae8628f869556ed2938 (diff)
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>
Diffstat (limited to 'conf/integration')
-rw-r--r--conf/integration/01_testcases.conf78
1 files changed, 39 insertions, 39 deletions
diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf
index a584845a..ff05186b 100644
--- 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