X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot;h=3c16e8a6520d0c09985490fdc5560eb3143e8680;hp=a55e29e11005081024d61dafb86c36f6de28afa0;hb=5e6145a4260ffce1c302e94b9b241851f90838e1;hpb=5221220aa5a893e93d78ba31f84b0ad4d6245ec3

diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
index a55e29e110..3c16e8a652 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -18,13 +18,11 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | IACLDST
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X710
+| ... | L3 | ${nic_name}
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| Test Teardown | Tear down performance test
 | ...
 | Test Template | Local Template
 | ...
@@ -36,12 +34,12 @@
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
 | ... | routing, two static IPv4 /24 routes and IPv4 iAcl security whitelist
 | ... | ingress /24 filter entries applied on links TG - DUT1 and DUT2 - TG.
-| ... | DUT1 and DUT2 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.
+| ... | DUT1 and DUT2 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, 253 flows per
 | ... | flow-group) with all packets containing Ethernet header, IPv6 header
@@ -50,8 +48,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-3n-ethip4-ip4src253
 
@@ -64,20 +62,18 @@
 | | ... | [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}
+| | 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 IPv4 forwarding in circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
@@ -95,53 +91,52 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-64B-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
+| | frame_size=${64} | phy_cores=${1}
 
 | tc02-64B-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
+| | frame_size=${64} | phy_cores=${2}
 
 | tc03-64B-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
+| | frame_size=${64} | phy_cores=${4}
 
 | tc04-1518B-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${1518} | phy_cores=${1}
 
 | tc05-1518B-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
 
 | tc06-1518B-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| | frame_size=${1518} | phy_cores=${4}
 
 | tc07-9000B-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
+| | frame_size=${9000} | phy_cores=${1}
 
 | tc08-9000B-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
+| | frame_size=${9000} | phy_cores=${2}
 
 | tc09-9000B-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${4}
 
 | tc10-IMIX-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
 
 | tc11-IMIX-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
 
 | tc12-IMIX-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${4}