airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] branch group-based-auth updated: AIRAVATA-2801 Move GATEWAY_INSTANCE_ID to correct Entity
Date Tue, 05 Jun 2018 13:52:47 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/group-based-auth by this push:
     new 931b425  AIRAVATA-2801 Move GATEWAY_INSTANCE_ID to correct Entity
931b425 is described below

commit 931b425d7d9dc543c5168e8f4173d4769b12fd0f
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Tue Jun 5 09:51:19 2018 -0400

    AIRAVATA-2801 Move GATEWAY_INSTANCE_ID to correct Entity
---
 .../registry/core/entities/expcatalog/ExperimentEntity.java   | 11 +++++++++++
 .../registry/core/entities/expcatalog/ProcessEntity.java      | 11 -----------
 .../src/main/resources/expcatalog-mysql.sql                   |  2 +-
 .../repositories/expcatalog/ExperimentRepositoryTest.java     |  2 ++
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
index b148d81..876a757 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
@@ -67,6 +67,9 @@ public class ExperimentEntity implements Serializable {
     @Column(name = "GATEWAY_EXECUTION_ID")
     public String gatewayExecutionId;
 
+    @Column(name = "GATEWAY_INSTANCE_ID")
+    public String gatewayInstanceId;
+
     @Column(name = "ENABLE_EMAIL_NOTIFICATION")
     public boolean enableEmailNotification;
 
@@ -181,6 +184,14 @@ public class ExperimentEntity implements Serializable {
         this.gatewayExecutionId = gatewayExecutionId;
     }
 
+    public String getGatewayInstanceId() {
+        return gatewayInstanceId;
+    }
+
+    public void setGatewayInstanceId(String gatewayInstanceId) {
+        this.gatewayInstanceId = gatewayInstanceId;
+    }
+
     public boolean isEnableEmailNotification() {
         return enableEmailNotification;
     }
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
index 8872b4d..4985102 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
@@ -67,9 +67,6 @@ public class ProcessEntity implements Serializable {
     @Column(name = "GATEWAY_EXECUTION_ID")
     private String gatewayExecutionId;
 
-    @Column(name = "GATEWAY_INSTANCE_ID")
-    private String gatewayInstanceId;
-
     @Column(name = "ENABLE_EMAIL_NOTIFICATION")
     private boolean enableEmailNotification;
 
@@ -209,14 +206,6 @@ public class ProcessEntity implements Serializable {
         this.gatewayExecutionId = gatewayExecutionId;
     }
 
-    public String getGatewayInstanceId() {
-        return gatewayInstanceId;
-    }
-
-    public void setGatewayInstanceId(String gatewayInstanceId) {
-        this.gatewayInstanceId = gatewayInstanceId;
-    }
-
     public boolean isEnableEmailNotification() {
         return enableEmailNotification;
     }
diff --git a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
index d078cad..c641bb6 100644
--- a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
@@ -106,6 +106,7 @@ CREATE TABLE EXPERIMENT (
         DESCRIPTION varchar(255),
         EXECUTION_ID varchar(255),
         GATEWAY_EXECUTION_ID varchar(255),
+        GATEWAY_INSTANCE_ID varchar(255),
         ENABLE_EMAIL_NOTIFICATION tinyint(1),
         EMAIL_ADDRESSES text,
         PRIMARY KEY (EXPERIMENT_ID),
@@ -228,7 +229,6 @@ CREATE TABLE PROCESS (
         APPLICATION_DEPLOYMENT_ID varchar(255),
         COMPUTE_RESOURCE_ID varchar(255),
         GATEWAY_EXECUTION_ID varchar(255),
-        GATEWAY_INSTANCE_ID varchar(255),
         ENABLE_EMAIL_NOTIFICATION BOOLEAN,
         EMAIL_ADDRESSES TEXT,
         STORAGE_RESOURCE_ID varchar(255),
diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
index d79d7b3..e59709a 100644
--- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
+++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
@@ -86,6 +86,7 @@ public class ExperimentRepositoryTest {
         experimentModel.setExperimentType(ExperimentType.SINGLE_APPLICATION);
         experimentModel.setUserName("user");
         experimentModel.setExperimentName("name");
+        experimentModel.setGatewayInstanceId("gateway-instance-id");
 
         String experimentId = experimentRepository.addExperiment(experimentModel);
         assertTrue(experimentId != null);
@@ -96,6 +97,7 @@ public class ExperimentRepositoryTest {
         ExperimentModel retrievedExperimentModel = experimentRepository.getExperiment(experimentId);
         assertEquals(experimentModel.getDescription(), retrievedExperimentModel.getDescription());
         assertEquals(ExperimentType.SINGLE_APPLICATION, retrievedExperimentModel.getExperimentType());
+        assertEquals("gateway-instance-id", retrievedExperimentModel.getGatewayInstanceId());
 
         UserConfigurationDataModel userConfigurationDataModel = new UserConfigurationDataModel();
         userConfigurationDataModel.setAiravataAutoSchedule(true);

-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.

Mime
View raw message