Pass domcapabilities to cr

Author: PhilippMatthes

internal/controller/hypervisor_controller.go

@@ -51,9 +51,10 @@ type HypervisorReconciler struct {
 }
 
 const (
-	OSUpdateType           = "OperatingSystemUpdate"
-	LibVirtType            = "LibVirtConnection"
-	CapabilitiesClientType = "CapabilitiesClientConnection"
+	OSUpdateType                 = "OperatingSystemUpdate"
+	LibVirtType                  = "LibVirtConnection"
+	CapabilitiesClientType       = "CapabilitiesClientConnection"
+	DomainCapabilitiesClientType = "DomainCapabilitiesClientConnection"
 )
 
 // +kubebuilder:rbac:groups=kvm.cloud.sap,resources=hypervisors,verbs=get;list;watch;update;patch;delete
@@ -204,6 +205,24 @@ func (r *HypervisorReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 				Reason:  "CapabilitiesClientGetFailed",
 			})
 		}
+
+		// Update the domain capabilities status.
+		if domainCapabilities, err := r.Libvirt.GetDomainCapabilities(); err == nil {
+			hypervisor.Status.DomainCapabilities = domainCapabilities
+			meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
+				Type:   DomainCapabilitiesClientType,
+				Status: metav1.ConditionTrue,
+				Reason: "DomainCapabilitiesClientGetSucceeded",
+			})
+		} else {
+			log.Error(err, "failed to get domain capabilities")
+			meta.SetStatusCondition(&hypervisor.Status.Conditions, metav1.Condition{
+				Type:    DomainCapabilitiesClientType,
+				Status:  metav1.ConditionFalse,
+				Message: err.Error(),
+				Reason:  "DomainCapabilitiesClientGetFailed",
+			})
+		}
 	}
 
 	// Reconcile operating system update

internal/controller/hypervisor_controller_test.go

@@ -115,6 +115,13 @@ var _ = Describe("Hypervisor Controller", func() {
 							HostMemory:  *resource.NewQuantity(8192, resource.DecimalSI),
 						}, nil
 					},
+					GetDomainCapabilitiesFunc: func() (kvmv1.DomainCapabilities, error) {
+						return kvmv1.DomainCapabilities{
+							Arch:              "x86_64",
+							HypervisorType:    "kvm",
+							SupportedCpuModes: []string{"mode/example", "mode/example/1"},
+						}, nil
+					},
 				},
 				Systemd: &systemd.InterfaceMock{
 					CloseFunc: func() {},
@@ -165,6 +172,11 @@ var _ = Describe("Hypervisor Controller", func() {
 				To(Equal(resource.NewQuantity(4, resource.DecimalSI).AsDec().UnscaledBig()))
 			Expect(hypervisor.Status.Capabilities.HostMemory.AsDec().UnscaledBig()).
 				To(Equal(resource.NewQuantity(8192, resource.DecimalSI).AsDec().UnscaledBig()))
+
+			Expect(hypervisor.Status.DomainCapabilities.Arch).To(Equal("x86_64"))
+			Expect(hypervisor.Status.DomainCapabilities.HypervisorType).To(Equal("kvm"))
+			Expect(hypervisor.Status.DomainCapabilities.SupportedCpuModes).To(ContainElements(
+				"mode/example", "mode/example/1"))
 		})
 	})
 })

internal/emulator/libvirt.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/libvirt"
 	"github.com/cobaltcore-dev/kvm-node-agent/internal/libvirt/capabilities"
+	"github.com/cobaltcore-dev/kvm-node-agent/internal/libvirt/domcapabilities"
 )
 
 func NewLibVirtEmulator(ctx context.Context) *libvirt.InterfaceMock {
@@ -58,6 +59,9 @@ func NewLibVirtEmulator(ctx context.Context) *libvirt.InterfaceMock {
 		GetCapabilitiesFunc: func() (v1.Capabilities, error) {
 			return capabilities.NewClientEmulator().Get(nil)
 		},
+		GetDomainCapabilitiesFunc: func() (v1.DomainCapabilities, error) {
+			return domcapabilities.NewClientEmulator().Get(nil)
+		},
 	}
 	return mockedInterface
 }

internal/libvirt/domcapabilities/client.go

@@ -42,7 +42,7 @@ func NewClient() Client {
 
 // Return the domain capabilities of the host we are mounted on.
 func (m *client) Get(virt *libvirt.Libvirt) (v1.DomainCapabilities, error) {
-	// Same as running `virsh domcapabilities`
+	// Same as running `virsh domcapabilities` without any arguments.
 	capabilitiesXMLStr, err := virt.
 		ConnectGetDomainCapabilities(nil, nil, nil, nil, 0)
 	if err != nil {
@@ -91,7 +91,7 @@ func convert(in DomainCapabilities) (out v1.DomainCapabilities, err error) {
 			continue
 		}
 		out.SupportedCpuModes = append(out.SupportedCpuModes,
-			fmt.Sprintf("mode/%s", cpuMode.Name))
+			"mode/"+cpuMode.Name)
 		for _, enum := range cpuMode.Enums {
 			for _, cpuType := range enum.Values {
 				out.SupportedCpuModes = append(out.SupportedCpuModes,

internal/libvirt/domcapabilities/client_test.go

@@ -76,13 +76,7 @@ func TestClientEmulatorGet(t *testing.T) {
 		t.Errorf("Expected %d supported CPU modes, got %d", len(expectedCpuModes), len(status.SupportedCpuModes))
 	}
 	for _, expected := range expectedCpuModes {
-		found := false
-		for _, actual := range status.SupportedCpuModes {
-			if actual == expected {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(status.SupportedCpuModes, expected)
 		if !found {
 			t.Errorf("Expected CPU mode '%s' not found in supported modes", expected)
 		}
@@ -188,13 +182,7 @@ func TestConvert(t *testing.T) {
 		t.Errorf("Expected %d CPU modes, got %d", len(expectedCpuModes), len(status.SupportedCpuModes))
 	}
 	for _, expected := range expectedCpuModes {
-		found := false
-		for _, actual := range status.SupportedCpuModes {
-			if actual == expected {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(status.SupportedCpuModes, expected)
 		if !found {
 			t.Errorf("Expected CPU mode '%s' not found", expected)
 		}
@@ -210,13 +198,7 @@ func TestConvert(t *testing.T) {
 		t.Errorf("Expected %d devices, got %d", len(expectedDevices), len(status.SupportedDevices))
 	}
 	for _, expected := range expectedDevices {
-		found := false
-		for _, actual := range status.SupportedDevices {
-			if actual == expected {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(status.SupportedDevices, expected)
 		if !found {
 			t.Errorf("Expected device '%s' not found", expected)
 		}
@@ -414,13 +396,7 @@ func TestConvertWithMultipleDeviceTypes(t *testing.T) {
 	}
 
 	for _, expected := range expectedDevices {
-		found := false
-		for _, actual := range status.SupportedDevices {
-			if actual == expected {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(status.SupportedDevices, expected)
 		if !found {
 			t.Errorf("Expected device '%s' not found", expected)
 		}
@@ -487,13 +463,7 @@ func TestConvertWithMultipleCpuModes(t *testing.T) {
 	}
 
 	for _, expected := range expectedCpuModes {
-		found := false
-		for _, actual := range status.SupportedCpuModes {
-			if actual == expected {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(status.SupportedCpuModes, expected)
 		if !found {
 			t.Errorf("Expected CPU mode '%s' not found", expected)
 		}
@@ -580,13 +550,7 @@ func TestConvertWithMultipleFeatures(t *testing.T) {
 	}
 
 	for _, expected := range expectedFeatures {
-		found := false
-		for _, actual := range status.SupportedFeatures {
-			if actual == expected {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(status.SupportedFeatures, expected)
 		if !found {
 			t.Errorf("Expected feature '%s' not found", expected)
 		}
@@ -613,10 +577,7 @@ func createMockDomainCapabilities(
 	for i, mode := range cpuModes {
 		enums := make([]DomainCapabilitiesEnum, len(mode.Enums))
 		for j, enum := range mode.Enums {
-			enums[j] = DomainCapabilitiesEnum{
-				Name:   enum.Name,
-				Values: enum.Values,
-			}
+			enums[j] = DomainCapabilitiesEnum(enum)
 		}
 		capabilitiesCpuModes[i] = DomainCapabilitiesCPUMode{
 			Name:      mode.Name,
@@ -630,10 +591,7 @@ func createMockDomainCapabilities(
 	for i, device := range devices {
 		enums := make([]DomainCapabilitiesEnum, len(device.Enums))
 		for j, enum := range device.Enums {
-			enums[j] = DomainCapabilitiesEnum{
-				Name:   enum.Name,
-				Values: enum.Values,
-			}
+			enums[j] = DomainCapabilitiesEnum(enum)
 		}
 		capabilitiesDevices[i] = DomainCapabilitiesDevice{
 			Supported: device.Supported,