Remove remaining entries check and fix cleanup

Author: darkowlzz

pkg/sanity/controller.go

@@ -272,6 +272,8 @@ var _ = DescribeSanity("ListVolumes [Controller Server]", func(sc *SanityContext
 		// currentTotalVols is the total number of volumes at a given time. It
 		// is used to verify that all the volumes have been listed.
 		currentTotalVols := 0
+		// newVolIDs to keep a record of the newly created volume ids.
+		var newVolIDs []string
 
 		// Get the number of existing volumes.
 		vols, err := c.ListVolumes(
@@ -311,6 +313,7 @@ var _ = DescribeSanity("ListVolumes [Controller Server]", func(sc *SanityContext
 				vol, err := c.CreateVolume(context.Background(), req)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(vol).NotTo(BeNil())
+				newVolIDs = append(newVolIDs, vol.GetVolume().GetId())
 			}
 
 			// Update the current total vols count.
@@ -331,26 +334,12 @@ var _ = DescribeSanity("ListVolumes [Controller Server]", func(sc *SanityContext
 		Expect(nextToken).To(Equal(strconv.Itoa(maxEntries)))
 		Expect(len(vols.GetEntries())).To(Equal(maxEntries))
 
-		// Request list volumes with starting_token and no max entries.
-		vols, err = c.ListVolumes(
-			context.Background(),
-			&csi.ListVolumesRequest{
-				StartingToken: nextToken,
-			})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(vols).NotTo(BeNil())
-
-		// Ensure that all the remaining entries are returned at once.
-		Expect(len(vols.GetEntries())).To(Equal(currentTotalVols - maxEntries))
-
 		if initialTotalVols < minVolCount {
 
 			By("cleaning up deleting the volumes")
-			requiredVols := minVolCount - initialTotalVols
-			name := "sanity"
-			for i := 1; i <= requiredVols; i++ {
+			for _, volID := range newVolIDs {
 				delReq := &csi.DeleteVolumeRequest{
-					VolumeId: name + strconv.Itoa(i),
+					VolumeId: volID,
 				}
 
 				if sc.Secrets != nil {