X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fvm_vhost%2F10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot;h=05925de881c59b1bd82234f619b8b3dca2f3a234;hp=f3e4a114f433340cb62b579754897ddd9b72a0d4;hb=233eeb3e9c9fb8d3c300d745fab8112a19d981db;hpb=80e06faea73f1574cdb932c25211162121fabd26

diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index f3e4a114f4..05925de881 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -26,13 +26,12 @@
 | 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
-| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
-| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| Test Teardown | Tear down performance test with vhost
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost and vpp link bonding*
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost and vpp
+| ... | link bonding*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1=DUT2-TG 3-node circular topology
 | ... | with single links between TG and DUT nodes and double link between DUT
@@ -41,13 +40,10 @@
 | ... | tagging is applied on link between DUT1 and DUT2.
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with VPP
 | ... | link bonding (mode LACP, transmit policy l34) on link between DUT1 and
-| ... | DUT2 and L2 bridge-domain with 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=1024, burst=64. DUT1, DUT2 are
-| ... | tested with ${nic_name}.\
+| ... | DUT2 and L2 bridge-domain with 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\
@@ -58,12 +54,17 @@
 | ... | flow-group) with all packets containing Ethernet header, IPv4 header
 | ... | with IP protocol=61 and static payload. MAC addresses are matching MAC
 | ... | addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
 | ${nic_name}= | Intel-X710
 | ${overhead}= | ${4}
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
+| ${nf_dtcr}= | ${1}
+| ${nf_dtc}= | ${1}
+| ${nf_chains}= | ${1}
+| ${nf_nodes}= | ${1}
 # Link bonding config
 | ${bond_mode}= | lacp
 | ${lb_mode}= | l34
@@ -89,10 +90,6 @@
 | | ...
 | | Set Test Variable | \${frame_size}
 | | ...
-| | ${dut1_vm_refs}= | Create Dictionary
-| | ${dut2_vm_refs}= | Create Dictionary
-| | Set Test Variable | ${dut1_vm_refs}
-| | Set Test Variable | ${dut2_vm_refs}
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
 | | And Add VLAN Strip Offload switch off between DUTs in 3-node double link topology
@@ -101,10 +98,9 @@
 | | When Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
 | | ... | ${bd_id1} | ${bd_id2} | ${subid}
 | | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
-| | And Configure guest VMs with dpdk-testpmd connected via vhost-user
-| | ... | vm_count=${1} | jumbo=${jumbo} | perf_qemu_qsz=${1024}
-| | ... | use_tuned_cfs=${False}
-| | And All Vpp Interfaces Ready Wait | ${nodes}
+| | And Configure chains of NFs connected via vhost-user
+| | ... | 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 ***