Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/93e18115 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/93e18115 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/93e18115 Branch: refs/heads/master Commit: 93e18115751e3ca1c6bd04fa6f0e12a20012471e Parents: 3dae704 d37c9d2 Author: scnakandala <[email protected]> Authored: Tue May 2 16:30:45 2017 -0400 Committer: scnakandala <[email protected]> Committed: Tue May 2 16:30:45 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/api/Airavata.java | 28 +- .../airavata/api/airavata_apiConstants.java | 28 +- .../main/resources/lib/airavata/Airavata.cpp | 18316 ++++++++++------- .../src/main/resources/lib/airavata/Airavata.h | 1390 +- .../lib/airavata/Airavata_server.skeleton.cpp | 35 + .../resources/lib/airavata/airavata_api_types.h | 1 + .../lib/airavata/airavata_data_models_types.h | 2 + .../lib/airavata/airavata_errors_types.cpp | 205 +- .../lib/airavata/airavata_errors_types.h | 44 + .../lib/airavata/db_event_model_constants.cpp | 34 + .../lib/airavata/db_event_model_constants.h | 41 + .../lib/airavata/db_event_model_types.cpp | 627 + .../lib/airavata/db_event_model_types.h | 318 + .../lib/airavata/messaging_events_types.cpp | 8 +- .../lib/airavata/messaging_events_types.h | 3 +- .../airavata/replica_catalog_models_types.cpp | 726 +- .../lib/airavata/replica_catalog_models_types.h | 274 +- .../airavata/tenant_profile_model_constants.cpp | 34 + .../airavata/tenant_profile_model_constants.h | 41 + .../lib/airavata/tenant_profile_model_types.cpp | 541 + .../lib/airavata/tenant_profile_model_types.h | 244 + .../lib/airavata/user_profile_model_types.cpp | 241 +- .../lib/airavata/user_profile_model_types.h | 57 +- .../resources/lib/Airavata/API/Airavata.php | 12 + .../resources/lib/Airavata/API/Error/Types.php | 82 + .../Model/AppCatalog/ComputeResource/Types.php | 2 +- .../lib/Airavata/Model/Application/Io/Types.php | 6 +- .../lib/Airavata/Model/Data/Replica/Types.php | 572 +- .../lib/Airavata/Model/Dbevent/Types.php | 573 + .../Airavata/Model/Messaging/Event/Types.php | 2 + .../lib/Airavata/Model/Tenant/Types.php | 528 + .../resources/lib/Airavata/Model/User/Types.php | 292 +- .../lib/apache/airavata/api/Airavata-remote | 49 + .../lib/apache/airavata/api/Airavata.py | 8167 +++++--- .../lib/apache/airavata/api/error/ttypes.py | 76 + .../resources/lib/apache/airavata/api/ttypes.py | 1 + .../airavata/model/data/replica/ttypes.py | 430 +- .../apache/airavata/model/dbevent/__init__.py | 1 + .../apache/airavata/model/dbevent/constants.py | 11 + .../lib/apache/airavata/model/dbevent/ttypes.py | 494 + .../airavata/model/messaging/event/ttypes.py | 3 + .../apache/airavata/model/tenant/__init__.py | 1 + .../apache/airavata/model/tenant/constants.py | 11 + .../lib/apache/airavata/model/tenant/ttypes.py | 352 + .../lib/apache/airavata/model/ttypes.py | 2 + .../lib/apache/airavata/model/user/ttypes.py | 234 +- .../apache/airavata/model/ComponentState.java | 28 +- .../apache/airavata/model/ComponentStatus.java | 28 +- .../org/apache/airavata/model/EdgeModel.java | 28 +- .../org/apache/airavata/model/NodeModel.java | 28 +- .../org/apache/airavata/model/PortModel.java | 28 +- .../apache/airavata/model/WorkflowModel.java | 28 +- .../apache/airavata/model/WorkflowState.java | 28 +- .../apache/airavata/model/WorkflowStatus.java | 28 +- .../ApplicationDeploymentDescription.java | 28 +- .../appdeployment/ApplicationModule.java | 28 +- .../appcatalog/appdeployment/CommandObject.java | 28 +- .../appcatalog/appdeployment/SetEnvPaths.java | 28 +- .../ApplicationInterfaceDescription.java | 28 +- .../appcatalog/computeresource/BatchQueue.java | 28 +- .../computeresource/CloudJobSubmission.java | 28 +- .../ComputeResourceDescription.java | 28 +- .../appcatalog/computeresource/DMType.java | 28 +- .../appcatalog/computeresource/FileSystems.java | 28 +- .../computeresource/GlobusJobSubmission.java | 28 +- .../computeresource/JobManagerCommand.java | 28 +- .../computeresource/JobSubmissionInterface.java | 28 +- .../computeresource/JobSubmissionProtocol.java | 28 +- .../computeresource/LOCALSubmission.java | 28 +- .../appcatalog/computeresource/MonitorMode.java | 28 +- .../computeresource/ProviderName.java | 28 +- .../computeresource/ResourceJobManager.java | 28 +- .../computeresource/ResourceJobManagerType.java | 32 +- .../computeresource/SSHJobSubmission.java | 28 +- .../computeresource/UnicoreJobSubmission.java | 28 +- .../ComputeResourcePreference.java | 28 +- .../gatewayprofile/GatewayResourceProfile.java | 28 +- .../gatewayprofile/StoragePreference.java | 28 +- .../StorageResourceDescription.java | 28 +- .../UserComputeResourcePreference.java | 28 +- .../UserResourceProfile.java | 28 +- .../UserStoragePreference.java | 28 +- .../airavata/model/application/io/DataType.java | 28 +- .../application/io/InputDataObjectType.java | 28 +- .../application/io/OutputDataObjectType.java | 28 +- .../airavata/model/commons/ErrorModel.java | 28 +- .../model/commons/ValidationResults.java | 28 +- .../airavata/model/commons/ValidatorResult.java | 28 +- .../commons/airavata_commonsConstants.java | 28 +- .../credential/store/CertificateCredential.java | 28 +- .../model/credential/store/CommunityUser.java | 28 +- .../credential/store/CredentialOwnerType.java | 28 +- .../credential/store/CredentialSummary.java | 28 +- .../credential/store/PasswordCredential.java | 28 +- .../model/credential/store/SSHCredential.java | 28 +- .../model/credential/store/SummaryType.java | 28 +- .../credential_store_data_modelsConstants.java | 28 +- .../airavata/model/data/movement/DMType.java | 28 +- .../data/movement/DataMovementInterface.java | 28 +- .../data/movement/DataMovementProtocol.java | 28 +- .../data/movement/GridFTPDataMovement.java | 28 +- .../model/data/movement/LOCALDataMovement.java | 28 +- .../model/data/movement/SCPDataMovement.java | 28 +- .../model/data/movement/SecurityProtocol.java | 28 +- .../data/movement/UnicoreDataMovement.java | 28 +- .../model/data/replica/DataProductModel.java | 112 +- .../model/data/replica/DataProductType.java | 28 +- .../data/replica/DataReplicaLocationModel.java | 72 +- .../data/replica/ReplicaLocationCategory.java | 28 +- .../data/replica/ReplicaPersistentType.java | 28 +- .../model/error/AiravataClientException.java | 28 +- .../airavata/model/error/AiravataErrorType.java | 28 +- .../model/error/AiravataSystemException.java | 28 +- .../model/error/AuthenticationException.java | 28 +- .../model/error/AuthorizationException.java | 28 +- .../error/ExperimentNotFoundException.java | 28 +- .../model/error/InvalidRequestException.java | 28 +- .../model/error/LaunchValidationException.java | 28 +- .../model/error/ProjectNotFoundException.java | 28 +- .../airavata/model/error/TimedOutException.java | 28 +- .../airavata/model/error/ValidationResults.java | 28 +- .../airavata/model/error/ValidatorResult.java | 28 +- .../model/experiment/ExperimentModel.java | 28 +- .../experiment/ExperimentSearchFields.java | 28 +- .../model/experiment/ExperimentStatistics.java | 28 +- .../experiment/ExperimentSummaryModel.java | 28 +- .../model/experiment/ExperimentType.java | 28 +- .../model/experiment/ProjectSearchFields.java | 28 +- .../experiment/UserConfigurationDataModel.java | 28 +- .../apache/airavata/model/group/GroupModel.java | 28 +- .../model/group/ResourcePermissionType.java | 28 +- .../airavata/model/group/ResourceType.java | 28 +- .../org/apache/airavata/model/job/JobModel.java | 28 +- .../event/ExperimentStatusChangeEvent.java | 28 +- .../messaging/event/ExperimentSubmitEvent.java | 28 +- .../model/messaging/event/JobIdentifier.java | 28 +- .../messaging/event/JobStatusChangeEvent.java | 28 +- .../event/JobStatusChangeRequestEvent.java | 28 +- .../airavata/model/messaging/event/Message.java | 28 +- .../model/messaging/event/MessageLevel.java | 28 +- .../model/messaging/event/MessageType.java | 28 +- .../messaging/event/ProcessIdentifier.java | 28 +- .../event/ProcessStatusChangeEvent.java | 28 +- .../event/ProcessStatusChangeRequestEvent.java | 28 +- .../messaging/event/ProcessSubmitEvent.java | 28 +- .../messaging/event/ProcessTerminateEvent.java | 28 +- .../model/messaging/event/TaskIdentifier.java | 28 +- .../messaging/event/TaskOutputChangeEvent.java | 28 +- .../messaging/event/TaskStatusChangeEvent.java | 28 +- .../event/TaskStatusChangeRequestEvent.java | 28 +- .../parallelism/ApplicationParallelismType.java | 28 +- .../airavata/model/process/ProcessModel.java | 28 +- .../ComputationalResourceSchedulingModel.java | 28 +- .../airavata/model/security/AuthzToken.java | 28 +- .../airavata/model/status/ExperimentState.java | 28 +- .../airavata/model/status/ExperimentStatus.java | 28 +- .../apache/airavata/model/status/JobState.java | 28 +- .../apache/airavata/model/status/JobStatus.java | 28 +- .../airavata/model/status/ProcessState.java | 28 +- .../airavata/model/status/ProcessStatus.java | 28 +- .../airavata/model/status/QueueStatusModel.java | 28 +- .../apache/airavata/model/status/TaskState.java | 28 +- .../airavata/model/status/TaskStatus.java | 28 +- .../airavata/model/task/DataStageType.java | 28 +- .../model/task/DataStagingTaskModel.java | 28 +- .../model/task/EnvironmentSetupTaskModel.java | 28 +- .../model/task/JobSubmissionTaskModel.java | 28 +- .../airavata/model/task/MonitorTaskModel.java | 28 +- .../apache/airavata/model/task/TaskModel.java | 28 +- .../apache/airavata/model/task/TaskTypes.java | 28 +- .../apache/airavata/model/tenant/Tenant.java | 2322 +++ .../model/tenant/TenantApprovalStatus.java | 77 + .../airavata/model/user/NSFDemographics.java | 28 +- .../org/apache/airavata/model/user/Status.java | 28 +- .../airavata/model/user/USCitizenship.java | 28 +- .../apache/airavata/model/user/UserProfile.java | 734 +- .../apache/airavata/model/user/disability.java | 28 +- .../apache/airavata/model/user/ethnicity.java | 28 +- .../org/apache/airavata/model/user/race.java | 28 +- .../model/user/user_profile_modelConstants.java | 28 +- .../airavata/model/workspace/Gateway.java | 28 +- .../model/workspace/GatewayApprovalStatus.java | 28 +- .../apache/airavata/model/workspace/Group.java | 28 +- .../airavata/model/workspace/Notification.java | 28 +- .../model/workspace/NotificationPriority.java | 28 +- .../airavata/model/workspace/Project.java | 28 +- .../apache/airavata/model/workspace/User.java | 28 +- .../core/impl/TenantManagementKeycloakImpl.java | 8 +- .../testing-0.17/files/client_truststore.jks | 271 + .../testing-0.17/group_vars/all/vars.yml | 10 +- .../testing-0.17/group_vars/all/vault.yml | 18 +- .../testing-0.17/group_vars/pga/vars.yml | 15 +- .../testing-0.17/group_vars/pga/vault.yml | 34 +- .../ansible/roles/api-orch/defaults/main.yml | 2 +- .../templates/airavata-server.properties.j2 | 32 +- dev-tools/ansible/roles/database/vars/main.yml | 2 + dev-tools/ansible/roles/gfac/defaults/main.yml | 2 +- .../templates/airavata-server.properties.j2 | 6 +- dev-tools/ansible/roles/pga/defaults/main.yml | 5 + dev-tools/ansible/roles/pga/tasks/main.yml | 2 +- .../roles/pga/templates/pga_config.php.j2 | 20 +- .../main/resources/airavata-server.properties | 2 + .../src/main/resources/client_truststore.jks | Bin 3740 -> 5312 bytes .../org/apache/airavata/server/ServerMain.java | 2 +- .../airavata-apis/airavata_api.thrift | 4 +- .../component-cpis/registry-api.thrift | 2 +- .../component-cpis/user-profile-cpi.thrift | 2 +- .../data-models/airavata_data_models.thrift | 5 +- .../user_resource_profile_model.thrift | 2 +- .../group_manager_model.thrift | 48 - .../user-group-models/user_profile_model.thrift | 186 - .../group_manager_model.thrift | 48 + .../tenant_profile_model.thrift | 58 + .../user_profile_model.thrift | 197 + .../iam-admin-services-cpi.thrift | 2 +- .../profile-user/profile-user-cpi.thrift | 2 +- 216 files changed, 28999 insertions(+), 14256 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/93e18115/thrift-interface-descriptions/service-cpis/profile-service/iam-admin-services/iam-admin-services-cpi.thrift ----------------------------------------------------------------------
