Merge branch 'sftp-bug' into 'master'

fix sftp observer bug for locations that involve host/port

See merge request DM/data-management!3

src/python/dm/daq_web_service/service/impl/sftpFileSystemObserverAgent.py

@@ -20,14 +20,14 @@ class SftpFileSystemObserverAgent(PollingFileSystemObserverAgent):
     def getFiles(self, dataDirectory):
         (scheme, host, port, dirPath) = SftpUtility.parseFtpUrl(dataDirectory, defaultHost=self.host, defaultPort=self.port)
         remotePrefix = SftpUtility.getRemotePrefix(dataDirectory)
-        self.logger.debug('Retrieving files from SFTP host: %s, port: %s, directory path: %s, remote prefix: %s' % (host, port, dirPath, remotePrefix))
-        sftpUtility = SftpUtility(host, port, self.username, self.password, self.privateKey)
+        self.logger.debug('Retrieving files from SFTP host: %s, port: %s, directory path: %s, remote prefix: %s' % (self.host, self.port, dirPath, remotePrefix))
+        sftpUtility = SftpUtility(self.host, self.port, self.username, self.password, self.privateKey)
         return sftpUtility.getFiles(dirPath, {}, filePathPrefix=remotePrefix)
 
     def getFile(self, filePath):
         (scheme, host, port, fPath) = SftpUtility.parseFtpUrl(filePath, defaultHost=self.host, defaultPort=self.port)
         remotePrefix = SftpUtility.getRemotePrefix(filePath)
-        self.logger.debug('Retrieving file from SFTP host: %s, port: %s, directory path: %s, remote prefix: %s' % (host, port, dirPath, remotePrefix))
-        sftpUtility = SftpUtility(host, port, self.username, self.password, self.privateKey)
+        self.logger.debug('Retrieving file from SFTP host: %s, port: %s, directory path: %s, remote prefix: %s' % (self.host, self.port, dirPath, remotePrefix))
+        sftpUtility = SftpUtility(self.host, self.port, self.username, self.password, self.privateKey)
         return sftpUtility.getFile(fPath, filePathPrefix=remotePrefix)