Improve Redfish recovery flow and raw export timing diagnostics

internal/parser/vendors/inspur/component.go

@@ -221,15 +221,19 @@ func parseHDDInfo(text string, hw *models.HardwareConfig) {
 	})
 	for _, hdd := range hddInfo {
 		if hdd.Present == 1 {
-			hddMap[hdd.LocationString] = struct {
+			slot := strings.TrimSpace(hdd.LocationString)
+			if slot == "" {
+				slot = fmt.Sprintf("HDD%d", hdd.ID)
+			}
+			hddMap[slot] = struct {
 				SN       string
 				Model    string
 				Firmware string
 				Mfr      string
 			}{
-				SN:       strings.TrimSpace(hdd.SN),
+				SN:       normalizeRedisValue(hdd.SN),
 				Model:    strings.TrimSpace(hdd.Model),
-				Firmware: strings.TrimSpace(hdd.Firmware),
+				Firmware: normalizeRedisValue(hdd.Firmware),
 				Mfr:      strings.TrimSpace(hdd.Manufacture),
 			}
 		}
@@ -245,18 +249,19 @@ func parseHDDInfo(text string, hw *models.HardwareConfig) {
 		if !ok {
 			continue
 		}
-		if hw.Storage[i].SerialNumber == "" {
+		if normalizeRedisValue(hw.Storage[i].SerialNumber) == "" {
 			hw.Storage[i].SerialNumber = detail.SN
 		}
 		if hw.Storage[i].Model == "" {
 			hw.Storage[i].Model = detail.Model
 		}
-		if hw.Storage[i].Firmware == "" {
+		if normalizeRedisValue(hw.Storage[i].Firmware) == "" {
 			hw.Storage[i].Firmware = detail.Firmware
 		}
 		if hw.Storage[i].Manufacturer == "" {
 			hw.Storage[i].Manufacturer = detail.Mfr
 		}
+		hw.Storage[i].Present = true
 	}
 
 	// If storage is empty, populate from HDD info
@@ -275,16 +280,21 @@ func parseHDDInfo(text string, hw *models.HardwareConfig) {
 			if hdd.CapableSpeed == 12 {
 				iface = "SAS"
 			}
+			slot := strings.TrimSpace(hdd.LocationString)
+			if slot == "" {
+				slot = fmt.Sprintf("HDD%d", hdd.ID)
+			}
 
 			hw.Storage = append(hw.Storage, models.Storage{
-				Slot:         hdd.LocationString,
+				Slot:         slot,
 				Type:         storType,
 				Model:        model,
 				SizeGB:       hdd.Capacity,
-				SerialNumber: strings.TrimSpace(hdd.SN),
+				SerialNumber: normalizeRedisValue(hdd.SN),
 				Manufacturer: extractStorageManufacturer(model),
-				Firmware:     strings.TrimSpace(hdd.Firmware),
+				Firmware:     normalizeRedisValue(hdd.Firmware),
 				Interface:    iface,
+				Present:      true,
 			})
 		}
 	}
@@ -732,28 +742,88 @@ func parseDiskBackplaneInfo(text string, hw *models.HardwareConfig) {
 		return
 	}
 
-	// Create storage entries based on backplane info
+	presentByBackplane := make(map[int]int)
+	totalPresent := 0
 	for _, bp := range backplaneInfo {
 		if bp.Present != 1 {
 			continue
 		}
+		if bp.DriverCount <= 0 {
+			continue
+		}
+		limit := bp.DriverCount
+		if bp.PortCount > 0 && limit > bp.PortCount {
+			limit = bp.PortCount
+		}
+		presentByBackplane[bp.BackplaneIndex] = limit
+		totalPresent += limit
+	}
+
+	if totalPresent == 0 {
+		return
+	}
+
+	existingPresent := countPresentStorage(hw.Storage)
+	remaining := totalPresent - existingPresent
+	if remaining <= 0 {
+		return
+	}
+
+	for _, bp := range backplaneInfo {
+		if bp.Present != 1 || remaining <= 0 {
+			continue
+		}
+		driveCount := presentByBackplane[bp.BackplaneIndex]
+		if driveCount <= 0 {
+			continue
+		}
 
 		location := "Rear"
 		if bp.Front == 1 {
 			location = "Front"
 		}
 
-		// Create entries for each port (disk slot)
-		for i := 0; i < bp.PortCount; i++ {
-			isPresent := i < bp.DriverCount
+		for i := 0; i < driveCount && remaining > 0; i++ {
+			slot := fmt.Sprintf("BP%d:%d", bp.BackplaneIndex, i)
+			if hasStorageSlot(hw.Storage, slot) {
+				continue
+			}
 
 			hw.Storage = append(hw.Storage, models.Storage{
-				Slot:        fmt.Sprintf("%d", i),
-				Present:     isPresent,
+				Slot:        slot,
+				Present:     true,
 				Location:    location,
 				BackplaneID: bp.BackplaneIndex,
 				Type:        "HDD",
 			})
+			remaining--
 		}
 	}
 }
+
+func countPresentStorage(storage []models.Storage) int {
+	count := 0
+	for _, dev := range storage {
+		if dev.Present {
+			count++
+			continue
+		}
+		if strings.TrimSpace(dev.Slot) != "" && (normalizeRedisValue(dev.Model) != "" || normalizeRedisValue(dev.SerialNumber) != "" || dev.SizeGB > 0) {
+			count++
+		}
+	}
+	return count
+}
+
+func hasStorageSlot(storage []models.Storage, slot string) bool {
+	slot = strings.ToLower(strings.TrimSpace(slot))
+	if slot == "" {
+		return false
+	}
+	for _, dev := range storage {
+		if strings.ToLower(strings.TrimSpace(dev.Slot)) == slot {
+			return true
+		}
+	}
+	return false
+}