feat(bonding): Add simple suite for minimal coverage

- We want 2-link suite, as it has a non-trivial traffic pattern.
 - Not done here, as it needs edits in multiple layers.
+ Add 1-link suite to compare (and for 1-link testbeds).
+ Simplify also old bonding keywords.
 + Partial support for future multi-link suites.
+ Update jobspecs for minimal coverage:
 + Only add to iterative, both MRR and NDRPDR.
 - Coverage jobspecs to be updated later.
 + {1,2,4}c 64B tests, only to 3n-icx for now.
 + For both primary NIC+driver combinations there.

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

2 files changed, 15 insertions, 114 deletions

diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot
index 00044e1253..347dd708a5 100644
--- a/resources/libraries/robot/l2/l2_bridge_domain.robot
+++ b/resources/libraries/robot/l2/l2_bridge_domain.robot
@@ -1,5 +1,5 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
-# Copyright (c) 2023 PANTHEON.tech and/or its affiliates.
+# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024 PANTHEON.tech 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:
@@ -458,83 +458,6 @@
 | | ... | Add interface to bridge domain | ${dut2} | ${DUT2_${int}2}[0]
 | | ... | ${bd_id2}
 
-| Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
-| | [Documentation]
-| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Create one
-| | ... | link bonding (BondEthernet) interface on both VPP nodes. Add one
-| | ... | physical interface towards next DUT as a member of BondEthernet
-| | ... | interface. Setup VLAN on BondEthernet interfaces between DUTs. Add one
-| | ... | Vhost-User interface into L2 bridge domains with learning enabled with
-| | ... | physical interface towards TG and other Vhost-User interface into L2
-| | ... | bridge domains with learning enabled with VLAN sub-interface. All
-| | ... | interfaces are brought up.
-| |
-| | ... | *Arguments:*
-| | ... | - bd_id1 - Bridge domain ID. Type: integer
-| | ... | - bd_id2 - Bridge domain ID. Type: integer
-| | ... | - subid - ID of the sub-interface to be created. Type: string
-| | ... | - tag_rewrite - Method of tag rewrite. Type: string
-| | ... | - bond_mode - Link bonding mode. Type: string
-| | ... | - lb_mode - Load balance mode. Type: string
-| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
-| | ... | Type: integer
-| |
-| | ... | *Example:*
-| |
-| | ... | \| Initialize L2 bridge domains with Vhost-User and VLAN with VPP\
-| | ... | link bonding in a 3-node circular topology \| 1 \| 2 \
-| | ... | \| 10 \| pop-1 \| xor \| l34 \|
-| |
-| | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
-| | ... | ${bond_mode} | ${lb_mode} | ${virtio_feature_mask}=${None}
-| |
-| | Set interfaces in path up
-| | ${dut1_eth_bond_if1}= | VPP Create Bond Interface
-| | ... | ${dut1} | ${bond_mode} | ${lb_mode}
-| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
-| | | ${_even}= | Evaluate | ${pf} % 2
-| | | Run Keyword If | not ${even}
-| | | ... | VPP Add Bond Member
-| | | ... | ${dut1} | ${DUT1_${int}${pf}}[0] | ${dut1_eth_bond_if1}
-| | END
-| | ${dut2_eth_bond_if1}= | VPP Create Bond Interface
-| | ... | ${dut2} | ${bond_mode} | ${lb_mode}
-| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
-| | | ${_even}= | Evaluate | ${pf} % 2
-| | | Run Keyword If | ${even}
-| | | ... | VPP Add Bond Member
-| | | ... | ${dut2} | ${DUT2_${int}${pf}}[0] | ${dut2_eth_bond_if1}
-| | END
-| | VPP Show Bond Data On All Nodes | ${nodes} | verbose=${TRUE}
-| | Initialize VLAN dot1q sub-interfaces in circular topology
-| | ... | ${dut1} | ${dut1_eth_bond_if1}
-| | ... | ${dut2} | ${dut2_eth_bond_if1} | ${subid}
-| | Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1}
-| | ... | ${dut2} | ${subif_index_2} | ${tag_rewrite}
-| | Configure vhost interfaces | ${dut1}
-| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
-| | ... | virtio_feature_mask=${virtio_feature_mask}
-| | Add interface to bridge domain
-| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${bd_id1}
-| | Add interface to bridge domain
-| | ... | ${dut1} | ${vhost_if1} | ${bd_id1}
-| | Add interface to bridge domain
-| | ... | ${dut1} | ${vhost_if2} | ${bd_id2}
-| | Add interface to bridge domain
-| | ... | ${dut1} | ${subif_index_1} | ${bd_id2}
-| | Configure vhost interfaces | ${dut2}
-| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
-| | ... | virtio_feature_mask=${virtio_feature_mask}
-| | Add interface to bridge domain
-| | ... | ${dut2} | ${subif_index_2} | ${bd_id1}
-| | Add interface to bridge domain
-| | ... | ${dut2} | ${vhost_if1} | ${bd_id1}
-| | Add interface to bridge domain
-| | ... | ${dut2} | ${vhost_if2} | ${bd_id2}
-| | Add interface to bridge domain
-| | ... | ${dut2} | ${DUT2_${int}2}[0] | ${bd_id2}
-
 | Initialize L2 Bridge Domain with memif pairs on DUT node
 | | [Documentation]
 | | ... | Create pairs of Memif interfaces on DUT node. Put each Memif interface
diff --git a/resources/libraries/robot/l2/l2_xconnect.robot b/resources/libraries/robot/l2/l2_xconnect.robot
index b782602827..604d3eba9b 100644
--- a/resources/libraries/robot/l2/l2_xconnect.robot
+++ b/resources/libraries/robot/l2/l2_xconnect.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 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:
@@ -214,7 +214,7 @@
 | | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Configure L2XC | ${dut2} | ${DUT2_${int}2}[0] | ${vhost_if2}
 
-| Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
+| Initialize L2 xconnect with link bonding in 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Create one
 | | ... | link bonding (BondEthernet) interface on both VPP nodes. Add one
@@ -224,60 +224,38 @@
 | | ... | other Vhost interface with VLAN sub-interface. All interfaces are
 | | ... | brought up.
 | |
-| | ... | *Arguments:*
-| | ... | - subid - ID of the sub-interface to be created. Type: string
-| | ... | - tag_rewrite - Method of tag rewrite. Type: string
+| | ... | *Required arguments read from test variables:*
 | | ... | - bond_mode - Link bonding mode. Type: string
 | | ... | - lb_mode - Load balance mode. Type: string
-| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | *Optional argument read from test variable:*
+| | ... | - dut_dut_links - Number of parallel DUT1-DUT2 links. Type: int
 | | ... | Type: integer
 | |
 | | ... | *Example:*
 | |
-| | ... | \| Initialize L2 xconnect with Vhost-User and VLAN with VPP link\
-| | ... | bonding in 3-node circular topology \| 10 \| pop-1 \| xor \| l34 \|
+| | ... | \| Initialize L2 xconnect with link bonding in 3-node circular topology
 | |
-| | [Arguments] | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode}
-| | ... | ${virtio_feature_mask}=${None}
+| | ${dut_dut_links}= | Get Variable Value | \${dut_dut_links} | ${1}
 | |
-| | Set interfaces in path up
 | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface
 | | ... | ${dut1} | ${bond_mode} | ${lb_mode}
-| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
-| | | ${_even}= | Evaluate | ${pf} % 2
-| | | Run Keyword If | not ${even}
+| | FOR | ${pf} | IN RANGE | 1 | ${dut_dut_links} * 2 + 1
+| | | Run Keyword If | not ${pf} % 2
 | | | ... | VPP Add Bond Member
 | | | ... | ${dut1} | ${DUT1_${int}${pf}}[0] | ${dut1_eth_bond_if1}
 | | END
 | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface
 | | ... | ${dut2} | ${bond_mode} | ${lb_mode}
-| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
-| | | ${_even}= | Evaluate | ${pf} % 2
-| | | Run Keyword If | ${even}
+| | FOR | ${pf} | IN RANGE | 1 | ${dut_dut_links} * 2 + 1
+| | | Run Keyword If | ${pf} % 2
 | | | ... | VPP Add Bond Member
 | | | ... | ${dut2} | ${DUT2_${int}${pf}}[0] | ${dut2_eth_bond_if1}
 | | END
 | | VPP Show Bond Data On All Nodes | ${nodes} | verbose=${TRUE}
-| | Initialize VLAN dot1q sub-interfaces in circular topology
-| | ... | ${dut1} | ${dut1_eth_bond_if1}
-| | ... | ${dut2} | ${dut2_eth_bond_if1} | ${subid}
-| | Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1}
-| | ... | ${dut2} | ${subif_index_2} | ${tag_rewrite}
-| | Configure vhost interfaces
-| | ... | ${dut1} | /run/vpp/sock-1-1 | /run/vpp/sock-1-2
-| | ... | virtio_feature_mask=${virtio_feature_mask}
-| | Configure L2XC
-| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${vhost_if1}
-| | Configure L2XC
-| | ... | ${dut1} | ${subif_index_1} | ${vhost_if2}
-| | Configure vhost interfaces
-| | ... | ${dut2} | /run/vpp/sock-1-1 | /run/vpp/sock-1-2
-| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Configure L2XC
-| | ... | ${dut2} | ${subif_index_2} | ${vhost_if1}
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${dut1_eth_bond_if1}
 | | Configure L2XC
-| | ... | ${dut2} | ${DUT2_${int}2}[0] | ${vhost_if2}
+| | ... | ${dut2} | ${DUT2_${int}2}[0] | ${dut2_eth_bond_if1}
 
 | Initialize L2 xconnect with memif pairs on DUT node
 | | [Documentation]