You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/07/03 17:45:21 UTC
[1/2] git commit: Gateway Profile updates - AIRAVATA-1318
Repository: airavata
Updated Branches:
refs/heads/master 226250038 -> efca3d60e
Gateway Profile updates - AIRAVATA-1318
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f0f3bf17
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f0f3bf17
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f0f3bf17
Branch: refs/heads/master
Commit: f0f3bf17a5db7d3a321f6b5af0016c8e314a2021
Parents: 15c8630
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Jul 3 11:45:03 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Jul 3 11:45:03 2014 -0400
----------------------------------------------------------------------
.../gatewayProfileModel.thrift | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f0f3bf17/airavata-api/thrift-interface-descriptions/gatewayProfileModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/gatewayProfileModel.thrift b/airavata-api/thrift-interface-descriptions/gatewayProfileModel.thrift
index b1a136a..ed0c3ae 100644
--- a/airavata-api/thrift-interface-descriptions/gatewayProfileModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/gatewayProfileModel.thrift
@@ -26,8 +26,8 @@ const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
/**
* Resource Preferences for each of the gateway
*
- * gatewayID:
- * Unique identifier for the gateway assigned by Airavata
+ * computeResourceId:
+ * Corelate the preference for compute resource to
*
* gatewayName:
* Name of the Gateway.
@@ -48,13 +48,13 @@ const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
*/
struct ComputeResourcePreference {
1: required string computeResourceId,
- 2: required string preferredJobSubmissionProtocol,
- 3: required string preferredDataMovementProtocol,
- 4: required string parentScratchLocation,
- 5: optional string allocationProjectNumber
+ 2: required bool overridebyAiravata = 1,
+ 3: optional string preferredJobSubmissionProtocol,
+ 4: optional string preferredDataMovementProtocol,
+ 5: optional string scratchLocation,
+ 6: optional string allocationProjectNumber
}
-
/**
* Gateway Profile
*
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/efca3d60
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/efca3d60
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/efca3d60
Branch: refs/heads/master
Commit: efca3d60e90a25dcef1e04dcaf3df618709a737e
Parents: f0f3bf1 2262500
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Jul 3 11:45:18 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Jul 3 11:45:18 2014 -0400
----------------------------------------------------------------------
.../php-cli-samples/add-compute-resources.php | 1 +
.../airavata-client-api-tester.php | 1 +
.../airavata-client-properties.ini | 2 +-
.../php-cli-samples/cloneExperiment.php | 13 ++----
.../php-cli-samples/createExperiment.php | 9 ++--
.../resources/php-cli-samples/createProject.php | 10 ++---
.../resources/php-cli-samples/getAPIVersion.php | 11 ++---
.../php-cli-samples/getAiravataClient.php | 44 ++++++++++++++++++++
.../getAllExperimentsInProject.php | 10 ++---
.../php-cli-samples/getAllUserExperiments.php | 12 ++----
.../php-cli-samples/getAllUserProjects.php | 9 ++--
.../resources/php-cli-samples/getAppModule.php | 9 ++--
.../getApplicationDeployedResources.php | 9 ++--
.../resources/php-cli-samples/getExperiment.php | 9 ++--
.../php-cli-samples/getExperimentOutputs.php | 10 ++---
.../php-cli-samples/getExperimentStatus.php | 9 ++--
.../php-cli-samples/launchExperiment.php | 9 ++--
.../list-application-interfaces.php | 1 +
.../php-cli-samples/list-compute-resources.php | 1 +
.../php-cli-samples/registerAppModule.php | 9 ++--
.../search_experiments_by_application.php | 9 ++--
.../search_experiments_by_description.php | 9 ++--
.../search_experiments_by_name.php | 9 ++--
.../php-cli-samples/terminateExperiment.php | 9 ++--
.../php-cli-samples/updateExperiment.php | 9 ++--
.../resources/php-cli-samples/updateProject.php | 10 ++---
26 files changed, 110 insertions(+), 133 deletions(-)
----------------------------------------------------------------------