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/20 15:18:53 UTC
git commit: adding the changes to the app catalog models and functions
Repository: airavata
Updated Branches:
refs/heads/master 63ff50cee -> 3049a0b17
adding the changes to the app catalog models and functions
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3049a0b1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3049a0b1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3049a0b1
Branch: refs/heads/master
Commit: 3049a0b17442ee0d906aa241f84d3d31601987ce
Parents: 63ff50c
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Tue May 20 06:18:03 2014 -0700
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Tue May 20 06:18:03 2014 -0700
----------------------------------------------------------------------
.../applicationCatalogAPI.thrift | 4 ++--
.../applicationCatalogDataModel.thrift | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3049a0b1/airavata-api/thrift-interface-descriptions/applicationCatalogAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationCatalogAPI.thrift b/airavata-api/thrift-interface-descriptions/applicationCatalogAPI.thrift
index 3ca0637..4517889 100644
--- a/airavata-api/thrift-interface-descriptions/applicationCatalogAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationCatalogAPI.thrift
@@ -153,12 +153,12 @@ service ApplicationCatalogAPI {
2: airavataErrors.AiravataClientException ace,
3: airavataErrors.AiravataSystemException ase)
- list<string> listApplicationDeploymentIds()
+ list<string> listApplicationDeploymentIds(1: required string applicationInterfaceId)
throws (1: airavataErrors.InvalidRequestException ire,
2: airavataErrors.AiravataClientException ace,
3: airavataErrors.AiravataSystemException ase)
- applicationCatalogDataModel.ApplicationDeployment getApplicationDeployment(1: required string applicationDeploymentId)
+ applicationCatalogDataModel.ApplicationDeployment getApplicationDeployment(1: required string applicationInterfaceId, 2: required string applicationDeploymentId)
throws (1: airavataErrors.InvalidRequestException ire,
2: airavataErrors.AiravataClientException ace,
3: airavataErrors.AiravataSystemException ase)
http://git-wip-us.apache.org/repos/asf/airavata/blob/3049a0b1/airavata-api/thrift-interface-descriptions/applicationCatalogDataModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/applicationCatalogDataModel.thrift b/airavata-api/thrift-interface-descriptions/applicationCatalogDataModel.thrift
index bcbcb86..308b490 100644
--- a/airavata-api/thrift-interface-descriptions/applicationCatalogDataModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationCatalogDataModel.thrift
@@ -111,26 +111,26 @@ enum SecurityProtocol {
struct SCPDataMovement {
- 1: required string scpDataMovementID = DEFAULT_ID,
+ 1: required string dataSubmissionDataID = DEFAULT_ID,
2: required SecurityProtocol securityProtocol,
3: optional i32 sshPort = 22
}
struct SSHJobSubmission {
- 1: required string sshJobSubmissionID = DEFAULT_ID,
+ 1: required string jobSubmissionDataID = DEFAULT_ID,
2: required ResourceJobManager resourceJobManager,
3: optional i32 sshPort = 22
}
struct GlobusJobSubmission {
- 1: required string globusJobSubmissionID = DEFAULT_ID,
+ 1: required string jobSubmissionDataID = DEFAULT_ID,
2: required SecurityProtocol securityProtocol,
3: required ResourceJobManager resourceJobManager,
- 4: optional string globusGateKeeperEndPoint
+ 4: optional list<string> globusGateKeeperEndPoint
}
struct GSISSHJobSubmission {
- 1: required string gssishJobSubmissionID = DEFAULT_ID,
+ 1: required string jobSubmissionDataID = DEFAULT_ID,
2: required ResourceJobManager resourceJobManager,
3: optional i32 sshPort = 22,
4: optional set<string> exports,