addressed pull request review comments for PR#243

- Reverted changes of NFS, Connector, SSH as they should not be part of epic1
changes.
- Added variable for SpectrumScaleParamPrefix

local/spectrumscale/connectors/connectors.go

@@ -54,6 +54,17 @@ const (
 )
 
 func GetSpectrumScaleConnector(logger *log.Logger, config resources.SpectrumScaleConfig) (SpectrumScaleConnector, error) {
-	logger.Printf("Initializing SpectrumScale REST connector\n")
-	return NewSpectrumRestV2(logger, config.RestConfig)
+	if config.RestConfig.ManagementIP != "" {
+		logger.Printf("Initializing SpectrumScale REST connector\n")
+		return NewSpectrumRestV2(logger, config.RestConfig)
+	}
+	if config.SshConfig.User != "" && config.SshConfig.Host != "" {
+		if config.SshConfig.Port == "" || config.SshConfig.Port == "0" {
+			config.SshConfig.Port = "22"
+		}
+		logger.Printf("Initializing SpectrumScale SSH connector with sshConfig: %+v\n", config.SshConfig)
+		return NewSpectrumSSH(logger, config.SshConfig)
+	}
+	logger.Println("Initializing SpectrumScale MMCLI Connector")
+	return NewSpectrumMMCLI(logger)
 }

resources/resources.go

@@ -86,7 +86,7 @@ const DefaultDbSslMode = SslModeVerifyFull
 const DefaultScbeSslMode = SslModeVerifyFull
 const DefaultPluginsSslMode = SslModeVerifyFull
 const SpectrumscaleDefaultPort = 443                              // the default port for SPECTRUM SCALE management
-
+const SpectrumScaleParamPrefix = "SPECTRUMSCALE_"
 
 type SshConfig struct {
 	User string

utils/utils.go

@@ -225,21 +225,28 @@ func LoadConfig() (resources.UbiquityServerConfig, error) {
 	config.LogLevel = os.Getenv("LOG_LEVEL")
 
 	sscConfig := resources.SpectrumScaleConfig{}
+	sshConfig := resources.SshConfig{}
+	sshConfig.User = os.Getenv("SSC_SSH_USER")
+	sshConfig.Host = os.Getenv("SSC_SSH_HOST")
+	sshConfig.Port = os.Getenv("SSC_SSH_PORT")
+	if sshConfig.User != "" && sshConfig.Host != "" && sshConfig.Port != "" {
+		sscConfig.SshConfig = sshConfig
+	}
 	restConfig := resources.RestConfig{}
-	restConfig.User = os.Getenv("SPECTRUMSCALE_REST_USER")
-	restConfig.Password = os.Getenv("SPECTRUMSCALE_REST_PASSWORD")
-	restConfig.Hostname = os.Getenv("SPECTRUMSCALE_REST_HOSTNAME")
-	restConfig.ManagementIP = os.Getenv("SPECTRUMSCALE_MANAGEMENT_IP")
-	spectrumscalePort, err := strconv.ParseInt(os.Getenv("SPECTRUMSCALE_MANAGEMENT_PORT"), 0, 32)
+	restConfig.User = os.Getenv(resources.SpectrumScaleParamPrefix + "REST_USER")
+	restConfig.Password = os.Getenv(resources.SpectrumScaleParamPrefix + "REST_PASSWORD")
+	restConfig.Hostname = os.Getenv(resources.SpectrumScaleParamPrefix + "REST_HOSTNAME")
+	restConfig.ManagementIP = os.Getenv(resources.SpectrumScaleParamPrefix + "MANAGEMENT_IP")
+	spectrumscalePort, err := strconv.ParseInt(os.Getenv(resources.SpectrumScaleParamPrefix + "MANAGEMENT_PORT"), 0, 32)
 	if err != nil {
 		restConfig.Port = resources.SpectrumscaleDefaultPort
 	} else {
 		restConfig.Port = int(spectrumscalePort)
 	}
 	sscConfig.RestConfig = restConfig
-	sscConfig.DefaultFilesystemName = os.Getenv("SPECTRUMSCALE_DEFAULT_FILESYSTEM_NAME")
-	sscConfig.NfsServerAddr = os.Getenv("SPECTRUMSCALE_NFS_SERVER_ADDRESS")
-	forceDelete, err := strconv.ParseBool(os.Getenv("SPECTRUMSCALE_FORCE_DELETE"))
+	sscConfig.DefaultFilesystemName = os.Getenv(resources.SpectrumScaleParamPrefix + "DEFAULT_FILESYSTEM_NAME")
+	sscConfig.NfsServerAddr = os.Getenv("SSC_NFS_SERVER_ADDRESS")
+	forceDelete, err := strconv.ParseBool(os.Getenv(resources.SpectrumScaleParamPrefix + "FORCE_DELETE"))
 	if err != nil {
 		sscConfig.ForceDelete = false
 	} else {