AIRAVATA-2316 Adding API methods to thrift
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ebba4c9f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ebba4c9f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ebba4c9f Branch: refs/heads/develop Commit: ebba4c9f54b3a36688fbdc99d8692e31f6b28922 Parents: 53193fb Author: Marcus Christie <[email protected]> Authored: Fri Feb 17 13:10:26 2017 -0500 Committer: Anuj Bhandar <[email protected]> Committed: Tue Feb 28 12:55:35 2017 -0500 ---------------------------------------------------------------------- .../airavata-apis/airavata_api.thrift | 46 +++++++++++++++++++- .../user-group-models/user_profile_model.thrift | 1 + 2 files changed, 46 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/ebba4c9f/thrift-interface-descriptions/airavata-apis/airavata_api.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index 2737616..34ef441 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -37,7 +37,6 @@ include "../data-models/app-catalog-models/application_io_models.thrift" include "../data-models/app-catalog-models/application_deployment_model.thrift" include "../data-models/app-catalog-models/application_interface_model.thrift" include "../data-models/resource-catalog-models/compute_resource_model.thrift" -include "../data-models/resource-catalog-models/credential_summary.thrift" include "../data-models/resource-catalog-models/storage_resource_model.thrift" include "../data-models/resource-catalog-models/gateway_resource_profile_model.thrift" include "../data-models/resource-catalog-models/user_resource_profile_model.thrift" @@ -45,6 +44,7 @@ include "../data-models/resource-catalog-models/data_movement_models.thrift" include "../data-models/workflow-models/workflow_data_model.thrift" include "../data-models/replica-catalog-models/replica_catalog_models.thrift" include "../data-models/user-group-models/group_manager_model.thrift" +include "../data-models/user-group-models/user_profile_model.thrift" namespace java org.apache.airavata.api namespace php Airavata.API @@ -3465,6 +3465,50 @@ bool createGroup(1: required security_model.AuthzToken authzToken, 2: required g 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase, 4: airavata_errors.AuthorizationException ae) + /* + * User Profile Service methods + */ + string addUserProfile (1: required security_model.AuthzToken authzToken, 2: required user_profile_model.UserProfile userProfile) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase, + 4: airavata_errors.AuthorizationException ae) + + bool updateUserProfile (1: required security_model.AuthzToken authzToken, 2: required user_profile_model.UserProfile userProfile) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase, + 4: airavata_errors.AuthorizationException ae) + + user_profile_model.UserProfile getUserProfileById(1: required security_model.AuthzToken authzToken, 2: required string userId, 3: required string gatewayId) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase, + 4: airavata_errors.AuthorizationException ae) + + bool deleteUserProfile(1: required security_model.AuthzToken authzToken, 2: required string userId) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase, + 4: airavata_errors.AuthorizationException ae) + + list<user_profile_model.UserProfile> getAllUserProfilesInGateway (1: required security_model.AuthzToken authzToken, 2: required string gatewayId, 3: required i32 offset, 4: required i32 limit) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase, + 4: airavata_errors.AuthorizationException ae) + + user_profile_model.UserProfile getUserProfileByName(1: required security_model.AuthzToken authzToken, 2: required string userName, 3: required string gatewayId) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase, + 4: airavata_errors.AuthorizationException ae) + + bool doesUserProfileExist(1: required security_model.AuthzToken authzToken, 2: required string userName, 3: required string gatewayId) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase, + 4: airavata_errors.AuthorizationException ae) // //End of API } http://git-wip-us.apache.org/repos/asf/airavata/blob/ebba4c9f/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift b/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift index e6b17ba..582fa91 100644 --- a/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift +++ b/thrift-interface-descriptions/data-models/user-group-models/user_profile_model.thrift @@ -173,6 +173,7 @@ struct UserProfile { 10: optional list<string> nationality, 11: optional string homeOrganization, 12: optional string orginationAffiliation, + // TODO: shouldn't these time fields be of type i64? 13: required string creationTime, 14: required string lastAccessTime, 15: required string validUntil,
