You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/07/16 20:47:43 UTC
airavata git commit: credential store functions added to airavata api
Repository: airavata
Updated Branches:
refs/heads/airavata-0.15-release-branch 53a0da454 -> fd4011108
credential store functions added to airavata api
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fd401110
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fd401110
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fd401110
Branch: refs/heads/airavata-0.15-release-branch
Commit: fd40111089928d4b3b9b801aec24d50cb123edf4
Parents: 53a0da4
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Jul 16 14:47:38 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Jul 16 14:47:38 2015 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 14 +++++++++++++-
.../store/server/CredentialStoreServer.java | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd401110/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 9e92e32..e9cc3d9 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -81,13 +81,25 @@ public class CreateLaunchExperiment {
public static void main(String[] args) throws Exception {
airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavataClient.getAPIVersion());
+// testCredentialStore();
// registerApplications(); // run this only the first time
- createAndLaunchExp();
+// createAndLaunchExp();
}
private static String fsdResourceId;
+ public static void testCredentialStore() throws Exception {
+// String token = airavataClient.generateAndRegisterSSHKeys(DEFAULT_GATEWAY, "admin");
+// System.out.println(token);
+ String sshPubKey = airavataClient.getSSHPubKey("90438471-507d-4a9f-9287-081fc816e0f2", DEFAULT_GATEWAY);
+ System.out.println(sshPubKey);
+ Map<String, String> sshPubKeys = airavataClient.getAllUserSSHPubKeys("admin");
+ for (String token : sshPubKeys.keySet()){
+ System.out.println(token + " : " + sshPubKeys.get(token));
+ }
+ }
+
public static void getAvailableAppInterfaceComputeResources(String appInterfaceId) {
try {
Map<String, String> availableAppInterfaceComputeResources = airavataClient.getAvailableAppInterfaceComputeResources(appInterfaceId);
http://git-wip-us.apache.org/repos/asf/airavata/blob/fd401110/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
index ebed9a1..d799f0c 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
@@ -71,7 +71,7 @@ public class CredentialStoreServer implements IServer {
final String serverHost = ServerSettings.getSetting(Constants.CREDENTIAL_SERVER_HOST, null);
params.setKeyStore(keystorePath, keystorePWD);
- TServerSocket serverTransport = TSSLTransportFactory.getServerSocket(serverPort, 100, InetAddress.getByName(serverHost), params);
+ TServerSocket serverTransport = TSSLTransportFactory.getServerSocket(serverPort, 10000, InetAddress.getByName(serverHost), params);
CredentialStoreService.Processor processor = new CredentialStoreService.Processor(new CredentialStoreServerHandler());