diff --git a/e2e/cephfs.go b/e2e/cephfs.go index 43171537f..6a1de944d 100644 --- 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 index 1bb60f5fe..2391c6747 100644 --- 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(