uses resource quantity for memory

ironcore-dev · Nov 11, 2024 · 0e4ec6d · 0e4ec6d
1 parent 80f7dbc
commit 0e4ec6d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/bmc/bmc.go b/bmc/bmc.go
@@ -6,6 +6,7 @@ package bmc
 import (
 	"github.com/stmcginnis/gofish/common"
 	"github.com/stmcginnis/gofish/redfish"
+	"k8s.io/apimachinery/pkg/api/resource"
 )
 
 // BMC defines an interface for interacting with a Baseboard Management Controller.
@@ -194,7 +195,7 @@ type SystemInfo struct {
 	PowerState             redfish.PowerState
 	NetworkInterfaces      []NetworkInterface
 	Processors             []Processor
-	TotalSystemMemoryBytes int64
+	TotalSystemMemoryBytes resource.Quantity
 	SystemUUID             string
 	SerialNumber           string
 	SKU                    string

diff --git a/bmc/redfish.go b/bmc/redfish.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/stmcginnis/gofish"
 	"github.com/stmcginnis/gofish/redfish"
+	"k8s.io/apimachinery/pkg/api/resource"
 )
 
 var _ BMC = (*RedfishBMC)(nil)
@@ -180,7 +181,12 @@ func (r *RedfishBMC) GetSystemInfo(systemUUID string) (SystemInfo, error) {
 	if err != nil {
 		return SystemInfo{}, fmt.Errorf("failed to get systems: %w", err)
 	}
+	memoryString := fmt.Sprintf("%.fGi", system.MemorySummary.TotalSystemMemoryGiB)
+	quantity, err := resource.ParseQuantity(memoryString)
 
+	if err != nil {
+		return SystemInfo{}, fmt.Errorf("failed to parse memory quantity: %w", err)
+	}
 	return SystemInfo{
 		SystemUUID:             system.UUID,
 		Manufacturer:           system.Manufacturer,
@@ -190,7 +196,7 @@ func (r *RedfishBMC) GetSystemInfo(systemUUID string) (SystemInfo, error) {
 		SerialNumber:           system.SerialNumber,
 		SKU:                    system.SKU,
 		IndicatorLED:           string(system.IndicatorLED),
-		TotalSystemMemoryBytes: int64(system.MemorySummary.TotalSystemMemoryGiB) * 1024 * 1024 * 1024,
+		TotalSystemMemoryBytes: quantity,
 	}, nil
 }
 

diff --git a/internal/controller/server_controller.go b/internal/controller/server_controller.go
@@ -436,7 +436,7 @@ func (r *ServerReconciler) updateServerStatus(ctx context.Context, log logr.Logg
 	server.Status.Manufacturer = systemInfo.Manufacturer
 	server.Status.Model = systemInfo.Model
 	server.Status.IndicatorLED = metalv1alpha1.IndicatorLED(systemInfo.IndicatorLED)
-	server.Status.TotalSystemMemory = resource.NewQuantity(systemInfo.TotalSystemMemoryBytes, resource.BinarySI)
+	server.Status.TotalSystemMemory = &systemInfo.TotalSystemMemoryBytes
 
 	currentBiosVersion, err := bmcClient.GetBiosVersion(server.Spec.UUID)
 	if err != nil {