airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AIRAVATA-1203
Date Wed, 14 May 2014 14:33:30 GMT
Repository: airavata
Updated Branches:
  refs/heads/master a5e696770 -> 131d967db


https://issues.apache.org/jira/browse/AIRAVATA-1203


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

Branch: refs/heads/master
Commit: 131d967dbfadd53b3ae0222c9fff23513928622a
Parents: a5e6967
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Wed May 14 07:33:15 2014 -0700
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Wed May 14 07:33:15 2014 -0700

----------------------------------------------------------------------
 airavata-api/generate-thrift-files.sh           |  10 +-
 .../applicationCatalogAPI.thrift                | 165 +++++++++++++++++++
 2 files changed, 172 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/131d967d/airavata-api/generate-thrift-files.sh
----------------------------------------------------------------------
diff --git a/airavata-api/generate-thrift-files.sh b/airavata-api/generate-thrift-files.sh
index 2fca4be..fdc84f1 100755
--- a/airavata-api/generate-thrift-files.sh
+++ b/airavata-api/generate-thrift-files.sh
@@ -121,7 +121,9 @@ rm -rf ${JAVA_BEAN_GEN_DIR}
 # Generate the Airavata Data Model using thrify Java Beans generator. This will take generate
the classes in bean style
 #   with members being private and setters returning voids.
 #   The airavataDataModel.thrift includes rest of data models.
-thrift ${THRIFT_ARGS} --gen java:beans ${THRIFT_IDL_DIR}/airavataDataModel.thrift || fail
unable to generate java bean thrift classes
+thrift ${THRIFT_ARGS} --gen java:beans ${THRIFT_IDL_DIR}/airavataDataModel.thrift || fail
unable to generate java bean thrift classes on base data model
+
+thrift ${THRIFT_ARGS} --gen java:beans ${THRIFT_IDL_DIR}/applicationCatalogDataModel.thrift
|| fail unable to generate java bean thrift classes on app catalog data model
 
 # For the generated java beans add the ASF V2 License header
 add_license_header ${JAVA_BEAN_GEN_DIR}
@@ -142,7 +144,9 @@ rm -rf ${JAVA_GEN_DIR}
 
 # Using thrify Java generator, generate the java classes based on Airavata API. This
 #   The airavataAPI.thrift includes rest of data models.
-thrift ${THRIFT_ARGS} --gen java ${THRIFT_IDL_DIR}/airavataAPI.thrift || fail unable to generate
java thrift classes
+thrift ${THRIFT_ARGS} --gen java ${THRIFT_IDL_DIR}/airavataAPI.thrift || fail unable to generate
java thrift classes on AiravataAPI
+
+thrift ${THRIFT_ARGS} --gen java ${THRIFT_IDL_DIR}/applicationCatalogAPI.thrift || fail unable
to generate java thrift classes on App Catalog API
 
 # For the generated java classes add the ASF V2 License header
 add_license_header $JAVA_GEN_DIR
@@ -200,4 +204,4 @@ copy_changed_files ${PHP_GEN_DIR} ${PHP_SDK_DIR}
 #rm -rf ${BASE_TARGET_DIR}
 
 echo "Successfully generated new sources, compared against exiting code and replaced the
changed files"
-exit 0
\ No newline at end of file
+exit 0

http://git-wip-us.apache.org/repos/asf/airavata/blob/131d967d/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
new file mode 100644
index 0000000..9dd08be
--- /dev/null
+++ b/airavata-api/thrift-interface-descriptions/applicationCatalogAPI.thrift
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+/*
+ * Application Programming Interface definition for Apache Airavata Services.
+ *   this parent thrift file is contains all service interfaces. The data models are 
+ *   described in respective thrift files.
+*/
+
+include "airavataErrors.thrift"
+include "airavataDataModel.thrift"
+include "computeResourceDescrption.thrift"
+
+namespace java org.apache.airavata.api.appcatalog
+namespace php Airavata.API.AppCatalog
+namespace cpp airavata.api.appcatalog
+namespace perl AiravataAPI.AppCatalog
+namespace py airavata.api.appcatalog
+namespace js AiravataAPI.AppCatalog
+
+/*
+ * Airavata Interface Versions depend upon this Thrift Interface File. When Making changes,
please edit the
+ *  Version Constants according to Semantic Versioning Specification (SemVer) http://semver.org.
+ *
+ * Note: The Airavata API version may be different from the Airavata software release versions.
+ *
+ * The Airavata API version is composed as a dot delimited string with major, minor, and
patch level components.
+ *
+ *  - Major: Incremented for backward incompatible changes. An example would be changes to
interfaces.
+ *  - Minor: Incremented for backward compatible changes. An example would be the addition
of a new optional methods.
+ *  - Patch: Incremented for bug fixes. The patch level should be increased for every edit
that doesn't result
+ *              in a change to major/minor version numbers.
+*/
+const string AIRAVATA_API_VERSION = "0.12.0"
+
+service ApplicationCatalogAPI {
+
+/*
+ * Apache Airavata API Service Methods. For data structures associated in the signatures,
please see included thrift files
+*/
+
+  /** Query Airavata to fetch the API version */
+  string GetAPIVersion(),
+  
+  /**
+   * Manage Computer Resources
+  */
+  void addComputerResourceDescription(1: ComputeResourceDescription computeResourceDescription)
+    throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)
+            
+  void addJobSubmissionProtocol(1: string computeResourceId, 2: 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) 
+            
+  list<string> listComputeResourceDescriptions()
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)
+
+  ComputeResourceDescription getComputeResourceDescription(1: string computeResourceId)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)
+
+  SSHJobSubmission getSSHJobSubmissionProtocol(1: string sshJobSubmissionProtocolResourceId)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)
+            
+  GSISSHJobSubmission getGSISSHJobSubmissionProtocol(1: string gsisshJobSubmissionProtocolResourceId)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)
+            
+  GlobusJobSubmission getGlobusJobSubmissionProtocol(1: string globusJobSubmissionProtocolResourceId)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)     
+            
+  SCPDataMovement getSCPDataMovementProtocol(1: string scpDataMovementResourceId)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase) 
+
+  bool isComputeResourceDescriptionRegistered(1: string hostName)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)
+
+  ComputeResourceDescription getComputeResourceDescriptionFromHostName(1: string hostName)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)
+                       
+  /**
+   * Manage Application Interfaces
+  */
+  void addApplicationInterface(1: ApplicationInterface applicationInterface)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)
+            
+  list<string> listApplicationInterfaceIds()
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)  
+
+  ApplicationInterface getApplicationInterface(1: string applicationInterfaceId)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)  
+
+  /**
+   * Manage application deployments
+  */
+  void addApplicationDeployment(1: string applicationInterfaceId, 2: ApplicationDeployment
applicationDeployment)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)   
+            
+  list<string> listApplicationDeploymentIds()
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)  
+
+  ApplicationDeployment getApplicationDeployment(1: string applicationDeploymentId)
+  	throws (1: airavataErrors.InvalidRequestException ire,
+            2: airavataErrors.AiravataClientException ace,
+            3: airavataErrors.AiravataSystemException ase)  
+}


Mime
View raw message