From 233eeb3e9c9fb8d3c300d745fab8112a19d981db Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 6 Jun 2019 12:16:12 +0000 Subject: CSIT-1521 Convert NestedVM testcase into KernelVM Change-Id: Ic493253dc29dad4fc7e6541e4b839ca5898a6a40 Signed-off-by: Peter Mikus --- ...dstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot | 36 ++++++++------------ ...-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot | 39 ++++++++-------------- ...iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot | 36 ++++++++------------ 3 files changed, 39 insertions(+), 72 deletions(-) (limited to 'tests/vpp/perf/vts') 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 b5119e08fc..27ef3203dc 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 @@ -25,8 +25,7 @@ | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test -| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd and ACL -| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} +| Test Teardown | Tear down performance test with vhost | ... | Test Template | Local Template | ... @@ -38,12 +37,10 @@ | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. | ... | Eth-IPv4-VXLAN-Eth-IPv4 is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge- -| ... | domain and MAC learning enabled. Qemu Guest is connected to VPP via -| ... | vhost-user interfaces. Guest is running DPDK testpmd interconnecting -| ... | vhost-user interfaces using 5 cores pinned to cpus 5-9 and 2048M -| ... | memory. Testpmd is using socket-mem=1024M (512x2M hugepages), 5 cores -| ... | (1 main core and 4 cores dedicated for io), forwarding mode is set to -| ... | io, rxd/txd=256, burst=64. DUT1, DUT2 are tested with ${nic_name}.\ +| ... | domain and MAC learning enabled. Qemu VNFs are connected \ +| ... | to VPP via vhost-user interfaces. Guest is running VPP l2xc \ +| ... | interconnecting vhost-user interfaces, rxd/txd=1024. DUT1/DUT2 is \ +| ... | tested with ${nic_name}. | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ | ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ @@ -60,18 +57,16 @@ *** Variables *** | ${nic_name}= | Intel-X710 | ${overhead}= | ${50} -# Socket names +| ${nf_dtcr}= | ${1} +| ${nf_dtc}= | ${1} +| ${nf_chains}= | ${1} +| ${nf_nodes}= | ${1} | ${dut1_bd_id1}= | 1 | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 -| ${sock1}= | /var/run/vpp/sock-1-${dut1_bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${dut1_bd_id2} # Traffic profile: | ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 | ${acl_type}= | permit -# Defaults for teardown: -| ${dut1}= | ${None} -| ${dut1_vm_refs}= | ${None} *** Keywords *** | Local Template @@ -99,8 +94,6 @@ | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} | | Set interfaces in path up -| | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | 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 @@ -108,13 +101,10 @@ | | Run Keyword If | '${acl_type}' != '${EMPTY}' | | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input | | ... | ${acl_type} | @{permit_list} -| | ${nf_cpus}= | Get Affinity NF | ${nodes} | DUT1 | nf_chains=${1} -| | | ... | nf_nodes=${1} | nf_chain=${1} | nf_node=${1} -| | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${cpu_count_int} -| | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user -| | ... | DUT1 | ${sock1} | ${sock2} | ${TEST NAME}DUT1_VM1 | ${nf_cpus} -| | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False} -| | Set Test Variable | &{dut1_vm_refs} | ${TEST NAME}DUT1_VM1=${vm1} +| | 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} +| | ... | vnf=vpp_chain_l2xc | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** 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 0345ceec3c..8e30354eb3 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 @@ -25,8 +25,7 @@ | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test -| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd and ACL -| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} +| Test Teardown | Tear down performance test with vhost | ... | Test Template | Local Template | ... @@ -38,12 +37,10 @@ | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. | ... | Eth-IPv4-VXLAN-Eth-IPv4 is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge- -| ... | domain and MAC learning enabled. Qemu Guest is connected to VPP via -| ... | vhost-user interfaces. Guest is running DPDK testpmd interconnecting -| ... | vhost-user interfaces using 5 cores pinned to cpus 5-9 and 2048M -| ... | memory. Testpmd is using socket-mem=1024M (512x2M hugepages), 5 cores -| ... | (1 main core and 4 cores dedicated for io), forwarding mode is set to -| ... | io, rxd/txd=256, burst=64. DUT1, DUT2 are tested with ${nic_name}.\ +| ... | domain and MAC learning enabled. Qemu VNFs are connected \ +| ... | to VPP via vhost-user interfaces. Guest is running VPP l2xc \ +| ... | interconnecting vhost-user interfaces, rxd/txd=1024. DUT1/DUT2 is \ +| ... | tested with ${nic_name}. | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ | ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ @@ -60,18 +57,16 @@ *** Variables *** | ${nic_name}= | Intel-X710 | ${overhead}= | ${50} -# Socket names +| ${nf_dtcr}= | ${1} +| ${nf_dtc}= | ${1} +| ${nf_chains}= | ${1} +| ${nf_nodes}= | ${1} | ${dut1_bd_id1}= | 1 | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 -| ${sock1}= | /var/run/vpp/sock-1-${dut1_bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${dut1_bd_id2} # Traffic profile: | ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 | ${acl_type}= | permit+reflect -# Defaults for teardown: -| ${dut1}= | ${None} -| ${dut1_vm_refs}= | ${None} *** Keywords *** | Local Template @@ -99,22 +94,14 @@ | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} | | Set interfaces in path up -| | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | 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} -| | ${nf_cpus}= | Get Affinity NF | ${nodes} | DUT1 | nf_chains=${1} -| | | ... | nf_nodes=${1} | nf_chain=${1} | nf_node=${1} -| | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${cpu_count_int} -| | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user -| | ... | DUT1 | ${sock1} | ${sock2} | ${TEST NAME}DUT1_VM1 | ${nf_cpus} -| | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False} -| | Set Test Variable | &{dut1_vm_refs} | ${TEST NAME}DUT1_VM1=${vm1} +| | 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} +| | ... | vnf=vpp_chain_l2xc | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** 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 3b7bd8f921..4e5d4df008 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 @@ -25,8 +25,7 @@ | Suite Teardown | Tear down 3-node performance topology | ... | Test Setup | Set up performance test -| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd and ACL -| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} +| Test Teardown | Tear down performance test with vhost | ... | Test Template | Local Template | ... @@ -38,12 +37,10 @@ | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. | ... | Eth-IPv4-VXLAN-Eth-IPv4 is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge- -| ... | domain and MAC learning enabled. Qemu Guest is connected to VPP via -| ... | vhost-user interfaces. Guest is running DPDK testpmd interconnecting -| ... | vhost-user interfaces using 5 cores pinned to cpus 5-9 and 2048M -| ... | memory. Testpmd is using socket-mem=1024M (512x2M hugepages), 5 cores -| ... | (1 main core and 4 cores dedicated for io), forwarding mode is set to -| ... | io, rxd/txd=256, burst=64. DUT1, DUT2 are tested with ${nic_name}.\ +| ... | domain and MAC learning enabled. Qemu VNFs are connected \ +| ... | to VPP via vhost-user interfaces. Guest is running VPP l2xc \ +| ... | interconnecting vhost-user interfaces, rxd/txd=1024. DUT1/DUT2 is \ +| ... | tested with ${nic_name}. | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ | ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ @@ -60,18 +57,16 @@ *** Variables *** | ${nic_name}= | Intel-X710 | ${overhead}= | ${50} -# Socket names +| ${nf_dtcr}= | ${1} +| ${nf_dtc}= | ${1} +| ${nf_chains}= | ${1} +| ${nf_nodes}= | ${1} | ${dut1_bd_id1}= | 1 | ${dut1_bd_id2}= | 2 | ${dut2_bd_id1}= | 1 -| ${sock1}= | /var/run/vpp/sock-1-${dut1_bd_id1} -| ${sock2}= | /var/run/vpp/sock-1-${dut1_bd_id2} # Traffic profile: | ${traffic_profile}= | trex-sl-ethip4-vxlansrc253 | ${acl_type}= | ${EMPTY} -# Defaults for teardown: -| ${dut1}= | ${None} -| ${dut1_vm_refs}= | ${None} *** Keywords *** | Local Template @@ -99,8 +94,6 @@ | | @{dut1_vxlans} = | Create List | ${vxlan1} | | @{dut2_vxlans} = | Create List | ${vxlan2} | | Set interfaces in path up -| | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} | | When Init L2 bridge domains with single DUT with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | 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 @@ -108,13 +101,10 @@ | | Run Keyword If | '${acl_type}' != '${EMPTY}' | | ... | Configure ACLs on a single interface | ${dut1} | ${dut1_if2} | input | | ... | ${acl_type} | @{permit_list} -| | ${nf_cpus}= | Get Affinity NF | ${nodes} | DUT1 | nf_chains=${1} -| | | ... | nf_nodes=${1} | nf_chain=${1} | nf_node=${1} -| | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${cpu_count_int} -| | ${vm1} = | And Configure guest VM with dpdk-testpmd connected via vhost-user -| | ... | DUT1 | ${sock1} | ${sock2} | ${TEST NAME}DUT1_VM1 | ${nf_cpus} -| | ... | jumbo=${jumbo} | perf_qemu_qsz=${1024} | use_tuned_cfs=${False} -| | Set Test Variable | &{dut1_vm_refs} | ${TEST NAME}DUT1_VM1=${vm1} +| | 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} +| | ... | vnf=vpp_chain_l2xc | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** -- cgit 1.2.3-korg