feat: added serial console and command shell to output

Signed-off-by: David Allen <davidallendj@gmail.com>

Author: davidallendj

pkg/crawler/main.go

@@ -49,14 +49,16 @@ type NetworkInterface struct {
 }
 
 type Manager struct {
-	URI                string              `json:"uri,omitempty"`
-	UUID               string              `json:"uuid,omitempty"`
-	Name               string              `json:"name,omitempty"`
-	Description        string              `json:"description,omitempty"`
-	Model              string              `json:"model,omitempty"`
-	Type               string              `json:"type,omitempty"`
-	FirmwareVersion    string              `json:"firmware_version,omitempty"`
-	EthernetInterfaces []EthernetInterface `json:"ethernet_interfaces,omitempty"`
+	URI                    string              `json:"uri,omitempty"`
+	UUID                   string              `json:"uuid,omitempty"`
+	Name                   string              `json:"name,omitempty"`
+	Description            string              `json:"description,omitempty"`
+	Model                  string              `json:"model,omitempty"`
+	Type                   string              `json:"type,omitempty"`
+	FirmwareVersion        string              `json:"firmware_version,omitempty"`
+	EthernetInterfaces     []EthernetInterface `json:"ethernet_interfaces,omitempty"`
+	SerialConsoleSupported []string            `json:"serial_console"`
+	CommandShellSupported  []string            `json:"command_shell"`
 }
 
 type Links struct {
@@ -71,14 +73,26 @@ type Power struct {
 	PowerControlIDs []string `json:"power_control_ids,omitempty"`
 }
 
+type SerialConsoleConfig struct {
+	Port    int  `json:"port,omitempty"`
+	Enabled bool `json:"enabled,omitempty"`
+}
+
+type SerialConsole struct {
+	IPMI   SerialConsoleConfig `json:"impi,omitempty"`
+	Telnet SerialConsoleConfig `json:"telnet,omitempty"`
+	SSH    SerialConsoleConfig `json:"ssh,omitempty"`
+}
+
 type InventoryDetail struct {
 	URI                  string              `json:"uri,omitempty"`                  // URI of the BMC
 	UUID                 string              `json:"uuid,omitempty"`                 // UUID of Node
 	Manufacturer         string              `json:"manufacturer,omitempty"`         // Manufacturer of the Node
 	SystemType           string              `json:"system_type,omitempty"`          // System type of the Node
 	Name                 string              `json:"name,omitempty"`                 // Name of the Node
-	Model                string              `json:"model,omitempty"`                // Model of the Node
-	Serial               string              `json:"serial,omitempty"`               // Serial number of the Node
+	ModelNumber          string              `json:"model,omitempty"`                // Model of the Node
+	SerialNumber         string              `json:"serial,omitempty"`               // Serial number of the Node
+	SerialConsole        SerialConsole       `json:"serial_console,omitempty"`       // Supported serial console types 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
@@ -204,11 +218,7 @@ func CrawlBMCForSystems(config CrawlerConfig) ([]InventoryDetail, error) {
 	}
 	// If nodes are found under both Chassis and Systems, Systems is assumed to be "more definitive"
 	// and will override corresponding fields from the Chassis version.
-	// err = mergo.Merge(&systems, newSystems, mergo.WithOverride)
-	systems, err = merge(systems, newSystems)
-	if err != nil {
-		return extractPtrMapValues(systems), fmt.Errorf("failed to merge systems from Chassis and Systems endpoints: %v", err)
-	}
+	systems = merge(systems, newSystems)
 	return extractPtrMapValues(systems), nil
 }
 
@@ -329,9 +339,23 @@ func walkSystems(rf_systems []*redfish.ComputerSystem, rf_chassis *redfish.Chass
 			Name:         rf_computersystem.Name,
 			Manufacturer: rf_computersystem.Manufacturer,
 			SystemType:   string(rf_computersystem.SystemType),
-			Model:        rf_computersystem.Model,
-			Serial:       rf_computersystem.SerialNumber,
-			BiosVersion:  rf_computersystem.BIOSVersion,
+			ModelNumber:  rf_computersystem.Model,
+			SerialNumber: rf_computersystem.SerialNumber,
+			SerialConsole: SerialConsole{
+				IPMI: SerialConsoleConfig{
+					Port:    rf_computersystem.SerialConsole.IPMI.Port,
+					Enabled: rf_computersystem.SerialConsole.IPMI.ServiceEnabled,
+				},
+				SSH: SerialConsoleConfig{
+					Port:    rf_computersystem.SerialConsole.SSH.Port,
+					Enabled: rf_computersystem.SerialConsole.SSH.ServiceEnabled,
+				},
+				Telnet: SerialConsoleConfig{
+					Port:    rf_computersystem.SerialConsole.Telnet.Port,
+					Enabled: rf_computersystem.SerialConsole.Telnet.ServiceEnabled,
+				},
+			},
+			BiosVersion: rf_computersystem.BIOSVersion,
 			Links: Links{
 				Managers: managerLinks,
 				Chassis:  chassisLinks,
@@ -356,6 +380,7 @@ func walkSystems(rf_systems []*redfish.ComputerSystem, rf_chassis *redfish.Chass
 			system.Chassis_Model = rf_chassis.Model
 		}
 
+		// add ethernet interfaces
 		rf_ethernetinterfaces, err := rf_computersystem.EthernetInterfaces()
 		if err != nil {
 			log.Error().Err(err).Msg("failed to get ethernet interfaces from computer system")
@@ -381,6 +406,7 @@ func walkSystems(rf_systems []*redfish.ComputerSystem, rf_chassis *redfish.Chass
 			return systems, err
 		}
 
+		// add network interfaces
 		for _, rf_networkInterface := range rf_networkInterfaces {
 			rf_networkAdapter, err := rf_networkInterface.NetworkAdapter()
 			if err != nil {
@@ -457,15 +483,26 @@ func walkManagers(rf_managers []*redfish.Manager, baseURI string) ([]Manager, er
 				IP:          rf_ethernetinterface.IPv4Addresses[0].Address,
 			})
 		}
+
+		var supported_serial_console []string
+		for _, console_type := range rf_manager.SerialConsole.ConnectTypesSupported {
+			supported_serial_console = append(supported_serial_console, string(console_type))
+		}
+		var supported_command_shell []string
+		for _, shell_type := range rf_manager.CommandShell.ConnectTypesSupported {
+			supported_command_shell = append(supported_command_shell, string(shell_type))
+		}
 		managers = append(managers, Manager{
-			URI:                baseURI + "/redfish/v1/Managers/" + rf_manager.ID,
-			UUID:               rf_manager.UUID,
-			Name:               rf_manager.Name,
-			Description:        rf_manager.Description,
-			Model:              rf_manager.Model,
-			Type:               string(rf_manager.ManagerType),
-			FirmwareVersion:    rf_manager.FirmwareVersion,
-			EthernetInterfaces: ethernet_interfaces,
+			URI:                    baseURI + "/redfish/v1/Managers/" + rf_manager.ID,
+			UUID:                   rf_manager.UUID,
+			Name:                   rf_manager.Name,
+			Description:            rf_manager.Description,
+			Model:                  rf_manager.Model,
+			Type:                   string(rf_manager.ManagerType),
+			FirmwareVersion:        rf_manager.FirmwareVersion,
+			EthernetInterfaces:     ethernet_interfaces,
+			SerialConsoleSupported: supported_serial_console,
+			CommandShellSupported:  supported_command_shell,
 		})
 	}
 	return managers, nil
@@ -528,10 +565,10 @@ func extractPtrMapValues[T any](m map[string]*T) []T {
 	return slice
 }
 
-func merge(systems map[string]*InventoryDetail, newSystems []InventoryDetail) (map[string]*InventoryDetail, error) {
+func merge(systems map[string]*InventoryDetail, newSystems []InventoryDetail) map[string]*InventoryDetail {
 	// add and replace values in systems with values from newSystems
 	for _, system := range newSystems {
 		systems[system.URI] = &system
 	}
-	return systems, nil
+	return systems
 }