From 73ba6f3e85d79f8cac1d9026a8c4175d5ebc98a6 Mon Sep 17 00:00:00 2001 From: riya-singhal31 Date: Thu, 3 Aug 2023 15:54:03 +0530 Subject: [PATCH] rbd: extending prefix test to mount the app to pvc Signed-off-by: riya-singhal31 --- e2e/rbd.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/e2e/rbd.go b/e2e/rbd.go index 954014f72681..e7d3514e4766 100644 --- a/e2e/rbd.go +++ b/e2e/rbd.go @@ -2833,14 +2833,9 @@ var _ = Describe("RBD", func() { framework.Failf("failed to create storageclass: %v", err) } // set up PVC - pvc, err := loadPVC(pvcPath) - if err != nil { - framework.Failf("failed to load PVC: %v", err) - } - pvc.Namespace = f.UniqueName - err = createPVCAndvalidatePV(f.ClientSet, pvc, deployTimeout) + pvc, app, err := createPVCAndAppBinding(pvcPath, appPath, f, 0) if err != nil { - framework.Failf("failed to create PVC: %v", err) + framework.Failf("failed to create PVC and application: %v", err) } // validate created backend rbd images @@ -2862,9 +2857,9 @@ var _ = Describe("RBD", func() { } // clean up after ourselves - err = deletePVCAndValidatePV(f.ClientSet, pvc, deployTimeout) + err = deletePVCAndApp("", f, pvc, app) if err != nil { - framework.Failf("failed to delete PVC: %v", err) + framework.Failf("failed to delete PVC and application: %v", err) } // validate created backend rbd images validateRBDImageCount(f, 0, defaultRBDPool)