Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4BC531868D for ; Mon, 23 Nov 2015 19:22:03 +0000 (UTC) Received: (qmail 8630 invoked by uid 500); 23 Nov 2015 19:22:03 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 8518 invoked by uid 500); 23 Nov 2015 19:22:02 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 8485 invoked by uid 99); 23 Nov 2015 19:22:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Nov 2015 19:22:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A4FD0E0946; Mon, 23 Nov 2015 19:22:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chathuri@apache.org To: commits@airavata.apache.org Date: Mon, 23 Nov 2015 19:22:02 -0000 Message-Id: <0de5ede70d2e48bfbfb7fef734b1abc6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/14] airavata git commit: moving data movement structs to common thrift file Repository: airavata Updated Branches: refs/heads/develop 4c0978b61 -> ca89eaee4 http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java index 527ee4e..8b3fa27 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java @@ -55,6 +55,7 @@ import org.apache.airavata.messaging.core.Publisher; import org.apache.airavata.messaging.core.impl.RabbitMQProcessLaunchConsumer; import org.apache.airavata.messaging.core.impl.RabbitMQStatusPublisher; import org.apache.airavata.model.appcatalog.computeresource.*; +import org.apache.airavata.model.data.movement.DataMovementProtocol; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java index d59f460..fd2f4d4 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java @@ -44,6 +44,7 @@ import org.apache.airavata.model.application.io.DataType; import org.apache.airavata.model.application.io.InputDataObjectType; import org.apache.airavata.model.application.io.OutputDataObjectType; import org.apache.airavata.model.commons.ErrorModel; +import org.apache.airavata.model.data.movement.SecurityProtocol; import org.apache.airavata.model.job.JobModel; import org.apache.airavata.model.process.ProcessModel; import org.apache.airavata.model.status.JobState; @@ -93,6 +94,7 @@ public class GFacEngineImpl implements GFacEngine { processContext.setGatewayResourceProfile(gatewayProfile); processContext.setComputeResourcePreference(appCatalog.getGatewayProfile().getComputeResourcePreference (gatewayId, processModel.getComputeResourceId())); +// appCatalog.getGatewayProfile().getStoragePreference() processContext.setComputeResourceDescription(appCatalog.getComputeResource().getComputeResource (processContext.getComputeResourcePreference().getComputeResourceId())); processContext.setApplicationDeploymentDescription(appCatalog.getApplicationDeployment() http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java ---------------------------------------------------------------------- diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java index 154fffd..6f871d0 100644 --- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java +++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java @@ -31,13 +31,10 @@ import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelism import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand; -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; import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission; -import org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol; import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference; import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile; import org.apache.airavata.model.error.AiravataClientException; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java ---------------------------------------------------------------------- diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java index 750255d..ffd438d 100644 --- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java +++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java @@ -29,8 +29,6 @@ import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentD import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; -import org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface; -import org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol; import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand; import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface; import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java index 14a5712..3aa8974 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java @@ -27,11 +27,14 @@ import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription; import org.apache.airavata.model.appcatalog.computeresource.*; -import org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface; import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface; import org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission; import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference; import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference; +import org.apache.airavata.model.data.movement.DataMovementInterface; +import org.apache.airavata.model.data.movement.DataMovementProtocol; +import org.apache.airavata.model.data.movement.SCPDataMovement; +import org.apache.airavata.model.data.movement.SecurityProtocol; import org.apache.airavata.model.process.ProcessModel; import org.apache.airavata.orchestrator.core.OrchestratorConfiguration; import org.apache.airavata.orchestrator.core.context.OrchestratorContext; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java index ee4d2c6..2f69dfd 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java @@ -29,6 +29,7 @@ import org.apache.airavata.model.application.io.DataType; import org.apache.airavata.model.application.io.InputDataObjectType; import org.apache.airavata.model.application.io.OutputDataObjectType; import org.apache.airavata.model.commons.ErrorModel; +import org.apache.airavata.model.data.movement.DataMovementProtocol; import org.apache.airavata.model.error.LaunchValidationException; import org.apache.airavata.model.error.ValidationResults; import org.apache.airavata.model.error.ValidatorResult; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java index 0bd3ad0..5df3270 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java @@ -22,6 +22,7 @@ package org.apache.airavata.registry.core.app.catalog.impl; import org.apache.airavata.model.appcatalog.computeresource.*; +import org.apache.airavata.model.data.movement.*; import org.apache.airavata.registry.core.app.catalog.resources.*; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogUtils; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java index 925073f..b005b09 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java @@ -242,14 +242,14 @@ public class GwyResourceProfileImpl implements GwyResourceProfile { } @Override - public StoragePreference getStoragePreference(String gatewayId, String dataMoveId) throws AppCatalogException { + public StoragePreference getStoragePreference(String gatewayId, String storageId) throws AppCatalogException { try { StoragePreferenceResource prefResource = new StoragePreferenceResource(); List computePrefList = prefResource.get(AppCatAbstractResource.ComputeResourcePreferenceConstants.GATEWAY_ID, gatewayId); for (AppCatalogResource resource : computePrefList){ StoragePreferenceResource dsP = (StoragePreferenceResource) resource; if (dsP.getStorageResourceId() != null && !dsP.getStorageResourceId().equals("")){ - if (dsP.getStorageResourceId().equals(dataMoveId)){ + if (dsP.getStorageResourceId().equals(storageId)){ return AppCatalogThriftConversion.getDataStoragePreference(dsP); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java index 5f0cfa2..c943f72 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java @@ -27,11 +27,9 @@ import org.apache.airavata.model.appcatalog.appinterface.*; import org.apache.airavata.model.appcatalog.computeresource.*; import org.apache.airavata.model.appcatalog.computeresource.BatchQueue; import org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission; -import org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface; import org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand; import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface; import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager; -import org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement; import org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission; import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference; import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile; @@ -40,6 +38,7 @@ import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescr import org.apache.airavata.model.application.io.DataType; import org.apache.airavata.model.application.io.InputDataObjectType; import org.apache.airavata.model.application.io.OutputDataObjectType; +import org.apache.airavata.model.data.movement.*; import org.apache.airavata.registry.core.app.catalog.resources.*; import org.apache.airavata.registry.cpi.AppCatalogException; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/UserConfigurationData.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/UserConfigurationData.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/UserConfigurationData.java index dec37db..73c2b8d 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/UserConfigurationData.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/UserConfigurationData.java @@ -45,6 +45,7 @@ public class UserConfigurationData { private Integer totalPhysicalMemory; private Experiment experiment; private String staticWorkingDir; + private String storageId; @Id @Column(name = "EXPERIMENT_ID") @@ -182,6 +183,15 @@ public class UserConfigurationData { this.staticWorkingDir = staticWorkingDir; } + @Column(name = "ST") + public String getStorageId() { + return storageId; + } + + public void setStorageId(String storageId) { + this.storageId = storageId; + } + // @Override // public boolean equals(Object o) { // if (this == o) return true; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserConfigurationDataResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserConfigurationDataResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserConfigurationDataResource.java index f018b87..aa16a01 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserConfigurationDataResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/UserConfigurationDataResource.java @@ -49,6 +49,7 @@ public class UserConfigurationDataResource extends AbstractExpCatResource { private Integer wallTimeLimit; private Integer totalPhysicalMemory; private String staticWorkingDir; + private String storageId; public String getExperimentId() { return experimentId; @@ -106,6 +107,14 @@ public class UserConfigurationDataResource extends AbstractExpCatResource { this.wallTimeLimit = wallTimeLimit; } + public String getStorageId() { + return storageId; + } + + public void setStorageId(String storageId) { + this.storageId = storageId; + } + public Integer getTotalPhysicalMemory() { return totalPhysicalMemory; } http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeAppCatalogExperimentCatResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeAppCatalogExperimentCatResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeAppCatalogExperimentCatResourceTest.java index 47ec011..c8dcc09 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeAppCatalogExperimentCatResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeAppCatalogExperimentCatResourceTest.java @@ -24,6 +24,7 @@ package org.apache.airavata.app.catalog; import org.apache.airavata.app.catalog.util.Initialize; import org.apache.airavata.model.appcatalog.computeresource.*; +import org.apache.airavata.model.data.movement.*; import org.apache.airavata.registry.core.app.catalog.resources.AppCatAbstractResource; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalog; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/GatewayProfileTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/GatewayProfileTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/GatewayProfileTest.java index ae3e11d..41ece9e 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/GatewayProfileTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/GatewayProfileTest.java @@ -23,10 +23,10 @@ package org.apache.airavata.app.catalog; import org.apache.airavata.app.catalog.util.Initialize; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; -import org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol; import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol; import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference; import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile; +import org.apache.airavata.model.data.movement.DataMovementProtocol; import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; import org.apache.airavata.registry.cpi.AppCatalog; import org.apache.airavata.registry.cpi.AppCatalogException; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java index d140c61..d66126f 100644 --- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java +++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java @@ -20,6 +20,7 @@ package org.apache.airavata.registry.cpi; import org.apache.airavata.model.appcatalog.computeresource.*; +import org.apache.airavata.model.data.movement.*; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java index 7e32663..0999f82 100644 --- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java +++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java @@ -70,7 +70,7 @@ public interface GwyResourceProfile { * @return ComputeResourcePreference */ ComputeResourcePreference getComputeResourcePreference (String gatewayId, String hostId) throws AppCatalogException; - StoragePreference getStoragePreference(String gatewayId, String dataMoveId) throws AppCatalogException; + StoragePreference getStoragePreference(String gatewayId, String storageId) throws AppCatalogException; /** * http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java ---------------------------------------------------------------------- diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java index a2e8e87..2e28e9e 100644 --- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java +++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java @@ -25,6 +25,10 @@ import org.apache.airavata.api.Airavata; import org.apache.airavata.model.appcatalog.computeresource.*; import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference; import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile; +import org.apache.airavata.model.data.movement.DMType; +import org.apache.airavata.model.data.movement.DataMovementProtocol; +import org.apache.airavata.model.data.movement.SCPDataMovement; +import org.apache.airavata.model.data.movement.SecurityProtocol; import org.apache.airavata.model.error.AiravataClientException; import org.apache.airavata.model.security.AuthzToken; import org.apache.thrift.TException; http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/thrift-interface-descriptions/airavata-api/airavata_api.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/airavata_api.thrift b/thrift-interface-descriptions/airavata-api/airavata_api.thrift index d17f455..858acd4 100644 --- a/thrift-interface-descriptions/airavata-api/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-api/airavata_api.thrift @@ -39,6 +39,7 @@ include "application_interface_model.thrift" include "gateway_resource_profile_model.thrift" include "workflow_data_model.thrift" include "security_model.thrift" +include "data_movement_models.thrift" namespace java org.apache.airavata.api namespace php Airavata.API @@ -1718,9 +1719,9 @@ service Airavata { */ string addLocalDataMovementDetails(1: required security_model.AuthzToken authzToken, 2: required string resourceId, - 3: required compute_resource_model.DMType dataMoveType, + 3: required data_movement_models.DMType dataMoveType, 4: required i32 priorityOrder, - 5: required compute_resource_model.LOCALDataMovement localDataMovement) + 5: required data_movement_models.LOCALDataMovement localDataMovement) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, @@ -1741,7 +1742,7 @@ service Airavata { */ bool updateLocalDataMovementDetails(1: required security_model.AuthzToken authzToken, 2: required string dataMovementInterfaceId, - 3: required compute_resource_model.LOCALDataMovement localDataMovement) + 3: required data_movement_models.LOCALDataMovement localDataMovement) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, @@ -1753,7 +1754,7 @@ service Airavata { * The identifier of the datamovement Interface to be retrieved. * @return LOCALDataMovement instance **/ - compute_resource_model.LOCALDataMovement getLocalDataMovement(1: required security_model.AuthzToken authzToken, + data_movement_models.LOCALDataMovement getLocalDataMovement(1: required security_model.AuthzToken authzToken, 2: required string dataMovementId) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, @@ -1780,9 +1781,9 @@ service Airavata { */ string addSCPDataMovementDetails(1: required security_model.AuthzToken authzToken, 2: required string resourceId, - 3: required compute_resource_model.DMType dataMoveType, + 3: required data_movement_models.DMType dataMoveType, 4: required i32 priorityOrder, - 5: required compute_resource_model.SCPDataMovement scpDataMovement) + 5: required data_movement_models.SCPDataMovement scpDataMovement) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, @@ -1804,7 +1805,7 @@ service Airavata { */ bool updateSCPDataMovementDetails(1: required security_model.AuthzToken authzToken, 2: required string dataMovementInterfaceId, - 3: required compute_resource_model.SCPDataMovement scpDataMovement) + 3: required data_movement_models.SCPDataMovement scpDataMovement) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, @@ -1816,7 +1817,7 @@ service Airavata { * The identifier of the datamovement Interface to be retrieved. * @return SCPDataMovement instance **/ - compute_resource_model.SCPDataMovement getSCPDataMovement(1: required security_model.AuthzToken authzToken, 2: required string dataMovementId) + data_movement_models.SCPDataMovement getSCPDataMovement(1: required security_model.AuthzToken authzToken, 2: required string dataMovementId) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, @@ -1825,22 +1826,22 @@ service Airavata { string addUnicoreDataMovementDetails(1: required security_model.AuthzToken authzToken, 2: required string resourceId, - 3: required compute_resource_model.DMType dataMoveType, + 3: required data_movement_models.DMType dataMoveType, 4: required i32 priorityOrder, - 5: required compute_resource_model.UnicoreDataMovement unicoreDataMovement) + 5: required data_movement_models.UnicoreDataMovement unicoreDataMovement) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, 4: airavata_errors.AuthorizationException ae) bool updateUnicoreDataMovementDetails(1: required security_model.AuthzToken authzToken, 2: required string dataMovementInterfaceId, - 3: required compute_resource_model.UnicoreDataMovement unicoreDataMovement) + 3: required data_movement_models.UnicoreDataMovement unicoreDataMovement) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, 4: airavata_errors.AuthorizationException ae) - compute_resource_model.UnicoreDataMovement getUnicoreDataMovement(1: required security_model.AuthzToken authzToken, + data_movement_models.UnicoreDataMovement getUnicoreDataMovement(1: required security_model.AuthzToken authzToken, 2: required string dataMovementId) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, @@ -1866,9 +1867,9 @@ service Airavata { */ string addGridFTPDataMovementDetails(1: required security_model.AuthzToken authzToken, 2: required string resourceId, - 3: required compute_resource_model.DMType dataMoveType, + 3: required data_movement_models.DMType dataMoveType, 4: required i32 priorityOrder, - 5: required compute_resource_model.GridFTPDataMovement gridFTPDataMovement) + 5: required data_movement_models.GridFTPDataMovement gridFTPDataMovement) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, @@ -1889,7 +1890,7 @@ service Airavata { * */ bool updateGridFTPDataMovementDetails(1: required security_model.AuthzToken authzToken, 2: required string dataMovementInterfaceId, - 3: required compute_resource_model.GridFTPDataMovement gridFTPDataMovement) + 3: required data_movement_models.GridFTPDataMovement gridFTPDataMovement) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, @@ -1901,7 +1902,7 @@ service Airavata { * The identifier of the datamovement Interface to be retrieved. * @return GridFTPDataMovement instance **/ - compute_resource_model.GridFTPDataMovement getGridFTPDataMovement(1: required security_model.AuthzToken authzToken, 2: required string dataMovementId) + data_movement_models.GridFTPDataMovement getGridFTPDataMovement(1: required security_model.AuthzToken authzToken, 2: required string dataMovementId) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, @@ -2147,7 +2148,7 @@ service Airavata { 4: airavata_errors.AuthorizationException ae) bool addGatewayStoragePreference(1: required security_model.AuthzToken authzToken, 2: required string gatewayID, - 3: required string dataMoveId, + 3: required string storageResourceId, 4: required gateway_resource_profile_model.StoragePreference storagePreference) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, @@ -2176,7 +2177,7 @@ service Airavata { gateway_resource_profile_model.StoragePreference getGatewayStoragePreference(1: required security_model.AuthzToken authzToken, 2: required string gatewayID, - 3: required string dataMoveId) + 3: required string storageResourceId) throws (1: airavata_errors.InvalidRequestException ire, 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift b/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift index fb21dd1..8fd125b 100644 --- a/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift +++ b/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift @@ -29,6 +29,7 @@ include "task_model.thrift" include "process_model.thrift" include "scheduling_model.thrift" include "status_models.thrift" +include "data_movement_models.thrift" namespace java org.apache.airavata.model namespace php Airavata.Model http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift b/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift index 434200b..1d7172f 100644 --- a/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift +++ b/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift @@ -19,6 +19,7 @@ */ include "airavata_commons.thrift" +include "data_movement_models.thrift" namespace java org.apache.airavata.model.appcatalog.computeresource namespace php Airavata.Model.AppCatalog.ComputeResource @@ -154,28 +155,6 @@ struct BatchQueue { 7: optional i32 maxMemory } -/** - * Enumeration of security authentication and authorization mechanisms supported by Airavata. This enumeration just - * describes the supported mechanism. The corresponding security credentials are registered with Airavata Credential - * store. - * - * USERNAME_PASSWORD: - * A User Name. - * - * SSH_KEYS: - * SSH Keys - * - * FIXME: Change GSI to a more precise generic security protocol - X509 - * -*/ -enum SecurityProtocol { - USERNAME_PASSWORD, - SSH_KEYS, - GSI, - KERBEROS, - OAUTH, - LOCAL -} /** * Enumeration of Airavata supported Job Submission Mechanisms for High Performance Computing Clusters. @@ -217,78 +196,6 @@ enum MonitorMode { FORK } -enum DMType { - COMPUTE_RESOURCE, - STORAGE_RESOURCE -} - -/** - * Enumeration of data movement supported by Airavata - * - * SCP: - * Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine. - * - * SFTP: - * The Simple Linux Utility for Resource Management is a open source workload manager. - * - * GridFTP: - * Globus File Transfer Protocol - * - * UNICORE_STORAGE_SERVICE: - * Storage Service Provided by Unicore - * -*/ -enum DataMovementProtocol { - LOCAL, - SCP, - SFTP, - GridFTP, - UNICORE_STORAGE_SERVICE -} - -/** - * Data Movement through Secured Copy - * - * alternativeSCPHostName: - * If the login to scp is different than the hostname itself, specify it here - * - * sshPort: - * If a non-default port needs to used, specify it. -*/ -struct SCPDataMovement { - 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, - 2: required SecurityProtocol securityProtocol, - 3: optional string alternativeSCPHostName, - 4: optional i32 sshPort = 22 -} - -/** - * Data Movement through GridFTP - * - * alternativeSCPHostName: - * If the login to scp is different than the hostname itself, specify it here - * - * sshPort: - * If a non-default port needs to used, specify it. -*/ -struct GridFTPDataMovement { - 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, - 2: required SecurityProtocol securityProtocol, - 3: required list gridFTPEndPoints -} - -/** - * Data Movement through UnicoreStorage - * - * unicoreEndPointURL: - * unicoreGateway End Point. The provider will query this service to fetch required service end points. -*/ -struct UnicoreDataMovement { - 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, - 2: required SecurityProtocol securityProtocol, - 3: required string unicoreEndPointURL -} - /** * Locally Fork Jobs as OS processes * @@ -300,24 +207,11 @@ struct UnicoreDataMovement { */ struct LOCALSubmission { 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, - 2: required SecurityProtocol securityProtocol, + 2: required data_movement_models.SecurityProtocol securityProtocol, 3: required ResourceJobManager resourceJobManager } /** - * LOCAL - * - * alternativeSCPHostName: - * If the login to scp is different than the hostname itself, specify it here - * - * sshPort: - * If a non-defualt port needs to used, specify it. -*/ -struct LOCALDataMovement { - 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, -} - -/** * Authenticate using Secured Shell * * alternativeSSHHostName: @@ -335,7 +229,7 @@ struct LOCALDataMovement { */ struct SSHJobSubmission { 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, - 2: required SecurityProtocol securityProtocol, + 2: required data_movement_models.SecurityProtocol securityProtocol, 3: required ResourceJobManager resourceJobManager, 4: optional string alternativeSSHHostName, 5: optional i32 sshPort = 22, @@ -345,7 +239,7 @@ struct SSHJobSubmission { struct GlobusJobSubmission { 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, - 2: required SecurityProtocol securityProtocol, + 2: required data_movement_models.SecurityProtocol securityProtocol, 3: optional list globusGateKeeperEndPoint } @@ -359,7 +253,7 @@ struct GlobusJobSubmission { */ struct UnicoreJobSubmission { 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, - 2: required SecurityProtocol securityProtocol, + 2: required data_movement_models.SecurityProtocol securityProtocol, 3: required string unicoreEndPointURL, } @@ -381,7 +275,7 @@ enum ProviderName { */ struct CloudJobSubmission { 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, - 2: required SecurityProtocol securityProtocol, + 2: required data_movement_models.SecurityProtocol securityProtocol, 3: required string nodeId, 4: required string executableType, 5: required ProviderName providerName, @@ -404,21 +298,7 @@ struct JobSubmissionInterface { 3: required i32 priorityOrder = 0, } -/** - * Data Movement Interfaces - * - * dataMovementInterfaceId: The Data Movement Interface has to be previously registered and referenced here. - * - * priorityOrder: - * For resources with multiple interfaces, the priority order should be selected. - * Lower the numerical number, higher the priority - * -*/ -struct DataMovementInterface { - 1: required string dataMovementInterfaceId, - 2: required DataMovementProtocol dataMovementProtocol, - 3: required i32 priorityOrder = 0, -} + /** * Computational Resource Description @@ -460,6 +340,6 @@ struct ComputeResourceDescription { 7: optional list batchQueues, 8: optional map fileSystems, 9: optional list jobSubmissionInterfaces, - 10: optional list dataMovementInterfaces, + 10: optional list dataMovementInterfaces, 11: optional i32 maxMemoryPerNode } http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/thrift-interface-descriptions/airavata-api/data_movement_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/data_movement_models.thrift b/thrift-interface-descriptions/airavata-api/data_movement_models.thrift new file mode 100644 index 0000000..677d790 --- /dev/null +++ b/thrift-interface-descriptions/airavata-api/data_movement_models.thrift @@ -0,0 +1,154 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +include "airavata_commons.thrift" + +namespace java org.apache.airavata.model.data.movement +namespace php Airavata.Model.Data.Movement +namespace cpp apache.airavata.model.data.movement +namespace py apache.airavata.model.data.movement + +enum DMType { + COMPUTE_RESOURCE, + STORAGE_RESOURCE +} + +/** + * Enumeration of security authentication and authorization mechanisms supported by Airavata. This enumeration just + * describes the supported mechanism. The corresponding security credentials are registered with Airavata Credential + * store. + * + * USERNAME_PASSWORD: + * A User Name. + * + * SSH_KEYS: + * SSH Keys + * + * FIXME: Change GSI to a more precise generic security protocol - X509 + * +*/ +enum SecurityProtocol { + USERNAME_PASSWORD, + SSH_KEYS, + GSI, + KERBEROS, + OAUTH, + LOCAL +} + + +/** + * Enumeration of data movement supported by Airavata + * + * SCP: + * Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine. + * + * SFTP: + * The Simple Linux Utility for Resource Management is a open source workload manager. + * + * GridFTP: + * Globus File Transfer Protocol + * + * UNICORE_STORAGE_SERVICE: + * Storage Service Provided by Unicore + * +*/ +enum DataMovementProtocol { + LOCAL, + SCP, + SFTP, + GridFTP, + UNICORE_STORAGE_SERVICE +} + +/** + * Data Movement through Secured Copy + * + * alternativeSCPHostName: + * If the login to scp is different than the hostname itself, specify it here + * + * sshPort: + * If a non-default port needs to used, specify it. +*/ +struct SCPDataMovement { + 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, + 2: required SecurityProtocol securityProtocol, + 3: optional string alternativeSCPHostName, + 4: optional i32 sshPort = 22 +} + +/** + * Data Movement through GridFTP + * + * alternativeSCPHostName: + * If the login to scp is different than the hostname itself, specify it here + * + * sshPort: + * If a non-default port needs to used, specify it. +*/ +struct GridFTPDataMovement { + 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, + 2: required SecurityProtocol securityProtocol, + 3: required list gridFTPEndPoints +} + +/** + * Data Movement through UnicoreStorage + * + * unicoreEndPointURL: + * unicoreGateway End Point. The provider will query this service to fetch required service end points. +*/ +struct UnicoreDataMovement { + 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, + 2: required SecurityProtocol securityProtocol, + 3: required string unicoreEndPointURL +} + +/** + * LOCAL + * + * alternativeSCPHostName: + * If the login to scp is different than the hostname itself, specify it here + * + * sshPort: + * If a non-defualt port needs to used, specify it. +*/ +struct LOCALDataMovement { + 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, +} + +/** + * Data Movement Interfaces + * + * dataMovementInterfaceId: The Data Movement Interface has to be previously registered and referenced here. + * + * priorityOrder: + * For resources with multiple interfaces, the priority order should be selected. + * Lower the numerical number, higher the priority + * +*/ +struct DataMovementInterface { + 1: required string dataMovementInterfaceId, + 2: required DataMovementProtocol dataMovementProtocol, + 3: required i32 priorityOrder = 0, +} + + + http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/thrift-interface-descriptions/airavata-api/experiment_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/experiment_model.thrift b/thrift-interface-descriptions/airavata-api/experiment_model.thrift index fa15459..d2a571e 100644 --- a/thrift-interface-descriptions/airavata-api/experiment_model.thrift +++ b/thrift-interface-descriptions/airavata-api/experiment_model.thrift @@ -55,7 +55,8 @@ struct UserConfigurationDataModel { 4: optional scheduling_model.ComputationalResourceSchedulingModel computationalResourceScheduling, 5: optional bool throttleResources = 0, 6: optional string userDN, - 7: optional bool generateCert = 0 + 7: optional bool generateCert = 0, + 8: optional string storageId; } /** http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift b/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift index 36474e0..de76c7d 100644 --- a/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift +++ b/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift @@ -24,6 +24,7 @@ namespace cpp apache.airavata.model.appcatalog.gatewayprofile namespace py apache.airavata.model.appcatalog.gatewayprofile include "compute_resource_model.thrift" +include "data_movement_models.thrift" /** * Gateway specific preferences for a Computer Resource @@ -64,7 +65,7 @@ struct ComputeResourcePreference { 2: required bool overridebyAiravata = 1, 3: optional string loginUserName, 4: optional compute_resource_model.JobSubmissionProtocol preferredJobSubmissionProtocol, - 5: optional compute_resource_model.DataMovementProtocol preferredDataMovementProtocol, + 5: optional data_movement_models.DataMovementProtocol preferredDataMovementProtocol, 6: optional string preferredBatchQueue, 7: optional string scratchLocation, 8: optional string allocationProjectNumber, http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/thrift-interface-descriptions/airavata-api/process_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/process_model.thrift b/thrift-interface-descriptions/airavata-api/process_model.thrift index c264381..409196a 100644 --- a/thrift-interface-descriptions/airavata-api/process_model.thrift +++ b/thrift-interface-descriptions/airavata-api/process_model.thrift @@ -57,5 +57,6 @@ struct ProcessModel { 15: optional airavata_commons.ErrorModel processError, 16: optional string gatewayExecutionId, 17: optional bool enableEmailNotification, - 18: optional list emailAddresses + 18: optional list emailAddresses, + 19: optional string storageResourceId } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/thrift-interface-descriptions/airavata-api/storage_resource_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/storage_resource_model.thrift b/thrift-interface-descriptions/airavata-api/storage_resource_model.thrift index f66b88f..1063f17 100644 --- a/thrift-interface-descriptions/airavata-api/storage_resource_model.thrift +++ b/thrift-interface-descriptions/airavata-api/storage_resource_model.thrift @@ -19,7 +19,7 @@ */ include "airavata_commons.thrift" -include "compute_resource_model.thrift" +include "data_movement_models.thrift" namespace java org.apache.airavata.model.appcatalog.storageresource namespace php Airavata.Model.AppCatalog.StorageResource @@ -48,5 +48,5 @@ struct StorageResourceDescription { 2: required string hostName, 3: optional string storageResourceDescription, 4: optional bool enabled, - 5: optional list dataMovementInterfaces, + 5: optional list dataMovementInterfaces, } http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/thrift-interface-descriptions/airavata-api/task_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/task_model.thrift b/thrift-interface-descriptions/airavata-api/task_model.thrift index 4dd1d84..f90e0e1 100644 --- a/thrift-interface-descriptions/airavata-api/task_model.thrift +++ b/thrift-interface-descriptions/airavata-api/task_model.thrift @@ -21,6 +21,7 @@ include "airavata_commons.thrift" include "status_models.thrift" include "compute_resource_model.thrift" +include "data_movement_models.thrift" include "application_io_models.thrift" include "job_model.thrift" @@ -93,7 +94,7 @@ struct DataStagingTaskModel { **/ struct EnvironmentSetupTaskModel { 1: required string location, - 2: required compute_resource_model.SecurityProtocol protocol + 2: required data_movement_models.SecurityProtocol protocol }