Refactor Snapshot Checkpoint in E2E Tests (#9083)

* Refactor backup volume info retrieval and snapshot checkpoint building in e2e tests
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

log backup volume info retrieval and snapshot checkpoint building
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

Add error handling for volume info retrieval in backup tests
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

Add error handling for volume info retrieval in backup tests
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

* Update snapshot checkpoint building to use DefaultKibishiiWorkerCounts
Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

---------

Signed-off-by: Priyansh Choudhary <im1706@gmail.com>

test/e2e/backups/deletion.go

@@ -166,12 +166,24 @@ func runBackupDeletionTests(client TestClient, veleroCfg VeleroConfig, backupLoc
 		return err
 	}
 
+	backupVolumeInfo, err := GetVolumeInfo(
+		veleroCfg.ObjectStoreProvider,
+		veleroCfg.CloudCredentialsFile,
+		veleroCfg.BSLBucket,
+		veleroCfg.BSLPrefix,
+		veleroCfg.BSLConfig,
+		backupName,
+		BackupObjectsPrefix+"/"+backupName,
+	)
+	if err != nil {
+		return errors.Wrapf(err, "Failed to get volume info for backup %s", backupName)
+	}
 	if useVolumeSnapshots {
 		// Check for snapshots existence
 		if veleroCfg.CloudProvider == Vsphere {
 			// For vSphere, checking snapshot should base on namespace and backup name
 			for _, ns := range workloadNamespaceList {
-				snapshotCheckPoint, err = GetSnapshotCheckPoint(client, veleroCfg, DefaultKibishiiWorkerCounts, ns, backupName, KibishiiPVCNameList)
+				snapshotCheckPoint, err := BuildSnapshotCheckPointFromVolumeInfo(veleroCfg, backupVolumeInfo, DefaultKibishiiWorkerCounts, ns, backupName, KibishiiPVCNameList)
 				Expect(err).NotTo(HaveOccurred(), "Fail to get Azure CSI snapshot checkpoint")
 				err = CheckSnapshotsInProvider(
 					veleroCfg,
@@ -186,7 +198,7 @@ func runBackupDeletionTests(client TestClient, veleroCfg VeleroConfig, backupLoc
 		} else {
 			// For public cloud, When using backup name to index VolumeSnapshotContents, make sure count of VolumeSnapshotContents should including PVs in all namespace
 			// so VolumeSnapshotContents count should be equal to "namespace count" * "Kibishii worker count per namespace".
-			snapshotCheckPoint, err = GetSnapshotCheckPoint(client, veleroCfg, DefaultKibishiiWorkerCounts*nsCount, "", backupName, KibishiiPVCNameList)
+			snapshotCheckPoint, err := BuildSnapshotCheckPointFromVolumeInfo(veleroCfg, backupVolumeInfo, DefaultKibishiiWorkerCounts*nsCount, "", backupName, KibishiiPVCNameList)
 			Expect(err).NotTo(HaveOccurred(), "Fail to get Azure CSI snapshot checkpoint")
 
 			// Get all snapshots base on backup name, regardless of namespaces

test/e2e/backups/ttl.go

@@ -54,7 +54,6 @@ func (b *TTL) Init() {
 }
 
 func TTLTest() {
-	var err error
 	var veleroCfg VeleroConfig
 	useVolumeSnapshots := true
 	test := new(TTL)
@@ -138,10 +137,21 @@ func TTLTest() {
 				})
 			}
 
-			snapshotCheckPoint, err = GetSnapshotCheckPoint(
-				client,
+			backupVolumeInfo, err := GetVolumeInfo(
+				veleroCfg.ObjectStoreProvider,
+				veleroCfg.CloudCredentialsFile,
+				veleroCfg.BSLBucket,
+				veleroCfg.BSLPrefix,
+				veleroCfg.BSLConfig,
+				test.backupName,
+				BackupObjectsPrefix+"/"+test.backupName,
+			)
+			Expect(err).NotTo(HaveOccurred(), "Failed to get volume info for backup")
+
+			snapshotCheckPoint, err = BuildSnapshotCheckPointFromVolumeInfo(
 				veleroCfg,
-				2,
+				backupVolumeInfo,
+				DefaultKibishiiWorkerCounts,
 				test.testNS,
 				test.backupName,
 				KibishiiPVCNameList,