Repository: airavata Updated Branches: refs/heads/master 5e81196d1 -> 90c47ded4
adding compute resource related data models - AIRAVATA-1236 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/90c47ded Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/90c47ded Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/90c47ded Branch: refs/heads/master Commit: 90c47ded4e6e162052f317b9b304b870a352a0a3 Parents: 5e81196 Author: Chathuri Wimalasena <[email protected]> Authored: Thu Jun 26 11:45:11 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Thu Jun 26 11:45:11 2014 -0400 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 6 +- .../catalog/data/model/GridFTPDataMovement.java | 82 ++++++++++++++++++++ .../catalog/data/model/SCPDataMovement.java | 12 +-- .../src/main/resources/META-INF/persistence.xml | 1 + .../src/main/resources/appcatalog-derby.sql | 49 +++++++----- .../src/main/resources/appcatalog-mysql.sql | 50 +++++++----- modules/app-catalog/pom.xml | 4 +- 7 files changed, 154 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/90c47ded/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 12f5435..c8c9235 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 @@ -61,12 +61,12 @@ public class CreateLaunchExperiment { AiravataUtils.setExecutionAsClient(); final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT); System.out.println("API version is " + airavata.getAPIVersion()); -// addDescriptors(); + addDescriptors(); // final String expId = createExperimentForSSHHost(airavata); - final String expId = createExperimentForTrestles(airavata); +// final String expId = createExperimentForTrestles(airavata); // final String expId = createExperimentForStampede(airavata); -// final String expId = createExperimentForLocalHost(airavata); + final String expId = createExperimentForLocalHost(airavata); // final String expId = createExperimentForLonestar(airavata); // final String expId = createExperimentWRFTrestles(airavata); System.out.println("Experiment ID : " + expId); http://git-wip-us.apache.org/repos/asf/airavata/blob/90c47ded/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridFTPDataMovement.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridFTPDataMovement.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridFTPDataMovement.java new file mode 100644 index 0000000..b952829 --- /dev/null +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GridFTPDataMovement.java @@ -0,0 +1,82 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.apache.aiaravata.application.catalog.data.model; + +import javax.persistence.*; + +@Entity +@Table(name = "GRID_FTP_DATAMOVEMENT") +public class GridFTPDataMovement { + @Id + @Column(name = "DATA_MOVE_ID") + private String dataMoveID; + @Column(name = "RESOURCE_ID") + private String resourceID; + @Column(name = "SECURITY_PROTOCOL") + private String securityProtocol; + @Column(name = "GRID_FTP_EP") + private String gridFTPEP; + + @ManyToOne(cascade= CascadeType.MERGE) + @JoinColumn(name = "RESOURCE_ID") + private ComputeResource computeResource; + + public String getDataMoveID() { + return dataMoveID; + } + + public void setDataMoveID(String dataMoveID) { + this.dataMoveID = dataMoveID; + } + + public String getResourceID() { + return resourceID; + } + + public void setResourceID(String resourceID) { + this.resourceID = resourceID; + } + + public String getSecurityProtocol() { + return securityProtocol; + } + + public void setSecurityProtocol(String securityProtocol) { + this.securityProtocol = securityProtocol; + } + + public String getGridFTPEP() { + return gridFTPEP; + } + + public void setGridFTPEP(String gridFTPEP) { + this.gridFTPEP = gridFTPEP; + } + + public ComputeResource getComputeResource() { + return computeResource; + } + + public void setComputeResource(ComputeResource computeResource) { + this.computeResource = computeResource; + } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/90c47ded/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SCPDataMovement.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SCPDataMovement.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SCPDataMovement.java index 02478c5..cb24df5 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SCPDataMovement.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/SCPDataMovement.java @@ -31,8 +31,8 @@ public class SCPDataMovement { @Id @Column(name = "DATA_MOVE_ID") private String dataMoveID; - @Column(name = "RESOURCE_JOB_MANAGER") - private String resourceJobManager; + @Column(name = "SECURITY_PROTOCOL") + private String securityProtocol; @Column(name = "SSH_PORT") private int sshPort; @@ -56,12 +56,12 @@ public class SCPDataMovement { this.dataMoveID = dataMoveID; } - public String getResourceJobManager() { - return resourceJobManager; + public String getSecurityProtocol() { + return securityProtocol; } - public void setResourceJobManager(String resourceJobManager) { - this.resourceJobManager = resourceJobManager; + public void setSecurityProtocol(String securityProtocol) { + this.securityProtocol = securityProtocol; } public int getSshPort() { http://git-wip-us.apache.org/repos/asf/airavata/blob/90c47ded/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml b/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml index 5019a6b..5fe0272 100644 --- a/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml +++ b/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml @@ -34,6 +34,7 @@ <class>org.apache.aiaravata.application.catalog.data.model.HostIPAddress</class> <class>org.apache.aiaravata.application.catalog.data.model.JobSubmissionProtocol</class> <class>org.apache.aiaravata.application.catalog.data.model.SCPDataMovement</class> + <class>org.apache.aiaravata.application.catalog.data.model.GridFTPDataMovement</class> <class>org.apache.aiaravata.application.catalog.data.model.SSHSubmission</class> <exclude-unlisted-classes>true</exclude-unlisted-classes> </persistence-unit> http://git-wip-us.apache.org/repos/asf/airavata/blob/90c47ded/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql index 8ab8181..5f3db14 100644 --- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql +++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql @@ -45,24 +45,6 @@ CREATE TABLE HOST_IPADDRESS FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE ); -CREATE TABLE JOB_SUBMISSION_PROTOCOL -( - RESOURCE_ID VARCHAR(255), - SUBMISSION_ID VARCHAR(255), - JOB_TYPE VARCHAR(255), - PRIMARY KEY(RESOURCE_ID,SUBMISSION_ID,JOB_TYPE), - FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE -); - -CREATE TABLE DATA_MOVEMENT_PROTOCOL -( - RESOURCE_ID VARCHAR(255), - DATA_MOVE_ID VARCHAR(255), - JOB_TYPE VARCHAR(255), - PRIMARY KEY(RESOURCE_ID,DATA_MOVE_ID,JOB_TYPE), - FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE -); - CREATE TABLE GSISSH_SUBMISSION ( SUBMISSION_ID VARCHAR(255), @@ -124,12 +106,41 @@ CREATE TABLE SCP_DATAMOVEMENT ( DATA_MOVE_ID VARCHAR(255), RESOURCE_ID VARCHAR(255), - RESOURCE_JOB_MANAGER VARCHAR(255), + SECURITY_PROTOCOL VARCHAR(255), SSH_PORT INTEGER, PRIMARY KEY(DATA_MOVE_ID), FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE ); +CREATE TABLE GRID_FTP_DATAMOVEMENT +( + DATA_MOVE_ID VARCHAR(255), + RESOURCE_ID VARCHAR(255), + SECURITY_PROTOCOL VARCHAR(255), + GRID_FTP_EP VARCHAR(255), + PRIMARY KEY(DATA_MOVE_ID), + FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE +); + +CREATE TABLE JOB_SUBMISSION_PROTOCOL +( + RESOURCE_ID VARCHAR(255), + SUBMISSION_ID VARCHAR(255), + JOB_TYPE VARCHAR(255), + PRIMARY KEY(RESOURCE_ID,SUBMISSION_ID,JOB_TYPE), + FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE +); + +CREATE TABLE DATA_MOVEMENT_PROTOCOL +( + RESOURCE_ID VARCHAR(255), + DATA_MOVE_ID VARCHAR(255), + JOB_TYPE VARCHAR(255), + PRIMARY KEY(RESOURCE_ID,DATA_MOVE_ID,JOB_TYPE), + FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE +); + + http://git-wip-us.apache.org/repos/asf/airavata/blob/90c47ded/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql index 8e3f913..7e25ca4 100644 --- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql +++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql @@ -45,24 +45,6 @@ CREATE TABLE HOST_IPADDRESS FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE ); -CREATE TABLE JOB_SUBMISSION_PROTOCOL -( - RESOURCE_ID VARCHAR(255), - SUBMISSION_ID VARCHAR(255), - JOB_TYPE VARCHAR(255), - PRIMARY KEY(RESOURCE_ID,SUBMISSION_ID,JOB_TYPE), - FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE -); - -CREATE TABLE DATA_MOVEMENT_PROTOCOL -( - RESOURCE_ID VARCHAR(255), - DATA_MOVE_ID VARCHAR(255), - JOB_TYPE VARCHAR(255), - PRIMARY KEY(RESOURCE_ID,DATA_MOVE_ID,JOB_TYPE), - FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE -); - CREATE TABLE GSISSH_SUBMISSION ( SUBMISSION_ID VARCHAR(255), @@ -124,8 +106,36 @@ CREATE TABLE SCP_DATAMOVEMENT ( DATA_MOVE_ID VARCHAR(255), RESOURCE_ID VARCHAR(255), - RESOURCE_JOB_MANAGER VARCHAR(255), + SECURITY_PROTOCOL VARCHAR(255), SSH_PORT INTEGER, PRIMARY KEY(DATA_MOVE_ID), FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE -); \ No newline at end of file +); + +CREATE TABLE GRID_FTP_DATAMOVEMENT +( + DATA_MOVE_ID VARCHAR(255), + RESOURCE_ID VARCHAR(255), + SECURITY_PROTOCOL VARCHAR(255), + GRID_FTP_EP VARCHAR(255), + PRIMARY KEY(DATA_MOVE_ID), + FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE +); + +CREATE TABLE JOB_SUBMISSION_PROTOCOL +( + RESOURCE_ID VARCHAR(255), + SUBMISSION_ID VARCHAR(255), + JOB_TYPE VARCHAR(255), + PRIMARY KEY(RESOURCE_ID,SUBMISSION_ID,JOB_TYPE), + FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE +); + +CREATE TABLE DATA_MOVEMENT_PROTOCOL +( + RESOURCE_ID VARCHAR(255), + DATA_MOVE_ID VARCHAR(255), + JOB_TYPE VARCHAR(255), + PRIMARY KEY(RESOURCE_ID,DATA_MOVE_ID,JOB_TYPE), + FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE +); http://git-wip-us.apache.org/repos/asf/airavata/blob/90c47ded/modules/app-catalog/pom.xml ---------------------------------------------------------------------- diff --git a/modules/app-catalog/pom.xml b/modules/app-catalog/pom.xml index 7c96ded..1f997c9 100644 --- a/modules/app-catalog/pom.xml +++ b/modules/app-catalog/pom.xml @@ -30,8 +30,8 @@ <activeByDefault>true</activeByDefault> </activation> <modules> - <!--module>app-catalog-data</module--> - <module>app-catalog-jpa</module> + <module>app-catalog-data</module> + <!--<module>app-catalog-jpa</module>--> </modules> </profile> </profiles>
