internal: update networkInterfaces, add carrierState, ipv6 and neighbors

- add fields to registry
- handle new registry fields and update crd

Author: xkonni

bmc/redfish_kube.go

@@ -71,7 +71,7 @@ func (r *RedfishKubeBMC) SetPXEBootOnce(ctx context.Context, systemURI string) e
 	if err := system.SetBoot(setBoot); err != nil {
 		return fmt.Errorf("failed to set the boot order: %w", err)
 	}
-	netData := `{"networkInterfaces":[{"name":"dummy0","ipAddress":"127.0.0.2","macAddress":"aa:bb:cc:dd:ee:ff"}]`
+	netData := `{"networkInterfaces":[{"name":"dummy0","ipAddresses":["127.0.0.2"],"macAddress":"aa:bb:cc:dd:ee:ff"}]`
 	curlCmd := fmt.Sprintf(
 		`apk add curl && curl -H 'Content-Type: application/json' \
 -d '{"SystemUUID":"%s","data":%s}}' \

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/siderolabs/go-smbios v0.3.3
 	github.com/spf13/cobra v1.9.1
 	github.com/stmcginnis/gofish v0.20.0
+	github.com/stretchr/testify v1.10.0
 	golang.org/x/crypto v0.42.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.33.3
@@ -62,6 +63,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.22.0 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.64.0 // indirect

internal/api/registry/server.go

@@ -6,9 +6,10 @@ package registry
 // NetworkInterface represents a network interface on a server,
 // including its IP and MAC addresses.
 type NetworkInterface struct {
-	Name       string `json:"name"`
-	IPAddress  string `json:"ipAddress"`
-	MACAddress string `json:"macAddress"`
+	Name          string   `json:"name"`
+	IpAddresses   []string `json:"ipAddresses"`
+	MACAddress    string   `json:"macAddress"`
+	CarrierStatus string   `json:"carrierStatus"`
 }
 
 // Server represents a server with a list of network interfaces.

internal/controller/server_controller.go

@@ -825,14 +825,61 @@ func (r *ServerReconciler) extractServerDetailsFromRegistry(ctx context.Context,
 	// update network interfaces
 	nics := make([]metalv1alpha1.NetworkInterface, 0, len(serverDetails.NetworkInterfaces))
 	for _, s := range serverDetails.NetworkInterfaces {
-		nics = append(nics, metalv1alpha1.NetworkInterface{
-			Name:       s.Name,
-			IP:         metalv1alpha1.MustParseIP(s.IPAddress),
-			MACAddress: s.MACAddress,
-		})
+		nic := metalv1alpha1.NetworkInterface{
+			Name:          s.Name,
+			MACAddress:    s.MACAddress,
+			CarrierStatus: s.CarrierStatus,
+		}
+
+		// Process all IP addresses from the single IpAddresses slice
+		var allIPs []metalv1alpha1.IP
+		for _, ipAddr := range s.IpAddresses {
+			if ipAddr != "" {
+				// Parse and validate the IP address
+				ip, err := metalv1alpha1.ParseIP(ipAddr)
+				if err != nil {
+					log.V(1).Info("Invalid IP address, skipping", "interface", s.Name, "ip", ipAddr, "error", err)
+					continue
+				}
+
+				// Add all valid IP addresses (both IPv4 and IPv6) to the slice
+				allIPs = append(allIPs, ip)
+			}
+		}
+
+		// Set the IPs field with all collected IP addresses
+		if len(allIPs) > 0 {
+			nic.IPs = allIPs
+		}
+
+		nics = append(nics, nic)
+	}
+
+	// Merge LLDP neighbors into corresponding network interfaces
+	for _, lldpIface := range serverDetails.LLDP {
+		// Find the matching network interface by name
+		for i := range nics {
+			if nics[i].Name == lldpIface.InterfaceName {
+				// Convert LLDP neighbors to the CRD format
+				neighbors := make([]metalv1alpha1.LLDPNeighbor, 0, len(lldpIface.Neighbors))
+				for _, neighbor := range lldpIface.Neighbors {
+					neighbors = append(neighbors, metalv1alpha1.LLDPNeighbor{
+						MACAddress:        neighbor.ChassisID,
+						PortID:            neighbor.PortID,
+						PortDescription:   neighbor.PortDescription,
+						SystemName:        neighbor.SystemName,
+						SystemDescription: neighbor.SystemDescription,
+					})
+				}
+				nics[i].Neighbors = neighbors
+				break
+			}
+		}
 	}
+
 	server.Status.NetworkInterfaces = nics
 
+	log.V(1).Info("Found server information in registry", "nics", nics)
 	if err := r.Status().Patch(ctx, server, client.MergeFrom(serverBase)); err != nil {
 		return false, fmt.Errorf("failed to patch server status: %w", err)
 	}

internal/registry/server_test.go

@@ -22,9 +22,9 @@ var _ = Describe("RegistryServer", func() {
 			Data: registry.Server{
 				NetworkInterfaces: []registry.NetworkInterface{
 					{
-						Name:       "foo",
-						IPAddress:  "1.1.1.1",
-						MACAddress: "abcd",
+						Name:        "foo",
+						IpAddresses: []string{"1.1.1.1"},
+						MACAddress:  "abcd",
 					},
 				},
 			},
@@ -48,9 +48,9 @@ var _ = Describe("RegistryServer", func() {
 		Expect(server).To(Equal(&registry.Server{
 			NetworkInterfaces: []registry.NetworkInterface{
 				{
-					Name:       "foo",
-					IPAddress:  "1.1.1.1",
-					MACAddress: "abcd",
+					Name:        "foo",
+					IpAddresses: []string{"1.1.1.1"},
+					MACAddress:  "abcd",
 				},
 			},
 		}))