X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot;h=867026f85f12315cbea98824c93a8713043a9d8c;hb=refs%2Fchanges%2F44%2F32444%2F3;hp=3467f0af37bc6c886d5ec5197e8065cae5309f73;hpb=d7e14a0a93e7e06047daeaf6a5575f227aeb925a;p=csit.git

diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
index 3467f0af37..867026f85f 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -16,11 +16,12 @@
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X710 | IP4FWD | FEATURE | POLICE_MARK | DRV_VFIO_PCI
+| ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | ethip4-ip4base-ipolicemarkbase
 |
-| Suite Setup | Setup suite single link | performance
+| Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test
+| Test Setup | Setup test | performance
 | Test Teardown | Tear down test | performance | classify
 |
 | Test Template | Local Template
@@ -46,17 +47,21 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC2698.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_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}= | 2
+| ${nic_vfs}= | 0
 | ${osi_layer}= | L3
 | ${overhead}= | ${0}
 | ${cir}= | ${100}
 | ${eir}= | ${150}
 | ${dscp}= | AF22
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n-ethip4-ip4src253
+# Traffic profile
+| ${traffic_profile}= | trex-stl-2n-ethip4-ip4src253
 
 *** Keywords ***
 | Local Template
@@ -73,14 +78,10 @@
 | |
 | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | |
-| | ${cb}= | Get Average Frame Size | ${frame_size}
-| | ${eb}= | Get Average Frame Size | ${frame_size}
-| |
 | | Set Test Variable | \${frame_size}
-| | Set Test Variable | \${cb}
-| | Set Test Variable | \${eb}
 | |
 | | Given Set Max Rate And Jumbo
+| | And Set Rates For Policer
 | | 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
@@ -91,50 +92,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 64B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 64B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 64B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 1518B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 1518B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 1518B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 9000B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 9000B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 9000B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| IMIX-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| IMIX-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| IMIX-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}