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/07/03 22:04:16 UTC
git commit: Updating Local Host details - AIRAVATA-1203
Repository: airavata
Updated Branches:
refs/heads/master 2338739ea -> 52cedaccc
Updating Local Host details - AIRAVATA-1203
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/52cedacc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/52cedacc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/52cedacc
Branch: refs/heads/master
Commit: 52cedaccccbc78d09ffabaffe352e9907392619f
Parents: 2338739
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Jul 3 16:04:09 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Jul 3 16:04:09 2014 -0400
----------------------------------------------------------------------
.../applicationDeploymentModel.thrift | 2 +-
.../computeResourceModel.thrift | 41 +++++++++++++++++---
2 files changed, 36 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/52cedacc/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift b/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
index 13ea0b0..1dc5344 100644
--- a/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationDeploymentModel.thrift
@@ -99,7 +99,7 @@ struct ApplicationDeploymentDescription {
4: required string computeHostId,
5: required string executablePath,
6: optional string appDeploymentDescription,
- 7: optional string moduleLoadCmd,
+ 7: optional list<string> moduleLoadCmds,
8: optional list<SetEnvPaths> libPrependPaths,
9: optional list<SetEnvPaths> libAppendPaths,
10: optional list<SetEnvPaths> setEnvironment,
http://git-wip-us.apache.org/repos/asf/airavata/blob/52cedacc/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 2588153..76f5951 100644
--- a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift
@@ -119,7 +119,7 @@ enum SecurityProtocol {
*
*/
enum JobSubmissionProtocol {
- LOCALHOST,
+ LOCAL,
SSH,
GSISSH,
GRAM,
@@ -143,7 +143,7 @@ enum JobSubmissionProtocol {
*
*/
enum DataMovementProtocol {
- LOCALHOST,
+ LOCAL,
SCP,
SFTP,
GridFTP,
@@ -182,6 +182,34 @@ struct GridFTPDataMovement {
}
/**
+ * Locally Fork Jobs as OS processes
+ *
+ * alternativeSSHHostName:
+ * If the login to ssh is different than the hostname itself, specify it here
+ *
+ * sshPort:
+ * If a non-defualt port needs to used, specify it.
+*/
+struct LOCALSubmission {
+ 1: required string jobSubmissionInterfaceId = DEFAULT_ID,
+ 3: required ResourceJobManager resourceJobManager,
+ 6: optional string monitoringMechanism
+}
+
+/**
+ * LOCAL
+ *
+ * alternativeSCPHostName:
+ * If the login to scp is different than the hostname itself, specify it here
+ *
+ * sshPort:
+ * If a non-defualt port needs to used, specify it.
+*/
+struct LOCALDataMovement {
+ 1: required string dataMovementInterfaceId = DEFAULT_ID,
+}
+
+/**
* Authenticate using Secured Shell
*
* alternativeSSHHostName:
@@ -192,10 +220,11 @@ struct GridFTPDataMovement {
*/
struct SSHJobSubmission {
1: required string jobSubmissionInterfaceId = DEFAULT_ID,
- 2: required ResourceJobManager resourceJobManager,
- 3: optional string alternativeSSHHostName,
- 4: optional i32 sshPort = 22,
- 5: optional string monitoringMechanism
+ 2: required SecurityProtocol securityProtocol,
+ 3: required ResourceJobManager resourceJobManager,
+ 4: optional string alternativeSSHHostName,
+ 5: optional i32 sshPort = 22,
+ 6: optional string monitoringMechanism
}
struct GlobusJobSubmission {