airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [5/6] airavata git commit: Adding data movement preferences
Date Fri, 25 Sep 2015 19:09:17 GMT
Adding data movement preferences


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/50fabc39
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/50fabc39
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/50fabc39

Branch: refs/heads/master
Commit: 50fabc39948016542041eb2c039c1bb0c74dbc69
Parents: 9b1d836
Author: Suresh Marru <smarru@apache.org>
Authored: Fri Sep 25 15:07:46 2015 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Fri Sep 25 15:07:46 2015 -0400

----------------------------------------------------------------------
 .../airavata-api/compute_resource_model.thrift  |  8 +++++++
 .../gateway_resource_profile_model.thrift       | 24 ++++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/50fabc39/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 75db7ec..163ff97 100644
--- a/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift
@@ -317,6 +317,13 @@ struct LOCALDataMovement {
  *
  * sshPort:
  *  If a non-default port needs to used, specify it.
+ *
+ * batchQueueEmailSenders:
+ *  If a resource always sends the monitoring from a specific address, specify the
+ *   full email address. If a resource sends emails from multiple addresses (
+ *    example: based on the submitted login node) then use the wildchar * to indicate
+ *    the same. Example: *@*.example.com or *@example.com
+ *
 */
 struct SSHJobSubmission {
     1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID,
@@ -325,6 +332,7 @@ struct SSHJobSubmission {
     4: optional string alternativeSSHHostName,
     5: optional i32 sshPort = 22,
     6: optional MonitorMode monitorMode,
+    7: optional list<string> batchQueueEmailSenders
 }
 
 struct GlobusJobSubmission {

http://git-wip-us.apache.org/repos/asf/airavata/blob/50fabc39/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 c3fa905..bee5483 100644
--- a/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift
@@ -54,6 +54,10 @@ include "compute_resource_model.thrift"
  *    allocation is approved, an allocation number is assigned. Before passing this number
with job submittions, the
  *    account to be used has to be added to the allocation.
  *
+ * resourceSpecificCredentialStoreToken:
+ *  Resource specific credential store token. If this token is specified, then it is superceeded
by the gateway's
+ *   default credential store.
+ *
 */
 struct ComputeResourcePreference {
     1: required string computeResourceId,
@@ -63,21 +67,33 @@ struct ComputeResourcePreference {
     5: optional compute_resource_model.DataMovementProtocol preferredDataMovementProtocol,
     6: optional string preferredBatchQueue,
     7: optional string scratchLocation,
-    8: optional string allocationProjectNumber
+    8: optional string allocationProjectNumber,
+    9: optional string resourceSpecificCredentialStoreToken
+}
+
+struct DataStoragePreference {
+    1: required string dataMovememtResourceId,
+    2: optional string loginUserName,
+    3: optional string fileSystemRootLocation,
+    3: optional string resourceSpecificCredentialStoreToken
 }
 
 /**
  * Gateway Resource Profile
  *
  * gatewayID:
- *   Unique identifier for the gateway assigned by Airavata. Corelate this to Airavata Admin
API Gateway Registration.
+ *  Unique identifier for the gateway assigned by Airavata. Corelate this to Airavata Admin
API Gateway Registration.
+ *
+ * credentialStoreToken:
+ *  Gateway's defualt credential store token.
  *
  * computeResourcePreferences:
  *  List of resource preferences for each of the registered compute resources.
  *
- *
 */
 struct GatewayResourceProfile {
     1: required string gatewayID,
-    2: optional list<ComputeResourcePreference> computeResourcePreferences
+    2: optional string credentialStoreToken,
+    3: optional list<ComputeResourcePreference> computeResourcePreferences
+    4: optional list<DataStoragePreference> dataStoragePreferences,
 }


Mime
View raw message