test(vm): set additional network interfaces

Signed-off-by: Isteb4k <dmitry.rakitin@flant.com>

Author: Isteb4k

images/virtualization-artifact/pkg/common/annotations/annotations.go

@@ -73,6 +73,9 @@ const (
 	// AnnVmStartRequested is an annotation on KVVM that represents a request to start a virtual machine.
 	AnnVmStartRequested = AnnAPIGroupV + "/vm-start-requested"
 
+	// AnnAdditionalNetworkInterfaces example: "name1:multus,name2:macvtap"
+	AnnAdditionalNetworkInterfaces = AnnAPIGroup + "/additional-network-interfaces"
+
 	// AnnVmRestartRequested is an annotation on KVVM that represents a request to restart a virtual machine.
 	AnnVmRestartRequested = AnnAPIGroupV + "/vm-restart-requested"
 

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm.go

@@ -19,6 +19,7 @@ package kvbuilder
 import (
 	"fmt"
 	"maps"
+	"strings"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -519,22 +520,24 @@ func (b *KVVM) GetOSSettings() map[string]interface{} {
 	}
 }
 
-func (b *KVVM) SetNetworkInterface(name string) {
-	devPreset := DeviceOptionsPresets.Find(b.opts.EnableParavirtualization)
-
-	net := virtv1.Network{
-		Name: name,
-		NetworkSource: virtv1.NetworkSource{
-			Pod: &virtv1.PodNetwork{},
-		},
+func (b *KVVM) SetNetworkInterface(vm *virtv2.VirtualMachine, name string) {
+	hasMacvtap := strings.Contains(vm.GetAnnotations()[annotations.AnnAdditionalNetworkInterfaces], "macvtap")
+	if !hasMacvtap {
+		net := virtv1.Network{
+			Name: name,
+			NetworkSource: virtv1.NetworkSource{
+				Pod: &virtv1.PodNetwork{},
+			},
+		}
+		b.Resource.Spec.Template.Spec.Networks = array.SetArrayElem(
+			b.Resource.Spec.Template.Spec.Networks, net,
+			func(v1, v2 virtv1.Network) bool {
+				return v1.Name == v2.Name
+			}, true,
+		)
 	}
-	b.Resource.Spec.Template.Spec.Networks = array.SetArrayElem(
-		b.Resource.Spec.Template.Spec.Networks, net,
-		func(v1, v2 virtv1.Network) bool {
-			return v1.Name == v2.Name
-		}, true,
-	)
 
+	devPreset := DeviceOptionsPresets.Find(b.opts.EnableParavirtualization)
 	iface := virtv1.Interface{
 		Name:  name,
 		Model: devPreset.InterfaceModel,
@@ -548,6 +551,98 @@ func (b *KVVM) SetNetworkInterface(name string) {
 	)
 }
 
+func (b *KVVM) SetMacvtapInterfaces(vm *virtv2.VirtualMachine) {
+	anis := vm.GetAnnotations()[annotations.AnnAdditionalNetworkInterfaces]
+	if anis == "" {
+		return
+	}
+
+	var networks []string
+
+	for _, network := range strings.Split(anis, ",") {
+		iname := strings.Split(network, ":")
+		if iname[1] == "macvtap" {
+			networks = append(networks, iname[0])
+		}
+	}
+
+	for _, network := range networks {
+		net := virtv1.Network{
+			Name: network,
+			NetworkSource: virtv1.NetworkSource{
+				Pod: &virtv1.PodNetwork{},
+			},
+		}
+		b.Resource.Spec.Template.Spec.Networks = array.SetArrayElem(
+			b.Resource.Spec.Template.Spec.Networks, net,
+			func(v1, v2 virtv1.Network) bool {
+				return v1.Name == v2.Name
+			}, true,
+		)
+
+		iface := virtv1.Interface{
+			Name: network,
+			Binding: &virtv1.PluginBinding{
+				Name: "macvtap",
+			},
+		}
+
+		b.Resource.Spec.Template.Spec.Domain.Devices.Interfaces = array.SetArrayElem(
+			b.Resource.Spec.Template.Spec.Domain.Devices.Interfaces, iface,
+			func(v1, v2 virtv1.Interface) bool {
+				return v1.Name == v2.Name
+			}, true,
+		)
+	}
+}
+
+func (b *KVVM) SetMultusInterfaces(vm *virtv2.VirtualMachine) {
+	anis := vm.GetAnnotations()[annotations.AnnAdditionalNetworkInterfaces]
+	if anis == "" {
+		return
+	}
+
+	var networks []string
+
+	for _, network := range strings.Split(anis, ",") {
+		iname := strings.Split(network, ":")
+		if iname[1] == "multus" {
+			networks = append(networks, iname[0])
+		}
+	}
+
+	for _, network := range networks {
+		net := virtv1.Network{
+			Name: network,
+			NetworkSource: virtv1.NetworkSource{
+				Multus: &virtv1.MultusNetwork{
+					NetworkName: network,
+				},
+			},
+		}
+		b.Resource.Spec.Template.Spec.Networks = array.SetArrayElem(
+			b.Resource.Spec.Template.Spec.Networks, net,
+			func(v1, v2 virtv1.Network) bool {
+				return v1.Name == v2.Name
+			}, true,
+		)
+
+		iface := virtv1.Interface{
+			Name: network,
+			InterfaceBindingMethod: virtv1.InterfaceBindingMethod{
+				Bridge: &virtv1.InterfaceBridge{},
+			},
+		}
+
+		b.Resource.Spec.Template.Spec.Domain.Devices.Interfaces = array.SetArrayElem(
+			b.Resource.Spec.Template.Spec.Domain.Devices.Interfaces, iface,
+			func(v1, v2 virtv1.Interface) bool {
+				return v1.Name == v2.Name
+			}, true,
+		)
+	}
+}
+
 func (b *KVVM) SetBootloader(bootloader virtv2.BootloaderType) error {
 	if b.Resource.Spec.Template.Spec.Domain.Firmware == nil {
 		b.Resource.Spec.Template.Spec.Domain.Firmware = &virtv1.Firmware{}

images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go

@@ -104,7 +104,13 @@ func ApplyVirtualMachineSpec(
 	}
 
 	kvvm.SetMetadata(vm.ObjectMeta)
-	kvvm.SetNetworkInterface(NetworkInterfaceName)
+
+	kvvm.Resource.Spec.Template.Spec.Networks = []virtv1.Network{}
+	kvvm.Resource.Spec.Template.Spec.Domain.Devices.Interfaces = []virtv1.Interface{}
+	kvvm.SetNetworkInterface(vm, NetworkInterfaceName)
+	kvvm.SetMultusInterfaces(vm)
+	kvvm.SetMacvtapInterfaces(vm)
+
 	kvvm.SetTablet("default-0")
 	kvvm.SetNodeSelector(vm.Spec.NodeSelector, class.Spec.NodeSelector.MatchLabels)
 	kvvm.SetTolerations(vm.Spec.Tolerations, class.Spec.Tolerations)

images/virtualization-artifact/pkg/controller/vm/internal/sync_kvvm.go

@@ -29,6 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
 	"github.com/deckhouse/virtualization-controller/pkg/common/object"
 	vmutil "github.com/deckhouse/virtualization-controller/pkg/common/vm"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
@@ -535,6 +536,10 @@ func (h *SyncKvvmHandler) applyVMChangesToKVVM(ctx context.Context, s state.Virt
 		return err
 	}
 
+	if s.VirtualMachine().Current().GetAnnotations()[annotations.AnnAdditionalNetworkInterfaces] != "" {
+		action = vmchange.ActionRestart
+	}
+
 	switch action {
 	case vmchange.ActionRestart:
 		h.recorder.WithLogging(log).Event(current, corev1.EventTypeNormal, virtv2.ReasonVMChangesApplied, "Apply disruptive changes with restart")