Repository: airavata Updated Branches: refs/heads/master 25cf3c97b -> f9f63a025
Adding a resource user name to compute resource preference - AIRAVATA-1617 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3df0250e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3df0250e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3df0250e Branch: refs/heads/master Commit: 3df0250ed0c46dff4daf013292f8178eec8634ed Parents: 25cf3c9 Author: Suresh Marru <[email protected]> Authored: Tue Mar 3 12:29:17 2015 -0500 Committer: Suresh Marru <[email protected]> Committed: Tue Mar 3 12:29:17 2015 -0500 ---------------------------------------------------------------------- .../computeResourceModel.thrift | 5 ----- .../gatewayResourceProfileModel.thrift | 20 +++++++++----------- 2 files changed, 9 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/3df0250e/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift ---------------------------------------------------------------------- diff --git a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift index 4747fbc..cb924e9 100644 --- a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift +++ b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift @@ -340,7 +340,6 @@ struct UnicoreJobSubmission { 3: required string unicoreEndPointURL } - /** * Provider name **/ @@ -364,10 +363,6 @@ struct CloudJobSubmission { 6: required string userAccountName } - - - - /** * Job Submission Interfaces * http://git-wip-us.apache.org/repos/asf/airavata/blob/3df0250e/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift ---------------------------------------------------------------------- diff --git a/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift b/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift index 83c808c..3f384c6 100644 --- a/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift +++ b/airavata-api/thrift-interface-descriptions/gatewayResourceProfileModel.thrift @@ -32,6 +32,9 @@ include "computeResourceModel.thrift" * overridebyAiravata: * If turned true, Airavata will override the preferences of better alternatives exist. * + * loginUserName: + * If turned true, Airavata will override the preferences of better alternatives exist. + * * preferredJobSubmissionProtocol: * For resources with multiple job submission protocols, the gateway can pick a preferred option. * @@ -53,11 +56,12 @@ include "computeResourceModel.thrift" struct ComputeResourcePreference { 1: required string computeResourceId, 2: required bool overridebyAiravata = 1, - 3: optional computeResourceModel.JobSubmissionProtocol preferredJobSubmissionProtocol, - 4: optional computeResourceModel.DataMovementProtocol preferredDataMovementProtocol, - 5: optional string preferredBatchQueue, - 6: optional string scratchLocation, - 7: optional string allocationProjectNumber + 3: optional string loginUserName, + 4: optional computeResourceModel.JobSubmissionProtocol preferredJobSubmissionProtocol, + 5: optional computeResourceModel.DataMovementProtocol preferredDataMovementProtocol, + 6: optional string preferredBatchQueue, + 7: optional string scratchLocation, + 8: optional string allocationProjectNumber } /** @@ -66,12 +70,6 @@ struct ComputeResourcePreference { * gatewayID: * Unique identifier for the gateway assigned by Airavata. Corelate this to Airavata Admin API Gateway Registration. * - * gatewayName: - * Name of the Gateway. - * - * gatewayDescription: - * A user friendly description of the gateway. - * * computeResourcePreferences: * List of resource preferences for each of the registered compute resources. *
