X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fdpdk%2Fperf%2F2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot;h=3b1afdd4342049a4cbb54a3940b2ad81ae8fcdc1;hp=74f75315bd5566b244f25d95bae092fa56849e53;hb=d68951ac245150eeefa6e0f4156e4c1b5c9e9325;hpb=11abbc5f27ec2d2036a36e0e427afb9e2d5ffe59

diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index 74f75315bd..3b1afdd434 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-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:
@@ -12,30 +12,29 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/dpdk/default.robot
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.DPDK.DPDKTools
-| ...
+|
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA
 | ... | NIC_Intel-X710 | DPDK | IP4FWD | BASE | ETH
-| ...
-| Suite Setup | Set up DPDK 2-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X710
-| Suite Teardown | Tear down DPDK 2-node performance topology
-| ...
+|
+| Suite Setup | Setup suite single link | performance | dpdk
+| Suite Teardown | Tear down suite | performance | dpdk
+|
 | Test Template | Local Template
-| ...
+|
 | Documentation | *Raw results IPv4 routing test cases*
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 3-node circular topology\
 | ... | with single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L3 IPv4 routing.
 | ... | *[Cfg] DUT configuration:* DUT1 run the DPDK l3fwd application\
-| ... | DUT1 tested with 2p10GE NIC X710 Niantic by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
+| ... | DUT1 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\
@@ -44,8 +43,9 @@
 | ... | interfaces.
 
 *** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
 
@@ -54,64 +54,61 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L3 IPv4 routing config.\
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
-| | ... | ${s_limit} | ${framesize}
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| |
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
+| |
+| | Set Test Variable | \${frame_size}
+| |
+| | Set Max Rate And Jumbo
 | | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-64B-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
+| | frame_size=${64} | phy_cores=${1}
 
 | tc02-64B-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
+| | frame_size=${64} | phy_cores=${2}
 
 | tc03-64B-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
+| | frame_size=${64} | phy_cores=${4}
 
 | tc04-1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${1518} | phy_cores=${1}
 
 | tc05-1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
 
 | tc06-1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| | frame_size=${1518} | phy_cores=${4}
 
 | tc07-9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
+| | frame_size=${9000} | phy_cores=${1}
 
 | tc08-9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
+| | frame_size=${9000} | phy_cores=${2}
 
 | tc09-9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${4}
 
 | tc10-IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
 
 | tc11-IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
 
 | tc12-IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${4}