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/07/09 20:14:12 UTC
[1/2] git commit: introducing new workflow thrift files
Repository: airavata
Updated Branches:
refs/heads/master 4a8e95766 -> fa6e188b2
introducing new workflow thrift files
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8577cea4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8577cea4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8577cea4
Branch: refs/heads/master
Commit: 8577cea4043bea1ed518cffb10868c32b177edce
Parents: 4244103
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Wed Jul 9 14:13:29 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Wed Jul 9 14:13:29 2014 -0400
----------------------------------------------------------------------
airavata-api/generate-thrift-files.sh | 6 ++
.../workflowAPI.thrift | 82 ++++++++++++++++++++
.../workflowDataModel.thrift | 36 +++++++++
3 files changed, 124 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8577cea4/airavata-api/generate-thrift-files.sh
----------------------------------------------------------------------
diff --git a/airavata-api/generate-thrift-files.sh b/airavata-api/generate-thrift-files.sh
index c8c1f74..049ba56 100755
--- a/airavata-api/generate-thrift-files.sh
+++ b/airavata-api/generate-thrift-files.sh
@@ -125,6 +125,8 @@ thrift ${THRIFT_ARGS} --gen java:beans ${THRIFT_IDL_DIR}/airavataDataModel.thrif
thrift ${THRIFT_ARGS} --gen java:beans ${THRIFT_IDL_DIR}/appCatalogModels.thrift || fail unable to generate java bean thrift classes on app catalog data models
+thrift ${THRIFT_ARGS} --gen java:beans ${THRIFT_IDL_DIR}/workflowDataModel.thrift || fail unable to generate java bean thrift classes on app workflow data models
+
# For the generated java beans add the ASF V2 License header
add_license_header ${JAVA_BEAN_GEN_DIR}
@@ -146,6 +148,8 @@ rm -rf ${JAVA_GEN_DIR}
# 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 on AiravataAPI
+thrift ${THRIFT_ARGS} --gen java ${THRIFT_IDL_DIR}/workflowAPI.thrift || fail unable to generate java thrift classes on WorkflowAPI
+
# For the generated java classes add the ASF V2 License header
add_license_header $JAVA_GEN_DIR
@@ -167,6 +171,7 @@ rm -rf ${CPP_GEN_DIR}
# The airavataAPI.thrift includes rest of data models.
thrift ${THRIFT_ARGS} --gen cpp ${THRIFT_IDL_DIR}/airavataAPI.thrift || fail unable to generate C++ thrift classes
+thrift ${THRIFT_ARGS} --gen cpp ${THRIFT_IDL_DIR}/workflowAPI.thrift || fail unable to generate C++ thrift classes for WorkflowAPI
# For the generated java classes add the ASF V2 License header
## TODO Write C++ license parser
@@ -188,6 +193,7 @@ rm -rf ${PHP_GEN_DIR}
# The airavataAPI.thrift includes rest of data models.
thrift ${THRIFT_ARGS} --gen php:autoload ${THRIFT_IDL_DIR}/airavataAPI.thrift || fail unable to generate PHP thrift classes
+thrift ${THRIFT_ARGS} --gen php:autoload ${THRIFT_IDL_DIR}/workflowAPI.thrift || fail unable to generate PHP thrift classes for WorkflowAPI
# For the generated java classes add the ASF V2 License header
## TODO Write PHP license parser
http://git-wip-us.apache.org/repos/asf/airavata/blob/8577cea4/airavata-api/thrift-interface-descriptions/workflowAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/workflowAPI.thrift b/airavata-api/thrift-interface-descriptions/workflowAPI.thrift
new file mode 100644
index 0000000..c853c8a
--- /dev/null
+++ b/airavata-api/thrift-interface-descriptions/workflowAPI.thrift
@@ -0,0 +1,82 @@
+/*
+ * 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 "experimentModel.thrift"
+include "workspaceModel.thrift"
+include "computeResourceModel.thrift"
+include "applicationDeploymentModel.thrift"
+include "applicationInterfaceModel.thrift"
+include "workflowDataModel.thrift"
+
+namespace java org.apache.airavata.api.workflow
+namespace php Airavata.API.Workflow
+namespace cpp airavata.api.workflow
+namespace perl AiravataWorkflowAPI
+namespace py airavata.api.workflow
+namespace js AiravataWorkflowAPI
+
+const string AIRAVATA_API_VERSION = "0.13.0"
+
+service Workflow {
+
+ list<string> getAllWorkflows()
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
+ workflowDataModel.Workflow getWorkflow (1: required string workflowTemplateId)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
+ void deleteWorkflow (1: required string workflowTemplateId)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
+ string registerWorkflow(1: required string workflowTemplateId, 2: required workflowDataModel.Workflow workflow)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
+ void updateWorkflow (1: required string workflowTemplateId, 2: required workflowDataModel.Workflow workflow)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
+ string getWorkflowTemplateId (1: required string workflowName)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
+ bool isWorkflowExistWithName(1: required string workflowName)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+ }
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/8577cea4/airavata-api/thrift-interface-descriptions/workflowDataModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/workflowDataModel.thrift b/airavata-api/thrift-interface-descriptions/workflowDataModel.thrift
new file mode 100644
index 0000000..43a529a
--- /dev/null
+++ b/airavata-api/thrift-interface-descriptions/workflowDataModel.thrift
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ *
+ */
+
+
+namespace java org.apache.airavata.model
+namespace php Airavata.Model
+
+/*
+ * This file describes the definitions of the Airavata Execution Data Structures. Each of the
+ * language specific Airavata Client SDK's will translate this neutral data model into an
+ * appropriate form for passing to the Airavata Server Execution API Calls.
+*/
+
+
+struct Workflow {
+ 1: required string templateId = DEFAULT_ID,
+ 2: required string name,
+ 3: optional string graph
+}
[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/fa6e188b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fa6e188b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fa6e188b
Branch: refs/heads/master
Commit: fa6e188b229e421180741ef22dc6a7f867202589
Parents: 8577cea 4a8e957
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Wed Jul 9 14:13:58 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Wed Jul 9 14:13:58 2014 -0400
----------------------------------------------------------------------
.../src/main/resources/lib/Airavata.cpp | 670 +++---
.../src/main/resources/lib/Airavata.h | 2110 +++++++++---------
.../resources/lib/Airavata_server.skeleton.cpp | 104 +-
.../resources/lib/airavataAPI_constants.cpp | 4 +-
.../main/resources/lib/airavataAPI_constants.h | 4 +-
.../main/resources/lib/airavataAPI_types.cpp | 4 +-
.../src/main/resources/lib/airavataAPI_types.h | 4 +-
.../lib/airavataDataModel_constants.cpp | 4 +-
.../resources/lib/airavataDataModel_constants.h | 4 +-
.../resources/lib/airavataDataModel_types.cpp | 4 +-
.../resources/lib/airavataDataModel_types.h | 4 +-
.../resources/lib/airavataErrors_constants.cpp | 4 +-
.../resources/lib/airavataErrors_constants.h | 4 +-
.../main/resources/lib/airavataErrors_types.cpp | 4 +-
.../main/resources/lib/airavataErrors_types.h | 4 +-
.../applicationDeploymentModel_constants.cpp | 4 +-
.../lib/applicationDeploymentModel_constants.h | 4 +-
.../lib/applicationDeploymentModel_types.cpp | 4 +-
.../lib/applicationDeploymentModel_types.h | 4 +-
.../lib/applicationInterfaceModel_constants.cpp | 4 +-
.../lib/applicationInterfaceModel_constants.h | 4 +-
.../lib/applicationInterfaceModel_types.cpp | 4 +-
.../lib/applicationInterfaceModel_types.h | 4 +-
.../lib/computeResourceModel_constants.cpp | 4 +-
.../lib/computeResourceModel_constants.h | 4 +-
.../lib/computeResourceModel_types.cpp | 4 +-
.../resources/lib/computeResourceModel_types.h | 4 +-
.../resources/lib/experimentModel_constants.cpp | 4 +-
.../resources/lib/experimentModel_constants.h | 4 +-
.../resources/lib/experimentModel_types.cpp | 4 +-
.../main/resources/lib/experimentModel_types.h | 4 +-
.../gatewayResourceProfileModel_constants.cpp | 4 +-
.../lib/gatewayResourceProfileModel_constants.h | 4 +-
.../lib/gatewayResourceProfileModel_types.cpp | 4 +-
.../lib/gatewayResourceProfileModel_types.h | 4 +-
.../resources/lib/workspaceModel_constants.cpp | 4 +-
.../resources/lib/workspaceModel_constants.h | 4 +-
.../main/resources/lib/workspaceModel_types.cpp | 4 +-
.../main/resources/lib/workspaceModel_types.h | 4 +-
.../php-cli-samples/add-compute-resources.php | 79 -
.../airavata-client-api-tester.php | 33 +-
.../php-cli-samples/cloneExperiment.php | 40 +-
.../php-cli-samples/createExperiment.php | 32 +-
.../getAllExperimentsInProject.php | 36 +-
.../php-cli-samples/getAllUserExperiments.php | 36 +-
.../php-cli-samples/getAllUserProjects.php | 39 +-
.../getApplicationDeployedResources.php | 36 +-
.../php-cli-samples/getApplicationInputs.php | 7 +-
.../php-cli-samples/getApplicationOutputs.php | 6 +-
.../resources/php-cli-samples/getExperiment.php | 39 +-
.../php-cli-samples/getExperimentOutputs.php | 12 +-
.../php-cli-samples/getExperimentStatus.php | 37 +-
.../php-cli-samples/launchExperiment.php | 36 +-
.../list-application-interfaces.php | 77 -
.../php-cli-samples/list-compute-resources.php | 102 -
.../search_experiments_by_application.php | 37 +-
.../search_experiments_by_description.php | 37 +-
.../search_experiments_by_name.php | 37 +-
.../php-cli-samples/terminateExperiment.php | 36 +-
.../php-cli-samples/updateExperiment.php | 48 +-
.../resources/php-cli-samples/updateProject.php | 36 +-
.../airavataAPI.thrift | 8 +-
.../airavataDataModel.thrift | 1 +
.../airavataErrors.thrift | 2 +-
.../applicationDeploymentModel.thrift | 1 +
.../applicationInterfaceModel.thrift | 1 +
.../computeResourceModel.thrift | 1 +
.../experimentModel.thrift | 1 +
.../gatewayResourceProfileModel.thrift | 1 +
.../workspaceModel.thrift | 1 +
.../data/impl/ApplicationDeploymentImpl.java | 52 +-
71 files changed, 1703 insertions(+), 2272 deletions(-)
----------------------------------------------------------------------