You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/11/23 20:22:15 UTC
[14/14] airavata git commit: moving data movement structs to common
thrift file
moving data movement structs to common thrift file
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ca89eaee
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ca89eaee
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ca89eaee
Branch: refs/heads/develop
Commit: ca89eaee465933f73cbf010751068a6fa276aef8
Parents: 4c0978b
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Mon Nov 23 14:21:52 2015 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Mon Nov 23 14:21:52 2015 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 9 +-
.../java/org/apache/airavata/api/Airavata.java | 780 +++++------
.../main/resources/lib/airavata/Airavata.cpp | 108 +-
.../src/main/resources/lib/airavata/Airavata.h | 328 ++---
.../lib/airavata/Airavata_server.skeleton.cpp | 28 +-
.../resources/lib/airavata/airavata_api_types.h | 1 +
.../lib/airavata/airavata_data_models_types.h | 1 +
.../airavata/compute_resource_model_types.cpp | 1298 ++++--------------
.../lib/airavata/compute_resource_model_types.h | 320 +----
.../airavata/data_movement_models_constants.cpp | 34 +
.../airavata/data_movement_models_constants.h | 41 +
.../lib/airavata/data_movement_models_types.cpp | 763 ++++++++++
.../lib/airavata/data_movement_models_types.h | 327 +++++
.../lib/airavata/experiment_model_types.cpp | 30 +-
.../lib/airavata/experiment_model_types.h | 20 +-
.../gateway_resource_profile_model_types.cpp | 4 +-
.../gateway_resource_profile_model_types.h | 7 +-
.../lib/airavata/process_model_types.cpp | 26 +-
.../lib/airavata/process_model_types.h | 16 +-
.../airavata/storage_resource_model_types.cpp | 4 +-
.../lib/airavata/storage_resource_model_types.h | 6 +-
.../resources/lib/airavata/task_model_types.cpp | 4 +-
.../resources/lib/airavata/task_model_types.h | 7 +-
.../resources/lib/Airavata/API/Airavata.php | 200 +--
.../Model/AppCatalog/ComputeResource/Types.php | 952 ++-----------
.../Model/AppCatalog/StorageResource/Types.php | 6 +-
.../lib/Airavata/Model/Data/Movement/Types.php | 742 ++++++++++
.../lib/Airavata/Model/Experiment/Types.php | 23 +
.../lib/Airavata/Model/Process/Types.php | 23 +
.../lib/apache/airavata/api/Airavata-remote | 4 +-
.../lib/apache/airavata/api/Airavata.py | 124 +-
.../resources/lib/apache/airavata/api/ttypes.py | 1 +
.../model/appcatalog/computeresource/ttypes.py | 714 +---------
.../model/appcatalog/gatewayprofile/ttypes.py | 1 +
.../model/appcatalog/storageresource/ttypes.py | 6 +-
.../lib/apache/airavata/model/data/__init__.py | 0
.../airavata/model/data/movement/__init__.py | 1 +
.../airavata/model/data/movement/constants.py | 11 +
.../airavata/model/data/movement/ttypes.py | 625 +++++++++
.../apache/airavata/model/experiment/ttypes.py | 15 +-
.../lib/apache/airavata/model/process/ttypes.py | 15 +-
.../lib/apache/airavata/model/task/ttypes.py | 1 +
.../lib/apache/airavata/model/ttypes.py | 1 +
.../client/samples/CreateLaunchBES.java | 3 +-
.../client/samples/CreateLaunchExperiment.java | 1 +
.../client/samples/RegisterSampleData.java | 4 +-
.../tools/RegisterOGCEUS3Application.java | 3 +
.../tools/RegisterSampleApplications.java | 4 +
.../tools/RegisterSampleApplicationsUtils.java | 2 +
.../client/tools/RegisterUS3Application.java | 3 +
.../computeresource/CloudJobSubmission.java | 22 +-
.../ComputeResourceDescription.java | 238 ++--
.../appcatalog/computeresource/DMType.java | 62 -
.../computeresource/DataMovementInterface.java | 630 ---------
.../computeresource/DataMovementProtocol.java | 87 --
.../computeresource/GlobusJobSubmission.java | 54 +-
.../computeresource/GridFTPDataMovement.java | 681 ---------
.../computeresource/LOCALDataMovement.java | 418 ------
.../computeresource/LOCALSubmission.java | 22 +-
.../computeresource/SCPDataMovement.java | 746 ----------
.../computeresource/SSHJobSubmission.java | 54 +-
.../computeresource/SecurityProtocol.java | 88 --
.../computeresource/UnicoreDataMovement.java | 629 ---------
.../computeresource/UnicoreJobSubmission.java | 22 +-
.../ComputeResourcePreference.java | 20 +-
.../StorageResourceDescription.java | 38 +-
.../airavata/model/data/movement/DMType.java | 62 +
.../data/movement/DataMovementInterface.java | 630 +++++++++
.../data/movement/DataMovementProtocol.java | 87 ++
.../data/movement/GridFTPDataMovement.java | 681 +++++++++
.../model/data/movement/LOCALDataMovement.java | 418 ++++++
.../model/data/movement/SCPDataMovement.java | 746 ++++++++++
.../model/data/movement/SecurityProtocol.java | 88 ++
.../data/movement/UnicoreDataMovement.java | 629 +++++++++
.../experiment/UserConfigurationDataModel.java | 114 +-
.../airavata/model/process/ProcessModel.java | 114 +-
.../model/task/EnvironmentSetupTaskModel.java | 22 +-
.../core/config/DataTransferTaskConfig.java | 2 +-
.../gfac/core/config/GFacYamlConfigruation.java | 2 +-
.../gfac/core/context/ProcessContext.java | 22 +-
.../org/apache/airavata/gfac/impl/Factory.java | 1 +
.../airavata/gfac/impl/GFacEngineImpl.java | 2 +
.../integration/tools/DocumentCreatorNew.java | 3 -
.../integration/tools/DocumentCreatorUtils.java | 2 -
.../core/utils/OrchestratorUtils.java | 5 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 1 +
.../app/catalog/impl/ComputeResourceImpl.java | 1 +
.../catalog/impl/GwyResourceProfileImpl.java | 4 +-
.../util/AppCatalogThriftConversion.java | 3 +-
.../catalog/model/UserConfigurationData.java | 10 +
.../UserConfigurationDataResource.java | 9 +
...puteAppCatalogExperimentCatResourceTest.java | 1 +
.../app/catalog/GatewayProfileTest.java | 2 +-
.../airavata/registry/cpi/ComputeResource.java | 1 +
.../registry/cpi/GwyResourceProfile.java | 2 +-
.../ComputeResourceRegister.java | 4 +
.../airavata-api/airavata_api.thrift | 37 +-
.../airavata-api/airavata_data_models.thrift | 1 +
.../airavata-api/compute_resource_model.thrift | 136 +-
.../airavata-api/data_movement_models.thrift | 154 +++
.../airavata-api/experiment_model.thrift | 3 +-
.../gateway_resource_profile_model.thrift | 3 +-
.../airavata-api/process_model.thrift | 3 +-
.../airavata-api/storage_resource_model.thrift | 4 +-
.../airavata-api/task_model.thrift | 3 +-
105 files changed, 8063 insertions(+), 7407 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 75f7359..d32a98e 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -46,6 +46,7 @@ import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription;
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.model.error.*;
import org.apache.airavata.model.experiment.*;
import org.apache.airavata.model.job.JobModel;
@@ -3584,7 +3585,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
@Override
- public boolean addGatewayStoragePreference(AuthzToken authzToken, String gatewayID, String dataMoveId, StoragePreference dataStoragePreference) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public boolean addGatewayStoragePreference(AuthzToken authzToken, String gatewayID, String storageResourceId, StoragePreference dataStoragePreference) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
if (!isGatewayExistInternal(gatewayID)){
logger.error("Gateway does not exist.Please provide a valid gateway id...");
@@ -3597,6 +3598,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
GatewayResourceProfile profile = gatewayProfile.getGatewayProfile(gatewayID);
// gatewayProfile.removeGatewayResourceProfile(gatewayID);
+ dataStoragePreference.setStorageResourceId(storageResourceId);
profile.addToStoragePreferences(dataStoragePreference);
gatewayProfile.updateGatewayResourceProfile(gatewayID, profile);
return true;
@@ -3654,7 +3656,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
@Override
- public StoragePreference getGatewayStoragePreference(AuthzToken authzToken, String gatewayID, String dataMoveId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public StoragePreference getGatewayStoragePreference(AuthzToken authzToken, String gatewayID, String storageId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
if (!isGatewayExistInternal(gatewayID)){
logger.error("Gateway does not exist.Please provide a valid gateway id...");
@@ -3662,7 +3664,6 @@ public class AiravataServerHandler implements Airavata.Iface {
}
appCatalog = RegistryFactory.getAppCatalog();
GwyResourceProfile gatewayProfile = appCatalog.getGatewayProfile();
- ComputeResource computeResource = appCatalog.getComputeResource();
if (!gatewayProfile.isGatewayResourceProfileExists(gatewayID)){
logger.error(gatewayID, "Given gateway profile does not exist in the system. Please provide a valid gateway id...");
AiravataSystemException exception = new AiravataSystemException();
@@ -3671,7 +3672,7 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
- return gatewayProfile.getStoragePreference(gatewayID, dataMoveId);
+ return gatewayProfile.getStoragePreference(gatewayID, storageId);
} catch (AppCatalogException e) {
logger.error(gatewayID, "Error while reading gateway data storage preference...", e);
AiravataSystemException exception = new AiravataSystemException();