X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F10ge2p1x710-ethip4-ip4scale6m-ndrpdr.robot;fp=tests%2Fvpp%2Fperf%2Fvm_vhost%2F10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot;h=0d4bc26e19eae10f4063989e3a028b48baf9dcd1;hb=refs%2Fchanges%2F74%2F39774%2F7;hp=4889a6754a9f3a88b3f43e118034bcc98804b7b2;hpb=30ac3eb3d8e508f80445936a218deaa3c9dc0e84;p=csit.git

diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-ndrpdr.robot
similarity index 54%
rename from tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
rename to tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-ndrpdr.robot
index 4889a6754a..0d4bc26e19 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale6m-ndrpdr.robot
@@ -14,35 +14,27 @@
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
 |
-| Force Tags | 3_NODE_DOUBLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | VHOST | 1VM
-| ... | VHOST_1024 | LBOND | LBOND_VPP | LBOND_MODE_LACP | LBOND_LB_L34
-| ... | LBOND_2L | VM_TESTPMD | DRV_VFIO_PCI
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
+| ... | NIC_Intel-X710 | ETH | IP4FWD | SCALE | FIB_6M | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | 2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm
+| ... | ethip4-ip4scale6m
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | vhost
+| Test Teardown | Tear down test | performance
 |
 | Test Template | Local Template
 |
-| Documentation | **RFC2544: Pkt throughput L2BD test cases with vhost and vpp \
-| ... | link bonding**
+| Documentation | **RFC2544: Pkt throughput IPv4 routing test cases**
 | ... |
-| ... | - **[Top] Network Topologies:** TG-DUT1=DUT2-TG 3-node circular \
-| ... | topology with single links between TG and DUT nodes and double link \
-| ... | between DUT nodes.
+| ... | - **[Top] Network Topologies:** TG-DUT1-DUT2-TG 3-node circular \
+| ... | topology with single links between nodes.
 | ... |
-| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 switching of IPv4. \
-| ... | 802.1q tagging is applied on link between DUT1 and DUT2.
+| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for IPv4 routing.
 | ... |
-| ... | - **[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 VNFs are \
-| ... | connected to VPP via vhost-user interfaces. Guest is running testpmd \
-| ... | interconnecting vhost-user interfaces, rxd/txd=1024. DUT1/DUT2 is \
+| ... | - **[Cfg] DUT configuration:** DUT1 and DUT2 are configured with IPv4. \
+| ... | routing and 2x1M static IPv4 /32 route entries. DUT1 and DUT2 are \
 | ... | tested with ${nic_name}.
 | ... |
 | ... | - **[Ver] TG verification:** TG finds and reports throughput NDR (Non \
@@ -52,7 +44,7 @@
 | ... | 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 \
+| ... | contains two L3 flow-groups (flow-group per direction, 1M flows per \
 | ... | 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.
@@ -60,35 +52,25 @@
 | ... | - **[Ref] Applicable standard specifications:** RFC2544.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | lacp_plugin.so
-| ... | vhost_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so
 | ${crypto_type}= | ${None}
 | ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 0
 | ${nic_txq_size}= | 0
-| ${nic_pfs}= | 4
+| ${nic_pfs}= | 2
 | ${nic_vfs}= | 0
-| ${osi_layer}= | L2
-| ${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
-| ${bd_id1}= | 1
-| ${bd_id2}= | 2
-# Traffic profile:
-| ${traffic_profile}= | trex-stl-ethip4-ip4src254
+| ${osi_layer}= | L3
+| ${overhead}= | ${0}
+| ${rts_per_flow}= | ${1000000}
+# Traffic profile
+| ${traffic_profile}= | trex-stl-ethip4-ip4dst${rts_per_flow}-${nic_pfs}p
 
 *** Keywords ***
 | Local Template
+| |
 | | [Documentation]
-| | ... | - **[Cfg]** DUT runs L2BD switching config. \
+| | ... | - **[Cfg]** DUT runs IPv4 routing config. \
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | - **[Ver]** Measure NDR and PDR values using MLRsearch algorithm.
 | |
@@ -101,66 +83,62 @@
 | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | |
 | | Set Test Variable | \${frame_size}
-| | Set Test Variable | ${vlan_strip_off} | ${TRUE}
 | |
 | | Given Set Max Rate And Jumbo
 | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
 | | And Pre-initialize layer driver | ${nic_driver}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize layer driver | ${nic_driver}
-| | And 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 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=testpmd_io
+| | And Initialize layer interface
+| | And Set interfaces in path up
+| | And Initialize IPv4 Forwarding | count=${rts_per_flow} | pfs=${nic_pfs}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 64B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-ethip4-ip4scale6m-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}