Infra: vpp_device -> Ubuntu 20.04

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: If24c385b93e1ba310ea258984c97494b4cab467c
(cherry picked from commit f754eac4faf76fdbffac648769c03f5668f9f6a2)

diff --git a/GPL/traffic_scripts/send_ip_check_headers.py b/GPL/traffic_scripts/send_ip_check_headers.py
index a384b68..40268d9 100644 (file)
--- a/GPL/traffic_scripts/send_ip_check_headers.py
+++ b/GPL/traffic_scripts/send_ip_check_headers.py
@@ -34,7 +34,7 @@ import ipaddress
 
 from robot.api import logger
 from scapy.layers.inet import IP
-from scapy.layers.inet6 import IPv6, ICMPv6ND_NS
+from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6MLReport2
 from scapy.layers.l2 import Ether, Dot1Q
 from scapy.packet import Raw
 
@@ -125,6 +125,10 @@ def main():
         if ether.haslayer(ICMPv6ND_NS):
             # read another packet in the queue if the current one is ICMPv6ND_NS
             continue
+        elif ether.haslayer(ICMPv6MLReport2):
+            # read another packet in the queue if the current one is
+            # ICMPv6MLReport2
+            continue
         else:
             # otherwise process the current packet
             break

diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index cd987ca..4af5267 100644 (file)
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -263,8 +263,8 @@ function get_available_interfaces () {
             # Add Intel Corporation XL710/X710 Virtual Function to the
             # whitelist.
             pci_id="0x154c"
-            tg_netdev=(enp24)
-            dut1_netdev=(enp59)
+            tg_netdev=(ens1 enp24)
+            dut1_netdev=(ens5 enp59)
             ;;
        "1n_tx2")
             # Add Intel Corporation XL710/X710 Virtual Function to the
@@ -601,6 +601,8 @@ function start_topology_containers () {
     # Mount vfio to be able to bind to see bound interfaces. We cannot use
     # --device=/dev/vfio as this does not see newly bound interfaces.
     dcr_stc_params+="--volume /dev/vfio:/dev/vfio "
+    # Disable manipulation with hugepages by VPP.
+    dcr_stc_params+="--volume /dev/null:/etc/sysctl.d/80-vpp.conf "
     # Mount docker.sock to be able to use docker deamon of the host.
     dcr_stc_params+="--volume /var/run/docker.sock:/var/run/docker.sock "
     # Mount /opt/boot/ where VM kernel and initrd are located.

diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-ethipv4-l2bdbasemaclrn-dev.robot
similarity index 67%
rename from tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
rename to tests/vpp/device/l2bd/eth2p-avf-ethipv4-l2bdbasemaclrn-dev.robot
index e9c062a..6f2a656 100644 (file)
--- a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-avf-ethipv4-l2bdbasemaclrn-dev.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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:
@@ -15,32 +15,32 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP4FWD | BASE | DOT1Q | IP4BASE | DRV_AVF
-| ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | avf-dot1qip4-l2bdbasemaclrn
+| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | DRV_AVF
+| ... | RXQ_SIZE_0 | TXQ_SIZE_0 | EXPECTED_FAILING
+| ... | avf-ethipv4-l2bdbasemaclrn
 |
 | 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 | *IPv4 routing with IEEE 802.1Q test cases*
+| Documentation | *L2 bridge-domain test cases*
 |
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\
-| ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing. IEEE 802.1Q\
-| ... | tagging is applied on links between TG-DUT1.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and\
-| ... | two static IPv4 /30 route entries. DUT1 is tested with ${nic_name}.
-| ... | *[Ver] TG verification:* Test IPv4 packets are sent in one direction \
-| ... | by TG on link to DUT1; on receive TG verifies packets for correctness \
-| ... | and drops as applicable.
-| ... | *[Ref] Applicable standard specifications:* IEEE 802.1q.
+| ... | *[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.\
+| ... | Both apply to all links.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-domain \
+| ... | switching.
+| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61 \
+| ... | are sent in both directions by TG on links to DUT1; on receive TG \
+| ... | verifies packets for correctness and their IPv4 src-addr, \
+| ... | dst-addr and MAC addresses.
+| ... | *[Ref] Applicable standard specifications:* RFC792
 
 *** Variables ***
-| @{plugins_to_enable}= | avf_plugin.so
+| @{plugins_to_enable}= | avf_plugin.so | perfmon_plugin.so
 | ${crypto_type}= | ${None}
 | ${nic_name}= | virtual
 | ${nic_driver}= | avf
@@ -48,7 +48,7 @@
 | ${nic_txq_size}= | 0
 | ${nic_pfs}= | 2
 | ${nic_vfs}= | 1
-| ${overhead}= | ${4}
+| ${overhead}= | ${0}
 
 *** Keywords ***
 | Local Template
@@ -72,12 +72,11 @@
 | | And Apply startup configuration on all VPP DUTs | with_trace=${True}
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
-| | And Initialize layer dot1q
 | | And Initialize L2 bridge domain
 | | Then Send IPv4 bidirectionally and verify received packets
 | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| 68B-avf-dot1qip4-l2bdbasemaclrn-dev
-| | [Tags] | 68B
-| | frame_size=${68} | phy_cores=${0}
+| 64B-avf-ethipv4-l2bdbasemaclrn-dev
+| | [Tags] | 64B
+| | frame_size=${64} | phy_cores=${0}