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/06/25 18:28:22 UTC
[1/2] git commit: updating taskdetails and orchestrator service
https://issues.apache.org/jira/browse/AIRAVATA-1301
Repository: airavata
Updated Branches:
refs/heads/master b62e67d50 -> 29f94c390
updating taskdetails and orchestrator service https://issues.apache.org/jira/browse/AIRAVATA-1301
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/59ffdfd5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/59ffdfd5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/59ffdfd5
Branch: refs/heads/master
Commit: 59ffdfd5e1c2610691f877cef20cc8bc4e102d4c
Parents: 236c04a
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Wed Jun 25 12:27:40 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Wed Jun 25 12:27:40 2014 -0400
----------------------------------------------------------------------
.../experimentModel.thrift | 20 +++++++++++---------
.../orchestrator.cpi.service.thrift | 12 +++++++++++-
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/59ffdfd5/airavata-api/thrift-interface-descriptions/experimentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/experimentModel.thrift b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
index 1801103..b2e7479 100644
--- a/airavata-api/thrift-interface-descriptions/experimentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
@@ -301,15 +301,17 @@ struct TaskDetails {
2: optional i64 creationTime,
3: optional string applicationId,
4: optional string applicationVersion,
- 5: optional list<DataObjectType> applicationInputs,
- 6: optional list<DataObjectType> applicationOutputs,
- 7: optional ComputationalResourceScheduling taskScheduling,
- 8: optional AdvancedInputDataHandling advancedInputDataHandling,
- 9: optional AdvancedOutputDataHandling advancedOutputDataHandling,
- 10: optional TaskStatus taskStatus,
- 11: optional list<JobDetails> jobDetailsList,
- 12: optional list<DataTransferDetails> dataTransferDetailsList,
- 13: optional list<ErrorDetails> errors
+ 5: optional string hostDescriptorId,
+ 6: optional string applicationDescriptorId,
+ 7: optional list<DataObjectType> applicationInputs,
+ 8: optional list<DataObjectType> applicationOutputs,
+ 9: optional ComputationalResourceScheduling taskScheduling,
+ 10: optional AdvancedInputDataHandling advancedInputDataHandling,
+ 11: optional AdvancedOutputDataHandling advancedOutputDataHandling,
+ 12: optional TaskStatus taskStatus,
+ 13: optional list<JobDetails> jobDetailsList,
+ 14: optional list<DataTransferDetails> dataTransferDetailsList,
+ 15: optional list<ErrorDetails> errors
}
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/59ffdfd5/modules/orchestrator/orchestrator-thrift-descriptions/orchestrator.cpi.service.thrift
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-thrift-descriptions/orchestrator.cpi.service.thrift b/modules/orchestrator/orchestrator-thrift-descriptions/orchestrator.cpi.service.thrift
index d0b97aa..05f30f2 100644
--- a/modules/orchestrator/orchestrator-thrift-descriptions/orchestrator.cpi.service.thrift
+++ b/modules/orchestrator/orchestrator-thrift-descriptions/orchestrator.cpi.service.thrift
@@ -45,6 +45,16 @@ service OrchestratorService {
bool launchExperiment (1: required string experimentId),
/**
+ * In order to run single applications users should create an associating
+ * WorkflowNodeDetails and a TaskDetails for it and hand it over for execution
+ *
+ * @param taskId
+ * @return sucess/failure
+ *
+ **/
+ bool launchTask (1: required string taskId),
+
+ /**
*
* Validate funcations which can verify if the experiment is ready to be launced.
*
@@ -63,4 +73,4 @@ service OrchestratorService {
*
**/
bool terminateExperiment (1: required string experimentId)
-}
\ No newline at end of file
+}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sa...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/29f94c39
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/29f94c39
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/29f94c39
Branch: refs/heads/master
Commit: 29f94c39055f7435803d21944c46b47228873576
Parents: 59ffdfd b62e67d
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Wed Jun 25 12:28:08 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Wed Jun 25 12:28:08 2014 -0400
----------------------------------------------------------------------
.../applicationCatalogAPI.thrift | 36 ++--
.../applicationCatalogDataModel.thrift | 204 -------------------
.../applicationDeploymentModel.thrift | 204 +++++++++++++++++++
.../applicationInterfaceModel.thrift | 204 +++++++++++++++++++
.../computeHostModel.thrift | 204 +++++++++++++++++++
.../gatewayProfileModel.thrift | 204 +++++++++++++++++++
tools/gsissh/src/main/java/SSHDemo.java | 2 +-
.../impl/DefaultSSHApiTestWithMyProxyAuth.java | 202 ++----------------
.../gsissh/src/test/resources/log4j.properties | 34 ++++
9 files changed, 887 insertions(+), 407 deletions(-)
----------------------------------------------------------------------