You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/05/08 23:05:21 UTC
git commit: Refer GLUE2 schema for terms -
http://www.ogf.org/documents/GFD.147.pdf - AIRAVATA-1015
Repository: airavata
Updated Branches:
refs/heads/master 2fce90ee8 -> 6dbe34e97
Refer GLUE2 schema for terms - http://www.ogf.org/documents/GFD.147.pdf - AIRAVATA-1015
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6dbe34e9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6dbe34e9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6dbe34e9
Branch: refs/heads/master
Commit: 6dbe34e972b8be126429fe1e8c08fc0b8c2b4658
Parents: 2fce90e
Author: Suresh Marru <sm...@apache.org>
Authored: Thu May 8 17:05:17 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu May 8 17:05:17 2014 -0400
----------------------------------------------------------------------
.../computeResourceDescription.thrift | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/6dbe34e9/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift b/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift
index c004cea..5cde3fb 100644
--- a/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift
+++ b/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift
@@ -31,6 +31,9 @@ const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
* PBS:
* Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
*
+ * UGE:
+ * Univa Grid Engine, a variation of PBS implementation.
+ *
* SLURM:
* The Simple Linux Utility for Resource Management is a open source workload manager.
*
@@ -38,6 +41,7 @@ const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
enum ResourceJobManager {
FORK,
PBS,
+ UGE,
SLURM
}
@@ -171,8 +175,9 @@ struct ComputeResourceDescription {
1: required bool isEmpty = 0,
2: required string resourceId = DEFAULT_ID,
3: required string hostName,
- 4: optional string ipAddress,
+ 4: optional set<string> hostAliases,
+ 4: optional set<string> ipAddresses,
5: optional string resourceDescription,
- 6: required JobSubmissionProtocols jobSubmissionProtocols,
- 7: required DataMovementProtocol dataMovementProtocols
+ 6: required map<JobSubmissionProtocol, JobSubmissionProtocols> jobSubmissionProtocols,
+ 7: required map<DataMovementProtocol, DataMovementProtocol> dataMovementProtocols
}
\ No newline at end of file