diff options
Diffstat (limited to 'tests/vpp/perf/vts')
4 files changed, 23 insertions, 17 deletions
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot index a2c755e29d..f105faf039 100644 --- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot @@ -63,7 +63,8 @@ | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 # Traffic profile: -| ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 +| ${traffic_profile}= +| ... | trex-sl-ethip4vxlan-ip4src${nf_chains}udpsrcrnd | ${acl_type}= | permit *** Keywords *** @@ -84,11 +85,11 @@ | | Set Test Variable | \${frame_size} | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | &{vxlan1} = | Create Dictionary | vni=24 | vtep=172.17.0.2 -| | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2 +| | &{vxlan1} = | Create Dictionary | vni=0 | vtep=172.17.0.2 +| | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} | | Set interfaces in path up diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot index bbb237f6c1..5e9e729386 100644 --- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot @@ -51,7 +51,7 @@ | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348. *** Variables *** -| @{plugins_to_enable}= | dpdk_plugin.so +| @{plugins_to_enable}= | dpdk_plugin.so | acl_plugin.so | ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 | ${overhead}= | ${50} @@ -63,7 +63,8 @@ | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 # Traffic profile: -| ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 +| ${traffic_profile}= +| ... | trex-sl-ethip4vxlan-ip4src${nf_chains}udpsrcrnd | ${acl_type}= | permit+reflect *** Keywords *** @@ -84,11 +85,11 @@ | | Set Test Variable | \${frame_size} | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | &{vxlan1} = | Create Dictionary | vni=24 | vtep=172.17.0.2 -| | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2 +| | &{vxlan1} = | Create Dictionary | vni=0 | vtep=172.17.0.2 +| | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} | | Set interfaces in path up @@ -96,6 +97,9 @@ | | ... | 172.16.0.1 | 16 | 172.26.0.1 | 16 | 172.16.0.2 | 172.26.0.2 | | ... | ${dut1_vxlans} | ${dut2_vxlans} | 172.17.0.0 | 16 | 172.27.0.0 | 16 | | @{permit_list} = | Create List | 10.0.0.1/32 | 10.0.0.2/32 +| | Run Keyword If | '${acl_type}' != '${EMPTY}' +| | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input +| | ... | ${acl_type} | @{permit_list} | | And Configure chains of NFs connected via vhost-user on single node | | ... | node=DUT1 | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | | ... | jumbo=${jumbo} | use_tuned_cfs=${False} | auto_scale=${True} diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot index a0f5c038a5..4f6e871aeb 100644 --- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot +++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot @@ -63,7 +63,8 @@ | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 # Traffic profile: -| ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 +| ${traffic_profile}= +| ... | trex-sl-ethip4vxlan-ip4src${nf_chains}udpsrcrnd | ${acl_type}= | ${EMPTY} *** Keywords *** @@ -84,11 +85,11 @@ | | Set Test Variable | \${frame_size} | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | Add PCI devices to all DUTs -| | Set Max Rate And Jumbo And Handle Multi Seg +| | And Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | &{vxlan1} = | Create Dictionary | vni=24 | vtep=172.17.0.2 -| | &{vxlan2} = | Create Dictionary | vni=24 | vtep=172.27.0.2 +| | &{vxlan1} = | Create Dictionary | vni=0 | vtep=172.17.0.2 +| | &{vxlan2} = | Create Dictionary | vni=0 | vtep=172.27.0.2 | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} | | Set interfaces in path up diff --git a/tests/vpp/perf/vts/regenerate_testcases.py b/tests/vpp/perf/vts/regenerate_testcases.py index 4fafb31de2..638693c515 100755 --- a/tests/vpp/perf/vts/regenerate_testcases.py +++ b/tests/vpp/perf/vts/regenerate_testcases.py @@ -15,4 +15,4 @@ from resources.libraries.python.autogen.Regenerator import Regenerator -Regenerator().regenerate_glob("*.robot", protocol="vxlan+ip4") +Regenerator().regenerate_glob("*.robot", protocol="ethip4vxlan") |