e2e: add e2e to test static pvc

added e2e test case to verify static pvc with and without fsName in the PV object. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
ceph · Jan 12, 2024 · e008e16 · e008e16
1 parent 1d17600
commit e008e16
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/e2e/cephfs.go b/e2e/cephfs.go
@@ -474,11 +474,19 @@ var _ = Describe(cephfsType, func() {
 				}
 			})
 
-			By("check static PVC", func() {
+			By("check static PVC with FsName", func() {
 				scPath := cephFSExamplePath + "secret.yaml"
-				err := validateCephFsStaticPV(f, appPath, scPath)
+				err := validateCephFsStaticPV(f, appPath, scPath, fileSystemName)
 				if err != nil {
-					framework.Failf("failed to validate CephFS static pv: %v", err)
+					framework.Failf("failed to validate CephFS static pv with filesystem name: %v", err)
+				}
+			})
+
+			By("check static PVC with without FsName", func() {
+				scPath := cephFSExamplePath + "secret.yaml"
+				err := validateCephFsStaticPV(f, appPath, scPath, "")
+				if err != nil {
+					framework.Failf("failed to validate CephFS static pv without filesystem name: %v", err)
 				}
 			})
 

diff --git a/e2e/staticpvc.go b/e2e/staticpvc.go
@@ -323,7 +323,7 @@ func validateRBDStaticMigrationPVC(f *framework.Framework, appPath, scName strin
 }
 
 //nolint:gocyclo,cyclop // reduce complexity
-func validateCephFsStaticPV(f *framework.Framework, appPath, scPath string) error {
+func validateCephFsStaticPV(f *framework.Framework, appPath, scPath, fsName string) error {
 	opt := make(map[string]string)
 	var (
 		cephFsVolName = "testSubVol"
@@ -406,7 +406,9 @@ func validateCephFsStaticPV(f *framework.Framework, appPath, scPath string) erro
 	}
 
 	opt["clusterID"] = fsID
-	opt["fsName"] = fileSystemName
+	if fsName != "" {
+		opt["fsName"] = fsName
+	}
 	opt["staticVolume"] = strconv.FormatBool(true)
 	opt["rootPath"] = rootPath
 	pv := getStaticPV(