Repository: airavata Updated Branches: refs/heads/master ce4b32490 -> 1d83a48b7
http://git-wip-us.apache.org/repos/asf/airavata/blob/1d83a48b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift ---------------------------------------------------------------------- diff --git a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift index 389c417..597519a 100644 --- a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift +++ b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift @@ -912,10 +912,10 @@ service Airavata { * The LOCALSubmission object to be added to the resource. * * @return status - * Returns a success/failure of the deletion. + * Returns the unique job submission id. * */ - bool addLocalSubmissionDetails(1: required string computeResourceId, + string addLocalSubmissionDetails(1: required string computeResourceId, 2: required i32 priorityOrder, 3: required computeResourceModel.LOCALSubmission localSubmission) @@ -956,10 +956,10 @@ service Airavata { * The SSHJobSubmission object to be added to the resource. * * @return status - * Returns a success/failure of the deletion. + * Returns the unique job submission id. * */ - bool addSSHJobSubmissionDetails(1: required string computeResourceId, + string addSSHJobSubmissionDetails(1: required string computeResourceId, 2: required i32 priorityOrder, 3: required computeResourceModel.SSHJobSubmission sshJobSubmission) throws (1: airavataErrors.InvalidRequestException ire, @@ -980,10 +980,10 @@ service Airavata { * The UnicoreJobSubmission object to be added to the resource. * * @return status - * Returns a success/failure of the deletion. + * Returns the unique job submission id. * */ - bool addUNICOREJobSubmissionDetails(1: required string computeResourceId, + string addUNICOREJobSubmissionDetails(1: required string computeResourceId, 2: required i32 priorityOrder, 3: required computeResourceModel.UnicoreJobSubmission unicoreJobSubmission) throws (1: airavataErrors.InvalidRequestException ire, @@ -1006,9 +1006,9 @@ service Airavata { * The SSHJobSubmission object to be added to the resource. * * @return status - * Returns a success/failure of the deletion. + * Returns the unique job submission id. **/ - bool addCloudJobSubmissionDetails(1: required string computeResourceId, + string addCloudJobSubmissionDetails(1: required string computeResourceId, 2: required i32 priorityOrder, 3: required computeResourceModel.CloudJobSubmission cloudSubmission) throws (1: airavataErrors.InvalidRequestException ire, @@ -1066,10 +1066,10 @@ service Airavata { * The LOCALDataMovement object to be added to the resource. * * @return status - * Returns a success/failure of the addition. + * Returns the unique job submission id. * */ - bool addLocalDataMovementDetails(1: required string computeResourceId, + string addLocalDataMovementDetails(1: required string computeResourceId, 2: required i32 priorityOrder, 3: required computeResourceModel.LOCALDataMovement localDataMovement) throws (1: airavataErrors.InvalidRequestException ire, @@ -1109,10 +1109,10 @@ service Airavata { * The SCPDataMovement object to be added to the resource. * * @return status - * Returns a success/failure of the deletion. + * Returns the unique job submission id. * */ - bool addSCPDataMovementDetails(1: required string computeResourceId, + string addSCPDataMovementDetails(1: required string computeResourceId, 2: required i32 priorityOrder, 3: required computeResourceModel.SCPDataMovement scpDataMovement) throws (1: airavataErrors.InvalidRequestException ire, @@ -1153,10 +1153,10 @@ service Airavata { * The GridFTPDataMovement object to be added to the resource. * * @return status - * Returns a success/failure of the deletion. + * Returns the unique job submission id. * */ - bool addGridFTPDataMovementDetails(1: required string computeResourceId, + string addGridFTPDataMovementDetails(1: required string computeResourceId, 2: required i32 priorityOrder, 3: required computeResourceModel.GridFTPDataMovement gridFTPDataMovement) throws (1: airavataErrors.InvalidRequestException ire, http://git-wip-us.apache.org/repos/asf/airavata/blob/1d83a48b/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 4a38dba..059e071 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 @@ -60,7 +60,7 @@ public interface ComputeResource { * This will add a SSHJobSubmission protocol to the database * @param computeResourceId compute resource id */ - void addJobSubmissionProtocol(String computeResourceId, JobSubmissionInterface jobSubmissionInterface) throws AppCatalogException; + String addJobSubmissionProtocol(String computeResourceId, JobSubmissionInterface jobSubmissionInterface) throws AppCatalogException; String addLocalJobSubmission (LOCALSubmission localSubmission) throws AppCatalogException; @@ -92,7 +92,7 @@ public interface ComputeResource { * This will add a SCPDataMovement protocol to the database * @param computeResourceId compute resource id */ - void addDataMovementProtocol (String computeResourceId, DataMovementInterface dataMovementInterface) throws AppCatalogException; + String addDataMovementProtocol (String computeResourceId, DataMovementInterface dataMovementInterface) throws AppCatalogException; /** * This method will add a GridFTP Data movement to the database http://git-wip-us.apache.org/repos/asf/airavata/blob/1d83a48b/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 5aab593..4807f04 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 @@ -216,7 +216,7 @@ public class ComputeResourceImpl implements ComputeResource { @Override - public void addJobSubmissionProtocol(String computeResourceId, JobSubmissionInterface jobSubmissionInterface) throws AppCatalogException { + public String addJobSubmissionProtocol(String computeResourceId, JobSubmissionInterface jobSubmissionInterface) throws AppCatalogException { try { JobSubmissionInterfaceResource jsi = AppCatalogThriftConversion.getJobSubmissionInterface(jobSubmissionInterface); jsi.setComputeResourceId(computeResourceId); @@ -224,6 +224,7 @@ public class ComputeResourceImpl implements ComputeResource { computeResourceResource=(ComputeResourceResource)computeResourceResource.get(computeResourceId); jsi.setComputeHostResource(computeResourceResource); jsi.save(); + return jsi.getJobSubmissionInterfaceId(); }catch (Exception e){ logger.error("Error while saving "+jobSubmissionInterface.getJobSubmissionProtocol().toString()+" Job Submission Protocol...", e); throw new AppCatalogException(e); @@ -340,7 +341,7 @@ public class ComputeResourceImpl implements ComputeResource { } @Override - public void addDataMovementProtocol(String computeResourceId, DataMovementInterface dataMovementInterface) throws AppCatalogException { + public String addDataMovementProtocol(String computeResourceId, DataMovementInterface dataMovementInterface) throws AppCatalogException { try { DataMovementInterfaceResource dmi = AppCatalogThriftConversion.getDataMovementInterface(dataMovementInterface); dmi.setComputeResourceId(computeResourceId); @@ -348,6 +349,7 @@ public class ComputeResourceImpl implements ComputeResource { computeResourceResource=(ComputeResourceResource)computeResourceResource.get(computeResourceId); dmi.setComputeHostResource(computeResourceResource); dmi.save(); + return dmi.getDataMovementInterfaceId(); }catch (Exception e){ logger.error("Error while saving "+dataMovementInterface.getDataMovementProtocol().toString()+" data movement Protocol...", e); throw new AppCatalogException(e);
