feat(test): add e2e device removal test

Author: qJkee

test/e2e/aws_disk_test.go

@@ -148,7 +148,7 @@ func (m *AWSDiskManager) createAndAttachAWSVolumesForNode(ctx context.Context, n
 			return fmt.Errorf("failed to create and attach aws Disks for Node %s with %v: %w",
 				nodeEntry.Node, createInput, err)
 		}
-		log.Info("creating volume", "size", volume.Size, "id", volume.VolumeId)
+		log.Info("creating volume", "size", volume.Size, "id", volume.VolumeId, "path", diskName)
 		volumes[i] = volume
 		volumeIDs = append(volumeIDs, volume.VolumeId)
 	}

test/e2e/lvm_cluster_test.go

@@ -90,4 +90,54 @@ func lvmClusterTest() {
 			VerifyLVMSSetup(ctx, cluster)
 		})
 	})
+
+	Describe("Device Removal", Serial, func() {
+		It("should remove devices from volume group successfully", func(ctx SpecContext) {
+			// Configure cluster with multiple devices for removal testing
+			cluster.Spec.Storage.DeviceClasses[0].DeviceSelector = &v1alpha1.DeviceSelector{
+				Paths: []v1alpha1.DevicePath{"/dev/sdg", "/dev/sdh"},
+			}
+
+			By("Creating cluster with multiple devices")
+			CreateResource(ctx, cluster)
+			VerifyLVMSSetup(ctx, cluster)
+
+			By("Removing one device from the volume group")
+			// Update cluster to remove /dev/sdi
+			cluster.Spec.Storage.DeviceClasses[0].DeviceSelector.Paths = []v1alpha1.DevicePath{
+				"/dev/sdg",
+			}
+
+			err := crClient.Update(ctx, cluster)
+			Expect(err).NotTo(HaveOccurred())
+
+			By("Verifying device removal completed successfully")
+			Eventually(func(ctx SpecContext) bool {
+				return validateDeviceRemovalSuccess(ctx, cluster, 1)
+			}, 5*timeout, interval).WithContext(ctx).Should(BeTrue())
+		})
+
+		It("should handle optional device removal", func(ctx SpecContext) {
+			// Configure cluster with both required and optional devices
+			cluster.Spec.Storage.DeviceClasses[0].DeviceSelector = &v1alpha1.DeviceSelector{
+				Paths:         []v1alpha1.DevicePath{"/dev/sdh"},
+				OptionalPaths: []v1alpha1.DevicePath{"/dev/sdl", "/dev/sdm"},
+			}
+
+			By("Creating cluster with required and optional devices")
+			CreateResource(ctx, cluster)
+			VerifyLVMSSetup(ctx, cluster)
+
+			By("Removing optional devices")
+			cluster.Spec.Storage.DeviceClasses[0].DeviceSelector.OptionalPaths = []v1alpha1.DevicePath{}
+
+			err := crClient.Update(ctx, cluster)
+			Expect(err).NotTo(HaveOccurred(), "Should allow removal of optional devices")
+
+			By("Verifying cluster remains Ready with required device only")
+			Eventually(func(ctx SpecContext) bool {
+				return validateClusterReady(ctx, cluster)
+			}, timeout, interval).WithContext(ctx).Should(BeTrue())
+		})
+	})
 }

test/e2e/validation_test.go

@@ -369,3 +369,39 @@ func GenericGetItemsFromList(list client.ObjectList) ([]client.Object, error) {
 
 	return result, nil
 }
+
+func validateDeviceRemovalSuccess(ctx context.Context, cluster *v1alpha1.LVMCluster, expectedDeviceCount int) bool {
+	vgStatus := getVGStatusForCluster(ctx, cluster)
+	return len(vgStatus.Devices) == expectedDeviceCount && vgStatus.Status == v1alpha1.VGStatusReady
+}
+
+func validateClusterReady(ctx context.Context, cluster *v1alpha1.LVMCluster) bool {
+	vgStatus := getVGStatusForCluster(ctx, cluster)
+	return vgStatus.Status == v1alpha1.VGStatusReady
+}
+
+func getVGStatusForCluster(ctx context.Context, cluster *v1alpha1.LVMCluster) v1alpha1.VGStatus {
+	currentCluster := &v1alpha1.LVMCluster{}
+	err := crClient.Get(ctx, client.ObjectKeyFromObject(cluster), currentCluster)
+	if err != nil {
+		return v1alpha1.VGStatus{}
+	}
+
+	if len(currentCluster.Status.DeviceClassStatuses) == 0 {
+		return v1alpha1.VGStatus{}
+	}
+
+	// Find the first device class (usually "vg1")
+	for _, deviceClassStatus := range currentCluster.Status.DeviceClassStatuses {
+		if len(deviceClassStatus.NodeStatus) > 0 {
+			// Return status from the first node with VG status
+			for _, nodeStatus := range deviceClassStatus.NodeStatus {
+				if nodeStatus.Name == lvmVolumeGroupName {
+					return nodeStatus.VGStatus
+				}
+			}
+		}
+	}
+
+	return v1alpha1.VGStatus{}
+}