X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fdevice%2Fcontainer_memif%2Feth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot;h=569396424aed716bbc6327850195a9d7e707697e;hp=dd74b2166b869735bda05135b85b104098601d6e;hb=8079ed2ff7e2fdd41474d286b98cd9be19481f7a;hpb=a4cad14b7e0b7e94f9e80b1a45cd86b3bc09d0a0

diff --git a/tests/vpp/device/container_memif/eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot
index dd74b2166b..569396424a 100644
--- a/tests/vpp/device/container_memif/eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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 | IP6FWD | BASE | MEMIF | DOCKER | DRV_VFIO_PCI
-| ...
-| Suite Setup | Setup suite single link | scapy
+| ... | NIC_Intel-X710 | ETH | IP6FWD | BASE | MEMIF | DOCKER | DRV_VFIO_PCI
+| ... | RXQ_SIZE_0 | TXQ_SIZE_0
+| ... | ethipv6-ip6base-eth-2memif-1dcr
+|
+| Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
 | Test Teardown | Tear down test | packet_trace | container
-| ...
+|
 | Test Template | Local Template
-| ...
+|
 | Documentation | *IPv4 routing test cases with memif interface*
-| ...
+|
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
 | ... | single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing on \
@@ -40,10 +42,14 @@
 | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
 
 *** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | perfmon_plugin.so | memif_plugin.so
 | ${crypto_type}= | ${None}
-| ${nic_name}= | virtual
+| ${nic_name}= | Intel-X710
 | ${nic_driver}= | vfio-pci
+| ${nic_rxq_size}= | 0
+| ${nic_txq_size}= | 0
+| ${nic_pfs}= | 2
+| ${nic_vfs}= | 0
 | ${overhead}= | ${0}
 # Container
 | ${container_engine}= | Docker
@@ -55,16 +61,16 @@
 | | ... | [Ver] Make TG send IPv6 packets in both directions between two\
 | | ... | of its interfaces to be routed by DUT to and from docker; verify\
 | | ... | all packets are received.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer. Type: integer
 | | ... | - 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 Set Max Rate And Jumbo
 | | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
 | | And Pre-initialize layer driver | ${nic_driver}
@@ -72,24 +78,25 @@
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Start containers for test | auto_scale=${False} | pinning=${False}
-| | And Set interfaces in path up
 | | And Set up memif interfaces on DUT node
 | | ... | ${dut1} | memif-DUT1_CNF | memif-DUT1_CNF
 | | ... | memif_if1=memif_if1 | memif_if2=memif_if2
 | | ... | rxq=${rxq_count_int} | txq=${rxq_count_int}
+| | # It takes some time for memifs to go up.
+| | And Set interfaces in path up
 | | And Add Fib Table | ${dut1} | 20 | ipv6=${True}
 | | And Assign Interface To Fib Table
 | | ... | ${dut1} | ${memif_if2} | 20 | ipv6=${True}
 | | And Assign Interface To Fib Table
-| | ... | ${dut1} | ${dut1_if2} | 20 | ipv6=${True}
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 20 | ipv6=${True}
 | | And VPP Interface Set IP Address
-| | ... | ${dut1} | ${dut1_if1} | 2001:1::1 | 64
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | 2001:1::1 | 64
 | | And VPP Interface Set IP Address
 | | ... | ${dut1} | ${memif_if1} | 2001:2::1 | 64
 | | And VPP Interface Set IP Address
 | | ... | ${dut1} | ${memif_if2} | 2001:2::2 | 64
 | | And VPP Interface Set IP Address
-| | ... | ${dut1} | ${dut1_if2} | 2001:3::1 | 64
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 2001:3::1 | 64
 | | ${memif_if2_key}= | Get interface by sw index | ${nodes['DUT1']}
 | | ... | ${memif_if2}
 | | ${memif_if2_mac}= | Get interface MAC | ${nodes['DUT1']} | ${memif_if2_key}
@@ -101,13 +108,13 @@
 | | VPP Add IP Neighbor
 | | ... | ${dut1} | ${memif_if1} | 2001:2::2 | ${memif_if2_mac}
 | | VPP Add IP Neighbor
-| | ... | ${dut1} | ${dut1_if2} | 2001:3::2 | ${tg_if2_mac}
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 2001:3::2 | ${TG_pf2_mac}[0]
 | | Then Send packet and verify headers
 | | ... | ${tg} | 2001:1::1 | 2001:3::2
-| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
-| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
+| | ... | ${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-78B-ethipv6-ip6base-eth-2memif-1dcr-dev
+| 78B-ethipv6-ip6base-eth-2memif-1dcr-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}