X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fl2%2F10ge2p1x710-avf-eth-l2patch-ndrpdr.robot;h=f5c3210a3ad65b8071935fc85ad575adf5c0edf4;hp=7fc0ec9892cd68fbef54e7f2f86508f8612e803c;hb=065313317117200ae456d1462be8af7898c5302e;hpb=89620b26d6bbf3dd9d9707851d8d140471d40b56

diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
index 7fc0ec9892..f5c3210a3a 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-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:
@@ -19,15 +19,12 @@
 | ...
 | Suite Setup | Run Keywords
 | ... | Set up SRIOV 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710 | AVF
+| ... | L2 | ${nic_name} | AVF
 | ... | AND | Set up performance test suite with AVF driver
-| ...
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
 | ...
 | Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| Test Teardown | Tear down test | performance
 | ...
 | Test Template | Local template
 | ...
@@ -37,12 +34,12 @@
 | ... | with single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 patch.
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 patch\
-| ... | DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel with VF enabled.
+| ... | DUT1 and DUT2 tested with ${nic_name} with VF enabled.\
 | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial 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\
+| ... | 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
@@ -52,8 +49,8 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
@@ -62,62 +59,71 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 patch config with ${phy_cores} phy
 | | ... | core(s).
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ... | [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} | ${20000}
+| | Set Test Variable | \${frame_size}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add DPDK no PCI to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
-| | ... | ${s_limit} | ${framesize}
+| | Set Max Rate And Jumbo
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize AVF interfaces
 | | And Initialize L2 patch
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-64B-1c-avf-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
+| | frame_size=${64} | phy_cores=${1}
 
-| tc02-1518B-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| tc02-64B-2c-avf-eth-l2patch-ndrpdr
+| | [Tags] | 64B | 2C
+| | frame_size=${64} | phy_cores=${2}
 
-| tc04-IMIX-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| tc03-64B-4c-avf-eth-l2patch-ndrpdr
+| | [Tags] | 64B | 4C
+| | frame_size=${64} | phy_cores=${4}
 
-| tc05-64B-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
+| tc04-1518B-1c-avf-eth-l2patch-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
 
-| tc06-1518B-2c-avf-eth-l2patch-ndrpdr
+| tc05-1518B-2c-avf-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
 
-| tc08-IMIX-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
+| tc06-1518B-4c-avf-eth-l2patch-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
 
-| tc09-64B-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
+| tc07-9000B-1c-avf-eth-l2patch-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
 
-| tc10-1518B-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| tc08-9000B-2c-avf-eth-l2patch-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-eth-l2patch-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-eth-l2patch-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-eth-l2patch-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
 
 | tc12-IMIX-4c-avf-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${4}