airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [1/2] change cloneExperiment method to have previousExpID and updated experiment - AIRAVATA-1207, fix issues in appcatalog thrift files
Date Wed, 14 May 2014 17:51:39 GMT
Repository: airavata
Updated Branches:
  refs/heads/master d76c9d57f -> 22d0a6f49


http://git-wip-us.apache.org/repos/asf/airavata/blob/22d0a6f4/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 9dd08be..9c2fb5c 100644
--- a/airavata-api/thrift-interface-descriptions/applicationCatalogAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationCatalogAPI.thrift
@@ -26,7 +26,8 @@
 
 include "airavataErrors.thrift"
 include "airavataDataModel.thrift"
-include "computeResourceDescrption.thrift"
+include "applicationCatalogDataModel.thrift"
+include "computeResourceDescription.thrift"
 
 namespace java org.apache.airavata.api.appcatalog
 namespace php Airavata.API.AppCatalog
@@ -62,57 +63,59 @@ service ApplicationCatalogAPI {
   /**
    * Manage Computer Resources
   */
-  void addComputerResourceDescription(1: ComputeResourceDescription computeResourceDescription)
+  void addComputerResourceDescription(1: computeResourceDescription.ComputeResourceDescription
computeResourceDescription)
     throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)
             
-  void addJobSubmissionProtocol(1: string computeResourceId, 2: SSHJobSubmission jobSubmission)
+  void addJobSubmissionProtocol(1: string computeResourceId, 2: computeResourceDescription.SSHJobSubmission
jobSubmission)
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)
             
-  void addJobSubmissionProtocol(1: string computeResourceId, 2: GSISSHJobSubmission jobSubmission)
-  	throws (1: airavataErrors.InvalidRequestException ire,
-            2: airavataErrors.AiravataClientException ace,
-            3: airavataErrors.AiravataSystemException ase)
-            
-  void addJobSubmissionProtocol(1: string computeResourceId, 2: GlobusJobSubmission jobSubmission)
-  	throws (1: airavataErrors.InvalidRequestException ire,
-            2: airavataErrors.AiravataClientException ace,
-            3: airavataErrors.AiravataSystemException ase)     
-            
-  void addDataMovementProtocol(1: string computeResourceId, 2: SCPDataMovement dataMovement)
-  	throws (1: airavataErrors.InvalidRequestException ire,
-            2: airavataErrors.AiravataClientException ace,
-            3: airavataErrors.AiravataSystemException ase) 
-            
+  /**
+  *void addJobSubmissionProtocol(1: string computeResourceId, 2: computeResourceDescrption.GSISSHJobSubmission
jobSubmission)
+  *	throws (1: airavataErrors.InvalidRequestException ire,
+  *          2: airavataErrors.AiravataClientException ace,
+  *          3: airavataErrors.AiravataSystemException ase)
+  *
+  *void addJobSubmissionProtocol(1: string computeResourceId, 2: computeResourceDescrption.GlobusJobSubmission
jobSubmission)
+  *	throws (1: airavataErrors.InvalidRequestException ire,
+  *          2: airavataErrors.AiravataClientException ace,
+  *          3: airavataErrors.AiravataSystemException ase)
+  *
+  *void addDataMovementProtocol(1: string computeResourceId, 2: computeResourceDescrption.SCPDataMovement
dataMovement)
+  *	throws (1: airavataErrors.InvalidRequestException ire,
+  *          2: airavataErrors.AiravataClientException ace,
+  *          3: airavataErrors.AiravataSystemException ase)
+  */
+
   list<string> listComputeResourceDescriptions()
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)
 
-  ComputeResourceDescription getComputeResourceDescription(1: string computeResourceId)
+  computeResourceDescription.ComputeResourceDescription getComputeResourceDescription(1:
string computeResourceId)
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)
 
-  SSHJobSubmission getSSHJobSubmissionProtocol(1: string sshJobSubmissionProtocolResourceId)
+  computeResourceDescription.SSHJobSubmission getSSHJobSubmissionProtocol(1: string sshJobSubmissionProtocolResourceId)
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)
             
-  GSISSHJobSubmission getGSISSHJobSubmissionProtocol(1: string gsisshJobSubmissionProtocolResourceId)
+  computeResourceDescription.GSISSHJobSubmission getGSISSHJobSubmissionProtocol(1: string
gsisshJobSubmissionProtocolResourceId)
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)
             
-  GlobusJobSubmission getGlobusJobSubmissionProtocol(1: string globusJobSubmissionProtocolResourceId)
+  computeResourceDescription.GlobusJobSubmission getGlobusJobSubmissionProtocol(1: string
globusJobSubmissionProtocolResourceId)
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)     
             
-  SCPDataMovement getSCPDataMovementProtocol(1: string scpDataMovementResourceId)
+  computeResourceDescription.SCPDataMovement getSCPDataMovementProtocol(1: string scpDataMovementResourceId)
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase) 
@@ -122,7 +125,7 @@ service ApplicationCatalogAPI {
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)
 
-  ComputeResourceDescription getComputeResourceDescriptionFromHostName(1: string hostName)
+  computeResourceDescription.ComputeResourceDescription getComputeResourceDescriptionFromHostName(1:
string hostName)
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)
@@ -130,7 +133,7 @@ service ApplicationCatalogAPI {
   /**
    * Manage Application Interfaces
   */
-  void addApplicationInterface(1: ApplicationInterface applicationInterface)
+  void addApplicationInterface(1: applicationCatalogDataModel.ApplicationInterface applicationInterface)
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)
@@ -140,7 +143,7 @@ service ApplicationCatalogAPI {
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)  
 
-  ApplicationInterface getApplicationInterface(1: string applicationInterfaceId)
+  applicationCatalogDataModel.ApplicationInterface getApplicationInterface(1: string applicationInterfaceId)
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)  
@@ -148,7 +151,7 @@ service ApplicationCatalogAPI {
   /**
    * Manage application deployments
   */
-  void addApplicationDeployment(1: string applicationInterfaceId, 2: ApplicationDeployment
applicationDeployment)
+  void addApplicationDeployment(1: string applicationInterfaceId, 2: applicationCatalogDataModel.ApplicationDeployment
applicationDeployment)
   	throws (1: airavataErrors.InvalidRequestException ire,
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)   
@@ -158,7 +161,7 @@ service ApplicationCatalogAPI {
             2: airavataErrors.AiravataClientException ace,
             3: airavataErrors.AiravataSystemException ase)  
 
-  ApplicationDeployment getApplicationDeployment(1: string applicationDeploymentId)
+  applicationCatalogDataModel.ApplicationDeployment getApplicationDeployment(1: 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/22d0a6f4/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 65314f0..a1921d2 100644
--- a/airavata-api/thrift-interface-descriptions/applicationCatalogDataModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/applicationCatalogDataModel.thrift
@@ -192,12 +192,12 @@ struct ComputeResourceDescription {
     2: required string resourceId = DEFAULT_ID,
     3: required string hostName,
     4: optional set<string> hostAliases,
-    4: optional set<string> ipAddresses,
-    5: optional string resourceDescription,
-    6: optional string scratchLocation,
-    7: optional string preferredJobSubmissionProtocol,
-    8: required map<string, JobSubmissionProtocol> jobSubmissionProtocols,
-    9: required map<string, DataMovementProtocol> dataMovementProtocols
+    5: optional set<string> ipAddresses,
+    6: optional string resourceDescription,
+    7: optional string scratchLocation,
+    8: optional string preferredJobSubmissionProtocol,
+    9: required map<string, JobSubmissionProtocol> jobSubmissionProtocols,
+    10: required map<string, DataMovementProtocol> dataMovementProtocols
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/airavata/blob/22d0a6f4/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 c025f12..4707c5f 100644
--- a/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift
+++ b/airavata-api/thrift-interface-descriptions/computeResourceDescription.thrift
@@ -192,12 +192,12 @@ struct ComputeResourceDescription {
     2: required string resourceId = DEFAULT_ID,
     3: required string hostName,
     4: optional set<string> hostAliases,
-    4: optional set<string> ipAddresses,
-    5: optional string resourceDescription,
-    6: optional string scratchLocation,
-    7: optional string preferredJobSubmissionProtocol,
-    8: required map<string, JobSubmissionProtocol> jobSubmissionProtocols,
-    9: required map<string, DataMovementProtocol> dataMovementProtocols
+    5: optional set<string> ipAddresses,
+    6: optional string resourceDescription,
+    7: optional string scratchLocation,
+    8: optional string preferredJobSubmissionProtocol,
+    9: required map<string, JobSubmissionProtocol> jobSubmissionProtocols,
+    10: required map<string, DataMovementProtocol> dataMovementProtocols
 }
 
 /*
@@ -225,9 +225,9 @@ struct Validation{
 struct InputParameter {
 	1:required string name,
 	2:required ParameterType type,
-	3:required bool optional=0,
+	3:required bool isOptional=0,
 	4:optional string defaultValue,
-	5:optional list<Validation> validations,
+	5:optional list<Validation> validations
 }
 
 struct OutputParameter {
@@ -246,6 +246,6 @@ struct Application {
     1: required bool isEmpty = 0,
     2: required string applicationId = DEFAULT_ID,
     4: optional list<InputParameter> input,
-    5: optional list<OutputParameter> input,
+    5: optional list<OutputParameter> output,
 	6: required list<ApplicationDeployment> deployment 
 }
\ No newline at end of file


Mime
View raw message