e2e: correct failure logging for NFS

Some of the steps still refer to CephFS, likely missed some replacements
while copy/pasting. The logging is a little confusing when messages
claim something with CephFS failed, but the test is about NFS.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2022-07-21 11:26:45 +02:00 committed by mergify[bot]
parent f0074a3ebf
commit a6cd56ae7e

View File

@ -373,7 +373,7 @@ var _ = Describe("nfs", func() {
By("verify RWOP volume support", func() { By("verify RWOP volume support", func() {
err := createNFSStorageClass(f.ClientSet, f, false, nil) err := createNFSStorageClass(f.ClientSet, f, false, nil)
if err != nil { if err != nil {
e2elog.Failf("failed to create CephFS storageclass: %v", err) e2elog.Failf("failed to create NFS storageclass: %v", err)
} }
pvc, err := loadPVC(pvcRWOPPath) pvc, err := loadPVC(pvcRWOPPath)
if err != nil { if err != nil {
@ -411,40 +411,40 @@ var _ = Describe("nfs", func() {
validateSubvolumeCount(f, 0, fileSystemName, defaultSubvolumegroup) validateSubvolumeCount(f, 0, fileSystemName, defaultSubvolumegroup)
err = deleteResource(nfsExamplePath + "storageclass.yaml") err = deleteResource(nfsExamplePath + "storageclass.yaml")
if err != nil { if err != nil {
e2elog.Failf("failed to delete CephFS storageclass: %v", err) e2elog.Failf("failed to delete NFS storageclass: %v", err)
} }
}) })
By("create a storageclass with pool and a PVC then bind it to an app", func() { By("create a storageclass with pool and a PVC then bind it to an app", func() {
err := createNFSStorageClass(f.ClientSet, f, false, nil) err := createNFSStorageClass(f.ClientSet, f, false, nil)
if err != nil { if err != nil {
e2elog.Failf("failed to create CephFS storageclass: %v", err) e2elog.Failf("failed to create NFS storageclass: %v", err)
} }
err = validatePVCAndAppBinding(pvcPath, appPath, f) err = validatePVCAndAppBinding(pvcPath, appPath, f)
if err != nil { if err != nil {
e2elog.Failf("failed to validate CephFS pvc and application binding: %v", err) e2elog.Failf("failed to validate NFS pvc and application binding: %v", err)
} }
err = deleteResource(nfsExamplePath + "storageclass.yaml") err = deleteResource(nfsExamplePath + "storageclass.yaml")
if err != nil { if err != nil {
e2elog.Failf("failed to delete CephFS storageclass: %v", err) e2elog.Failf("failed to delete NFS storageclass: %v", err)
} }
}) })
By("create a PVC and bind it to an app", func() { By("create a PVC and bind it to an app", func() {
err := createNFSStorageClass(f.ClientSet, f, false, nil) err := createNFSStorageClass(f.ClientSet, f, false, nil)
if err != nil { if err != nil {
e2elog.Failf("failed to create CephFS storageclass: %v", err) e2elog.Failf("failed to create NFS storageclass: %v", err)
} }
err = validatePVCAndAppBinding(pvcPath, appPath, f) err = validatePVCAndAppBinding(pvcPath, appPath, f)
if err != nil { if err != nil {
e2elog.Failf("failed to validate CephFS pvc and application binding: %v", err) e2elog.Failf("failed to validate NFS pvc and application binding: %v", err)
} }
}) })
By("create a PVC and bind it to an app with normal user", func() { By("create a PVC and bind it to an app with normal user", func() {
err := validateNormalUserPVCAccess(pvcPath, f) err := validateNormalUserPVCAccess(pvcPath, f)
if err != nil { if err != nil {
e2elog.Failf("failed to validate normal user CephFS pvc and application binding: %v", err) e2elog.Failf("failed to validate normal user NFS pvc and application binding: %v", err)
} }
}) })