vpp_device: Multiple NICs (suitegen)

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I81958fbf6ef240d53a0fb8708ca882baf02f606c

10 files changed, 41 insertions, 23 deletions

diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-adlalwlistbase-dev.robot b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4-ip4base-adlalwlistbase-scapy.robot
index db49d8e8c6..da772e71e9 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-adlalwlistbase-dev.robot
+++ b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4-ip4base-adlalwlistbase-scapy.robot
@@ -81,6 +81,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| 64B-ethip4-ip4base-adlalwlistbase-dev
-| | [Tags] | 64B
+| 64B-0c-ethip4-ip4base-adlalwlistbase-scapy
+| | [Tags] | 64B | 0C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-adlblklistbase-dev.robot b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4-ip4base-adlblklistbase-scapy.robot
index 32248e29b5..6129f5abde 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-adlblklistbase-dev.robot
+++ b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4-ip4base-adlblklistbase-scapy.robot
@@ -81,6 +81,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| 64B-ethip4-ip4base-adlblklistbase-dev
-| | [Tags] | 64B
+| 64B-0c-ethip4-ip4base-adlblklistbase-scapy
+| | [Tags] | 64B | 0C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-scapy.robot
index 1a40e11d87..1e250e5954 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
+++ b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-scapy.robot
@@ -85,6 +85,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| 64B-ethip4-ip4base-iacldstbase-dev
-| | [Tags] | 64B
+| 64B-0c-ethip4-ip4base-iacldstbase-scapy
+| | [Tags] | 64B | 0C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-scapy.robot
index 042d986d61..f0f9de7f70 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot
+++ b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-scapy.robot
@@ -80,6 +80,6 @@
 | | ... | 10.10.10.2 | 20.20.20.2
 
 *** Test Cases ***
-| 64B-ethip4-ip4base-ipolicemarkbase-dev
-| | [Tags] | 64B
+| 64B-0c-ethip4-ip4base-ipolicemarkbase-scapy
+| | [Tags] | 64B | 0C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4-ip4base-scapy.robot
index c96fc9df93..7da5a2b127 100644
--- a/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot
+++ b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4-ip4base-scapy.robot
@@ -17,7 +17,7 @@
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
 | ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | IP4BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethipv4-ip4base
+| ... | ethip4-ip4base
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
@@ -78,6 +78,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| 64B-ethipv4-ip4base-dev
-| | [Tags] | 64B
+| 64B-0c-ethip4-ip4base-scapy
+| | [Tags] | 64B | 0C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44det-dev.robot b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44det-scapy.robot
index 4ade0f72df..a32cfb1557 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44det-dev.robot
+++ b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44det-scapy.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | BASE | TCP | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-nat44det-dev
+| ... | ethip4tcp-nat44det-scapy
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
@@ -106,6 +106,6 @@
 | | ... | ${protocol} | ${src_port_in} | ${dst_port}
 
 *** Test Cases ***
-| 64B-ethip4tcp-nat44det-dev
-| | [Tags] | 64B
+| 64B-0c-ethip4tcp-nat44det-scapy
+| | [Tags] | 64B | 0C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44ed-dev.robot b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-scapy.robot
index de498d61b6..6ac9d03252 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44ed-dev.robot
+++ b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-scapy.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_ENDPOINT_DEPENDENT
 | ... | BASE | TCP | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-nat44ed-dev
+| ... | ethip4tcp-nat44ed-scapy
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
@@ -109,6 +109,6 @@
 | | ... | ${protocol} | ${src_port_in} | ${dst_port}
 
 *** Test Cases ***
-| 64B-ethip4tcp-nat44ed-dev
-| | [Tags] | 64B
+| 64B-0c-ethip4tcp-nat44ed-scapy
+| | [Tags] | 64B | 0C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4udp-nat44det-dev.robot b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-scapy.robot
index 04fe4fe1e1..ffc083797e 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4udp-nat44det-dev.robot
+++ b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-scapy.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | BASE | UDP | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-nat44det-dev
+| ... | ethip4udp-nat44det-scapy
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
@@ -106,6 +106,6 @@
 | | ... | ${protocol} | ${src_port_in} | ${dst_port}
 
 *** Test Cases ***
-| 64B-ethip4udp-nat44det-dev
-| | [Tags] | 64B
+| 64B-0c-ethip4udp-nat44det-scapy
+| | [Tags] | 64B | 0C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4udp-nat44ed-dev.robot b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-scapy.robot
index 27bcf5e830..d9588ae9a1 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4udp-nat44ed-dev.robot
+++ b/tests/vpp/device/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-scapy.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_ENDPOINT_DEPENDENT
 | ... | BASE | UDP | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-nat44ed-dev
+| ... | ethip4udp-nat44ed-scapy
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
@@ -109,6 +109,6 @@
 | | ... | ${protocol} | ${src_port_in} | ${dst_port}
 
 *** Test Cases ***
-| 64B-ethip4udp-nat44ed-dev
-| | [Tags] | 64B
+| 64B-0c-ethip4udp-nat44ed-scapy
+| | [Tags] | 64B | 0C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/regenerate_testcases.py b/tests/vpp/device/ip4/regenerate_testcases.py
new file mode 100755
index 0000000000..87521e662d
--- /dev/null
+++ b/tests/vpp/device/ip4/regenerate_testcases.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+
+# 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:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from resources.libraries.python.autogen.Regenerator import Regenerator
+
+Regenerator().regenerate_glob(u"*.robot")