X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fdevice%2Fip4%2Feth2p-ethip4-ip4base-iacldstbase-dev.robot;h=b34ad495ee554ec74b0a807b7edef3a82f455d1c;hp=ccdc74f06ae0965bc4034e09e97873829dfd1e5f;hb=be5265bc9612f5aedf4f25720c4bd8941e359410;hpb=7b73d46872db5adfc8f4603a9ca783be7d3fa323

diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
index ccdc74f06a..b34ad495ee 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-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,18 +13,20 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
-| ...
+|
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP4FWD | FEATURE | IACLDST
-| ...
-| Suite Setup | Setup suite single link | scapy
+| ... | NIC_Virtual | ETH | IP4FWD | FEATURE | IACLDST | DRV_VFIO_PCI
+| ... | RXQ_SIZE_0 | TXQ_SIZE_0
+| ... | ethip4-ip4base-iacldstbase
+|
+| Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
 | Test Teardown | Tear down test | packet_trace | classify
-| ...
+|
 | Test Template | Local Template
-| ...
+|
 | Documentation | *IPv4 iAcl whitelist test cases*
-| ...
+|
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
 | ... | with single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 on all links.
@@ -38,7 +40,13 @@
 
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so
+| ${crypto_type}= | ${None}
 | ${nic_name}= | virtual
+| ${nic_driver}= | vfio-pci
+| ${nic_rxq_size}= | 0
+| ${nic_txq_size}= | 0
+| ${nic_pfs}= | 2
+| ${nic_vfs}= | 0
 | ${overhead}= | ${0}
 
 *** Keywords ***
@@ -46,40 +54,37 @@
 | | [Documentation]
 | | ... | [Ver] Make TG send IPv4 on its interface to DUT1; \
 | | ... | verify received IPv4 pkts are 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 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 | with_trace=${True}
-| | When Initialize IPv4 forwarding in circular topology
+| | When Initialize layer driver | ${nic_driver}
+| | And Initialize layer interface
+| | And Initialize IPv4 forwarding in circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst | 255.255.255.255
 | | And Vpp Configures Classify Session L3
 | | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip4 | dst
 | | ... | 20.20.20.2
 | | And Vpp Enable Input Acl Interface
-| | ... | ${dut1} | ${dut1_if1} | ip4 | ${table_idx}
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ip4 | ${table_idx}
 | | Then Send packet and verify headers
 | | ... | ${tg} | 10.10.10.2 | 20.20.20.2
-| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
-| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
-# TODO: Add check of number of hits of the classify session after traffic
-# Until there is implemented check of number of hits of the classify session
-# after passing the traffic log the show classify tables verbose to allow visual
-# check of hit number when needed.
-| | And Show Classify Tables Verbose | ${dut1}
+| | ... | ${TG_pf1}[0] | ${TG_pf1_mac}[0] | ${DUT1_vf1_mac}[0]
+| | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-64B-ethip4-ip4base-iacldstbase-dev
+| 64B-ethip4-ip4base-iacldstbase-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}