airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject git commit: fixing the namespaces and re-ording struts
Date Mon, 03 Feb 2014 20:50:43 GMT
Updated Branches:
  refs/heads/master 72f55e982 -> 5cf0a0f55


fixing the namespaces and re-ording struts


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5cf0a0f5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5cf0a0f5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5cf0a0f5

Branch: refs/heads/master
Commit: 5cf0a0f554fb2be52eac19b1af3e8506c63f2276
Parents: 72f55e9
Author: Suresh Marru <smarru@apache.org>
Authored: Mon Feb 3 15:50:25 2014 -0500
Committer: Suresh Marru <smarru@apache.org>
Committed: Mon Feb 3 15:50:25 2014 -0500

----------------------------------------------------------------------
 modules/thrift-interfaces/airavataAPI.thrift    | 15 ++++----
 .../thrift-interfaces/experimentModel.thrift    | 36 ++++++++++----------
 2 files changed, 26 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/5cf0a0f5/modules/thrift-interfaces/airavataAPI.thrift
----------------------------------------------------------------------
diff --git a/modules/thrift-interfaces/airavataAPI.thrift b/modules/thrift-interfaces/airavataAPI.thrift
index 66fbe4b..b79fd5d 100644
--- a/modules/thrift-interfaces/airavataAPI.thrift
+++ b/modules/thrift-interfaces/airavataAPI.thrift
@@ -24,8 +24,9 @@
  *   described in respective thrift files.
 */
 
-include "airavataDataModel.thrift"
 include "airavataErrors.thrift"
+include "airavataDataModel.thrift"
+include "experimentModel.thrift"
 
 namespace java org.apache.airavata.api
 namespace php Airavata.API
@@ -93,7 +94,7 @@ service Airavata {
    *       rather an Airavata Administrator will be notified to take corrective action.
    *
   */
-  string createExperiment(1: airavataDatastructures.ExperimentMetadata experimentMetadata)
+  string createExperiment(1: experimentModel.BasicMetadata basicExperimentMetadata)
     throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)
@@ -131,7 +132,7 @@ service Airavata {
    *       rather an Airavata Administrator will be notified to take corrective action.
    *
   */
-  airavataDatastructures.ExperimentMetadata getExperimentMetadata(1: string airavataExperimentId)
+  experimentModel.BasicMetadata getBasicExperimentMetadata(1: string airavataExperimentId)
     throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.ExperimentNotFoundException enf,
             3: airavataErrors.AiravataClientException ace,
@@ -181,7 +182,7 @@ service Airavata {
    *
   */
   void configureExperiment(1: string airavataExperimentId,
-                           2: airavataDatastructures.ExperimentConfigurationData experimentConfigurationData)
+                           2: experimentModel.ConfigurationData experimentConfigurationData)
     throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.ExperimentNotFoundException enf,
             3: airavataErrors.AiravataClientException ace,
@@ -220,7 +221,7 @@ service Airavata {
    *       rather an Airavata Administrator will be notified to take corrective action.
    *
   */
-  airavataDatastructures.ExperimentConfigurationData getExperimentConfiguration(1: string
airavataExperimentId)
+  experimentModel.ConfigurationData getExperimentConfiguration(1: string airavataExperimentId)
     throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.ExperimentNotFoundException enf,
             3: airavataErrors.AiravataClientException ace,
@@ -325,7 +326,7 @@ service Airavata {
    *
   */
   string configureAndLaunchExperiment (1: string airavataExperimentId
-                                       2: airavataDatastructures.ExperimentConfigurationData
experimentConfigurationData,
+                                       2: experimentModel.ConfigurationData experimentConfigurationData,
                                        3: string airavataCredStoreToken)
     throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.ExperimentNotFoundException enf,
@@ -372,7 +373,7 @@ service Airavata {
    *
   */
   string cloneExperimentConfiguration(1: string airavataExperimentIdToBeCloned,
-                                      2: airavataDatastructures.ExperimentMetadata experimentMetadata)
+                                      2: experimentModel.BasicMetadata basicExperimentMetadata)
     throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.ExperimentNotFoundException enf,
             3: airavataErrors.AiravataClientException ace,

http://git-wip-us.apache.org/repos/asf/airavata/blob/5cf0a0f5/modules/thrift-interfaces/experimentModel.thrift
----------------------------------------------------------------------
diff --git a/modules/thrift-interfaces/experimentModel.thrift b/modules/thrift-interfaces/experimentModel.thrift
index 212f153..71e9e6a 100644
--- a/modules/thrift-interfaces/experimentModel.thrift
+++ b/modules/thrift-interfaces/experimentModel.thrift
@@ -72,24 +72,6 @@ struct BasicMetadata {
 }
 
 /**
- * A structure holding the experiment configuration.
- *
- *
-*/
-struct ConfigurationData {
-  1: optional BasicMetadata basicMetadata,
-  2: optional string applicationId,
-  3: optional string applicationVersion,
-  4: optional string workflowTemplateId,
-  5: optional string worklfowTemplateVersion,
-  6: optional map<string,string> experimentInputs,
-  7: optional ComputationalResourceScheduling computationalResourceScheduling,
-  8: optional AdvancedInputDataHandling advanceInputDataHandling,
-  9: optional AdvancedOutputDataHandling advanceOutputDataHandling,
-  10: optional QualityOfServiceParams qosParams
-}
-
-/**
  * A structure holding the Computational Resource Scheduling.
  *
 */
@@ -137,3 +119,21 @@ struct QualityOfServiceParams {
     2:optional string executeBefore,
     3:optional i32 numberofRetries,
 }
+
+/**
+ * A structure holding the experiment configuration.
+ *
+ *
+*/
+struct ConfigurationData {
+  1: optional BasicMetadata basicMetadata,
+  2: optional string applicationId,
+  3: optional string applicationVersion,
+  4: optional string workflowTemplateId,
+  5: optional string worklfowTemplateVersion,
+  6: optional map<string,string> experimentInputs,
+  7: optional ComputationalResourceScheduling computationalResourceScheduling,
+  8: optional AdvancedInputDataHandling advanceInputDataHandling,
+  9: optional AdvancedOutputDataHandling advanceOutputDataHandling,
+  10: optional QualityOfServiceParams qosParams
+}


Mime
View raw message