X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fdevice%2Fl2bd%2Feth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot;h=bee7330174386183e5135425b6432e8a7f242e95;hb=14a71b74b414df7616ccb5ada3d50ecb90d96bae;hp=dd2cb7c13db5ab0a384e2d70483c9f4d77127402;hpb=fba708653f0c3bdc01ffcd86a10e5aab379380a5;p=csit.git

diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
index dd2cb7c13d..bee7330174 100644
--- a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.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,19 +13,21 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
-| ...
+|
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
 | ... | NIC_Virtual | DOT1Q | L2BDMACLRN | BASE | DRV_AVF | GBP
-| ...
-| Suite Setup | Setup suite single link | avf | scapy
-| Suite Teardown | Tear down suite | vifs
+| ... | RXQ_SIZE_0 | TXQ_SIZE_0
+| ... | avf-dot1q-l2bdbasemaclrn-gbp
+|
+| Suite Setup | Setup suite topology interfaces | scapy
+| Suite Teardown | Tear down suite
 | Test Setup | Setup test
 | Test Teardown | Tear down test | packet_trace
-| ...
+|
 | Test Template | Local template
-| ...
+|
 | Documentation | *L2BD with IEEE 802.1Q and GBP test cases*
-| ...
+|
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
 | ... | with single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4 for L2 switching of IPv4. \
@@ -46,40 +48,45 @@
 | ... | *[Ref] Applicable standard specifications:* IEEE 802.1q.
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so | gbp_plugin.so
-| ... | acl_plugin.so
+| @{plugins_to_enable}= | avf_plugin.so | gbp_plugin.so | acl_plugin.so
+| ${crypto_type}= | ${None}
 | ${nic_name}= | virtual
+| ${nic_driver}= | avf
+| ${nic_rxq_size}= | 0
+| ${nic_txq_size}= | 0
+| ${nic_pfs}= | 2
+| ${nic_vfs}= | 1
 | ${overhead}= | ${4}
 
 *** Keywords ***
 | Local template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\
-| | ... | of its interfaces to be switched by DUT to and from docker; verify\
-| | ... | all packets are received.
-| | ...
+| | ... | [Ver] Make TG send IPv4 packet in one direction between two\
+| | ... | of its interfaces to be switched by DUT to and from docker.\
+| | ... | Make TG verify IPv4 packet is correct.
+| |
 | | ... | *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 DPDK no PCI to all DUTs
-| | And Set Max Rate And Jumbo
+| |
+| | 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 | with_trace=${True}
-| | When Initialize AVF interfaces
+| | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Initialize layer dot1q
 | | And Initialize GBP routing domains
 | | Then Send packet and verify headers
 | | ... | ${tg} | 10.10.10.2 | 20.20.20.2
-| | ... | ${tg_if1} | ${tg_if1_mac} | ba:dc:00:ff:ee:01
-| | ... | ${tg_if2} | ba:dc:00:ff:ee:01 | ${tg_if2_mac}
+| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ba:dc:00:ff:ee:01
+| | ... | ${TG_pf2}[0] | ba:dc:00:ff:ee:01 | ${TG_pf2_mac}[0]
 | | ... | traffic_script=send_ip_check_headers
 
 *** Test Cases ***