[airavata] branch develop updated: Adding api host and port to the load config

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 59e7ba7  Adding api host and port to the load config
59e7ba7 is described below

commit 59e7ba74fbf445a104a35ddc99f5d1e5ca732e11
Author: Dimuthu Wannipurage <di...@datasprouts.com>
AuthorDate: Fri Nov 16 15:22:02 2018 -0500

    Adding api host and port to the load config
---
 .../apache/airavata/tools/load/Configurations.java | 18 ++++++++++++++++
 .../org/apache/airavata/tools/load/LoadClient.java | 24 +++++-----------------
 .../src/main/resources/conf/load-config.yml        |  2 ++
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/tools/load-client/src/main/java/org/apache/airavata/tools/load/Configurations.java b/tools/load-client/src/main/java/org/apache/airavata/tools/load/Configurations.java
index b267f1f..ca4c249 100644
--- a/tools/load-client/src/main/java/org/apache/airavata/tools/load/Configurations.java
+++ b/tools/load-client/src/main/java/org/apache/airavata/tools/load/Configurations.java
@@ -5,6 +5,8 @@ import org.apache.airavata.tools.load.Configuration;
 import java.util.List;
 
 public class Configurations {
+    private String apiHost;
+    private int apiPort;
     private List<Configuration> configurations;
 
     public List<Configuration> getConfigurations() {
@@ -14,4 +16,20 @@ public class Configurations {
     public void setConfigurations(List<Configuration> configurations) {
         this.configurations = configurations;
     }
+
+    public String getApiHost() {
+        return apiHost;
+    }
+
+    public void setApiHost(String apiHost) {
+        this.apiHost = apiHost;
+    }
+
+    public int getApiPort() {
+        return apiPort;
+    }
+
+    public void setApiPort(int apiPort) {
+        this.apiPort = apiPort;
+    }
 }
diff --git a/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java b/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java
index 283499a..e7186da 100644
--- a/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java
+++ b/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java
@@ -16,9 +16,6 @@ import java.util.concurrent.CompletionService;
 
 public class LoadClient {
 
-    private String apiHost;
-    private int apiPort = 9930;
-
     private String privateKeyFile = System.getProperty("user.home") + "/.ssh/id_rsa";
     private String publicKeyFile = System.getProperty("user.home") + "/.ssh/id_rsa.pub";
     private String passPhrase = null;
@@ -29,7 +26,6 @@ public class LoadClient {
     private Configurations configurations;
 
     public void init() throws Exception {
-        securityManager.loadCertificate(apiHost, apiPort);
 
         if (configFile == null) {
             try (InputStream in = LoadClient.class.getResourceAsStream("/conf/load-config.yml")) {
@@ -44,11 +40,14 @@ public class LoadClient {
                 createStorageResourceManagers(configurations);
             }
         }
+
+        securityManager.loadCertificate(configurations.getApiHost(), configurations.getApiPort());
     }
 
     public void start() throws Exception {
         for (Configuration configuration : configurations.getConfigurations()) {
-            UnitLoad unitLoad = new UnitLoad(apiHost, apiPort, securityManager.getTrustStorePath(), securityManager.getTrustStorePassword(),
+            UnitLoad unitLoad = new UnitLoad(configurations.getApiHost(), configurations.getApiPort(),
+                    securityManager.getTrustStorePath(), securityManager.getTrustStorePassword(),
                     storageResourceManagerStore.get(configuration.getStorageResourceId()));
             CompletionService<Boolean> completion = unitLoad.execute(configuration);
 
@@ -63,7 +62,7 @@ public class LoadClient {
 
     private void createStorageResourceManagers(Configurations configurations) throws Exception {
 
-        Airavata.Client airavataClient = AiravataClientFactory.createAiravataSecureClient(apiHost, apiPort,
+        Airavata.Client airavataClient = AiravataClientFactory.createAiravataSecureClient(configurations.getApiHost(), configurations.getApiPort(),
                 securityManager.getTrustStorePath(), securityManager.getTrustStorePassword(), 100000);
 
         for (Configuration configuration : configurations.getConfigurations()) {
@@ -105,19 +104,6 @@ public class LoadClient {
             System.exit(0);
         }
 
-        if (cmd.hasOption("apiHost")) {
-            loadClient.apiHost = cmd.getOptionValue("apiHost");
-        } else {
-            System.out.println("Error : API host should be specified");
-            System.exit(0);
-        }
-
-        if (cmd.hasOption("apiPort")) {
-            loadClient.apiPort = Integer.parseInt(cmd.getOptionValue("apiPort"));
-        } else {
-            System.out.println("Using default API port " + loadClient.apiPort);
-        }
-
         if (cmd.hasOption("privateKeyPath")) {
             loadClient.privateKeyFile = cmd.getOptionValue("privateKeyPath");
         } else {
diff --git a/tools/load-client/src/main/resources/conf/load-config.yml b/tools/load-client/src/main/resources/conf/load-config.yml
index a193c36..16654a2 100644
--- a/tools/load-client/src/main/resources/conf/load-config.yml
+++ b/tools/load-client/src/main/resources/conf/load-config.yml
@@ -1,3 +1,5 @@
+apiHost: 149.165.170.103
+apiPort: 9930
 configurations:
   - experimentBaseName: "LoadTest"
     userId: "dimuthu"