diff options
Diffstat (limited to 'conf')
| -rwxr-xr-x | conf/01_testcases.conf | 8 | ||||
| -rw-r--r-- | conf/02_vswitch.conf | 2 | ||||
| -rw-r--r-- | conf/integration/01_testcases.conf | 40 |
3 files changed, 26 insertions, 24 deletions
diff --git a/conf/01_testcases.conf b/conf/01_testcases.conf index 148171fd..23a3ae57 100755 --- a/conf/01_testcases.conf +++ b/conf/01_testcases.conf @@ -28,10 +28,12 @@ # "Frame Modification": "vlan" # One of the supported frame modifications: # # vlan, mpls, mac, dscp, ttl, ip_addr, # # ip_port. -# "biDirectional": [true|false], # Specifies if generated traffic will be -# # full-duplex (true) or half-duplex (false) +# "biDirectional": ["True"|"False"] +# # Specifies if generated traffic will be +# # full-duplex (True) or half-duplex (False) # # It can be overridden by cli option bidirectional. -# # Default value is "false". +# # Default value is "False". Must be of type +# # string. # "MultiStream": 0-65535 # Optional. Defines number of flows simulated # # by traffic generator. Value 0 disables # # MultiStream feature diff --git a/conf/02_vswitch.conf b/conf/02_vswitch.conf index d36d1786..67f96991 100644 --- a/conf/02_vswitch.conf +++ b/conf/02_vswitch.conf @@ -71,7 +71,7 @@ VHOST_USER_SOCKS = ['/tmp/dpdkvhostuser0', '/tmp/dpdkvhostuser1', # hardware configuration, like cpu numbering and NUMA. VSWITCHD_DPDK_ARGS = ['-c', '0x4', '-n', '4', '--socket-mem 1024,0'] -VSWITCHD_VANILLA_ARGS = ['--pidfile'] +VSWITCHD_VANILLA_ARGS = [] # use full module path to load module matching OVS version built from the source VSWITCH_VANILLA_KERNEL_MODULES = ['libcrc32c', 'ip_tunnel', 'vxlan', 'gre', 'nf_conntrack', 'nf_defrag_ipv4', 'nf_defrag_ipv6', os.path.join(OVS_DIR_VANILLA, 'datapath/linux/openvswitch.ko')] diff --git a/conf/integration/01_testcases.conf b/conf/integration/01_testcases.conf index e9257ae0..2edbe08b 100644 --- a/conf/integration/01_testcases.conf +++ b/conf/integration/01_testcases.conf @@ -136,7 +136,7 @@ INTEGRATION_TESTS = [ "Name": "overlay_p2p_tput", "Traffic Type": "rfc2544", "Deployment": "op2p", - "biDirectional": False, + "biDirectional": 'False', "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0], "Tunnel Operation": "encapsulation", "Description": "Overlay Encapsulation Throughput RFC2544 Test", @@ -145,7 +145,7 @@ INTEGRATION_TESTS = [ "Name": "overlay_p2p_cont", "Traffic Type": "continuous", "Deployment": "op2p", - "biDirectional": False, + "biDirectional": 'False', "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0], "Tunnel Operation": "encapsulation", "Description": "Overlay Encapsulation Continuous Stream", @@ -154,7 +154,7 @@ INTEGRATION_TESTS = [ "Name": "overlay_p2p_decap_tput", "Traffic Type": "rfc2544", "Deployment": "op2p", - "biDirectional": False, + "biDirectional": 'False', "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0], "Tunnel Operation": "decapsulation", "Description": "Overlay Decapsulation Throughput RFC2544 Test", @@ -163,7 +163,7 @@ INTEGRATION_TESTS = [ "Name": "overlay_p2p_decap_cont", "Traffic Type": "continuous", "Deployment": "op2p", - "biDirectional": False, + "biDirectional": 'False', "Tunnel Type": SUPPORTED_TUNNELING_PROTO[0], "Tunnel Operation": "decapsulation", "Description": "Overlay Decapsulation Continuous Stream", @@ -264,7 +264,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' : 'throughput', 'bidir' : 'True'}], ] + STEP_VSWITCH_P2P_FLOWS_FINIT }, @@ -274,7 +274,7 @@ 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' : 'back2back', 'bidir' : 'True'}], ] + STEP_VSWITCH_P2P_FLOWS_FINIT }, @@ -284,7 +284,7 @@ INTEGRATION_TESTS = [ "Description": "vSwitch - configure switch and execute continuous stream test", "TestSteps": STEP_VSWITCH_P2P_FLOWS_INIT + [ - ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : True}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}], ] + STEP_VSWITCH_P2P_FLOWS_FINIT }, @@ -306,7 +306,7 @@ INTEGRATION_TESTS = [ "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT + [ ['vnf', 'start'], - ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', 'bidir' : True}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', 'bidir' : 'True'}], ['vnf', 'stop'], ] + STEP_VSWITCH_PVP_FLOWS_FINIT @@ -318,7 +318,7 @@ INTEGRATION_TESTS = [ "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT + [ ['vnf', 'start'], - ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : True}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : 'True'}], ['vnf', 'stop'], ] + STEP_VSWITCH_PVP_FLOWS_FINIT @@ -330,7 +330,7 @@ INTEGRATION_TESTS = [ "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT + [ ['vnf', 'start'], - ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : True}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}], ['vnf', 'stop'], ] + STEP_VSWITCH_PVP_FLOWS_FINIT @@ -342,9 +342,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' : 'throughput', 'bidir' : 'True'}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : 'True'}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}], ['vnf', 'stop'], ] + STEP_VSWITCH_PVP_FLOWS_FINIT @@ -370,7 +370,7 @@ INTEGRATION_TESTS = [ [ ['vnf1', 'start'], ['vnf2', 'start'], - ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', 'bidir' : True}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'throughput', 'bidir' : 'True'}], ['vnf1', 'stop'], ['vnf2', 'stop'], ] + @@ -384,7 +384,7 @@ INTEGRATION_TESTS = [ [ ['vnf1', 'start'], ['vnf2', 'start'], - ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : True}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : 'True'}], ['vnf1', 'stop'], ['vnf2', 'stop'], ] + @@ -398,7 +398,7 @@ INTEGRATION_TESTS = [ [ ['vnf1', 'start'], ['vnf2', 'start'], - ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : True}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}], ['vnf1', 'stop'], ['vnf2', 'stop'], ] + @@ -412,9 +412,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' : 'throughput', 'bidir' : 'True'}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'back2back', 'bidir' : 'True'}], + ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}], ['vnf1', 'stop'], ['vnf2', 'stop'], ] + @@ -434,7 +434,7 @@ INTEGRATION_TESTS = [ # "TestSteps": STEP_VSWITCH_PVP_FLOWS_INIT + # [ # ['vnf', 'start'], -# ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : True}], +# ['trafficgen', 'send_traffic', {'traffic_type' : 'continuous', 'bidir' : 'True'}], # ['vnf', 'stop'], # ] + # STEP_VSWITCH_PVP_FLOWS_FINIT |