mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-22 14:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: Make getConfigFile() generic

Browse Source 
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>
This commit is contained in:
karthik-us 2023-06-06 18:46:27 +05:30 committed by mergify[bot]
parent 6ac3a4dabc
commit e4e373cd47
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/cephfs.go
View File

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

2
e2e/nfs.go
View File

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

2
e2e/rbd.go
View File

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

9
e2e/utils.go
View File

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