cnf:network add sriov bond mode test cases

Author: Gregory Kopels

tests/cnf/core/network/sriov/internal/sriovenv/bond.go

@@ -0,0 +1,59 @@
+package sriovenv
+
+import (
+	"fmt"
+
+	"github.com/rh-ecosystem-edge/eco-goinfra/pkg/nad"
+	. "github.com/rh-ecosystem-edge/eco-gotests/tests/cnf/core/network/internal/netinittools"
+	"github.com/rh-ecosystem-edge/eco-gotests/tests/cnf/core/network/sriov/internal/tsparams"
+)
+
+// CreateBondNAD creates a Bond CNI NAD in the SR-IOV test namespace.
+// This follows the same pattern used by sriov/tests/qinq.go.
+func CreateBondNAD(
+	nadName string,
+	mode string,
+	mtu int,
+	slaveCount int,
+	ipamType string,
+	vlanInContainer *uint16,
+) (*nad.Builder, error) {
+	if slaveCount < 2 {
+		return nil, fmt.Errorf("slaveCount must be >= 2, got %d", slaveCount)
+	}
+
+	var links []nad.Link
+	for i := 1; i <= slaveCount; i++ {
+		links = append(links, nad.Link{Name: fmt.Sprintf("net%d", i)})
+	}
+
+	plugin := nad.NewMasterBondPlugin(nadName, mode).
+		WithFailOverMac(1).
+		WithLinksInContainer(true).
+		WithMiimon(100).
+		WithLinks(links).
+		WithCapabilities(&nad.Capability{IPs: true}).
+		WithIPAM(&nad.IPAM{Type: ipamType})
+
+	if vlanInContainer != nil {
+		plugin = plugin.WithVLANInContainer(*vlanInContainer)
+	}
+
+	masterPlugin, err := plugin.GetMasterPluginConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	if mtu > 0 {
+		masterPlugin.Mtu = mtu
+	}
+
+	createdNAD, err := nad.NewBuilder(APIClient, nadName, tsparams.TestNamespaceName).
+		WithMasterPlugin(masterPlugin).
+		Create()
+	if err != nil {
+		return nil, err
+	}
+
+	return createdNAD, nil
+}

tests/cnf/core/network/sriov/internal/tsparams/consts.go

@@ -38,6 +38,13 @@ const (
 	// Net1Interface is the name of the first secondary network interface attached to pods.
 	Net1Interface = "net1"
 
+	// MTU500 is used by SR-IOV IPv4 custom MTU tests.
+	MTU500 = 500
+	// MTU1280 is the minimum MTU for IPv6.
+	MTU1280 = 1280
+	// MTU9000 is used by jumbo MTU tests.
+	MTU9000 = 9000
+
 	// ClientPodMTU500 is the name of the client pod for MTU 500 tests.
 	ClientPodMTU500 = "client-mtu500"
 	// ServerPodMTU500 is the name of the server pod for MTU 500 tests.

tests/cnf/core/network/sriov/tests/qinq.go

@@ -1077,12 +1077,8 @@ func runQinQDpdkTestCases(nodeName, serverName, clientName, sriovNetworkName, na
 
 // defineBondNAD returns network attachment definition for a Bond interface.
 func defineQinQBondNAD(nadname, mode string) *nad.Builder {
-	bondNad, err := nad.NewMasterBondPlugin(nadname, mode).WithFailOverMac(1).
-		WithLinksInContainer(true).WithVLANInContainer(uint16(100)).WithMiimon(100).
-		WithLinks([]nad.Link{{Name: "net1"}, {Name: "net2"}}).WithIPAM(&nad.IPAM{Type: ""}).GetMasterPluginConfig()
-	Expect(err).ToNot(HaveOccurred(), "Failed to define Bond NAD for %s", nadname)
-
-	createdNad, err := nad.NewBuilder(APIClient, nadname, tsparams.TestNamespaceName).WithMasterPlugin(bondNad).Create()
+	vlan := uint16(100)
+	createdNad, err := sriovenv.CreateBondNAD(nadname, mode, 0, 2, "", &vlan)
 	Expect(err).ToNot(HaveOccurred(), "Failed to create Bond NAD for %s", nadname)
 
 	return createdNad