airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [10/14] airavata git commit: adding gateway instance id implementtaions
Date Thu, 03 Mar 2016 18:15:20 GMT
adding gateway instance id implementtaions


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f0c730cd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f0c730cd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f0c730cd

Branch: refs/heads/master
Commit: f0c730cda531633e9c126bde248b3a9843edfe90
Parents: b537f35
Author: smarru <smarru@apache.org>
Authored: Fri Feb 26 16:23:57 2016 -0500
Committer: smarru <smarru@apache.org>
Committed: Fri Feb 26 16:23:57 2016 -0500

----------------------------------------------------------------------
 .../core/experiment/catalog/impl/ExperimentRegistry.java |  2 ++
 .../core/experiment/catalog/model/Experiment.java        | 11 +++++++++++
 .../experiment/catalog/resources/ExperimentResource.java | 11 +++++++++++
 .../core/experiment/catalog/resources/Utils.java         |  1 +
 .../catalog/utils/ThriftDataModelConversion.java         |  1 +
 5 files changed, 26 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/f0c730cd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
index ee0f18a..98dfe91 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
@@ -90,6 +90,7 @@ public class ExperimentRegistry {
             experimentResource.setDescription(experiment.getDescription());
             experimentResource.setExecutionId(experiment.getExecutionId());
             experimentResource.setGatewayExecutionId(experiment.getGatewayExecutionId());
+            experimentResource.setGatewayInstanceId(experiment.getGatewayInstanceId());
             if(experiment.isEnableEmailNotification()){
                 experimentResource.setEnableEmailNotification(true);
                 if(experiment.getEmailAddresses() != null){
@@ -580,6 +581,7 @@ public class ExperimentRegistry {
             existingExperiment.setUserName(experiment.getUserName());
             existingExperiment.setGatewayId(experiment.getGatewayId());
             existingExperiment.setGatewayExecutionId(experiment.getGatewayExecutionId());
+            existingExperiment.setGatewayInstanceId(experiment.getGatewayInstanceId());
             existingExperiment.setProjectId(experiment.getProjectId());
             existingExperiment.setCreationTime(AiravataUtils.getTime(experiment.getCreationTime()));
             existingExperiment.setDescription(experiment.getDescription());

http://git-wip-us.apache.org/repos/asf/airavata/blob/f0c730cd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
index f896316..666d11c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
@@ -41,6 +41,8 @@ public class Experiment {
     private String description;
     private String executionId;
     private String gatewayExecutionId;
+    private String gatewayInstanceId;
+
     private Boolean enableEmailNotification;
     private String emailAddresses;
     private Users user;
@@ -143,6 +145,15 @@ public class Experiment {
         this.gatewayExecutionId = gatewayExecutionId;
     }
 
+    @Column(name = "GATEWAY_INSTANCE_ID")
+    public String getGatewayInstanceId() {
+        return gatewayInstanceId;
+    }
+
+    public void setGatewayInstanceId(String gatewayInstanceId) {
+        this.gatewayInstanceId = gatewayInstanceId;
+    }
+
     @Column(name = "ENABLE_EMAIL_NOTIFICATION")
     public Boolean getEnableEmailNotification() {
         return enableEmailNotification;

http://git-wip-us.apache.org/repos/asf/airavata/blob/f0c730cd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
index 17dfd55..721ec05 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
@@ -50,6 +50,7 @@ public class ExperimentResource extends AbstractExpCatResource {
     private String description;
     private String executionId;
     private String gatewayExecutionId;
+    private String gatewayInstanceId;
     private boolean enableEmailNotification;
     private String emailAddresses;
 
@@ -125,6 +126,14 @@ public class ExperimentResource extends AbstractExpCatResource {
         this.executionId = executionId;
     }
 
+    public String getGatewayInstanceId() {
+        return gatewayInstanceId;
+    }
+
+    public void setGatewayInstanceId(String gatewayInstanceId) {
+        this.gatewayInstanceId = gatewayInstanceId;
+    }
+
     public String getGatewayExecutionId() {
         return gatewayExecutionId;
     }
@@ -149,6 +158,7 @@ public class ExperimentResource extends AbstractExpCatResource {
         this.emailAddresses = emailAddresses;
     }
 
+
     public ExperimentCatResource create(ResourceType type) throws RegistryException{
        switch (type){
            case EXPERIMENT_ERROR:
@@ -506,6 +516,7 @@ public class ExperimentResource extends AbstractExpCatResource {
             experiment.setCreationTime(creationTime);
             experiment.setDescription(description);
             experiment.setExecutionId(executionId);
+            experiment.setGatewayInstanceId(gatewayInstanceId);
             experiment.setGatewayExecutionId(gatewayExecutionId);
             experiment.setEnableEmailNotification(enableEmailNotification);
             experiment.setEmailAddresses(emailAddresses);

http://git-wip-us.apache.org/repos/asf/airavata/blob/f0c730cd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
index c94fef9..d7b15b4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
@@ -422,6 +422,7 @@ public class Utils {
             experimentResource.setDescription(o.getDescription());
             experimentResource.setExecutionId(o.getExecutionId());
             experimentResource.setGatewayExecutionId(o.getGatewayExecutionId());
+            experimentResource.setGatewayInstanceId(o.getGatewayInstanceId());
             experimentResource.setEnableEmailNotification(o.getEnableEmailNotification());
             experimentResource.setEmailAddresses(o.getEmailAddresses());
         }

http://git-wip-us.apache.org/repos/asf/airavata/blob/f0c730cd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index 1ecc37b..1eea10d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -123,6 +123,7 @@ public class ThriftDataModelConversion {
             experiment.setDescription(experimentResource.getDescription());
             experiment.setEnableEmailNotification(experimentResource.getEnableEmailNotification());
             experiment.setGatewayExecutionId(experimentResource.getGatewayExecutionId());
+            experiment.setGatewayInstanceId(experimentResource.getGatewayInstanceId());
             if (experiment.isEnableEmailNotification()){
                 String notificationEmails = experimentResource.getEmailAddresses();
                 experiment.setEmailAddresses(getEmailAddresses(notificationEmails.split(",")));


Mime
View raw message