X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fnfv_density%2Fvm_vhost%2Fchain%2F2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot;h=f131d1afdff222e1ab905e12c26436480784850d;hp=8fa70d5aacf6b61bddace0c7f01c07756d144801;hb=be5265bc9612f5aedf4f25720c4bd8941e359410;hpb=fcc77752111a4fbe8caa341cf5249efbad305a2a

diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
index 8fa70d5aac..f131d1afdf 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-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,23 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
-| ...
+|
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM
+| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | DRV_VFIO_PCI
+| ... | RXQ_SIZE_0 | TXQ_SIZE_0
 | ... | VHOST_1024 | NF_DENSITY | NF_VPPIP4 | CHAIN | 1R2C | 2VM2T
-| ...
-| Suite Setup | Setup suite single link | performance
+| ... | eth-l2bd-1ch-4vh-2vm2t-vppip4
+|
+| 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 | vhost
-| ...
+|
 | Test Template | Local Template
-| ...
+|
 | Documentation
 | ... | *RFC2544: Pkt throughput L2BD test cases with 4 vhost 1 chain 2 VMs*
-| ...
+|
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
 | ... | with single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
@@ -50,9 +52,14 @@
 
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
-| ${osi_layer}= | L3
+| ${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}= | L2
 | ${overhead}= | ${0}
 | ${nf_dtcr}= | ${1}
 | ${nf_dtc}= | ${1}
@@ -67,20 +74,20 @@
 | | ... | [Cfg] DUT runs L2BD switching config.
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - 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] | ${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
@@ -89,54 +96,54 @@
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes}
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo}
-| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vpp_chain_ip4
+| | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=vppip4_2vhostvr1024
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}