fix(vlan): do not apply strip offload

Some tests (bonding) are failing as VPP refuses startup.conf.
That is because the config parameter support has been removed:
https://gerrit.fd.io/r/c/vpp/+/34822
That is VPP commit 8c8531c15c9195c2c82695eff6e70887de67fd88.

According to commit message, it was just a workaround
for Cisco ENIC cards, which are no longer tested in CSIT.

+ Delete 1 robot and 1 python keyword as they become unused.

Change-Id: If53e324a27cfbd4659e49ab8bcd03253642dde96
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py
index 3bd9c0b..e183014 100644 (file)
--- a/resources/libraries/python/VppConfigGenerator.py
+++ b/resources/libraries/python/VppConfigGenerator.py
@@ -257,20 +257,6 @@ class VppConfigGenerator:
                 path = [u"dpdk", f"dev {device}"]
                 self.add_config_item(self._nodeconfig, u"", path)
 
-    def add_dpdk_dev_parameter(self, device, parameter, value):
-        """Add parameter for DPDK device.
-
-        :param device: PCI device (format xxxx:xx:xx.x).
-        :param parameter: Parameter name.
-        :param value: Parameter value.
-        :type device: str
-        :type parameter: str
-        :type value: str
-        """
-        if pci_dev_check(device):
-            path = [u"dpdk", f"dev {device}", parameter]
-            self.add_config_item(self._nodeconfig, value, path)
-
     def add_dpdk_cryptodev(self, count):
         """Add DPDK Crypto PCI device configuration.
 

diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot
index b7eadbe..08646d9 100644 (file)
--- a/resources/libraries/robot/shared/default.robot
+++ b/resources/libraries/robot/shared/default.robot
@@ -236,24 +236,6 @@
 | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD
 | | Set Tags | ${dp_count_int}T${cpu_count_int}C
 
-| Add DPDK VLAN strip offload switch off between DUTs
-| | [Documentation]
-| | ... | Add VLAN Strip Offload switch off on PCI devices between DUTs to VPP
-| | ... | configuration file.
-| |
-| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
-| | | ${_even}= | Evaluate | ${pf} % 2
-| | | Run Keyword Unless | ${even}
-| | | ... | DUT1.Add DPDK Dev Parameter | ${DUT1_${int}${pf}_pci}[0]
-| | | ... | vlan-strip-offload | off
-| | END
-| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
-| | | ${_even}= | Evaluate | ${pf} % 2
-| | | Run Keyword If | ${even}
-| | | ... | DUT2.Add DPDK Dev Parameter | ${DUT2_${int}${pf}_pci}[0]
-| | | ... | vlan-strip-offload | off
-| | END
-
 | Add NAT to all DUTs
 | | [Documentation] | Add NAT configuration to all DUTs.
 | |

diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot
index b33baaf..0582558 100644 (file)
--- a/resources/libraries/robot/shared/interfaces.robot
+++ b/resources/libraries/robot/shared/interfaces.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 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:
@@ -155,10 +155,6 @@
 | | | ... | ${dut}.Add DPDK Cryptodev | ${dp_count_int}
 | | | Run Keyword | ${dut}.Add DPDK Max Simd Bitwidth | ${GRAPH_NODE_VARIANT}
 | | END
-| | ${_vlan_strip} | ${value}= | Run Keyword And Ignore Error
-| | ... | Variable Should Exist | ${vlan_strip_off}
-| | Run keyword If | '${_vlan_strip}' == 'PASS' and ${duts_count} == 2
-| | ... | Add DPDK VLAN strip offload switch off between DUTs
 
 | Pre-initialize layer avf on all DUTs
 | | [Documentation]