MGMT-14881 - return a valid error when no disks has been found

internal/host/validations_test.go

@@ -2153,4 +2153,96 @@ var _ = Describe("Validations test", func() {
 			Expect(message).To(Equal(""))
 		})
 	})
+
+	Context("Has Min Valid Disks", func() {
+		var (
+			host    models.Host
+			cluster common.Cluster
+		)
+
+		const (
+			diskNotDetected string = "Failed to detected disks"
+			failureMessage  string = "No eligible disks were found, please check specific disks to see why they are not eligible"
+			successMessage  string = "Sufficient disk capacity"
+		)
+
+		BeforeEach(func() {
+			// Create a test cluster
+			cluster = hostutil.GenerateTestCluster(clusterID)
+			Expect(db.Create(&cluster).Error).ToNot(HaveOccurred())
+
+			// Create a test host
+			hostId, infraEnvId := strfmt.UUID(uuid.New().String()), strfmt.UUID(uuid.New().String())
+			mockProviderRegistry.EXPECT().IsHostSupported(models.PlatformTypeVsphere, gomock.Any()).Return(false, nil).AnyTimes()
+			host = hostutil.GenerateTestHostByKind(hostId, infraEnvId, &clusterID, models.HostStatusKnown, models.HostKindHost, models.HostRoleMaster)
+			host.Inventory = hostutil.GenerateMasterInventory()
+			// Remove Disks
+			var inventory models.Inventory
+			err := json.Unmarshal([]byte(host.Inventory), &inventory)
+			Expect(err).ShouldNot(HaveOccurred())
+			inventory.Disks = []*models.Disk{}
+			inventoryByte, _ := json.Marshal(inventory)
+			host.Inventory = string(inventoryByte)
+
+			Expect(db.Create(&host).Error).ShouldNot(HaveOccurred())
+			host = hostutil.GetHostFromDB(*host.ID, host.InfraEnvID, db).Host
+		})
+
+		updateDiskInventory := func(h *models.Host, disk models.Disk) {
+			var inventory models.Inventory
+			err := json.Unmarshal([]byte(h.Inventory), &inventory)
+			Expect(err).ShouldNot(HaveOccurred())
+
+			inventory.Disks = []*models.Disk{&disk}
+
+			inventoryByte, _ := json.Marshal(inventory)
+			h.Inventory = string(inventoryByte)
+
+			Expect(db.Save(&host).Error).ShouldNot(HaveOccurred())
+		}
+
+		createDisk := func(size int64) models.Disk {
+			return models.Disk{
+				SizeBytes: conversions.GibToBytes(size),
+				Name:      "nvme10",
+				DriveType: models.DriveTypeHDD,
+				ID:        "/dev/sda",
+				HasUUID:   true,
+			}
+		}
+
+		It("Sufficient disk", func() {
+			disk1 := createDisk(120)
+			mockHwValidator.EXPECT().ListEligibleDisks(gomock.Any()).Return([]*models.Disk{&disk1}).AnyTimes()
+
+			updateDiskInventory(&host, disk1)
+			mockAndRefreshStatus(&host)
+			host = hostutil.GetHostFromDB(*host.ID, host.InfraEnvID, db).Host
+
+			status, message, ok := getValidationResult(host.ValidationsInfo, HasMinValidDisks)
+			Expect(ok).To(BeTrue())
+			Expect(successMessage).To(Equal(message))
+			Expect(ValidationSuccess).To(Equal(status))
+		})
+		It("No eligible disks", func() {
+			updateDiskInventory(&host, createDisk(1))
+			mockAndRefreshStatus(&host)
+			host = hostutil.GetHostFromDB(*host.ID, host.InfraEnvID, db).Host
+
+			status, message, ok := getValidationResult(host.ValidationsInfo, HasMinValidDisks)
+			Expect(ok).To(BeTrue())
+			Expect(failureMessage).To(Equal(message))
+			Expect(ValidationFailure).To(Equal(status))
+
+		})
+		It("Disk not Detected", func() {
+			mockAndRefreshStatus(&host)
+			host = hostutil.GetHostFromDB(*host.ID, host.InfraEnvID, db).Host
+
+			status, message, ok := getValidationResult(host.ValidationsInfo, HasMinValidDisks)
+			Expect(ok).To(BeTrue())
+			Expect(diskNotDetected).To(Equal(message))
+			Expect(ValidationError).To(Equal(status))
+		})
+	})
 })

internal/host/validator.go

@@ -128,8 +128,12 @@ func (c *validationContext) loadInventory() error {
 	if inventory == nil || err != nil {
 		return err
 	}
-	if inventory.CPU == nil || inventory.Memory == nil || len(inventory.Disks) == 0 {
-		return errors.New("Inventory is not valid")
+	if inventory.Memory == nil {
+		return errors.New("Inventory is not valid, Memory not detected")
+	}
+
+	if inventory.CPU == nil {
+		return errors.New("Inventory is not valid, CPU not detected")
 	}
 	c.inventory = inventory
 	return nil
@@ -502,6 +506,13 @@ func (v *validator) hasMinValidDisks(c *validationContext) (ValidationStatus, st
 	if c.inventory == nil {
 		return ValidationPending, "Missing inventory"
 	}
+	inventory, err := c.inventoryCache.GetOrUnmarshal(c.host)
+	if err != nil {
+		return ValidationError, "Failed to load inventory"
+	}
+	if len(inventory.Disks) == 0 {
+		return ValidationError, "Failed to detected disks"
+	}
 	disks := v.hwValidator.ListEligibleDisks(c.inventory)
 	if len(disks) > 0 {
 		return ValidationSuccess, "Sufficient disk capacity"