You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/07/06 05:09:47 UTC
git commit: adding the updated CPI
Repository: airavata
Updated Branches:
refs/heads/master 08245f259 -> b0062bbec
adding the updated CPI
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b0062bbe
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b0062bbe
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b0062bbe
Branch: refs/heads/master
Commit: b0062bbecf1bffb2804605da663ffd2dfbab85a8
Parents: 08245f2
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Sat Jul 5 23:09:33 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Sat Jul 5 23:09:33 2014 -0400
----------------------------------------------------------------------
.../appcatalog/cpi/ComputeResource.java | 13 +++++
.../catalog/data/impl/ComputeResourceImpl.java | 51 ++++++++++++++++++++
2 files changed, 64 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b0062bbe/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java b/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
index a4bea56..1556042 100644
--- a/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
+++ b/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
@@ -8,6 +8,9 @@ import org.apache.airavata.model.appcatalog.computeresource.DataMovementInterfac
import org.apache.airavata.model.appcatalog.computeresource.GlobusJobSubmission;
import org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
+import org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement;
+import org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
import org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement;
import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
@@ -32,6 +35,8 @@ public interface ComputeResource {
*/
String addSSHJobSubmission (SSHJobSubmission sshJobSubmission) throws AppCatalogException;
+ String addResourceJobManager(ResourceJobManager resourceJobManager) throws AppCatalogException;
+
/**
* This will add a SSHJobSubmission protocol to the database
* @param computeResourceId compute resource id
@@ -39,6 +44,8 @@ public interface ComputeResource {
*/
void addSSHJobSubmissionProtocol(String computeResourceId, JobSubmissionInterface jobSubmissionInterface) throws AppCatalogException;
+ String addLocalJobSubmission (LOCALSubmission localSubmission) throws AppCatalogException;
+
/**
* This method will add a GlobusJobSubmission to the database
* @param globusJobSubmission GSISSHJobSubmission object
@@ -53,6 +60,8 @@ public interface ComputeResource {
*/
void addGlobusJobSubmissionProtocol (String computeResourceId, String jobSubmissionId) throws AppCatalogException;
+ String addLocalDataMovement (LOCALDataMovement localDataMovement) throws AppCatalogException;
+
/**
* This method will add a SCPData movement to the database
* @param scpDataMovement SCPData movement object
@@ -163,4 +172,8 @@ public interface ComputeResource {
*/
void removeComputeResource (String resourceId) throws AppCatalogException;
+ LOCALSubmission getLocalJobSubmission(String submissionId) throws AppCatalogException;
+
+ LOCALDataMovement getLocalDataMovement(String datamovementId) throws AppCatalogException;
+
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b0062bbe/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
index b0903f7..ff2ae58 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
@@ -37,8 +37,10 @@ import org.apache.aiaravata.application.catalog.data.resources.GridftpDataMoveme
import org.apache.aiaravata.application.catalog.data.resources.GridftpEndpointResource;
import org.apache.aiaravata.application.catalog.data.resources.HostAliasResource;
import org.apache.aiaravata.application.catalog.data.resources.HostIPAddressResource;
+import org.apache.aiaravata.application.catalog.data.resources.JobManagerCommandResource;
import org.apache.aiaravata.application.catalog.data.resources.JobSubmissionInterfaceResource;
import org.apache.aiaravata.application.catalog.data.resources.Resource;
+import org.apache.aiaravata.application.catalog.data.resources.ResourceJobManagerResource;
import org.apache.aiaravata.application.catalog.data.resources.ScpDataMovementResource;
import org.apache.aiaravata.application.catalog.data.resources.SshJobSubmissionResource;
import org.apache.aiaravata.application.catalog.data.util.AppCatalogThriftConversion;
@@ -50,8 +52,12 @@ import org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol
import org.apache.airavata.model.appcatalog.computeresource.FileSystems;
import org.apache.airavata.model.appcatalog.computeresource.GlobusJobSubmission;
import org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement;
+import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
+import org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement;
+import org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
import org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement;
import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
import org.slf4j.Logger;
@@ -643,4 +649,49 @@ public class ComputeResourceImpl implements ComputeResource {
throw new AppCatalogException(e);
}
}
+
+ @Override
+ public String addResourceJobManager(ResourceJobManager resourceJobManager)
+ throws AppCatalogException {
+ ResourceJobManagerResource resource = AppCatalogThriftConversion.getResourceJobManager(resourceJobManager);
+ resource.setResourceJobManagerId(AppCatalogUtils.getID("RJM"));
+ resource.save();
+ Map<JobManagerCommand, String> jobManagerCommands = resourceJobManager.getJobManagerCommands();
+ for (JobManagerCommand commandType : jobManagerCommands.keySet()) {
+ JobManagerCommandResource r = new JobManagerCommandResource();
+ r.setCommandType(commandType.toString());
+ r.setCommand(jobManagerCommands.get(commandType));
+ r.setResourceJobManagerId(resource.getResourceJobManagerId());
+ r.save();
+ }
+ return resource.getResourceJobManagerId();
+ }
+
+ @Override
+ public String addLocalJobSubmission(LOCALSubmission localSubmission)
+ throws AppCatalogException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String addLocalDataMovement(LOCALDataMovement localDataMovement)
+ throws AppCatalogException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public LOCALSubmission getLocalJobSubmission(String submissionId)
+ throws AppCatalogException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public LOCALDataMovement getLocalDataMovement(String datamovementId)
+ throws AppCatalogException {
+ // TODO Auto-generated method stub
+ return null;
+ }
}