http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/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 7ece54d..b64903e 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 @@ -226,14 +226,14 @@ public interface ComputeResource { * @param jobSubmissionInterfaceId unique job submission interface id * @throws AppCatalogException */ - void removeJobSubmissionInterface(String jobSubmissionInterfaceId) throws AppCatalogException; + void removeJobSubmissionInterface(String computeResourceId, String jobSubmissionInterfaceId) throws AppCatalogException; /** * This method will remove data movement interface * @param dataMovementInterfaceId unique data movement id * @throws AppCatalogException */ - void removeDataMovementInterface(String dataMovementInterfaceId) throws AppCatalogException; + void removeDataMovementInterface(String computeResourceId, String dataMovementInterfaceId) throws AppCatalogException;
http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/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 dd1982e..6b9b841 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 @@ -698,10 +698,13 @@ public class ComputeResourceImpl implements ComputeResource { } @Override - public void removeJobSubmissionInterface(String jobSubmissionInterfaceId) throws AppCatalogException { + public void removeJobSubmissionInterface(String computeResourceId, String jobSubmissionInterfaceId) throws AppCatalogException { try { JobSubmissionInterfaceResource resource = new JobSubmissionInterfaceResource(); - resource.remove(jobSubmissionInterfaceId); + Map<String, String> ids = new HashMap<String, String>(); + ids.put(AbstractResource.JobSubmissionInterfaceConstants.COMPUTE_RESOURCE_ID, computeResourceId); + ids.put(AbstractResource.JobSubmissionInterfaceConstants.JOB_SUBMISSION_INTERFACE_ID, jobSubmissionInterfaceId); + resource.remove(ids); }catch (Exception e){ logger.error("Error while removing job submission interface..", e); throw new AppCatalogException(e); @@ -709,10 +712,13 @@ public class ComputeResourceImpl implements ComputeResource { } @Override - public void removeDataMovementInterface(String dataMovementInterfaceId) throws AppCatalogException { + public void removeDataMovementInterface(String computeResourceId, String dataMovementInterfaceId) throws AppCatalogException { try { DataMovementInterfaceResource resource = new DataMovementInterfaceResource(); - resource.remove(dataMovementInterfaceId); + Map<String, String> ids = new HashMap<String, String>(); + ids.put(AbstractResource.DataMovementInterfaceConstants.COMPUTE_RESOURCE_ID, computeResourceId); + ids.put(AbstractResource.DataMovementInterfaceConstants.DATA_MOVEMENT_INTERFACE_ID, dataMovementInterfaceId); + resource.remove(ids); }catch (Exception e){ logger.error("Error while removing data movement interface..", e); throw new AppCatalogException(e);
