e2e: Make getConfigFile() generic

Update the getConfigFile() function to allow any file to be looked
at on the preferred location first and fall back to the alternate
location if it does not exist there.

Signed-off-by: karthik-us <ksubrahm@redhat.com>

e2e/cephfs.go

@@ -67,7 +67,7 @@ func deleteCephfsPlugin() {
 }
 
 func createORDeleteCephfsResources(action kubectlAction) {
-	cephConfigFile := getConfigFile(deployPath + cephConfconfigMap)
+	cephConfigFile := getConfigFile(cephConfconfigMap, deployPath, examplePath)
 	resources := []ResourceDeployer{
 		// shared resources
 		&yamlResource{

e2e/nfs.go

@@ -79,7 +79,7 @@ func deleteNFSPlugin() {
 }
 
 func createORDeleteNFSResources(f *framework.Framework, action kubectlAction) {
-	cephConfigFile := getConfigFile(deployPath + cephConfconfigMap)
+	cephConfigFile := getConfigFile(cephConfconfigMap, deployPath, examplePath)
 	resources := []ResourceDeployer{
 		// shared resources
 		&yamlResource{

e2e/rbd.go

@@ -130,7 +130,7 @@ func deleteRBDPlugin() {
 }
 
 func createORDeleteRbdResources(action kubectlAction) {
-	cephConfigFile := getConfigFile(deployPath + cephConfconfigMap)
+	cephConfigFile := getConfigFile(cephConfconfigMap, deployPath, examplePath)
 	resources := []ResourceDeployer{
 		// shared resources
 		&yamlResource{

e2e/utils.go

@@ -1733,11 +1733,12 @@ func rwopMayFail(err error) bool {
 	return !rwopSupported
 }
 
-// getConfigFile returns the passed config file location if it exists, else
-// returns the old location of the config file under 'examples/' directory.
-func getConfigFile(configFile string) string {
+// getConfigFile returns the config file path at the preferred location if it
+// exists there. Returns the fallback location otherwise.
+func getConfigFile(filename, preferred, fallback string) string {
+	configFile := preferred + filename
 	if _, err := os.Stat(configFile); os.IsNotExist(err) {
-		configFile = examplePath + cephConfconfigMap
+		configFile = fallback + filename
 	}
 
 	return configFile