Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8CC9418C43 for ; Tue, 7 Jul 2015 19:39:07 +0000 (UTC) Received: (qmail 95079 invoked by uid 500); 7 Jul 2015 19:39:06 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 95020 invoked by uid 500); 7 Jul 2015 19:39:06 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 94966 invoked by uid 99); 7 Jul 2015 19:39:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jul 2015 19:39:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 70104E3A9C; Tue, 7 Jul 2015 19:39:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Message-Id: <6019974d886b4cd6bafb121b2ac7d3ad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: Added authentication info Date: Tue, 7 Jul 2015 19:39:06 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/master 25a389537 -> 23466997d Added authentication info Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/23466997 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/23466997 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/23466997 Branch: refs/heads/master Commit: 23466997d451f2e862a8cc5fa3db055e5b2128af Parents: 25a3895 Author: Shameera Rathanyaka Authored: Tue Jul 7 15:38:59 2015 -0400 Committer: Shameera Rathanyaka Committed: Tue Jul 7 15:38:59 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/impl/Factory.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/23466997/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java index a2bebc3..d00155d 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java @@ -29,6 +29,7 @@ import org.apache.airavata.gfac.core.GFacEngine; import org.apache.airavata.gfac.core.GFacException; import org.apache.airavata.gfac.core.JobManagerConfiguration; import org.apache.airavata.gfac.core.authentication.AuthenticationInfo; +import org.apache.airavata.gfac.core.authentication.SSHKeyAuthentication; import org.apache.airavata.gfac.core.cluster.RemoteCluster; import org.apache.airavata.gfac.core.cluster.ServerInfo; import org.apache.airavata.gfac.core.config.DataTransferTaskConfig; @@ -188,6 +189,7 @@ public abstract class Factory { for (JobSubmissionInterface jobSubmissionInterface : jobSubmissionInterfaces) { if (jobSubmissionInterface.getJobSubmissionProtocol() == cRP.getPreferredJobSubmissionProtocol()) { jsInterface = jobSubmissionInterface; + break; } } if (jsInterface == null) { @@ -209,13 +211,22 @@ public abstract class Factory { } JobManagerConfiguration jobManagerConfiguration = getJobManagerConfiguration(resourceJobManager); - AuthenticationInfo authenticationInfo = null; - remoteCluster = new HPCRemoteCluster(serverInfo, jobManagerConfiguration, null); + AuthenticationInfo authenticationInfo = getSSHKeyAuthentication(); + remoteCluster = new HPCRemoteCluster(serverInfo, jobManagerConfiguration, authenticationInfo); remoteClusterMap.put(key, remoteCluster); } return remoteCluster; } + private static SSHKeyAuthentication getSSHKeyAuthentication() throws ApplicationSettingsException { + String username = ServerSettings.getSetting("ssh.user"); + String privateKeyFilePath = ServerSettings.getSetting("private.ssh.key"); + String publicKeyFilePath = ServerSettings.getSetting("public.ssh.key"); + String passphrase = ServerSettings.getSetting("ssh.keypass"); + return new SSHKeyAuthentication(username, privateKeyFilePath, + publicKeyFilePath, passphrase); + } + public static JobSubmissionTask getJobSubmissionTask(JobSubmissionProtocol jobSubmissionProtocol) throws GFacException { if (jobSubmissionTask == null) {