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:26:27 UTC
git commit: https://issues.apache.org/jira/browse/AIRAVATA-1228
Repository: airavata
Updated Branches:
refs/heads/master b0062bbec -> 6a84bdb08
https://issues.apache.org/jira/browse/AIRAVATA-1228
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6a84bdb0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6a84bdb0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6a84bdb0
Branch: refs/heads/master
Commit: 6a84bdb08d8957258a960ef275b4710dbb610bd7
Parents: b0062bb
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Sat Jul 5 23:26:15 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Sat Jul 5 23:26:15 2014 -0400
----------------------------------------------------------------------
.../catalog/data/impl/ComputeResourceImpl.java | 24 +++++++++-----
.../data/util/AppCatalogThriftConversion.java | 35 ++++++++++++++++++++
2 files changed, 51 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/6a84bdb0/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 ff2ae58..a0169de 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
@@ -39,6 +39,8 @@ 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.LocalDataMovementResource;
+import org.apache.aiaravata.application.catalog.data.resources.LocalSubmissionResource;
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;
@@ -670,28 +672,34 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public String addLocalJobSubmission(LOCALSubmission localSubmission)
throws AppCatalogException {
- // TODO Auto-generated method stub
- return null;
+ localSubmission.setJobSubmissionInterfaceId(AppCatalogUtils.getID("LOCAL"));
+ LocalSubmissionResource localJobSubmission = AppCatalogThriftConversion.getLocalJobSubmission(localSubmission);
+ localJobSubmission.save();
+ return localJobSubmission.getJobSubmissionInterfaceId();
}
@Override
public String addLocalDataMovement(LOCALDataMovement localDataMovement)
throws AppCatalogException {
- // TODO Auto-generated method stub
- return null;
+ localDataMovement.setDataMovementInterfaceId(AppCatalogUtils.getID("LOCAL"));
+ LocalDataMovementResource ldm = AppCatalogThriftConversion.getLocalDataMovement(localDataMovement);
+ ldm.save();
+ return ldm.getDataMovementInterfaceId();
}
@Override
public LOCALSubmission getLocalJobSubmission(String submissionId)
throws AppCatalogException {
- // TODO Auto-generated method stub
- return null;
+ LocalSubmissionResource localSubmissionResource = new LocalSubmissionResource();
+ localSubmissionResource= (LocalSubmissionResource)localSubmissionResource.get(submissionId);
+ return AppCatalogThriftConversion.getLocalJobSubmission(localSubmissionResource);
}
@Override
public LOCALDataMovement getLocalDataMovement(String datamovementId)
throws AppCatalogException {
- // TODO Auto-generated method stub
- return null;
+ LocalDataMovementResource localDataMovementResource = new LocalDataMovementResource();
+ localDataMovementResource = (LocalDataMovementResource) localDataMovementResource.get(datamovementId);
+ return AppCatalogThriftConversion.getLocalDataMovement(localDataMovementResource);
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6a84bdb0/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
index 15b2604..13d3565 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
@@ -54,6 +54,8 @@ import org.apache.aiaravata.application.catalog.data.resources.JobSubmissionInte
import org.apache.aiaravata.application.catalog.data.resources.JobSubmissionProtocolResource;
import org.apache.aiaravata.application.catalog.data.resources.LibraryApendPathResource;
import org.apache.aiaravata.application.catalog.data.resources.LibraryPrepandPathResource;
+import org.apache.aiaravata.application.catalog.data.resources.LocalDataMovementResource;
+import org.apache.aiaravata.application.catalog.data.resources.LocalSubmissionResource;
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;
@@ -74,6 +76,8 @@ 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.ResourceJobManagerType;
import org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement;
@@ -270,8 +274,38 @@ public class AppCatalogThriftConversion {
return resource;
}
+ public static LocalDataMovementResource getLocalDataMovement(LOCALDataMovement localSubmission)throws AppCatalogException{
+ LocalDataMovementResource submission = new LocalDataMovementResource();
+ submission.setDataMovementInterfaceId(localSubmission.getDataMovementInterfaceId());
+ return submission;
+ }
+
+ public static LOCALDataMovement getLocalDataMovement(LocalDataMovementResource localSubmission)throws AppCatalogException{
+ LOCALDataMovement submission = new LOCALDataMovement();
+ submission.setDataMovementInterfaceId(localSubmission.getDataMovementInterfaceId());
+ return submission;
+ }
+
+
+ public static LocalSubmissionResource getLocalJobSubmission(LOCALSubmission localSubmission)throws AppCatalogException{
+ LocalSubmissionResource submission = new LocalSubmissionResource();
+ submission.setJobSubmissionInterfaceId(localSubmission.getJobSubmissionInterfaceId());
+ ResourceJobManagerResource resourceJobManager = getResourceJobManager(localSubmission.getResourceJobManager());
+ submission.setResourceJobManagerId(resourceJobManager.getResourceJobManagerId());
+ submission.setResourceJobManagerResource(resourceJobManager);
+ return submission;
+ }
+
+ public static LOCALSubmission getLocalJobSubmission(LocalSubmissionResource localSubmission)throws AppCatalogException{
+ LOCALSubmission submission = new LOCALSubmission();
+ submission.setJobSubmissionInterfaceId(localSubmission.getJobSubmissionInterfaceId());
+ submission.setResourceJobManager(getResourceJobManager(localSubmission.getResourceJobManagerResource()));
+ return submission;
+ }
+
public static ResourceJobManagerResource getResourceJobManager(ResourceJobManager manager){
ResourceJobManagerResource r = new ResourceJobManagerResource();
+ r.setResourceJobManagerId(manager.getJobManagerBinPath());
r.setJobManagerBinPath(manager.getJobManagerBinPath());
r.setPushMonitoringEndpoint(manager.getPushMonitoringEndpoint());
r.setResourceJobManagerType(manager.getResourceJobManagerType().toString());
@@ -280,6 +314,7 @@ public class AppCatalogThriftConversion {
public static ResourceJobManager getResourceJobManager(ResourceJobManagerResource manager) throws AppCatalogException{
ResourceJobManager r = new ResourceJobManager();
+ r.setResourceJobManagerId(manager.getResourceJobManagerId());
r.setJobManagerBinPath(manager.getJobManagerBinPath());
r.setPushMonitoringEndpoint(manager.getPushMonitoringEndpoint());
r.setResourceJobManagerType(ResourceJobManagerType.valueOf(manager.getResourceJobManagerType()));