Repository: airavata Updated Branches: refs/heads/master 48cd362a5 -> 87f6fbd8c
fixed scheduling info Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/87f6fbd8 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/87f6fbd8 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/87f6fbd8 Branch: refs/heads/master Commit: 87f6fbd8c4e99634a5b8efc5cf361c47abfcc6a2 Parents: 48cd362 Author: Sachith Withana <[email protected]> Authored: Fri Jun 20 09:19:30 2014 +0530 Committer: Sachith Withana <[email protected]> Committed: Fri Jun 20 09:19:30 2014 +0530 ---------------------------------------------------------------------- .../jpa/model/ApplicationDeployment.java | 40 ++++++++++++ .../appcatalog/jpa/model/Deployment.java | 66 ++++++++++++++------ .../src/main/resources/appcatalog-mysql_new.sql | 4 +- 3 files changed, 90 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/87f6fbd8/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeployment.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeployment.java b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeployment.java index a1290d3..bf60615 100644 --- a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeployment.java +++ b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/ApplicationDeployment.java @@ -26,4 +26,44 @@ public class ApplicationDeployment { @ManyToOne(cascade = CascadeType.REMOVE) @JoinColumn(name = "APPLICATION_ID") private Application application; + + public String getDeploymentID() { + return deploymentID; + } + + public void setDeploymentID(String deploymentID) { + this.deploymentID = deploymentID; + } + + public String getApplicationID() { + return applicationID; + } + + public void setApplicationID(String applicationID) { + this.applicationID = applicationID; + } + + public String getDeploymentHostName() { + return deploymentHostName; + } + + public void setDeploymentHostName(String deploymentHostName) { + this.deploymentHostName = deploymentHostName; + } + + public Deployment getDeployment() { + return deployment; + } + + public void setDeployment(Deployment deployment) { + this.deployment = deployment; + } + + public Application getApplication() { + return application; + } + + public void setApplication(Application application) { + this.application = application; + } } http://git-wip-us.apache.org/repos/asf/airavata/blob/87f6fbd8/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/Deployment.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/Deployment.java b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/Deployment.java index 14fafa1..afc1280 100644 --- a/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/Deployment.java +++ b/modules/app-catalog/app-catalog-jpa/src/main/java/org/apache/airavata/persistence/appcatalog/jpa/model/Deployment.java @@ -27,20 +27,60 @@ public class Deployment { @Column(name = "EXECUTION_PATH") private String executionPath; + @Column(name = "QUEUE_NAME") + private String queueName; + @Column(name = "CPU_COUNT") - private String cpuCount; + private int cpuCount; @Column(name = "NODE_COUNT") - private String nodeCount; + private int nodeCount; - @Column(name = "WALLTIME") - private String walltime; + @Column(name = "WALLTIME_LIMIT") + private int walltime; + @Column(name = "NO_OF_THREADS") + private int numberOfThreads; @ManyToOne(cascade = CascadeType.REMOVE) @JoinColumn(name = "COMPUTE_RESOURCE_ID") private ComputeResource computeResource; + public String getQueueName() { + return queueName; + } + + public void setQueueName(String queueName) { + this.queueName = queueName; + } + + public void setCpuCount(int cpuCount) { + this.cpuCount = cpuCount; + } + + public void setNodeCount(int nodeCount) { + this.nodeCount = nodeCount; + } + + public void setWalltime(int walltime) { + this.walltime = walltime; + } + + public int getNumberOfThreads() { + return numberOfThreads; + } + + public void setNumberOfThreads(int numberOfThreads) { + this.numberOfThreads = numberOfThreads; + } + + public ComputeResource getComputeResource() { + return computeResource; + } + + public void setComputeResource(ComputeResource computeResource) { + this.computeResource = computeResource; + } public String getApplicationID() { return applicationID; @@ -98,27 +138,15 @@ public class Deployment { this.executionPath = executionPath; } - public String getCpuCount() { + public int getCpuCount() { return cpuCount; } - public void setCpuCount(String cpuCount) { - this.cpuCount = cpuCount; - } - - public String getNodeCount() { + public int getNodeCount() { return nodeCount; } - public void setNodeCount(String nodeCount) { - this.nodeCount = nodeCount; - } - - public String getWalltime() { + public int getWalltime() { return walltime; } - - public void setWalltime(String walltime) { - this.walltime = walltime; - } } http://git-wip-us.apache.org/repos/asf/airavata/blob/87f6fbd8/modules/app-catalog/app-catalog-jpa/src/main/resources/appcatalog-mysql_new.sql ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-jpa/src/main/resources/appcatalog-mysql_new.sql b/modules/app-catalog/app-catalog-jpa/src/main/resources/appcatalog-mysql_new.sql index df36eb9..a375bf9 100644 --- a/modules/app-catalog/app-catalog-jpa/src/main/resources/appcatalog-mysql_new.sql +++ b/modules/app-catalog/app-catalog-jpa/src/main/resources/appcatalog-mysql_new.sql @@ -94,9 +94,11 @@ CREATE TABLE DEPLOYMENT OUTPUT_DIR VARCHAR (255), SCRATCH_DIR VARCHAR (255), EXECUTION_PATH VARCHAR (255), + QUEUE_NAME VARCHAR (255), CPU_COUNT SMALLINT , NODE_COUNT SMALLINT , - WALLCOUNT SMALLINT , + WALLTIME_LIMIT SMALLINT , + NO_OF_THREADS SMALLINT , PRIMARY KEY (DEPLOYMENT_ID), FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
