Repository: airavata Updated Branches: refs/heads/master 7c1034996 -> ac574c942
adding chessis number to database and test issue in CS Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ac574c94 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ac574c94 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ac574c94 Branch: refs/heads/master Commit: ac574c942c91a76bd0d9fccfc9350dfcd29f9cb0 Parents: 7c10349 Author: Chathuri Wimalasena <[email protected]> Authored: Fri Mar 6 10:43:09 2015 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Mar 6 10:43:09 2015 -0500 ---------------------------------------------------------------------- .../store/store/impl/db/CommunityUserDAOTest.java | 4 ++-- .../jpa/model/Computational_Resource_Scheduling.java | 10 ++++++++++ .../jpa/resources/ComputationSchedulingResource.java | 10 ++++++++++ .../persistance/registry/jpa/resources/Utils.java | 1 + .../registry/jpa/utils/ThriftDataModelConversion.java | 1 + .../src/main/resources/registry-derby.sql | 1 + .../src/main/resources/registry-mysql.sql | 1 + .../src/test/resources/registry-derby.sql | 1 + 8 files changed, 27 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/ac574c94/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/CommunityUserDAOTest.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/CommunityUserDAOTest.java b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/CommunityUserDAOTest.java index 8ed8a6a..787cc54 100644 --- a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/CommunityUserDAOTest.java +++ b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/CommunityUserDAOTest.java @@ -45,11 +45,11 @@ public class CommunityUserDAOTest extends DatabaseTestCases { waitTillServerStarts(); String createTable = "CREATE TABLE COMMUNITY_USER\n" + " (\n" - + " GATEWAY_NAME VARCHAR(256) NOT NULL,\n" + + " GATEWAY_ID VARCHAR(256) NOT NULL,\n" + " COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,\n" + " TOKEN_ID VARCHAR(256) NOT NULL,\n" + " COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,\n" - + " PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME, TOKEN_ID)\n" + + " PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)\n" + " )"; String dropTable = "drop table COMMUNITY_USER"; http://git-wip-us.apache.org/repos/asf/airavata/blob/ac574c94/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Computational_Resource_Scheduling.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Computational_Resource_Scheduling.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Computational_Resource_Scheduling.java index 01c0bca..e440510 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Computational_Resource_Scheduling.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Computational_Resource_Scheduling.java @@ -57,6 +57,8 @@ public class Computational_Resource_Scheduling implements Serializable { private int totalPhysicalmemory; @Column(name = "COMPUTATIONAL_PROJECT_ACCOUNT") private String projectName; + @Column(name = "CHESSIS_NAME") + private String chessisName; @ManyToOne(cascade= CascadeType.MERGE) @JoinColumn(name = "EXPERIMENT_ID") @@ -66,6 +68,14 @@ public class Computational_Resource_Scheduling implements Serializable { @JoinColumn(name = "TASK_ID") private TaskDetail task; + public String getChessisName() { + return chessisName; + } + + public void setChessisName(String chessisName) { + this.chessisName = chessisName; + } + public int getSchedulingId() { return schedulingId; } http://git-wip-us.apache.org/repos/asf/airavata/blob/ac574c94/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ComputationSchedulingResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ComputationSchedulingResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ComputationSchedulingResource.java index dae5dd3..7c0327f 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ComputationSchedulingResource.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ComputationSchedulingResource.java @@ -49,6 +49,15 @@ public class ComputationSchedulingResource extends AbstractResource { private Timestamp jobStartTime; private int physicalMemory; private String projectName; + private String chessisName; + + public String getChessisName() { + return chessisName; + } + + public void setChessisName(String chessisName) { + this.chessisName = chessisName; + } public int getSchedulingId() { return schedulingId; @@ -200,6 +209,7 @@ public class ComputationSchedulingResource extends AbstractResource { scheduling.setJobStartTime(jobStartTime); scheduling.setTotalPhysicalmemory(physicalMemory); scheduling.setProjectName(projectName); + scheduling.setChessisName(chessisName); em.persist(scheduling); schedulingId = scheduling.getSchedulingId(); em.getTransaction().commit(); http://git-wip-us.apache.org/repos/asf/airavata/blob/ac574c94/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java index 9add15b..7c4850a 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java @@ -746,6 +746,7 @@ public class Utils { schedulingResource.setJobStartTime(o.getJobStartTime()); schedulingResource.setPhysicalMemory(o.getTotalPhysicalmemory()); schedulingResource.setProjectName(o.getProjectName()); + schedulingResource.setChessisName(o.getChessisName()); } return schedulingResource; http://git-wip-us.apache.org/repos/asf/airavata/blob/ac574c94/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java index 7aec17e..95c0e29 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java @@ -664,6 +664,7 @@ public class ThriftDataModelConversion { scheduling.setJobStartTime((int)csr.getJobStartTime().getTime()); scheduling.setTotalPhysicalMemory(csr.getPhysicalMemory()); scheduling.setComputationalProjectAccount(csr.getProjectName()); + scheduling.setChassisName(csr.getChessisName()); return scheduling; } return null; http://git-wip-us.apache.org/repos/asf/airavata/blob/ac574c94/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql index b7c8a7d..2fd1283 100644 --- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql +++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql @@ -318,6 +318,7 @@ CREATE TABLE COMPUTATIONAL_RESOURCE_SCHEDULING JOB_START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', TOTAL_PHYSICAL_MEMORY INTEGER, COMPUTATIONAL_PROJECT_ACCOUNT VARCHAR(255), + CHESSIS_NAME VARCHAR(255), PRIMARY KEY(RESOURCE_SCHEDULING_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE http://git-wip-us.apache.org/repos/asf/airavata/blob/ac574c94/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql index 442a47b..750067b 100644 --- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql +++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql @@ -319,6 +319,7 @@ CREATE TABLE COMPUTATIONAL_RESOURCE_SCHEDULING JOB_START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', TOTAL_PHYSICAL_MEMORY INTEGER, COMPUTATIONAL_PROJECT_ACCOUNT VARCHAR(255), + CHESSIS_NAME VARCHAR(255), PRIMARY KEY(RESOURCE_SCHEDULING_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE http://git-wip-us.apache.org/repos/asf/airavata/blob/ac574c94/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql index b7c8a7d..2fd1283 100644 --- a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql +++ b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql @@ -318,6 +318,7 @@ CREATE TABLE COMPUTATIONAL_RESOURCE_SCHEDULING JOB_START_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', TOTAL_PHYSICAL_MEMORY INTEGER, COMPUTATIONAL_PROJECT_ACCOUNT VARCHAR(255), + CHESSIS_NAME VARCHAR(255), PRIMARY KEY(RESOURCE_SCHEDULING_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE, FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
