e2e: Add PVC validator to ByFileAndBlockEncryption

Signed-off-by: Marcel Lauhoff <marcel.lauhoff@suse.com>
This commit is contained in:
Marcel Lauhoff
2022-08-04 18:12:33 +02:00
committed by mergify[bot]
parent 0f626b705a
commit 7db0c3bfbf
3 changed files with 17 additions and 6 deletions

View File

@ -235,10 +235,10 @@ func checkClusternameInMetadata(f *framework.Framework, ns, pool, image string)
// ByFileAndBlockEncryption wraps ginkgo's By to run the test body using file and block encryption specific validators.
func ByFileAndBlockEncryption(
text string,
callback func(validator encryptionValidateFunc, encryptionType string),
callback func(validator encryptionValidateFunc, pvcValidator validateFunc, encryptionType string),
) {
By(text+" (block)", func() { callback(validateEncryptedPVCAndAppBinding, "block") })
By(text+" (file)", func() { callback(validateEncryptedFilesystemAndAppBinding, "file") })
By(text+" (block)", func() { callback(validateEncryptedPVCAndAppBinding, isBlockEncryptedPVC, "block") })
By(text+" (file)", func() { callback(validateEncryptedFilesystemAndAppBinding, isFileEncryptedPVC, "file") })
}
var _ = Describe("RBD", func() {