X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fvm_vhost%2F2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot;h=70dacd184f830fcf930e8225b154e04ded6ede92;hp=e9c5df2a07315bc148932f2768a69dffbeceed37;hb=96a3c5c7ace8357d26e833a46845486787aa75c3;hpb=8acda639fca422c07701d0be0c9254d8be129a66

diff --git a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot
index e9c5df2a07..70dacd184f 100644
--- a/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n-10ge2p1x710-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr.robot
@@ -13,20 +13,17 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.QemuUtils
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
 | ... | VHOST_1024 | NF_DENSITY | NF_L3FWDIP4 | CHAIN | 2R8C
 | ...
 | Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X710
+| ... | L3 | ${nic_name}
 | Suite Teardown | Tear down 2-node performance topology
 | ...
 | Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
-| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| Test Teardown | Tear down performance test with vhost
 | ...
 | Test Template | Local Template
 | ...
@@ -40,12 +37,12 @@
 | ... | domain and MAC learning enabled. Qemu VNFs are connected to VPP via
 | ... | vhost-user interfaces. Guest is running DPDK l3fwd IPv4
 | ... | interconnecting vhost-user interfaces, forwarding mode is
-| ... | set to io, rxd/txd=1024. DUT1 is tested with 2p10GE NIC X710 by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using MLRsearch library.
+| ... | set to io, rxd/txd=1024. DUT1 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\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library.\
 | ... | Test packets are generated by TG on links to DUTs. TG traffic profile
 | ... | contains two L3 flow-groups (flow-group per direction, 254 flows per
 | ... | flow-group) with all packets containing Ethernet header, IPv4 header
@@ -54,8 +51,8 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-# X710 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-2c8n
 
@@ -67,76 +64,55 @@
 | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
 | | ...
 | | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
 | | ... | Type: integer, string
 | | ... | - phy_cores - Number of physical cores. Type: integer
 | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
 | | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ${dut1_vm_refs}= | Create Dictionary
-| | Set Test Variable | ${dut1_vm_refs}
+| | Set Test Variable | \${frame_size}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
+| | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domains for multiple chains with Vhost-User
 | | ... | nf_chains=${2} | nf_nodes=${8}
-| | And Configure chains of NFs with dpdk-testpmd-mac connected via vhost-user
+| | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${2} | nf_nodes=${8} | jumbo=${jumbo}
-| | ... | perf_qemu_qsz=${1024} | use_tuned_cfs=${False}
+| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_mac
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-64B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
+| | frame_size=${64} | phy_cores=${1}
 
 | tc02-64B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
+| | frame_size=${64} | phy_cores=${2}
 
 | tc04-1518B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${1518} | phy_cores=${1}
 
 | tc05-1518B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| | frame_size=${1518} | phy_cores=${2}
 
 | tc07-9000B-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
+| | frame_size=${9000} | phy_cores=${1}
 
 | tc08-9000B-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${2}
 
 | tc10-IMIX-1c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
 
 | tc11-IMIX-2c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
 | | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bd-32vhost-2chain-16vm-l3fwdip4-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${2}