You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/05/09 17:02:37 UTC
git commit: https://issues.apache.org/jira/browse/AIRAVATA-1203
Repository: airavata
Updated Branches:
refs/heads/master cd8250db1 -> 483a0f529
https://issues.apache.org/jira/browse/AIRAVATA-1203
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/483a0f52
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/483a0f52
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/483a0f52
Branch: refs/heads/master
Commit: 483a0f5294308a7afe12e3d6d48e52bb672a52e8
Parents: cd8250d
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Fri May 9 08:02:27 2014 -0700
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Fri May 9 08:02:27 2014 -0700
----------------------------------------------------------------------
.../computeResourceDescription.thrift | 46 +++++---------------
1 file changed, 11 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/483a0f52/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 b3d1620..c025f12 100644
--- a/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift
+++ b/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift
@@ -107,58 +107,34 @@ enum SecurityProtocol {
OAUTH
}
-struct SSHJobSubmission {
- 1: required SecurityProtocol securityProtocol,
- 2: required ResourceJobManager resourceJobManager,
- 3: optional i32 sshPort = 22
-}
+
struct SCPDataMovement {
1: required SecurityProtocol securityProtocol,
2: optional i32 sshPort = 22,
}
-struct GlobusJobSubmission {
- 1: required SecurityProtocol securityProtocol,
- 2: required ResourceJobManager resourceJobManager,
- 3: optional string globusGateKeeperEndPoint
-}
-
-struct EC2JobSubmission {
- 1: required SecurityProtocol securityProtocol,
+struct SSHJobSubmission {
2: required ResourceJobManager resourceJobManager,
- 3: optional string imageID,
- 4: optional string instanceID
+ 3: optional i32 sshPort = 22
}
-struct UnicoreJobSubmission {
+struct GlobusJobSubmission {
1: required SecurityProtocol securityProtocol,
2: required ResourceJobManager resourceJobManager,
- 3: optional string unicoreBESEndPoint
+ 3: optional string globusGateKeeperEndPoint
}
struct GSISSHJobSubmission {
- 1: required SecurityProtocol securityProtocol,
2: required ResourceJobManager resourceJobManager,
3: optional i32 sshPort = 22,
- 4: optional list<string> exports,
- 5: optional string preJobCommands,
- 6: optional string postJobCommands,
+ 4: optional set<string> exports,
+ 5: optional list<string> preJobCommands,
+ 6: optional list<string> postJobCommands,
7: optional string installedPath,
8: optional string monitorMode
}
-struct WhirConfiguration {
- 1: optional string configurationFile,
- 2: optional string byonClusterConfigurationFile,
- 3: optional map<string,string> properties,
-}
-struct HadoopJobSubmission {
- 1: required string jobProtocolDataId = DEFAULT_ID,
- 2: required SecurityProtocol securityProtocol,
- 3: required ResourceJobManager resourceJobManager,
- 4: optional string hadoopConfigurationDirectory,
- 5: optional WhirConfiguration whirrConfiguration,
-}
+
/**
* Job Submission Protocols
*
@@ -218,8 +194,8 @@ struct ComputeResourceDescription {
4: optional set<string> hostAliases,
4: optional set<string> ipAddresses,
5: optional string resourceDescription,
- 6: optional string scratchLocation
- 7: optional list<string> jobSubmissionProtocolPreferenceOrder,
+ 6: optional string scratchLocation,
+ 7: optional string preferredJobSubmissionProtocol,
8: required map<string, JobSubmissionProtocol> jobSubmissionProtocols,
9: required map<string, DataMovementProtocol> dataMovementProtocols
}