From 33899663e15c56235ca38c20f51f8a651aaa3449 Mon Sep 17 00:00:00 2001
From: Rakshith R <rar@redhat.com>
Date: Fri, 16 Jul 2021 18:46:36 +0530
Subject: [PATCH] e2e: add prefixname to rbd controller test

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit 0744ad502bcdfab82cc14cad0dec61813042ef4f)
---
 e2e/rbd.go   | 14 ++++++++++----
 e2e/utils.go | 11 ++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/e2e/rbd.go b/e2e/rbd.go
index a809a3868..cf6ea789e 100644
--- a/e2e/rbd.go
+++ b/e2e/rbd.go
@@ -2354,17 +2354,23 @@ var _ = Describe("RBD", func() {
 			By("validate the functionality of controller", func() {
 				err := deleteResource(rbdExamplePath + "storageclass.yaml")
 				if err != nil {
-					e2elog.Failf("failed to delete storageclass with error %v", err)
+					e2elog.Failf("failed to delete storageclass : %v", err)
 				}
-				err = validateController(f, pvcPath, appPath, rbdExamplePath+"storageclass.yaml")
+				scParams := map[string]string{
+					"volumeNamePrefix": "test-",
+				}
+				err = validateController(f,
+					pvcPath, appPath, rbdExamplePath+"storageclass.yaml",
+					nil,
+					scParams)
 				if err != nil {
-					e2elog.Failf("failed to validate controller with error %v", err)
+					e2elog.Failf("failed to validate controller : %v", err)
 				}
 				// validate created backend rbd images
 				validateRBDImageCount(f, 0, defaultRBDPool)
 				err = createRBDStorageClass(f.ClientSet, f, defaultSCName, nil, nil, deletePolicy)
 				if err != nil {
-					e2elog.Failf("failed to create storageclass with error %v", err)
+					e2elog.Failf("failed to create storageclass : %v", err)
 				}
 			})
 
diff --git a/e2e/utils.go b/e2e/utils.go
index 8431a8fd2..471fcec13 100644
--- a/e2e/utils.go
+++ b/e2e/utils.go
@@ -1045,13 +1045,17 @@ func validatePVCSnapshot(
 // Mount the PVC to application (NodeStage/NodePublish should work)
 // Resize the PVC
 // Delete the Application and PVC.
-func validateController(f *framework.Framework, pvcPath, appPath, scPath string) error {
+func validateController(
+	f *framework.Framework,
+	pvcPath, appPath, scPath string,
+	scOptions, scParams map[string]string) error {
 	size := "1Gi"
 	poolName := defaultRBDPool
 	expandSize := "10Gi"
 	var err error
 	// create storageclass with retain
-	err = createRBDStorageClass(f.ClientSet, f, defaultSCName, nil, nil, retainPolicy)
+	err = createRBDStorageClass(f.ClientSet, f, defaultSCName, scOptions, scParams,
+		retainPolicy)
 	if err != nil {
 		return fmt.Errorf("failed to create storageclass: %w", err)
 	}
@@ -1083,7 +1087,8 @@ func validateController(f *framework.Framework, pvcPath, appPath, scPath string)
 	if err != nil {
 		return fmt.Errorf("failed to delete storageclass: %w", err)
 	}
-	err = createRBDStorageClass(f.ClientSet, f, defaultSCName, nil, nil, deletePolicy)
+	err = createRBDStorageClass(f.ClientSet, f, defaultSCName, scOptions, scParams,
+		deletePolicy)
 	if err != nil {
 		return fmt.Errorf("failed to create storageclass: %w", err)
 	}