From 92866f46fdaf4c8c8caaa0055ec4fd7215b08e98 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 7 Apr 2022 17:36:45 +0200 Subject: [PATCH] e2e: allow passing CephFS filesystem name on CLI A new -filesystem=... option has been added so that the e2e tests can run against environments that do not have a "myfs" CephFS filesystem. Signed-off-by: Niels de Vos --- e2e/README.md | 1 + e2e/cephfs_helper.go | 4 ++-- e2e/e2e_test.go | 1 + e2e/staticpvc.go | 13 ++++++------- e2e/utils.go | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/e2e/README.md b/e2e/README.md index 8dccda124..22765f706 100644 --- a/e2e/README.md +++ b/e2e/README.md @@ -101,6 +101,7 @@ are available while running tests: | kubeconfig | Path to kubeconfig containing embedded authinfo (default: $HOME/.kube/config) | | timeout | Panic test binary after duration d (default 0, timeout disabled) | | v | Verbose: print additional output | +| filesystem | Name of the CephFS filesystem (default: "myfs") | ## E2E for snapshot diff --git a/e2e/cephfs_helper.go b/e2e/cephfs_helper.go index e9d7bfd13..7ceadf6d8 100644 --- a/e2e/cephfs_helper.go +++ b/e2e/cephfs_helper.go @@ -40,7 +40,7 @@ const ( // validateSubvolumegroup validates whether subvolumegroup is present. func validateSubvolumegroup(f *framework.Framework, subvolgrp string) error { - cmd := fmt.Sprintf("ceph fs subvolumegroup getpath myfs %s", subvolgrp) + cmd := fmt.Sprintf("ceph fs subvolumegroup getpath %s %s", fileSystemName, subvolgrp) stdOut, stdErr, err := execCommandInToolBoxPod(f, cmd, rookNamespace) if err != nil { return fmt.Errorf("failed to exec command in toolbox: %w", err) @@ -67,7 +67,7 @@ func createCephfsStorageClass( if err != nil { return err } - sc.Parameters["fsName"] = "myfs" + sc.Parameters["fsName"] = fileSystemName sc.Parameters["csi.storage.k8s.io/provisioner-secret-namespace"] = cephCSINamespace sc.Parameters["csi.storage.k8s.io/provisioner-secret-name"] = cephFSProvisionerSecretName diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index f9dc4a0a6..01b4d0dbb 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -43,6 +43,7 @@ func init() { flag.StringVar(&upgradeVersion, "upgrade-version", "v3.5.1", "target version for upgrade testing") flag.StringVar(&cephCSINamespace, "cephcsi-namespace", defaultNs, "namespace in which cephcsi deployed") flag.StringVar(&rookNamespace, "rook-namespace", "rook-ceph", "namespace in which rook is deployed") + flag.StringVar(&fileSystemName, "filesystem", "myfs", "CephFS filesystem to use") setDefaultKubeconfig() // Register framework flags, then handle flags diff --git a/e2e/staticpvc.go b/e2e/staticpvc.go index 4e75a051d..c3ad075bd 100644 --- a/e2e/staticpvc.go +++ b/e2e/staticpvc.go @@ -331,7 +331,6 @@ func validateCephFsStaticPV(f *framework.Framework, appPath, scPath string) erro var ( cephFsVolName = "testSubVol" groupName = "testGroup" - fsName = "myfs" pvName = "pv-name" pvcName = "pvc-name" namespace = f.UniqueName @@ -361,7 +360,7 @@ func validateCephFsStaticPV(f *framework.Framework, appPath, scPath string) erro size := "4294967296" // create subvolumegroup, command will work even if group is already present. - cmd := fmt.Sprintf("ceph fs subvolumegroup create %s %s", fsName, groupName) + cmd := fmt.Sprintf("ceph fs subvolumegroup create %s %s", fileSystemName, groupName) _, e, err = execCommandInPod(f, cmd, rookNamespace, &listOpt) if err != nil { @@ -372,7 +371,7 @@ func validateCephFsStaticPV(f *framework.Framework, appPath, scPath string) erro } // create subvolume - cmd = fmt.Sprintf("ceph fs subvolume create %s %s %s --size %s", fsName, cephFsVolName, groupName, size) + cmd = fmt.Sprintf("ceph fs subvolume create %s %s %s --size %s", fileSystemName, cephFsVolName, groupName, size) _, e, err = execCommandInPod(f, cmd, rookNamespace, &listOpt) if err != nil { return err @@ -382,7 +381,7 @@ func validateCephFsStaticPV(f *framework.Framework, appPath, scPath string) erro } // get rootpath - cmd = fmt.Sprintf("ceph fs subvolume getpath %s %s %s", fsName, cephFsVolName, groupName) + cmd = fmt.Sprintf("ceph fs subvolume getpath %s %s %s", fileSystemName, cephFsVolName, groupName) rootPath, e, err := execCommandInPod(f, cmd, rookNamespace, &listOpt) if err != nil { return err @@ -415,7 +414,7 @@ func validateCephFsStaticPV(f *framework.Framework, appPath, scPath string) erro } opt["clusterID"] = fsID - opt["fsName"] = fsName + opt["fsName"] = fileSystemName opt["staticVolume"] = strconv.FormatBool(true) opt["rootPath"] = rootPath pv := getStaticPV( @@ -474,7 +473,7 @@ func validateCephFsStaticPV(f *framework.Framework, appPath, scPath string) erro } // delete subvolume - cmd = fmt.Sprintf("ceph fs subvolume rm %s %s %s", fsName, cephFsVolName, groupName) + cmd = fmt.Sprintf("ceph fs subvolume rm %s %s %s", fileSystemName, cephFsVolName, groupName) _, e, err = execCommandInPod(f, cmd, rookNamespace, &listOpt) if err != nil { return err @@ -484,7 +483,7 @@ func validateCephFsStaticPV(f *framework.Framework, appPath, scPath string) erro } // delete subvolume group - cmd = fmt.Sprintf("ceph fs subvolumegroup rm %s %s", fsName, groupName) + cmd = fmt.Sprintf("ceph fs subvolumegroup rm %s %s", fileSystemName, groupName) _, e, err = execCommandInPod(f, cmd, rookNamespace, &listOpt) if err != nil { return err diff --git a/e2e/utils.go b/e2e/utils.go index 8bc873d5f..5167d65d2 100644 --- a/e2e/utils.go +++ b/e2e/utils.go @@ -526,7 +526,7 @@ func pvcDeleteWhenPoolNotFound(pvcPath string, cephFS bool, f *framework.Framewo return err } // delete cephFS filesystem - err = deletePool("myfs", cephFS, f) + err = deletePool(fileSystemName, cephFS, f) if err != nil { return err }