Merge pull request #39 from cjh1/collection-nis

Store network interfaces during collect

internal/collect.go

@@ -115,9 +115,6 @@ func CollectAll(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) err
 					"RediscoverOnUpdate": false,
 				}
 
-				// unmarshal json to send in correct format
-				var rm map[string]json.RawMessage
-
 				// chassis
 				if gofishClient != nil {
 					chassis, err := CollectChassis(gofishClient, q)
@@ -125,32 +122,23 @@ func CollectAll(probeStates *[]ScannedResult, l *log.Logger, q *QueryParams) err
 						l.Log.Errorf("failed to collect chassis: %v", err)
 						continue
 					}
-					err = json.Unmarshal(chassis, &rm)
+					data["Chassis"] = chassis
-					if err != nil {
-						l.Log.Errorf("failed to unmarshal chassis JSON: %v", err)
-					}
-					data["Chassis"] = rm["Chassis"]
 
 					// systems
 					systems, err := CollectSystems(gofishClient, q)
 					if err != nil {
 						l.Log.Errorf("failed to collect systems: %v", err)
 					}
-					err = json.Unmarshal(systems, &rm)
+					data["Systems"] = systems
-					if err != nil {
-						l.Log.Errorf("failed to unmarshal system JSON after collect: %v", err)
-					}
-					data["Systems"] = rm["Systems"]
 
 					// add other fields from systems
-					if len(rm["Systems"]) > 0 {
+					if len(systems) > 0 {
-						var s map[string][]any
+						system := systems[0]["Data"].(*redfish.ComputerSystem)
-						fmt.Printf("Systems before unmarshaling: %v\n", string(rm["Systems"]))
+						if system == nil {
-						err = json.Unmarshal(rm["Systems"], &s)
+							l.Log.Errorf("invalid system data (data is nil)")
-						if err != nil {
+						} else {
-							l.Log.Errorf("failed to unmarshal systems JSON: %v", err)
+							data["Name"] = system.Name
 						}
-						data["Name"] = s["Name"]
 					}
 				} else {
 					l.Log.Errorf("invalid client (client is nil)")
@@ -392,19 +380,26 @@ func CollectEthernetInterfaces(c *gofish.APIClient, q *QueryParams, systemID str
 	return b, nil
 }
 
-func CollectChassis(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
+func CollectChassis(c *gofish.APIClient, q *QueryParams) ([]map[string]any, error) {
-	chassis, err := c.Service.Chassis()
+	rfChassis, err := c.Service.Chassis()
 	if err != nil {
 		return nil, fmt.Errorf("failed to query chassis (%v:%v): %v", q.Host, q.Port, err)
 	}
 
-	data := map[string]any{"Chassis": chassis}
+	var chassis []map[string]any
-	b, err := json.MarshalIndent(data, "", "    ")
+	for _, ch := range rfChassis {
+		networkAdapters, err := ch.NetworkAdapters()
 		if err != nil {
-		return nil, fmt.Errorf("failed to marshal JSON: %v", err)
+			return nil, fmt.Errorf("failed to get network adapters: %v", err)
 		}
 
-	return b, nil
+		chassis = append(chassis, map[string]any{
+			"Data":            ch,
+			"NetworkAdapters": networkAdapters,
+		})
+	}
+
+	return chassis, nil
 }
 
 func CollectStorage(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
@@ -432,8 +427,8 @@ func CollectStorage(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
 	return b, nil
 }
 
-func CollectSystems(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
+func CollectSystems(c *gofish.APIClient, q *QueryParams) ([]map[string]any, error) {
-	systems, err := c.Service.Systems()
+	rfSystems, err := c.Service.Systems()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get systems (%v:%v): %v", q.Host, q.Port, err)
 	}
@@ -445,13 +440,10 @@ func CollectSystems(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
 	// 2.a. if yes, query both properties to use in next step
 	// 2.b. for each service, query its data and add the ethernet interfaces
 	// 2.c. add the system to list of systems to marshal and return
-	var (
+	var systems []map[string]any
-		temp []map[string]any
-		eths []*redfish.EthernetInterface
-	)
 
-	for _, system := range systems {
+	for _, system := range rfSystems {
-		eths, err = system.EthernetInterfaces()
+		eths, err := system.EthernetInterfaces()
 		if err != nil {
 			return nil, fmt.Errorf("failed to get system ethernet interfaces: %v", err)
 		}
@@ -473,10 +465,31 @@ func CollectSystems(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
 			}
 		}
 
+		// add network interfaces to system
+		rfNetworkInterfaces, err := system.NetworkInterfaces()
+		if err != nil {
+			return nil, fmt.Errorf("failed to get system network interfaces: %v", err)
+		}
+
+		// get the network adapter ID for each network interface
+		var networkInterfaces []map[string]any
+		for _, rfNetworkInterface := range rfNetworkInterfaces {
+			networkAdapter, err := rfNetworkInterface.NetworkAdapter()
+			if err != nil {
+				return nil, fmt.Errorf("failed to get network adapter: %v", err)
+			}
+
+			networkInterfaces = append(networkInterfaces, map[string]any{
+				"Data":             rfNetworkInterface,
+				"NetworkAdapterId": networkAdapter.ID,
+			})
+		}
+
 		// add system to collection of systems
-		temp = append(temp, map[string]any{
+		systems = append(systems, map[string]any{
 			"Data":               system,
 			"EthernetInterfaces": eths,
+			"NetworkInterfaces":  networkInterfaces,
 		})
 	}
 
@@ -589,13 +602,7 @@ func CollectSystems(c *gofish.APIClient, q *QueryParams) ([]byte, error) {
 	// 	}
 	// }
 
-	data := map[string]any{"Systems": temp}
+	return systems, nil
-	b, err := json.MarshalIndent(data, "", "    ")
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal JSON: %v", err)
-	}
-
-	return b, nil
 }
 
 func CollectRegisteries(c *gofish.APIClient, q *QueryParams) ([]byte, error) {

pkg/crawler/main.go

@@ -24,6 +24,22 @@ type EthernetInterface struct {
 	Description string `json:"description,omitempty"` // Description of the interface
 }
 
+type NetworkAdapter struct {
+	URI          string `json:"uri,omitempty"`          // URI of the adapter
+	Manufacturer string `json:"manufacturer,omitempty"` // Manufacturer of the adapter
+	Name         string `json:"name,omitempty"`         // Name of the adapter
+	Model        string `json:"model,omitempty"`        // Model of the adapter
+	Serial       string `json:"serial,omitempty"`       // Serial number of the adapter
+	Description  string `json:"description,omitempty"`  // Description of the adapter
+}
+
+type NetworkInterface struct {
+	URI         string         `json:"uri,omitempty"`         // URI of the interface
+	Name        string         `json:"name,omitempty"`        // Name of the interface
+	Description string         `json:"description,omitempty"` // Description of the interface
+	Adapter     NetworkAdapter `json:"adapter,omitempty"`     // Adapter of the interface
+}
+
 type InventoryDetail struct {
 	URI                  string              `json:"uri,omitempty"`                  // URI of the BMC
 	Manufacturer         string              `json:"manufacturer,omitempty"`         // Manufacturer of the Node
@@ -32,6 +48,7 @@ type InventoryDetail struct {
 	Serial               string              `json:"serial,omitempty"`               // Serial number of the Node
 	BiosVersion          string              `json:"bios_version,omitempty"`         // Version of the BIOS
 	EthernetInterfaces   []EthernetInterface `json:"ethernet_interfaces,omitempty"`  // Ethernet interfaces of the Node
+	NetworkInterfaces    []NetworkInterface  `json:"network_interfaces,omitempty"`   // Network interfaces of the Node
 	PowerState           string              `json:"power_state,omitempty"`          // Power state of the Node
 	ProcessorCount       int                 `json:"processor_count,omitempty"`      // Processors of the Node
 	ProcessorType        string              `json:"processor_type,omitempty"`       // Processor type of the Node
@@ -129,6 +146,7 @@ func walkSystems(rf_systems []*redfish.ComputerSystem, rf_chassis *redfish.Chass
 		}
 		for _, rf_ethernetinterface := range rf_ethernetinterfaces {
 			ethernetinterface := EthernetInterface{
+				URI:         baseURI + rf_ethernetinterface.ODataID,
 				MAC:         rf_ethernetinterface.MACAddress,
 				Name:        rf_ethernetinterface.Name,
 				Description: rf_ethernetinterface.Description,
@@ -138,6 +156,41 @@ func walkSystems(rf_systems []*redfish.ComputerSystem, rf_chassis *redfish.Chass
 			}
 			system.EthernetInterfaces = append(system.EthernetInterfaces, ethernetinterface)
 		}
+
+		rf_networkInterfaces, err := rf_computersystem.NetworkInterfaces()
+		if err != nil {
+			log.Error().Err(err).Msg("failed to get network interfaces from computer system")
+			return systems, err
+		}
+
+		for _, rf_networkInterface := range rf_networkInterfaces {
+			rf_networkAdapter, err := rf_networkInterface.NetworkAdapter()
+			if err != nil {
+				log.Error().Err(err).Msg("failed to get network adapter from network interface")
+				return systems, err
+			}
+
+			var networkAdapter NetworkAdapter
+			if rf_networkAdapter != nil {
+				networkAdapter = NetworkAdapter{
+					URI:          baseURI + rf_networkAdapter.ODataID,
+					Name:         rf_networkAdapter.Name,
+					Manufacturer: rf_networkAdapter.Manufacturer,
+					Model:        rf_networkAdapter.Model,
+					Serial:       rf_networkAdapter.SerialNumber,
+					Description:  rf_networkAdapter.Description,
+				}
+			}
+
+			networkInterface := NetworkInterface{
+				URI:         baseURI + rf_networkInterface.ODataID,
+				Name:        rf_networkInterface.Name,
+				Description: rf_networkInterface.Description,
+				Adapter:     networkAdapter,
+			}
+			system.NetworkInterfaces = append(system.NetworkInterfaces, networkInterface)
+		}
+
 		for _, rf_trustedmodule := range rf_computersystem.TrustedModules {
 			system.TrustedModules = append(system.TrustedModules, fmt.Sprintf("%s %s", rf_trustedmodule.InterfaceType, rf_trustedmodule.FirmwareVersion))
 		}