X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip6_tunnels%2F10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot;h=cff2a720974de1677e7a96d460bfb27594244aa7;hp=482e1cacebe9ec1c6cf3d306326f9810d6974547;hb=be5265bc9612f5aedf4f25720c4bd8941e359410;hpb=fcc77752111a4fbe8caa341cf5249efbad305a2a

diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
index 482e1caceb..cff2a72097 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -13,21 +13,25 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
+| Resource | resources/libraries/robot/overlay/lisp.robot
+|
 | Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
-| ...
+|
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
 | ... | NIC_Intel-X710 | IP6FWD | ENCAP | LISP | IP6UNRLAY | IP6OVRLAY
-| ...
-| Suite Setup | Setup suite single link | performance
+| ... | DRV_VFIO_PCI
+| ... | RXQ_SIZE_0 | TXQ_SIZE_0
+| ... | ethip6lispip6-ip6base
+|
+| 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
-| ...
+|
 | Test Template | Local Template
-| ...
+|
 | Documentation | *RFC6830: Pkt throughput Lisp test cases*
-| ...
+|
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
 | ... | with single links between nodes.\
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv6-LISP-IPv6 on DUT1-DUT2,\
@@ -44,10 +48,14 @@
 
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
-| ${osi_layer}= | L3
+| ${crypto_type}= | ${None}
 | ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
-# LISP overhead
+| ${nic_rxq_size}= | 0
+| ${nic_txq_size}= | 0
+| ${nic_pfs}= | 2
+| ${nic_vfs}= | 0
+| ${osi_layer}= | L3
 | ${overhead}= | 8
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
@@ -59,77 +67,78 @@
 | | ... | filters config.\
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.\
 | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - frame_size - Frame size in Bytes as 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] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| | ...
+| |
 | | Set Test Variable | \${frame_size}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | And Set Max Rate And Jumbo And Handle Multi Seg
+| |
+| | 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 layer interface
 | | And Initialize LISP IPv6 forwarding in 3-node circular topology
 | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
 | | ... | ${dut2_to_tg_ip6} | ${prefix6}
 | | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${NONE}
+| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${NONE}
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
 | | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6lispip6-ip6base-ndrpdr
+| 78B-1c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6lispip6-ip6base-ndrpdr
+| 78B-2c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6lispip6-ip6base-ndrpdr
+| 78B-4c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6lispip6-ip6base-ndrpdr
+| 1518B-1c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6lispip6-ip6base-ndrpdr
+| 1518B-2c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6lispip6-ip6base-ndrpdr
+| 1518B-4c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6lispip6-ip6base-ndrpdr
+| 9000B-1c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6lispip6-ip6base-ndrpdr
+| 9000B-2c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6lispip6-ip6base-ndrpdr
+| 9000B-4c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6lispip6-ip6base-ndrpdr
+| IMIX-1c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6lispip6-ip6base-ndrpdr
+| IMIX-2c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6lispip6-ip6base-ndrpdr
+| IMIX-4c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}