Fix to pass the gateway name from request. AIRAVATA-1554 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b81daafb Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b81daafb Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b81daafb
Branch: refs/heads/gfac-storm Commit: b81daafbe1dbbe3523e515f137b2ad2fdfa8e684 Parents: 18f338c Author: raminder <[email protected]> Authored: Thu Jan 22 16:38:06 2015 -0500 Committer: raminder <[email protected]> Committed: Thu Jan 22 16:38:06 2015 -0500 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java | 4 ++-- .../java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b81daafb/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java index c3546f0..a3c99ba 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java @@ -74,7 +74,7 @@ public class GFACGSISSHUtils { logger.error("This is a wrong method to invoke to non ssh host types,please check your gfac-config.xml"); } else if (jobProtocol == JobSubmissionProtocol.SSH && sshJobSubmission.getSecurityProtocol() == SecurityProtocol.GSI) { String credentialStoreToken = jobExecutionContext.getCredentialStoreToken(); // this is set by the framework - RequestData requestData = new RequestData(ServerSettings.getDefaultUserGateway()); + RequestData requestData = new RequestData(jobExecutionContext.getGatewayID()); requestData.setTokenId(credentialStoreToken); PBSCluster pbsCluster = null; GSISecurityContext context = null; @@ -84,7 +84,7 @@ public class GFACGSISSHUtils { if (credentialReader != null) { CertificateCredential credential = null; try { - credential = (CertificateCredential) credentialReader.getCredential(ServerSettings.getDefaultUserGateway(), credentialStoreToken); + credential = (CertificateCredential) credentialReader.getCredential(jobExecutionContext.getGatewayID(), credentialStoreToken); requestData.setMyProxyUserName(credential.getCommunityUser().getUserName()); } catch (Exception e) { logger.error(e.getLocalizedMessage()); http://git-wip-us.apache.org/repos/asf/airavata/blob/b81daafb/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java index b3c155d..c9d5f0f 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java @@ -83,7 +83,7 @@ public class GFACSSHUtils { if (securityProtocol == SecurityProtocol.GSI || securityProtocol == SecurityProtocol.SSH_KEYS) { SSHSecurityContext sshSecurityContext = new SSHSecurityContext(); String credentialStoreToken = jobExecutionContext.getCredentialStoreToken(); // this is set by the framework - RequestData requestData = new RequestData(ServerSettings.getDefaultUserGateway()); + RequestData requestData = new RequestData(jobExecutionContext.getGatewayID()); requestData.setTokenId(credentialStoreToken); ServerInfo serverInfo = new ServerInfo(null, jobExecutionContext.getHostName());
