You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/01/14 16:42:57 UTC
[01/50] [abbrv] airavata-php-gateway git commit: Confirmation to
remove token added.
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop b3adcfe88 -> 2b0a8601b
Confirmation to remove token added.
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/8f85afc2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/8f85afc2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/8f85afc2
Branch: refs/heads/develop
Commit: 8f85afc2c2ae6ce28ff3f075092ec46a510a218b
Parents: b85b15b
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Dec 11 14:04:41 2015 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Dec 11 14:04:41 2015 -0500
----------------------------------------------------------------------
app/views/admin/manage-credentials.blade.php | 44 ++++++++++++++++-------
1 file changed, 31 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/8f85afc2/app/views/admin/manage-credentials.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-credentials.blade.php b/app/views/admin/manage-credentials.blade.php
index eacd67c..6b0b476 100644
--- a/app/views/admin/manage-credentials.blade.php
+++ b/app/views/admin/manage-credentials.blade.php
@@ -201,21 +201,39 @@
$(".remove-token").click( function(){
var removeSpan = $(this);
+ var tr = removeSpan.parent().parent();
var tokenToRemove = removeSpan.data("token");
- $(".loading-img").removeClass("hide");
- $.ajax({
- type: "POST",
- data:{ "token" : tokenToRemove},
- url: "{{URL::to('/')}}/admin/remove-ssh-token"
- }).success( function( data){
- if( data.responseText == 1)
- removeSpan.parent().parent().addClass("alert").addClass("alert-danger");
- setTimeout( function(){
- removeSpan.parent().parent().slideUp(1000);
- }, 2000);
- }).fail( function( data){
- removeSpan.parent().parent().after("<tr class='alert alert-danger'><td></td><td>Error occurred : " + $.parseJSON( data.responseText).error.message + "</td><td></td></tr>");
+ var publicKey = tr.children(".public-key").html();
+ tr.children(".public-key").html("<div class='alert alert-danger'>Do you really want to remove the token? This action cannot be undone.<br/>" +
+ "<span class='btn-group'>"+
+ "<input type='button' class='btn btn-default remove-token-confirmation' value='Yes'/>" +
+ "<input type='button' class='btn btn-default remove-token-cancel' value='Cancel'/>"+
+ "</span></div>");
+
+
+ tr.find( ".remove-token-confirmation").click( function(){
+ $(".loading-img").removeClass("hide");
+ $.ajax({
+ type: "POST",
+ data:{ "token" : tokenToRemove},
+ url: "{{URL::to('/')}}/admin/remove-ssh-token"
+ }).success( function( data){
+ if( data.responseText == 1)
+ tr.addClass("alert").addClass("alert-danger");
+ setTimeout( function(){
+ tr.slideUp(1000);
+ }, 2000);
+ }).fail( function( data){
+ tr.after("<tr class='alert alert-danger'><td></td><td>Error occurred : " + $.parseJSON( data.responseText).error.message + "</td><td></td></tr>");
+ }).complete( function(){
+ $(".loading-img").addClass("hide");
+
+ });
+ });
+ tr.find( ".remove-token-cancel").click( function(){
+ tr.children(".public-key").html( publicKey);
});
+
});
</script>
@stop
\ No newline at end of file
[12/50] [abbrv] airavata-php-gateway git commit: sending gateway
portal url in user creation notification email
Posted by sc...@apache.org.
sending gateway portal url in user creation notification email
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/9c406fdf
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/9c406fdf
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/9c406fdf
Branch: refs/heads/develop
Commit: 9c406fdff381a7784e9e3cb7a235c12a22dbce5c
Parents: 9db8cee
Author: scnakandala <su...@gmail.com>
Authored: Tue Dec 15 10:57:30 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Dec 15 10:57:30 2015 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 3 ++-
app/libraries/ProjectUtilities.php | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9c406fdf/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 952f211..324de20 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -350,7 +350,8 @@ class AccountController extends BaseController
else
$username = $username . "@" . $wsisConfig['tenant-domain'];
- $str = "Username: " . $username ."<br/>";
+ $str = "Gateway Portal: " . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] ."<br/>";
+ $str = $str . "Username: " . $username ."<br/>";
$str = $str . "Name: " . $userProfile["firstname"] . " " . $userProfile["lastname"] . "<br/>";
$str = $str . "Email: " . $userProfile["email"];
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9c406fdf/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ProjectUtilities.php b/app/libraries/ProjectUtilities.php
index 5b3b217..7dcfbfe 100644
--- a/app/libraries/ProjectUtilities.php
+++ b/app/libraries/ProjectUtilities.php
@@ -183,7 +183,7 @@ class ProjectUtilities
$updatedProject->owner = $projectDetails["owner"];
$updatedProject->name = $projectDetails["name"];
$updatedProject->description = $projectDetails["description"];
-
+ var_dump($updatedProject);exit;
try {
Airavata::updateProject(Session::get('authz-token'), $projectId, $updatedProject);
[18/50] [abbrv] airavata-php-gateway git commit: updating the thrift
0.9.3 generated code
Posted by sc...@apache.org.
updating the thrift 0.9.3 generated code
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/e5e190ef
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e5e190ef
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e5e190ef
Branch: refs/heads/develop
Commit: e5e190efdf66f5cc11665f2f4665fedc48abb507
Parents: b545744
Author: scnakandala <su...@gmail.com>
Authored: Wed Dec 16 23:01:28 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Dec 16 23:01:28 2015 -0500
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 1104 ++++++++++++++----
app/libraries/Airavata/API/Error/Types.php | 2 +-
app/libraries/Airavata/API/Types.php | 4 +-
.../Model/AppCatalog/AppDeployment/Types.php | 2 +-
.../Model/AppCatalog/AppInterface/Types.php | 2 +-
.../Model/AppCatalog/ComputeResource/Types.php | 11 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 2 +-
.../Model/AppCatalog/StorageResource/Types.php | 2 +-
.../Airavata/Model/Application/Io/Types.php | 2 +-
app/libraries/Airavata/Model/Commons/Types.php | 2 +-
.../Airavata/Model/Data/Movement/Types.php | 2 +-
.../Airavata/Model/Data/Resource/Types.php | 312 +++--
.../Airavata/Model/Experiment/Types.php | 2 +-
app/libraries/Airavata/Model/Job/Types.php | 2 +-
.../Airavata/Model/Messaging/Event/Types.php | 2 +-
app/libraries/Airavata/Model/Process/Types.php | 2 +-
.../Airavata/Model/Scheduling/Types.php | 2 +-
app/libraries/Airavata/Model/Security/Types.php | 2 +-
app/libraries/Airavata/Model/Status/Types.php | 2 +-
app/libraries/Airavata/Model/Task/Types.php | 2 +-
app/libraries/Airavata/Model/Types.php | 2 +-
.../Airavata/Model/Workspace/Types.php | 2 +-
.../Thrift/Exception/TProtocolException.php | 2 -
.../Protocol/TBinaryProtocolAccelerated.php | 17 +-
.../Thrift/Protocol/TCompactProtocol.php | 12 +-
app/libraries/Thrift/Protocol/TJSONProtocol.php | 4 +-
.../Thrift/Serializer/TBinarySerializer.php | 8 +-
app/libraries/Thrift/Thrift.php | 789 +++++++++++++
.../Thrift/Transport/TBufferedTransport.php | 7 +-
app/libraries/Thrift/Transport/TSocket.php | 6 +-
app/libraries/Thrift/autoload.php | 51 +
31 files changed, 2011 insertions(+), 352 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index 7171104..4cc073b 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -1,7 +1,7 @@
<?php
namespace Airavata\API;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -20,6 +20,7 @@ interface AiravataIf {
/**
* Fetch Apache Airavata API version
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @return string
* @throws \Airavata\API\Error\InvalidRequestException
@@ -29,6 +30,16 @@ interface AiravataIf {
*/
public function getAPIVersion(\Airavata\Model\Security\AuthzToken $authzToken);
/**
+ * Register a Gateway with Airavata.
+ *
+ * @param gateway
+ * The gateway data model.
+ *
+ * @return gatewayId
+ * Th unique identifier of the newly registered gateway.
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param \Airavata\Model\Workspace\Gateway $gateway
* @return string
@@ -39,6 +50,18 @@ interface AiravataIf {
*/
public function addGateway(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Workspace\Gateway $gateway);
/**
+ * Update previously registered Gateway metadata.
+ *
+ * @param gatewayId
+ * The gateway Id of the Gateway which require an update.
+ *
+ * @return gateway
+ * Modified gateway obejct.
+ *
+ * @exception AiravataClientException
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param \Airavata\Model\Workspace\Gateway $updatedGateway
@@ -49,6 +72,16 @@ interface AiravataIf {
*/
public function updateGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Workspace\Gateway $updatedGateway);
/**
+ * Get Gateway details by providing gatewayId
+ *
+ * @param gatewayId
+ * The gateway Id of the Gateway.
+ *
+ * @return gateway
+ * Gateway obejct.
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @return \Airavata\Model\Workspace\Gateway
@@ -59,6 +92,16 @@ interface AiravataIf {
*/
public function getGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId);
/**
+ * Delete a Gateway
+ *
+ * @param gatewayId
+ * The gateway Id of the Gateway to be deleted.
+ *
+ * @return boolean
+ * Boolean identifier for the success or failure of the deletion operation.
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @return bool
@@ -69,6 +112,9 @@ interface AiravataIf {
*/
public function deleteGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId);
/**
+ * Get All the Gateways Connected to Airavata.
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @return \Airavata\Model\Workspace\Gateway[]
* @throws \Airavata\API\Error\InvalidRequestException
@@ -78,6 +124,19 @@ interface AiravataIf {
*/
public function getAllGateways(\Airavata\Model\Security\AuthzToken $authzToken);
/**
+ * Check for the Existance of a Gateway within Airavata
+ *
+ * @param gatewayId
+ * Provide the gatewayId of the gateway you want to check the existancy
+ *
+ * @return boolean
+ * Boolean idetifier for the existance or non-existane of the gatewayId
+ *
+ * @return gatewayId
+ * return the gatewayId of the existing gateway.
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @return bool
@@ -91,7 +150,7 @@ interface AiravataIf {
* Generate and Register SSH Key Pair with Airavata Credential Store.
*
* @param gatewayId
- * The identifier for the requested gateway.
+ * The identifier for the requested Gateway.
*
* @param userName
* The User for which the credential should be registered. For community accounts, this user is the name of the
@@ -99,7 +158,7 @@ interface AiravataIf {
*
* @return airavataCredStoreToken
* An SSH Key pair is generated and stored in the credential store and associated with users or community account
- * belonging to a gateway.
+ * belonging to a Gateway.
*
*
*
@@ -113,6 +172,18 @@ interface AiravataIf {
*/
public function generateAndRegisterSSHKeys(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName);
/**
+ * Get a Public Key by Providing the Token
+ *
+ * @param CredStoreToken
+ * Credential Store Token which you want to find the Public Key for.
+ *
+ * @param gatewayId
+ * This is the unique identifier of your gateway where the token and public key was generated from.
+ *
+ * @return publicKey
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataCredStoreToken
* @param string $gatewayId
@@ -123,6 +194,18 @@ interface AiravataIf {
*/
public function getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId);
/**
+ * Get a Public Key by Providing the Token
+ *
+ * @param CredStoreToken
+ * Credential Store Token which you want to find the Public Key for.
+ *
+ * @param gatewayId
+ * This is the unique identifier of your gateway where the token and public key was generated from.
+ *
+ * @return SSHpubKey
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $userName
* @return array
@@ -132,6 +215,18 @@ interface AiravataIf {
*/
public function getAllUserSSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $userName);
/**
+ * Get all Public Keys of the Gateway
+ *
+ * @param CredStoreToken
+ * Credential Store Token which you want to find the Public Key for.
+ *
+ * @param gatewayId
+ * This is the unique identifier of your gateway where the token and public key was generated from.
+ *
+ * @return publicKey
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @return array
@@ -141,6 +236,16 @@ interface AiravataIf {
*/
public function getAllGatewaySSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId);
/**
+ * Delete a Gateway
+ *
+ * @param gatewayId
+ * The gateway Id of the Gateway to be deleted.
+ *
+ * @return boolean
+ * Boolean identifier for the success or failure of the deletion operation.
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataCredStoreToken
* @param string $gatewayId
@@ -161,6 +266,7 @@ interface AiravataIf {
* The Project Object described in the workspace_model
*
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param \Airavata\Model\Workspace\Project $project
@@ -172,7 +278,14 @@ interface AiravataIf {
*/
public function createProject(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Workspace\Project $project);
/**
- * Update a Project
+ * Update an Existing Project
+ *
+ * @param projectId
+ * The projectId of the project needed an update.
+ *
+ * @return void
+ * Currently this does not return any value.
+ *
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -187,6 +300,14 @@ interface AiravataIf {
public function updateProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId, \Airavata\Model\Workspace\Project $updatedProject);
/**
* Get a Project by ID
+ * This method is to obtain a project by providing a projectId
+ *
+ * @param projectId
+ * projectId of the project you require
+ *
+ * @return project
+ * project data model will be returned
+ *
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -200,6 +321,17 @@ interface AiravataIf {
*/
public function getProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId);
/**
+ * Delete a Project
+ * This method is used to delete an existing Project
+ *
+ * @param projectId
+ * projectId of the project you want to delete
+ *
+ * @return boolean
+ * Boolean identifier for the success or failure of the deletion operation.
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $projectId
* @return bool
@@ -211,18 +343,22 @@ interface AiravataIf {
*/
public function deleteProject(\Airavata\Model\Security\AuthzToken $authzToken, $projectId);
/**
- * * Get all Project by user with pagination. Results will be ordered based
- * * on creation time DESC
- * *
- * * @param gatewayId
- * * The identifier for the requested gateway.
- * * @param userName
- * * The identifier of the user
- * * @param limit
- * * The amount results to be fetched
- * * @param offset
- * * The starting point of the results to be fetched
- * *
+ * Get all Project by user with pagination. Results will be ordered based
+ * on creation time DESC
+ *
+ * @param gatewayId
+ * The identifier for the requested gateway.
+ *
+ * @param userName
+ * The identifier of the user
+ *
+ * @param limit
+ * The amount results to be fetched
+ *
+ * @param offset
+ * The starting point of the results to be fetched
+ *
+ *
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
@@ -251,6 +387,7 @@ interface AiravataIf {
* @param offset
* The starting point of the results to be fetched
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
@@ -279,6 +416,7 @@ interface AiravataIf {
* @param offset
* The starting point of the results to be fetched
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
@@ -307,6 +445,7 @@ interface AiravataIf {
* @param offset
* The starting point of the results to be fetched
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
@@ -335,6 +474,7 @@ interface AiravataIf {
* @param offset
* The starting point of the results to be fetched
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
@@ -363,6 +503,7 @@ interface AiravataIf {
* @param offset
* The starting point of the results to be fetched
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
@@ -391,6 +532,7 @@ interface AiravataIf {
* @param offset
* The starting point of the results to be fetched
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
@@ -421,6 +563,7 @@ interface AiravataIf {
* @param offset
* The starting point of the results to be fetched
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
@@ -450,6 +593,7 @@ interface AiravataIf {
* @param offset
* The starting point of the results to be fetched
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
@@ -495,6 +639,7 @@ interface AiravataIf {
* @param offset
* The starting point of the results to be fetched
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $projectId
* @param int $limit
@@ -520,6 +665,7 @@ interface AiravataIf {
* @param offset
* The starting point of the results to be fetched
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
* @param string $userName
@@ -533,39 +679,40 @@ interface AiravataIf {
*/
public function getUserExperiments(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $userName, $limit, $offset);
/**
- * Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
- * but inferred from the sshKeyAuthentication header. This experiment is just a persistent place holder. The client
- * has to subsequently configure and launch the created experiment. No action is taken on Airavata Server except
- * registering the experiment in a persistent store.
- *
- * @param basicExperimentMetadata
- * The create experiment will require the basic experiment metadata like the name and description, intended user,
- * the gateway identifer and if the experiment should be shared public by defualt. During the creation of an experiment
- * the ExperimentMetadata is a required field.
- *
- * @return
- * The server-side generated.airavata.registry.core.experiment.globally unique identifier.
- *
- * @throws org.apache.airavata.model.error.InvalidRequestException
- * For any incorrect forming of the request itself.
- *
- * @throws org.apache.airavata.model.error.AiravataClientException
- * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- *
- * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- * step, then Airavata Registry will not have a provenance area setup. The client has to follow
- * gateway registration steps and retry this request.
- *
- * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- * For now this is a place holder.
- *
- * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- * is implemented, the authorization will be more substantial.
- *
- * @throws org.apache.airavata.model.error.AiravataSystemException
- * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
- *
+ * * Create an experiment for the specified user belonging to the gateway. The gateway identity is not explicitly passed
+ * * but inferred from the sshKeyAuthentication header. This experiment is just a persistent place holder. The client
+ * * has to subsequently configure and launch the created experiment. No action is taken on Airavata Server except
+ * * registering the experiment in a persistent store.
+ * *
+ * * @param basicExperimentMetadata
+ * * The create experiment will require the basic experiment metadata like the name and description, intended user,
+ * * the gateway identifer and if the experiment should be shared public by defualt. During the creation of an experiment
+ * * the ExperimentMetadata is a required field.
+ * *
+ * * @return
+ * * The server-side generated.airavata.registry.core.experiment.globally unique identifier.
+ * *
+ * * @throws org.apache.airavata.model.error.InvalidRequestException
+ * * For any incorrect forming of the request itself.
+ * *
+ * * @throws org.apache.airavata.model.error.AiravataClientException
+ * * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+ * *
+ * * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ * * step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ * * gateway registration steps and retry this request.
+ * *
+ * * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ * * For now this is a place holder.
+ * *
+ * * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ * * is implemented, the authorization will be more substantial.
+ * *
+ * * @throws org.apache.airavata.model.error.AiravataSystemException
+ * * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ * * rather an Airavata Administrator will be notified to take corrective action.
+ * *
+ * *
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
@@ -578,12 +725,18 @@ interface AiravataIf {
*/
public function createExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Experiment\ExperimentModel $experiment);
/**
+ * Delete an Experiment
+ *
* If the experiment is not already launched experiment can be deleted.
*
* @param authzToken
+ *
* @param experiementId
+ * Experiment ID of the experimnet you want to delete.
+ *
+ * @return boolean
+ * Identifier for the success or failure of the deletion operation
*
- * @return boolean identifier for the success or failure of the deletion operation
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -596,7 +749,66 @@ interface AiravataIf {
*/
public function deleteExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $experimentId);
/**
- * Fetch previously created experiment metadata.
+ * * Fetch previously created experiment metadata.
+ * *
+ * * @param airavataExperimentId
+ * * The identifier for the requested experiment. This is returned during the create experiment step.
+ * *
+ * * @return experimentMetada
+ * * This method will return the previously stored experiment metadata.
+ * *
+ * * @throws org.apache.airavata.model.error.InvalidRequestException
+ * * For any incorrect forming of the request itself.
+ * *
+ * * @throws org.apache.airavata.model.error.ExperimentNotFoundException
+ * * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+ * *
+ * * @throws org.apache.airavata.model.error.AiravataClientException
+ * * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+ * *
+ * * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ * * step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ * * gateway registration steps and retry this request.
+ * *
+ * * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ * * For now this is a place holder.
+ * *
+ * * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ * * is implemented, the authorization will be more substantial.
+ * *
+ * * @throws org.apache.airavata.model.error.AiravataSystemException
+ * * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ * * rather an Airavata Administrator will be notified to take corrective action.
+ * *
+ * *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $airavataExperimentId
+ * @return \Airavata\Model\Experiment\ExperimentModel A structure holding the experiment metadata and its child models.
+ *
+ * userName:
+ * The user name of the targeted gateway end user on whose behalf the experiment is being created.
+ * the associated gateway identity can only be inferred from the security hand-shake so as to avoid
+ * authorized Airavata Clients mimicking an unauthorized request. If a gateway is not registered with
+ * Airavata, an authorization exception is thrown.
+ *
+ * experimentName:
+ * The name of the experiment as defined by the user. The name need not be unique as uniqueness is enforced
+ * by the generated experiment id.
+ *
+ * experimentDescription:
+ * The verbose description of the experiment. This is an optional parameter.
+ *
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\ExperimentNotFoundException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
+ /**
+ * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ * tasks -> jobs information.
*
* @param airavataExperimentId
* The identifier for the requested experiment. This is returned during the create experiment step.
@@ -612,7 +824,7 @@ interface AiravataIf {
*
* @throws org.apache.airavata.model.error.AiravataClientException
* The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- *
+ *
* UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
* step, then Airavata Registry will not have a provenance area setup. The client has to follow
* gateway registration steps and retry this request.
@@ -651,16 +863,21 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
+ public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
/**
- * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
- * tasks -> jobs information.
+ * Configure a previously created experiment with required inputs, scheduling and other quality of service
+ * parameters. This method only updates the experiment object within the registry. The experiment has to be launched
+ * to make it actionable by the server.
*
* @param airavataExperimentId
* The identifier for the requested experiment. This is returned during the create experiment step.
*
- * @return experimentMetada
- * This method will return the previously stored experiment metadata.
+ * @param experimentConfigurationData
+ * The configuration information of the experiment with application input parameters, computational resource scheduling
+ * information, special input output handling and additional quality of service parameters.
+ *
+ * @return
+ * This method call does not have a return value.
*
* @throws org.apache.airavata.model.error.InvalidRequestException
* For any incorrect forming of the request itself.
@@ -670,7 +887,7 @@ interface AiravataIf {
*
* @throws org.apache.airavata.model.error.AiravataClientException
* The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- *
+ *
* UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
* step, then Airavata Registry will not have a provenance area setup. The client has to follow
* gateway registration steps and retry this request.
@@ -688,40 +905,57 @@ interface AiravataIf {
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataExperimentId
- * @return \Airavata\Model\Experiment\ExperimentModel A structure holding the experiment metadata and its child models.
- *
- * userName:
- * The user name of the targeted gateway end user on whose behalf the experiment is being created.
- * the associated gateway identity can only be inferred from the security hand-shake so as to avoid
- * authorized Airavata Clients mimicking an unauthorized request. If a gateway is not registered with
- * Airavata, an authorization exception is thrown.
- *
- * experimentName:
- * The name of the experiment as defined by the user. The name need not be unique as uniqueness is enforced
- * by the generated experiment id.
- *
- * experimentDescription:
- * The verbose description of the experiment. This is an optional parameter.
+ * @param \Airavata\Model\Experiment\ExperimentModel $experiment
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\ExperimentNotFoundException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $airavataExperimentId
+ * @param \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $airavataExperimentId
+ * @param \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling);
+ /**
+ * *
+ * * Validate experiment configuration. A true in general indicates, the experiment is ready to be launched.
+ * *
+ * * @param experimentId
+ * *
+ * *
+ * * @return boolean
+ * * Identifier for the success or failure of the validation operation
+ * *
+ * *
*
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $airavataExperimentId
+ * @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\ExperimentNotFoundException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
+ public function validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
/**
- * Configure a previously created experiment with required inputs, scheduling and other quality of service
- * parameters. This method only updates the experiment object within the registry. The experiment has to be launched
- * to make it actionable by the server.
+ * Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
+ * notifications and intermediate and output data will be subsequently available for this experiment.
*
* @param airavataExperimentId
* The identifier for the requested experiment. This is returned during the create experiment step.
*
- * @param experimentConfigurationData
- * The configuration information of the experiment with application input parameters, computational resource scheduling
- * information, special input output handling and additional quality of service parameters.
- *
* @return
* This method call does not have a return value.
*
@@ -751,94 +985,31 @@ interface AiravataIf {
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataExperimentId
- * @param \Airavata\Model\Experiment\ExperimentModel $experiment
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\ExperimentNotFoundException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment);
- /**
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $airavataExperimentId
- * @param \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration);
- /**
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $airavataExperimentId
- * @param \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling);
- /**
- * *
- * * Validate experiment configuration. A true in general indicates, the experiment is ready to be launched.
- * *
- * * @param experimentID
- * * @return sucess/failure
- * *
- * *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $airavataExperimentId
- * @return bool
+ * @param string $gatewayId
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\ExperimentNotFoundException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
+ public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId);
/**
- * Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
- * notifications and intermediate and output data will be subsequently available for this experiment.
- *
- * @param airavataExperimentId
- * The identifier for the requested experiment. This is returned during the create experiment step.
- *
- * @return
- * This method call does not have a return value.
- *
- * @throws org.apache.airavata.model.error.InvalidRequestException
- * For any incorrect forming of the request itself.
+ * Get Experiment Status
*
- * @throws org.apache.airavata.model.error.ExperimentNotFoundException
- * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+ * Obtain the status os an experiment by providing the Experiment Id
*
- * @throws org.apache.airavata.model.error.AiravataClientException
- * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- *
- * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- * step, then Airavata Registry will not have a provenance area setup. The client has to follow
- * gateway registration steps and retry this request.
+ * @param authzToken
*
- * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- * For now this is a place holder.
+ * @param experiementId
+ * Experiment ID of the experimnet you require the status
*
- * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- * is implemented, the authorization will be more substantial.
+ * @return ExperimentStatus
+ * ExperimentStatus model with current status will be returned.
*
- * @throws org.apache.airavata.model.error.AiravataSystemException
- * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataExperimentId
- * @param string $gatewayId
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\ExperimentNotFoundException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId);
- /**
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $airavataExperimentId
* @return \Airavata\Model\Status\ExperimentStatus Status: A generic status object.
*
* state:
@@ -859,6 +1030,19 @@ interface AiravataIf {
*/
public function getExperimentStatus(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
/**
+ * Get Experiment Outputs
+ * This method to be used when need to obtain outputs of a certain Experiment
+ *
+ * @param authzToken
+ *
+ * @param experiementId
+ * Experiment ID of the experimnet you need the outputs
+ *
+ * @return list
+ * List of experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataExperimentId
* @return \Airavata\Model\Application\Io\OutputDataObjectType[]
@@ -870,6 +1054,19 @@ interface AiravataIf {
*/
public function getExperimentOutputs(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
/**
+ * Get Intermediate Experiment Outputs
+ * This method to be used when need to obtain intermediate outputs of a certain Experiment
+ *
+ * @param authzToken
+ *
+ * @param experiementId
+ * Experiment ID of the experimnet you need the intermediate outputs
+ *
+ * @return list
+ * List of intermediate experiment outputs will be returned. They will be returned as a list of OutputDataObjectType for the experiment
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataExperimentId
* @return \Airavata\Model\Application\Io\OutputDataObjectType[]
@@ -881,6 +1078,19 @@ interface AiravataIf {
*/
public function getIntermediateOutputs(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
/**
+ * Get Job Status for an Experiment
+ * This method to be used when need to get the job status of an Experiment. An experiment may have one or many jobs; there for one or many job statuses may turnup
+ *
+ * @param authzToken
+ *
+ * @param experiementId
+ * Experiment ID of the experimnet you need the intermediate outputs
+ *
+ * @return JobStatus
+ * Job status (string) for all all the existing jobs for the experiment will be returned in the form of a map
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataExperimentId
* @return array
@@ -892,6 +1102,19 @@ interface AiravataIf {
*/
public function getJobStatuses(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
/**
+ * Get Job Details for all the jobs within an Experiment
+ * This method to be used when need to get the job details for one or many jobs of an Experiment.
+ *
+ * @param authzToken
+ *
+ * @param experiementId
+ * Experiment ID of the experimnet you need job details
+ *
+ * @return list of JobDetails
+ * Job details
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataExperimentId
* @return \Airavata\Model\Job\JobModel[]
@@ -1925,7 +2148,7 @@ interface AiravataIf {
* The SSHJobSubmission object to be updated.
*
* @return status
- * Returns a success/failure of the deletion.
+ * Returns a success/failure of the update.
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -1948,7 +2171,7 @@ interface AiravataIf {
* The CloudJobSubmission object to be updated.
*
* @return status
- * Returns a success/failure of the deletion.
+ * Returns a success/failure of the update.
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -1962,6 +2185,19 @@ interface AiravataIf {
*/
public function updateCloudJobSubmissionDetails(\Airavata\Model\Security\AuthzToken $authzToken, $jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\CloudJobSubmission $sshJobSubmission);
/**
+ * Update the UNIOCRE Job Submission details
+ *
+ * @param jobSubmissionInterfaceId
+ * The identifier of the JobSubmission Interface to be updated.
+ *
+ * @param UnicoreJobSubmission
+ * The UnicoreJobSubmission object to be updated.
+ *
+ * @return status
+ * Returns a success/failure of the update.
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $jobSubmissionInterfaceId
* @param \Airavata\Model\AppCatalog\ComputeResource\UnicoreJobSubmission $unicoreJobSubmission
@@ -1976,9 +2212,12 @@ interface AiravataIf {
* Add a Local data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
*
- * @param computeResourceId
+ * @param resourceId
* The identifier of the compute resource to which JobSubmission protocol to be added
*
+ * @param DMType
+ * DMType object to be added to the resource.
+ *
* @param priorityOrder
* Specify the priority of this job manager. If this is the only jobmanager, the priority can be zero.
*
@@ -1989,6 +2228,7 @@ interface AiravataIf {
* Returns the unique job submission id.
*
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $resourceId
* @param int $dataMoveType
@@ -2014,6 +2254,7 @@ interface AiravataIf {
* Returns a success/failure of the update.
*
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementInterfaceId
* @param \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement
@@ -2025,11 +2266,14 @@ interface AiravataIf {
*/
public function updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
/**
- * * This method returns local datamovement object
- * * @param dataMovementId
- * * The identifier of the datamovement Interface to be retrieved.
- * * @return LOCALDataMovement instance
- * *
+ * This method returns local datamovement object
+ *
+ * @param dataMovementId
+ * The identifier of the datamovement Interface to be retrieved.
+ *
+ * @return LOCALDataMovement instance
+ *
+ *
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementId
@@ -2051,7 +2295,7 @@ interface AiravataIf {
* Add a SCP data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
*
- * @param computeResourceId
+ * @param resourceId
* The identifier of the compute resource to which JobSubmission protocol to be added
*
* @param priorityOrder
@@ -2101,11 +2345,14 @@ interface AiravataIf {
*/
public function updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement);
/**
- * * This method returns SCP datamovement object
- * * @param dataMovementId
- * * The identifier of the datamovement Interface to be retrieved.
- * * @return SCPDataMovement instance
- * *
+ * This method returns SCP datamovement object
+ *
+ * @param dataMovementId
+ * The identifier of the datamovement Interface to be retrieved.
+ *
+ * @return SCPDataMovement instance
+ *
+ *
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementId
@@ -2124,6 +2371,22 @@ interface AiravataIf {
*/
public function getSCPDataMovement(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementId);
/**
+ * Add a UNICORE data movement details to a compute resource
+ * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
+ *
+ * @param resourceId
+ * The identifier of the compute resource to which data movement protocol to be added
+ *
+ * @param priorityOrder
+ * Specify the priority of this job manager. If this is the only jobmanager, the priority can be zero.
+ *
+ * @param UnicoreDataMovement
+ * The UnicoreDataMovement object to be added to the resource.
+ *
+ * @return status
+ * Returns the unique data movement id.
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $resourceId
* @param int $dataMoveType
@@ -2137,6 +2400,20 @@ interface AiravataIf {
*/
public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
/**
+ * Update a selected UNICORE data movement details
+ * App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
+ *
+ * @param dataMovementInterfaceId
+ * The identifier of the data movement Interface to be updated.
+ *
+ * @param UnicoreDataMovement
+ * The UnicoreDataMovement object to be updated.
+ *
+ * @return status
+ * Returns a success/failure of the update.
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementInterfaceId
* @param \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement
@@ -2148,6 +2425,15 @@ interface AiravataIf {
*/
public function updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
/**
+ * This method returns UNICORE datamovement object
+ *
+ * @param dataMovementId
+ * The identifier of the datamovement Interface to be retrieved.
+ *
+ * @return UnicoreDataMovement instance
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementId
* @return \Airavata\Model\Data\Movement\UnicoreDataMovement Data Movement through UnicoreStorage
@@ -2165,8 +2451,11 @@ interface AiravataIf {
* Add a GridFTP data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
*
- * @param computeResourceId
- * The identifier of the compute resource to which JobSubmission protocol to be added
+ * @param resourceId
+ * The identifier of the compute resource to which dataMovement protocol to be added
+ *
+ * @param DMType
+ * The DMType object to be added to the resource.
*
* @param priorityOrder
* Specify the priority of this job manager. If this is the only jobmanager, the priority can be zero.
@@ -2175,7 +2464,8 @@ interface AiravataIf {
* The GridFTPDataMovement object to be added to the resource.
*
* @return status
- * Returns the unique job submission id.
+ * Returns the unique data movement id.
+ *
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -2200,8 +2490,9 @@ interface AiravataIf {
* @param gridFTPDataMovement
* The GridFTPDataMovement object to be updated.
*
- * @return status
- * Returns a success/failure of the updation.
+ * @return boolean
+ * Returns a success/failure of the update.
+ *
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -2215,11 +2506,14 @@ interface AiravataIf {
*/
public function updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement);
/**
- * * This method returns GridFTP datamovement object
- * * @param dataMovementId
- * * The identifier of the datamovement Interface to be retrieved.
- * * @return GridFTPDataMovement instance
- * *
+ * This method returns GridFTP datamovement object
+ *
+ * @param dataMovementId
+ * The identifier of the datamovement Interface to be retrieved.
+ *
+ * @return GridFTPDataMovement instance
+ *
+ *
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementId
@@ -2250,6 +2544,7 @@ interface AiravataIf {
* Returns a success/failure of the change.
*
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $jobSubmissionInterfaceId
* @param int $newPriorityOrder
@@ -2273,6 +2568,7 @@ interface AiravataIf {
* Returns a success/failure of the change.
*
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementInterfaceId
* @param int $newPriorityOrder
@@ -2312,6 +2608,7 @@ interface AiravataIf {
* Returns a success/failure of the changes.
*
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param array $dataMovementPriorityMap
* @return bool
@@ -2331,6 +2628,7 @@ interface AiravataIf {
* Returns a success/failure of the deletion.
*
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $computeResourceId
* @param string $jobSubmissionInterfaceId
@@ -2351,6 +2649,7 @@ interface AiravataIf {
* Returns a success/failure of the deletion.
*
*
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $computeResourceId
* @param string $dataMovementInterfaceId
@@ -2418,6 +2717,19 @@ interface AiravataIf {
*/
public function deleteResourceJobManager(\Airavata\Model\Security\AuthzToken $authzToken, $resourceJobManagerId);
/**
+ * Delete a Compute Resource Queue
+ *
+ * @param computeResourceId
+ * The identifier of the compute resource which has the queue to be deleted
+ *
+ * @param queueName
+ * Name of the queue need to be deleted. Name is the uniqueue identifier for the queue within a compute resource
+ *
+ * @return status
+ * Returns a success/failure of the deletion.
+ *
+ *
+ *
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $computeResourceId
* @param string $queueName
@@ -2812,7 +3124,7 @@ interface AiravataIf {
*/
public function isWorkflowExistWithName(\Airavata\Model\Security\AuthzToken $authzToken, $workflowName);
/**
- * * Replica Catalog Related API Methods
+ * * Data Manager Related API Methods
* *
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -2823,7 +3135,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel);
+ public function registerDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel
@@ -2852,6 +3164,18 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AuthorizationException
*/
public function getDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $resourceId
+ * @param string $destStorageResourceId
+ * @param string $destinationParentPath
+ * @return string
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function copyDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $destStorageResourceId, $destinationParentPath);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -11411,35 +11735,35 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("isWorkflowExistWithName failed: unknown result");
}
- public function publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
+ public function registerDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
{
- $this->send_publishDataResource($authzToken, $dataResourceModel);
- return $this->recv_publishDataResource();
+ $this->send_registerDataResource($authzToken, $dataResourceModel);
+ return $this->recv_registerDataResource();
}
- public function send_publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
+ public function send_registerDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
{
- $args = new \Airavata\API\Airavata_publishDataResource_args();
+ $args = new \Airavata\API\Airavata_registerDataResource_args();
$args->authzToken = $authzToken;
$args->dataResourceModel = $dataResourceModel;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'publishDataResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'registerDataResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('publishDataResource', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('registerDataResource', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_publishDataResource()
+ public function recv_registerDataResource()
{
$bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
- if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_publishDataResource_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_registerDataResource_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -11453,7 +11777,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_publishDataResource_result();
+ $result = new \Airavata\API\Airavata_registerDataResource_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -11472,7 +11796,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("publishDataResource failed: unknown result");
+ throw new \Exception("registerDataResource failed: unknown result");
}
public function updateDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
@@ -11661,6 +11985,72 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getDataResource failed: unknown result");
}
+ public function copyDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $destStorageResourceId, $destinationParentPath)
+ {
+ $this->send_copyDataResource($authzToken, $resourceId, $destStorageResourceId, $destinationParentPath);
+ return $this->recv_copyDataResource();
+ }
+
+ public function send_copyDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $destStorageResourceId, $destinationParentPath)
+ {
+ $args = new \Airavata\API\Airavata_copyDataResource_args();
+ $args->authzToken = $authzToken;
+ $args->resourceId = $resourceId;
+ $args->destStorageResourceId = $destStorageResourceId;
+ $args->destinationParentPath = $destinationParentPath;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'copyDataResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('copyDataResource', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_copyDataResource()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_copyDataResource_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_copyDataResource_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("copyDataResource failed: unknown result");
+ }
+
}
// HELPER FUNCTIONS AND STRUCTURES
@@ -52192,7 +52582,7 @@ class Airavata_isWorkflowExistWithName_result {
}
-class Airavata_publishDataResource_args {
+class Airavata_registerDataResource_args {
static $_TSPEC;
/**
@@ -52230,7 +52620,7 @@ class Airavata_publishDataResource_args {
}
public function getName() {
- return 'Airavata_publishDataResource_args';
+ return 'Airavata_registerDataResource_args';
}
public function read($input)
@@ -52276,7 +52666,7 @@ class Airavata_publishDataResource_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_publishDataResource_args');
+ $xfer += $output->writeStructBegin('Airavata_registerDataResource_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -52300,7 +52690,7 @@ class Airavata_publishDataResource_args {
}
-class Airavata_publishDataResource_result {
+class Airavata_registerDataResource_result {
static $_TSPEC;
/**
@@ -52373,7 +52763,7 @@ class Airavata_publishDataResource_result {
}
public function getName() {
- return 'Airavata_publishDataResource_result';
+ return 'Airavata_registerDataResource_result';
}
public function read($input)
@@ -52442,7 +52832,7 @@ class Airavata_publishDataResource_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_publishDataResource_result');
+ $xfer += $output->writeStructBegin('Airavata_registerDataResource_result');
if ($this->success !== null) {
$xfer += $output->writeFieldBegin('success', TType::STRING, 0);
$xfer += $output->writeString($this->success);
@@ -53273,4 +53663,328 @@ class Airavata_getDataResource_result {
}
+class Airavata_copyDataResource_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $resourceId = null;
+ /**
+ * @var string
+ */
+ public $destStorageResourceId = null;
+ /**
+ * @var string
+ */
+ public $destinationParentPath = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'authzToken',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Security\AuthzToken',
+ ),
+ 2 => array(
+ 'var' => 'resourceId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'destStorageResourceId',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'destinationParentPath',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['authzToken'])) {
+ $this->authzToken = $vals['authzToken'];
+ }
+ if (isset($vals['resourceId'])) {
+ $this->resourceId = $vals['resourceId'];
+ }
+ if (isset($vals['destStorageResourceId'])) {
+ $this->destStorageResourceId = $vals['destStorageResourceId'];
+ }
+ if (isset($vals['destinationParentPath'])) {
+ $this->destinationParentPath = $vals['destinationParentPath'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_copyDataResource_args';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->authzToken = new \Airavata\Model\Security\AuthzToken();
+ $xfer += $this->authzToken->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->resourceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->destStorageResourceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->destinationParentPath);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_copyDataResource_args');
+ if ($this->authzToken !== null) {
+ if (!is_object($this->authzToken)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1);
+ $xfer += $this->authzToken->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->resourceId !== null) {
+ $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+ $xfer += $output->writeString($this->resourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->destStorageResourceId !== null) {
+ $xfer += $output->writeFieldBegin('destStorageResourceId', TType::STRING, 3);
+ $xfer += $output->writeString($this->destStorageResourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->destinationParentPath !== null) {
+ $xfer += $output->writeFieldBegin('destinationParentPath', TType::STRING, 4);
+ $xfer += $output->writeString($this->destinationParentPath);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_copyDataResource_result {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $success = null;
+ /**
+ * @var \Airavata\API\Error\InvalidRequestException
+ */
+ public $ire = null;
+ /**
+ * @var \Airavata\API\Error\AiravataClientException
+ */
+ public $ace = null;
+ /**
+ * @var \Airavata\API\Error\AiravataSystemException
+ */
+ public $ase = null;
+ /**
+ * @var \Airavata\API\Error\AuthorizationException
+ */
+ public $ae = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::STRING,
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ 4 => array(
+ 'var' => 'ae',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AuthorizationException',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ if (isset($vals['ae'])) {
+ $this->ae = $vals['ae'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_copyDataResource_result';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 0:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRUCT) {
+ $this->ae = new \Airavata\API\Error\AuthorizationException();
+ $xfer += $this->ae->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_copyDataResource_result');
+ if ($this->success !== null) {
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $xfer += $this->ase->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ae !== null) {
+ $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
+ $xfer += $this->ae->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/API/Error/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Error/Types.php b/app/libraries/Airavata/API/Error/Types.php
index d0a1ab6..edaa6de 100644
--- a/app/libraries/Airavata/API/Error/Types.php
+++ b/app/libraries/Airavata/API/Error/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\API\Error;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/API/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Types.php b/app/libraries/Airavata/API/Types.php
index 55d6b6d..389e1ca 100644
--- a/app/libraries/Airavata/API/Types.php
+++ b/app/libraries/Airavata/API/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\API;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -22,7 +22,7 @@ final class Constant extends \Thrift\Type\TConstant {
static protected function init_AIRAVATA_API_VERSION() {
return /**
- * Airavata Interface Versions depend upon this Thrift Interface File. When Making changes, please edit the
+ * 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.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
index e35f999..ab599e6 100644
--- a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\AppDeployment;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php b/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
index 3c03cc7..1d09112 100644
--- a/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\AppInterface;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 006e85b..00f7e6c 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\ComputeResource;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -182,6 +182,15 @@ final class MonitorMode {
);
}
+final class DMType {
+ const COMPUTE_RESOURCE = 0;
+ const STORAGE_RESOURCE = 1;
+ static public $__names = array(
+ 0 => 'COMPUTE_RESOURCE',
+ 1 => 'STORAGE_RESOURCE',
+ );
+}
+
/**
* Provider name
*
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index 9152391..46f89a0 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\GatewayProfile;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php b/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
index cf8f4b3..93df378 100644
--- a/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\StorageResource;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Application/Io/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Application/Io/Types.php b/app/libraries/Airavata/Model/Application/Io/Types.php
index e04650d..cc208a6 100644
--- a/app/libraries/Airavata/Model/Application/Io/Types.php
+++ b/app/libraries/Airavata/Model/Application/Io/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Application\Io;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Commons/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Commons/Types.php b/app/libraries/Airavata/Model/Commons/Types.php
index a4b8b85..ecc9532 100644
--- a/app/libraries/Airavata/Model/Commons/Types.php
+++ b/app/libraries/Airavata/Model/Commons/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Commons;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Data/Movement/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Movement/Types.php b/app/libraries/Airavata/Model/Data/Movement/Types.php
index bacee47..274a4a8 100644
--- a/app/libraries/Airavata/Model/Data/Movement/Types.php
+++ b/app/libraries/Airavata/Model/Data/Movement/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Data\Movement;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
[23/50] [abbrv] airavata-php-gateway git commit: differentiating the
scigap portal through a configuration
Posted by sc...@apache.org.
differentiating the scigap portal through a configuration
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/062aef9c
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/062aef9c
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/062aef9c
Branch: refs/heads/develop
Commit: 062aef9c425997a6b5259e80e3452647ce7f9074
Parents: 33bd2a7
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 12:24:40 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 12:24:40 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 4 ++++
app/controllers/AccountController.php | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/062aef9c/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index 041004d..344813b 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -170,6 +170,10 @@ return array(
* *****************************************************************
*/
'portal' => [
+ /**
+ * Whether this portal is the SciGaP admin portal
+ */
+ 'scigap-admin-portal' => false,
/**
* Set the name of theme in use here
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/062aef9c/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 3f1bd6b..e1975cd 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -144,7 +144,7 @@ class AccountController extends BaseController
}
//only for super admin
- if( Config::get('pga_config.wsis')['tenant-domain'] == ""){
+ if( Config::get('pga_config.portal')['scigap-admin-portal'] == true){
Session::put("scigap_admin", true);
}
[15/50] [abbrv] airavata-php-gateway git commit: fixing invalid admin
warning
Posted by sc...@apache.org.
fixing invalid admin warning
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/cd0cba97
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/cd0cba97
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/cd0cba97
Branch: refs/heads/develop
Commit: cd0cba97e5dd1324912c8abeda17ef28e8648c41
Parents: 5308fe8
Author: scnakandala <su...@gmail.com>
Authored: Tue Dec 15 11:11:56 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Dec 15 11:11:56 2015 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cd0cba97/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index bb469dd..3f1bd6b 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -154,7 +154,12 @@ class AccountController extends BaseController
if(Session::get("admin") || Session::get("admin-read-only") || Session::get("authorized-user")){
return $this->initializeWithAiravata($username);
}
- return Redirect::to("admin/dashboard");
+
+ if(Session::get("admin") || Session::get("admin-read-only")){
+ return Redirect::to("admin/dashboard");
+ }else{
+ return Redirect::to("home");
+ }
}
}
[41/50] [abbrv] airavata-php-gateway git commit: fixing output path
generation issue
Posted by sc...@apache.org.
fixing output path generation issue
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/9b6f7f1e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/9b6f7f1e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/9b6f7f1e
Branch: refs/heads/develop
Commit: 9b6f7f1ed670a2fca37eb194815c795f8e3f05a4
Parents: 9949d78
Author: scnakandala <su...@gmail.com>
Authored: Mon Jan 11 13:52:32 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jan 11 13:52:32 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 5 -----
app/libraries/ExperimentUtilities.php | 8 ++------
2 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9b6f7f1e/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index 2a11842..07520a4 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -109,11 +109,6 @@ return array(
'server-allowed-file-size' => 64,
/**
- * directory in the web server where experiment data is staged. (relative to the PGA documents root)
- */
- 'experiment-data-dir' => '/../experimentData',
-
- /**
* absolute path of the data dir
*/
'experiment-data-absolute-path' => '/var/www/experimentData',
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9b6f7f1e/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index dfa7e6d..74e4946 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -657,15 +657,11 @@ class ExperimentUtilities
//print_r( $outputs); exit;
foreach ((array)$outputs as $output) {
if ($output->type == DataType::URI || $output->type == DataType::STDOUT || $output->type == DataType::STDERR) {
- $explode = explode('/', $output->value);
- //echo '<p>' . $output->key . ': <a href="' . $output->value . '">' . $output->value . '</a></p>';
- $outputPath = str_replace(Config::get('pga_config.airavata')['experiment-data-absolute-path'], Config::get('pga_config.airavata')['experiment-data-dir'], $output->value);
- //print_r( $output->value);
if(file_exists(str_replace('//','/',$output->value))){
- $outputPathArray = explode("/", $outputPath);
+ $outputPathArray = explode("/", $output->value);
echo '<p>' . $output->name . ' : ' . '<a target="_blank"
- href="' . URL::to("/") . '/download/' . $outputPathArray[ count($outputPathArray)-2] . '/' .
+ href="' . URL::to("/") . '/download/' . $outputPathArray[ count($outputPathArray)-3] . "/" . $outputPathArray[ count($outputPathArray)-2] . '/' .
$outputPathArray[ count($outputPathArray)-1] . '">' .
$outputPathArray[sizeof($outputPathArray) - 1] . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
}
[30/50] [abbrv] airavata-php-gateway git commit: adding missing files
Posted by sc...@apache.org.
adding missing files
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/be57aed4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/be57aed4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/be57aed4
Branch: refs/heads/develop
Commit: be57aed4599483430d6f443104886647cba2d666
Parents: 4f63322
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 13:31:19 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 13:31:19 2016 -0500
----------------------------------------------------------------------
.gitignore | 3 ++-
app/views/partials/experiment-container.blade.php | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/be57aed4/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 5cbbd4e..9ab2713 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ composer.lock
.DS_Store
Thumbs.db
-/app/storage
\ No newline at end of file
+/app/storage
+/themes
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/be57aed4/app/views/partials/experiment-container.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-container.blade.php b/app/views/partials/experiment-container.blade.php
index defae90..24b1df1 100644
--- a/app/views/partials/experiment-container.blade.php
+++ b/app/views/partials/experiment-container.blade.php
@@ -1,6 +1,6 @@
@if ( isset($expContainer))
@if (sizeof($expContainer) == 0)
- @if (isset($pageNo) && $pageNo == 1) {
+ @if (isset($pageNo) && $pageNo == 1)
{{ CommonUtilities::print_warning_message('No results found. Please try again.') }}
@else
{{ CommonUtilities::print_warning_message('No more results found.') }}
[45/50] [abbrv] airavata-php-gateway git commit: fixing echo cloning
bug
Posted by sc...@apache.org.
fixing echo cloning bug
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/894346d5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/894346d5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/894346d5
Branch: refs/heads/develop
Commit: 894346d5bca683e7f65afd57ec3940a4be348565
Parents: b0dc024
Author: scnakandala <su...@gmail.com>
Authored: Tue Jan 12 12:28:11 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Jan 12 12:28:11 2016 -0500
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/894346d5/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 74e4946..1598eba 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -1108,10 +1108,7 @@ class ExperimentUtilities
$applicationInputs = AppUtilities::get_application_inputs($experiment->executionId);
$experimentInputs = $experiment->experimentInputs; // get current inputs
- //var_dump($experimentInputs);
$experimentInputs = ExperimentUtilities::process_inputs($applicationInputs, $experimentInputs); // get new inputs
- $experiment->userConfigurationData->experimentDataDir = ExperimentUtilities::$relativeExperimentDataDir;
- //var_dump($experimentInputs);
if ($experimentInputs) {
$experiment->experimentInputs = $experimentInputs;
[25/50] [abbrv] airavata-php-gateway git commit: view cr should show
form disabled fields
Posted by sc...@apache.org.
view cr should show form disabled fields
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/81bab7a7
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/81bab7a7
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/81bab7a7
Branch: refs/heads/develop
Commit: 81bab7a7fcc28ecf47ade823c764421d02316253
Parents: 6c46b9f
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 12:34:17 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 12:34:17 2016 -0500
----------------------------------------------------------------------
app/views/resource/browse.blade.php | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/81bab7a7/app/views/resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php
index 1ee5491..6b3ffa1 100644
--- a/app/views/resource/browse.blade.php
+++ b/app/views/resource/browse.blade.php
@@ -51,11 +51,13 @@
<th>Id</th>
@if(Session::has("admin"))
<th>Enabled</th>
- <!--<th>Edit</th>-->
+ @if(Session::has("scigap_admin"))
+ <th>Edit</th>
+ @endif
@endif
<th>View</th>
- @if(Session::has("admin"))
- <!--<th>Delete</th>-->
+ @if(Session::has("scigap_admin"))
+ <th>Delete</th>
@endif
</tr>
@@ -80,20 +82,19 @@
</div>
@endif
</td>
- <!--
<td><a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
<span class="glyphicon glyphicon-pencil"></span>
</a>
</td>
- -->
@endif
+ @if(Session::has("scigap_admin"))
<td>
- <a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
+ <a href="{{URL::to('/')}}/cr/view?crId={{ $crId }}" title="View">
<span class="glyphicon glyphicon-list"></span>
</a>
</td>
- @if(Session::has("admin"))
- <!--
+ @endif
+ @if(Session::has("scigap_admin"))
<td>
<a href="#" title="Delete">
<span class="glyphicon glyphicon-trash del-cr" data-toggle="modal"
@@ -102,7 +103,6 @@
data-crid="{{$crId}}"></span>
</a>
</td>
- -->
@endif
</tr>
@endforeach
[43/50] [abbrv] airavata-php-gateway git commit: fixing warning
message
Posted by sc...@apache.org.
fixing warning message
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/7b8cd114
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7b8cd114
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7b8cd114
Branch: refs/heads/develop
Commit: 7b8cd1147f6d1bdfb3a4f948ec43de285e3fc04c
Parents: 91d7391
Author: scnakandala <su...@gmail.com>
Authored: Tue Jan 12 01:54:20 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Jan 12 01:54:20 2016 -0500
----------------------------------------------------------------------
app/controllers/AdminController.php | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7b8cd114/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 2b45e4b..23096f1 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -4,7 +4,6 @@ class AdminController extends BaseController {
public function __construct()
{
- $this->beforeFilter('verifyadmin');
Session::put("nav-active", "user-console");
}
@@ -13,12 +12,14 @@ class AdminController extends BaseController {
}
public function addAdminSubmit(){
- WSIS::update_user_roles( Input::get("username"), array( "new"=>array("admin"), "deleted"=>array() ) );
+ $this->beforeFilter('verifyadmin');
+ WSIS::update_user_roles( Input::get("username"), array( "new"=>array("admin"), "deleted"=>array() ) );
return View::make("account/admin-dashboard")->with("message", "User has been added to Admin.");
}
public function usersView(){
+ $this->beforeFilter('verifyadmin');
if( Input::has("role"))
{
$users = WSIS::getUserlistOfRole(Input::get("role"));
@@ -37,6 +38,7 @@ class AdminController extends BaseController {
}
public function searchUsersView(){
+ $this->beforeFilter('verifyadmin');
if(Input::has("search_val"))
{
$users = WSIS::searchUsers(Input::get("search_val"));
@@ -51,6 +53,7 @@ class AdminController extends BaseController {
}
public function gatewayView(){
+ $this->beforeFilter('verifyadmin');
//only for super admin
//Session::put("super-admin", true);
$crData = CRUtilities::getEditCRData();
@@ -74,6 +77,7 @@ class AdminController extends BaseController {
}
public function addGatewayAdminSubmit(){
+ $this->beforeFilter('verifyadmin');
//check if username exists
if(WSIS::usernameExists( Input::get("username")) )
{
@@ -87,29 +91,33 @@ class AdminController extends BaseController {
}
public function rolesView(){
-
+ $this->beforeFilter('verifyadmin');
$roles = WSIS::getAllRoles();
Session::put("admin-nav", "manage-roles");
return View::make("admin/manage-roles", array("roles" => $roles));
}
public function experimentsView(){
+ $this->beforeFilter('verifyadmin');
Session::put("admin-nav", "exp-statistics");
return View::make("admin/manage-experiments" );
}
public function resourcesView(){
+ $this->beforeFilter('verifyadmin');
$data = CRUtilities::getBrowseCRData(false);
$allCRs = $data["crObjects"];
return View::make("admin/manage-resources", array("resources" => $allCRs) );
}
public function addRole(){
+ $this->beforeFilter('verifyadmin');
WSIS::addRole( Input::get("role") );
return Redirect::to("admin/dashboard/roles")->with( "message", "Role has been added.");
}
public function addRolesToUser(){
+ $this->beforeFilter('verifyadmin');
$currentRoles = (array)WSIS::getUserRoles(Input::get("username"));
$roles["new"] = array_diff(Input::all()["roles"], $currentRoles);
$roles["deleted"] = array_diff($currentRoles, Input::all()["roles"]);
@@ -130,6 +138,7 @@ class AdminController extends BaseController {
}
public function removeRoleFromUser(){
+ $this->beforeFilter('verifyadmin');
$roles["deleted"] = array(Input::all()["roleName"]);
$roles["new"] = array();
$username = Input::all()["username"];
@@ -138,16 +147,19 @@ class AdminController extends BaseController {
}
public function getRoles(){
+ $this->beforeFilter('verifyadmin');
return json_encode((array)WSIS::getUserRoles(Input::get("username")));
}
public function deleteRole(){
+ $this->beforeFilter('verifyadmin');
WSIS::deleteRole( Input::get("role") );
return Redirect::to("admin/dashboard/roles")->with( "message", "Role has been deleted.");
}
public function credentialStoreView(){
+ $this->beforeFilter('verifyadmin');
Session::put("admin-nav", "credential-store");
$tokens = AdminUtilities::get_all_ssh_tokens();
//var_dump( $tokens); exit;
@@ -155,6 +167,7 @@ class AdminController extends BaseController {
}
public function updateUserRoles(){
+ $this->beforeFilter('verifyadmin');
if( Input::has("add"))
return WSIS::updateUserRoles(Input::get("username"), array("new"=> Input::get("roles"), "deleted" => array() ) );
else
@@ -165,7 +178,7 @@ class AdminController extends BaseController {
/* ---- Super Admin Functions ------- */
public function addGateway(){
-
+ $this->beforeFilter('verifyadmin');
$inputs = Input::all();
$gateway = AdminUtilities::add_gateway(Input::all());
@@ -181,6 +194,7 @@ class AdminController extends BaseController {
public function experimentStatistics()
{
+ $this->beforeFilter('verifyadmin');
if (Request::ajax()) {
$inputs = Input::all();
$expStatistics = AdminUtilities::get_experiment_execution_statistics(strtotime($inputs['fromTime']) * 1000
@@ -191,6 +205,7 @@ class AdminController extends BaseController {
public function getExperimentsOfTimeRange()
{
+ $this->beforeFilter('verifyadmin');
if (Request::ajax()) {
$inputs = Input::all();
$expContainer = AdminUtilities::get_experiments_of_time_range($inputs);
@@ -204,6 +219,7 @@ class AdminController extends BaseController {
}
public function enableComputeResource(){
+ $this->beforeFilter('verifyadmin');
$resourceId = Input::get("resourceId");
$computeResource = CRUtilities::get_compute_resource($resourceId);
$computeResource->enabled = true;
@@ -211,6 +227,7 @@ class AdminController extends BaseController {
}
public function disableComputeResource(){
+ $this->beforeFilter('verifyadmin');
$resourceId = Input::get("resourceId");
$computeResource = CRUtilities::get_compute_resource($resourceId);
$computeResource->enabled = false;
@@ -218,6 +235,7 @@ class AdminController extends BaseController {
}
public function createSSH(){
+ $this->beforeFilter('verifyadmin');
$newToken = AdminUtilities::create_ssh_token();
$pubkey = AdminUtilities::get_pubkey_from_token( $newToken);
return Response::json( array( "token" => $newToken, "pubkey" => $pubkey));
@@ -225,6 +243,7 @@ class AdminController extends BaseController {
}
public function removeSSH(){
+ $this->beforeFilter('verifyadmin');
$removeToken = Input::get("token");
if( AdminUtilities::remove_ssh_token( $removeToken) )
return 1;
[24/50] [abbrv] airavata-php-gateway git commit: storage resource
registering should be enabled only to the scigap admin
Posted by sc...@apache.org.
storage resource registering should be enabled only to the scigap admin
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/6c46b9f3
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6c46b9f3
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6c46b9f3
Branch: refs/heads/develop
Commit: 6c46b9f36acb4b797ac76cf12d814cebe7f9dfce
Parents: 062aef9
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 12:26:23 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 12:26:23 2016 -0500
----------------------------------------------------------------------
app/views/partials/dashboard-block.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6c46b9f3/app/views/partials/dashboard-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/dashboard-block.blade.php b/app/views/partials/dashboard-block.blade.php
index 5b8c818..cf0205f 100644
--- a/app/views/partials/dashboard-block.blade.php
+++ b/app/views/partials/dashboard-block.blade.php
@@ -39,7 +39,7 @@
<li>
<a><span class="glyphicon glyphicon-folder-open"></span> Storage Resources</a>
<ul>
- @if(Session::has("admin"))
+ @if(Session::has("scigap_admin"))
<li
@if( Session::has("admin-nav") && Session::get("admin-nav") == "sr-create") class="active" @endif>
<a class="dashboard-link" href="{{ URL::to('/')}}/sr/create"><i class="fa fa-fw fa-table"></i>Register</a>
[34/50] [abbrv] airavata-php-gateway git commit: modifying the auto
refreshing logic in experiment summary
Posted by sc...@apache.org.
modifying the auto refreshing logic in experiment summary
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/961aabc4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/961aabc4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/961aabc4
Branch: refs/heads/develop
Commit: 961aabc4822c563f22d0dddd6b1563ad39aed017
Parents: 5c1a773
Author: scnakandala <su...@gmail.com>
Authored: Fri Jan 8 14:26:46 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jan 8 14:26:46 2016 -0500
----------------------------------------------------------------------
app/views/experiment/summary.blade.php | 22 ++++++++++++++++++----
app/views/partials/experiment-info.blade.php | 5 +++++
2 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/961aabc4/app/views/experiment/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/summary.blade.php b/app/views/experiment/summary.blade.php
index cefc532..1643640 100755
--- a/app/views/experiment/summary.blade.php
+++ b/app/views/experiment/summary.blade.php
@@ -12,9 +12,10 @@
@section('scripts')
@parent
<script>
- var $continue = true;
+ var autoRefresh = false;
setInterval(function () {
- //if ($.trim($(".exp-status").html()) != "COMPLETED" && $continue) {
+ if (($.trim($(".exp-status").html()) != "COMPLETED" && $.trim($(".exp-status").html()) != "FAILED"
+ && $.trim($(".exp-status").html()) != "CANCELLED") && autoRefresh) {
$.ajax({
type: "GET",
url: "{{URL::to('/') }}/experiment/summary",
@@ -23,12 +24,25 @@
data = $.parseJSON( data);
//if ($.trim($("#expObj").val()) != $.trim(exp)) {
if ($.trim($("#lastModifiedTime").val()) != $.trim( data.expVal["experimentTimeOfStateChange"])) {
- $continue = false;
$(".refresh-exp").click();
}
}
});
- // }
+ }
}, 3000);
+
+ $('.btn-toggle').click(function() {
+ if(autoRefresh){
+ autoRefresh = false;
+ }else{
+ autoRefresh = true;
+ }
+
+ $(this).find('.btn').toggleClass('active');
+ if ($(this).find('.btn-primary').size()>0) {
+ $(this).find('.btn').toggleClass('btn-primary');
+ }
+ $(this).find('.btn').toggleClass('btn-default');
+ });
</script>
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/961aabc4/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index cb6ec26..b039371 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -10,6 +10,11 @@
@if( !isset($dashboard))
<small><a href="{{ URL::to('/') }}/experiment/summary?expId={{ $experiment->experimentId }}"
title="Refresh"><span class="glyphicon glyphicon-refresh refresh-exp"></span></a></small>
+ <small><small>Enable Auto Refresh </small></small>
+ <div class="btn-group btn-toggle">
+ <button class="btn btn-xs btn-default">ON</button>
+ <button class="btn btn-xs btn-primary active">OFF</button>
+ </div>
@endif
</h1>
[19/50] [abbrv] airavata-php-gateway git commit: rolling back to
thrift 0.9.2
Posted by sc...@apache.org.
rolling back to thrift 0.9.2
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/a090e895
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a090e895
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a090e895
Branch: refs/heads/develop
Commit: a090e89549ec01d8be70f4769a216e77b37c624f
Parents: e5e190e
Author: scnakandala <su...@gmail.com>
Authored: Thu Dec 17 00:52:37 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Dec 17 00:52:37 2015 -0500
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 2 +-
app/libraries/Airavata/API/Error/Types.php | 2 +-
app/libraries/Airavata/API/Types.php | 2 +-
app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php | 2 +-
app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php | 2 +-
app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php | 2 +-
app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php | 2 +-
app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php | 2 +-
app/libraries/Airavata/Model/Application/Io/Types.php | 2 +-
app/libraries/Airavata/Model/Commons/Types.php | 2 +-
app/libraries/Airavata/Model/Data/Movement/Types.php | 2 +-
app/libraries/Airavata/Model/Data/Resource/Types.php | 2 +-
app/libraries/Airavata/Model/Experiment/Types.php | 2 +-
app/libraries/Airavata/Model/Job/Types.php | 2 +-
app/libraries/Airavata/Model/Messaging/Event/Types.php | 2 +-
app/libraries/Airavata/Model/Process/Types.php | 2 +-
app/libraries/Airavata/Model/Scheduling/Types.php | 2 +-
app/libraries/Airavata/Model/Security/Types.php | 2 +-
app/libraries/Airavata/Model/Status/Types.php | 2 +-
app/libraries/Airavata/Model/Task/Types.php | 2 +-
app/libraries/Airavata/Model/Types.php | 2 +-
app/libraries/Airavata/Model/Workspace/Types.php | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index 4cc073b..52f2310 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -1,7 +1,7 @@
<?php
namespace Airavata\API;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/API/Error/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Error/Types.php b/app/libraries/Airavata/API/Error/Types.php
index edaa6de..d0a1ab6 100644
--- a/app/libraries/Airavata/API/Error/Types.php
+++ b/app/libraries/Airavata/API/Error/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\API\Error;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/API/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Types.php b/app/libraries/Airavata/API/Types.php
index 389e1ca..2261a42 100644
--- a/app/libraries/Airavata/API/Types.php
+++ b/app/libraries/Airavata/API/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\API;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
index ab599e6..e35f999 100644
--- a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\AppDeployment;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php b/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
index 1d09112..3c03cc7 100644
--- a/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\AppInterface;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 00f7e6c..57a4574 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\ComputeResource;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index 46f89a0..9152391 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\GatewayProfile;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php b/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
index 93df378..cf8f4b3 100644
--- a/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\StorageResource;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Application/Io/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Application/Io/Types.php b/app/libraries/Airavata/Model/Application/Io/Types.php
index cc208a6..e04650d 100644
--- a/app/libraries/Airavata/Model/Application/Io/Types.php
+++ b/app/libraries/Airavata/Model/Application/Io/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Application\Io;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Commons/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Commons/Types.php b/app/libraries/Airavata/Model/Commons/Types.php
index ecc9532..a4b8b85 100644
--- a/app/libraries/Airavata/Model/Commons/Types.php
+++ b/app/libraries/Airavata/Model/Commons/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Commons;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Data/Movement/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Movement/Types.php b/app/libraries/Airavata/Model/Data/Movement/Types.php
index 274a4a8..bacee47 100644
--- a/app/libraries/Airavata/Model/Data/Movement/Types.php
+++ b/app/libraries/Airavata/Model/Data/Movement/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Data\Movement;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Data/Resource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Resource/Types.php b/app/libraries/Airavata/Model/Data/Resource/Types.php
index cd5542a..ea5798f 100644
--- a/app/libraries/Airavata/Model/Data/Resource/Types.php
+++ b/app/libraries/Airavata/Model/Data/Resource/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Data\Resource;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Experiment/Types.php b/app/libraries/Airavata/Model/Experiment/Types.php
index fdca5bd..1f0e20e 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Experiment;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Job/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Job/Types.php b/app/libraries/Airavata/Model/Job/Types.php
index 22453c1..c7d3dd8 100644
--- a/app/libraries/Airavata/Model/Job/Types.php
+++ b/app/libraries/Airavata/Model/Job/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Job;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Messaging/Event/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Messaging/Event/Types.php b/app/libraries/Airavata/Model/Messaging/Event/Types.php
index 9c6a1e8..6fa7020 100644
--- a/app/libraries/Airavata/Model/Messaging/Event/Types.php
+++ b/app/libraries/Airavata/Model/Messaging/Event/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Messaging\Event;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Process/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Process/Types.php b/app/libraries/Airavata/Model/Process/Types.php
index 120c078..2712080 100644
--- a/app/libraries/Airavata/Model/Process/Types.php
+++ b/app/libraries/Airavata/Model/Process/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Process;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Scheduling/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Scheduling/Types.php b/app/libraries/Airavata/Model/Scheduling/Types.php
index 44c1180..966792d 100644
--- a/app/libraries/Airavata/Model/Scheduling/Types.php
+++ b/app/libraries/Airavata/Model/Scheduling/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Scheduling;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Security/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Security/Types.php b/app/libraries/Airavata/Model/Security/Types.php
index f388971..7904fef 100644
--- a/app/libraries/Airavata/Model/Security/Types.php
+++ b/app/libraries/Airavata/Model/Security/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Security;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Status/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Status/Types.php b/app/libraries/Airavata/Model/Status/Types.php
index 8457502..2a21e14 100644
--- a/app/libraries/Airavata/Model/Status/Types.php
+++ b/app/libraries/Airavata/Model/Status/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Status;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Task/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Task/Types.php b/app/libraries/Airavata/Model/Task/Types.php
index fcf5994..deae011 100644
--- a/app/libraries/Airavata/Model/Task/Types.php
+++ b/app/libraries/Airavata/Model/Task/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Task;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Types.php b/app/libraries/Airavata/Model/Types.php
index fe337a7..1304f75 100644
--- a/app/libraries/Airavata/Model/Types.php
+++ b/app/libraries/Airavata/Model/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a090e895/app/libraries/Airavata/Model/Workspace/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Workspace/Types.php b/app/libraries/Airavata/Model/Workspace/Types.php
index 6903330..4523e3d 100644
--- a/app/libraries/Airavata/Model/Workspace/Types.php
+++ b/app/libraries/Airavata/Model/Workspace/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Workspace;
/**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.2)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
[37/50] [abbrv] airavata-php-gateway git commit: setting experiment
data dir from pga
Posted by sc...@apache.org.
setting experiment data dir from pga
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/93775fea
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/93775fea
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/93775fea
Branch: refs/heads/develop
Commit: 93775fea1f62fea1b218e160ebe50ebf131471bd
Parents: 99d146a
Author: scnakandala <su...@gmail.com>
Authored: Mon Jan 11 12:03:46 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jan 11 12:03:46 2016 -0500
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 427 +++++++++++++++++++
.../Airavata/Model/Experiment/Types.php | 23 +
app/libraries/Airavata/Model/Process/Types.php | 23 +
app/libraries/ExperimentUtilities.php | 6 +-
4 files changed, 478 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/93775fea/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index 4cc073b..e9cec60 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -3176,6 +3176,19 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AuthorizationException
*/
public function copyDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $destStorageResourceId, $destinationParentPath);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $resourceId
+ * @param string $replicaId
+ * @param string $destStorageResourceId
+ * @param string $destinationParentPath
+ * @return string
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function copyDataReplica(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $replicaId, $destStorageResourceId, $destinationParentPath);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -12051,6 +12064,73 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("copyDataResource failed: unknown result");
}
+ public function copyDataReplica(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $replicaId, $destStorageResourceId, $destinationParentPath)
+ {
+ $this->send_copyDataReplica($authzToken, $resourceId, $replicaId, $destStorageResourceId, $destinationParentPath);
+ return $this->recv_copyDataReplica();
+ }
+
+ public function send_copyDataReplica(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $replicaId, $destStorageResourceId, $destinationParentPath)
+ {
+ $args = new \Airavata\API\Airavata_copyDataReplica_args();
+ $args->authzToken = $authzToken;
+ $args->resourceId = $resourceId;
+ $args->replicaId = $replicaId;
+ $args->destStorageResourceId = $destStorageResourceId;
+ $args->destinationParentPath = $destinationParentPath;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'copyDataReplica', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('copyDataReplica', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_copyDataReplica()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_copyDataReplica_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_copyDataReplica_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("copyDataReplica failed: unknown result");
+ }
+
}
// HELPER FUNCTIONS AND STRUCTURES
@@ -53987,4 +54067,351 @@ class Airavata_copyDataResource_result {
}
+class Airavata_copyDataReplica_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $resourceId = null;
+ /**
+ * @var string
+ */
+ public $replicaId = null;
+ /**
+ * @var string
+ */
+ public $destStorageResourceId = null;
+ /**
+ * @var string
+ */
+ public $destinationParentPath = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'authzToken',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Security\AuthzToken',
+ ),
+ 2 => array(
+ 'var' => 'resourceId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'replicaId',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'destStorageResourceId',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
+ 'var' => 'destinationParentPath',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['authzToken'])) {
+ $this->authzToken = $vals['authzToken'];
+ }
+ if (isset($vals['resourceId'])) {
+ $this->resourceId = $vals['resourceId'];
+ }
+ if (isset($vals['replicaId'])) {
+ $this->replicaId = $vals['replicaId'];
+ }
+ if (isset($vals['destStorageResourceId'])) {
+ $this->destStorageResourceId = $vals['destStorageResourceId'];
+ }
+ if (isset($vals['destinationParentPath'])) {
+ $this->destinationParentPath = $vals['destinationParentPath'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_copyDataReplica_args';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->authzToken = new \Airavata\Model\Security\AuthzToken();
+ $xfer += $this->authzToken->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->resourceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->replicaId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->destStorageResourceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->destinationParentPath);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_copyDataReplica_args');
+ if ($this->authzToken !== null) {
+ if (!is_object($this->authzToken)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1);
+ $xfer += $this->authzToken->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->resourceId !== null) {
+ $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+ $xfer += $output->writeString($this->resourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->replicaId !== null) {
+ $xfer += $output->writeFieldBegin('replicaId', TType::STRING, 3);
+ $xfer += $output->writeString($this->replicaId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->destStorageResourceId !== null) {
+ $xfer += $output->writeFieldBegin('destStorageResourceId', TType::STRING, 4);
+ $xfer += $output->writeString($this->destStorageResourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->destinationParentPath !== null) {
+ $xfer += $output->writeFieldBegin('destinationParentPath', TType::STRING, 5);
+ $xfer += $output->writeString($this->destinationParentPath);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_copyDataReplica_result {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $success = null;
+ /**
+ * @var \Airavata\API\Error\InvalidRequestException
+ */
+ public $ire = null;
+ /**
+ * @var \Airavata\API\Error\AiravataClientException
+ */
+ public $ace = null;
+ /**
+ * @var \Airavata\API\Error\AiravataSystemException
+ */
+ public $ase = null;
+ /**
+ * @var \Airavata\API\Error\AuthorizationException
+ */
+ public $ae = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::STRING,
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ 4 => array(
+ 'var' => 'ae',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AuthorizationException',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ if (isset($vals['ae'])) {
+ $this->ae = $vals['ae'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_copyDataReplica_result';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 0:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRUCT) {
+ $this->ae = new \Airavata\API\Error\AuthorizationException();
+ $xfer += $this->ae->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_copyDataReplica_result');
+ if ($this->success !== null) {
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $xfer += $this->ase->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ae !== null) {
+ $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
+ $xfer += $this->ae->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/93775fea/app/libraries/Airavata/Model/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Experiment/Types.php b/app/libraries/Airavata/Model/Experiment/Types.php
index fdca5bd..7180c44 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -85,6 +85,10 @@ class UserConfigurationDataModel {
* @var string
*/
public $storageId = null;
+ /**
+ * @var string
+ */
+ public $experimentDataDir = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -122,6 +126,10 @@ class UserConfigurationDataModel {
'var' => 'storageId',
'type' => TType::STRING,
),
+ 9 => array(
+ 'var' => 'experimentDataDir',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -149,6 +157,9 @@ class UserConfigurationDataModel {
if (isset($vals['storageId'])) {
$this->storageId = $vals['storageId'];
}
+ if (isset($vals['experimentDataDir'])) {
+ $this->experimentDataDir = $vals['experimentDataDir'];
+ }
}
}
@@ -228,6 +239,13 @@ class UserConfigurationDataModel {
$xfer += $input->skip($ftype);
}
break;
+ case 9:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->experimentDataDir);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -284,6 +302,11 @@ class UserConfigurationDataModel {
$xfer += $output->writeString($this->storageId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->experimentDataDir !== null) {
+ $xfer += $output->writeFieldBegin('experimentDataDir', TType::STRING, 9);
+ $xfer += $output->writeString($this->experimentDataDir);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/93775fea/app/libraries/Airavata/Model/Process/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Process/Types.php b/app/libraries/Airavata/Model/Process/Types.php
index 120c078..c0000d0 100644
--- a/app/libraries/Airavata/Model/Process/Types.php
+++ b/app/libraries/Airavata/Model/Process/Types.php
@@ -113,6 +113,10 @@ class ProcessModel {
* @var bool
*/
public $generateCert = false;
+ /**
+ * @var string
+ */
+ public $experimentDataDir = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -223,6 +227,10 @@ class ProcessModel {
'var' => 'generateCert',
'type' => TType::BOOL,
),
+ 22 => array(
+ 'var' => 'experimentDataDir',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -289,6 +297,9 @@ class ProcessModel {
if (isset($vals['generateCert'])) {
$this->generateCert = $vals['generateCert'];
}
+ if (isset($vals['experimentDataDir'])) {
+ $this->experimentDataDir = $vals['experimentDataDir'];
+ }
}
}
@@ -504,6 +515,13 @@ class ProcessModel {
$xfer += $input->skip($ftype);
}
break;
+ case 22:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->experimentDataDir);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -679,6 +697,11 @@ class ProcessModel {
$xfer += $output->writeBool($this->generateCert);
$xfer += $output->writeFieldEnd();
}
+ if ($this->experimentDataDir !== null) {
+ $xfer += $output->writeFieldBegin('experimentDataDir', TType::STRING, 22);
+ $xfer += $output->writeString($this->experimentDataDir);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/93775fea/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 8d428b4..06351b4 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -196,6 +196,8 @@ class ExperimentUtilities
if (ExperimentUtilities::$experimentPath == null) {
ExperimentUtilities::create_experiment_folder_path();
}
+ $userConfigData->experimentDataDir = ExperimentUtilities::$experimentPath;
+
$experiment = new ExperimentModel();
// required
$experiment->projectId = $_POST['project'];
@@ -452,6 +454,7 @@ class ExperimentUtilities
$experimentInput->value = $hostPathConstant . $newInputPath;
}
}
+ $experiment->userConfigurationData->experimentDataDir = ExperimentUtilities::$experimentPath;
Airavata::updateExperiment(Session::get('authz-token'), $cloneId, $experiment);
return $cloneId;
} catch (InvalidRequestException $ire) {
@@ -633,7 +636,7 @@ class ExperimentUtilities
*
*/
- public static function list_output_files($outputs, $status, $process)
+ public static function list_ouatput_files($outputs, $status, $process)
{
if( $process)
{
@@ -1108,6 +1111,7 @@ class ExperimentUtilities
$experimentInputs = $experiment->experimentInputs; // get current inputs
//var_dump($experimentInputs);
$experimentInputs = ExperimentUtilities::process_inputs($applicationInputs, $experimentInputs); // get new inputs
+ $experiment->userConfigurationData->experimentDataDir = ExperimentUtilities::$experimentPath;
//var_dump($experimentInputs);
if ($experimentInputs) {
[36/50] [abbrv] airavata-php-gateway git commit: hiding experiment
has failed message in PGA experiment outputs list
Posted by sc...@apache.org.
hiding experiment has failed message in PGA experiment outputs list
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/99d146ad
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/99d146ad
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/99d146ad
Branch: refs/heads/develop
Commit: 99d146adecf8635b607b3bd30ceba64bd44b17cf
Parents: ae9ed4a
Author: scnakandala <su...@gmail.com>
Authored: Mon Jan 11 10:36:22 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jan 11 10:36:22 2016 -0500
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 4 ++--
app/views/partials/experiment-info.blade.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/99d146ad/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index f19027f..8d428b4 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -663,8 +663,8 @@ class ExperimentUtilities
$outputPathArray[ count($outputPathArray)-1] . '">' .
$outputPathArray[sizeof($outputPathArray) - 1] . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
}
- else
- echo 'Output paths are not correctly defined for : <br/>' . $output->name . '<br/><br/> Please report this issue to the admin<br/><br/>';
+// else
+// echo 'Output paths are not correctly defined for : <br/>' . $output->name . '<br/><br/> Please report this issue to the admin<br/><br/>';
}
elseif ($output->type == DataType::STRING) {
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/99d146ad/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index b039371..bef7c83 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -128,7 +128,7 @@
<td><?php ExperimentUtilities::list_output_files($experiment->experimentOutputs, $experiment->experimentStatus->state, false); ?></td>
</tr>
<!-- an experiment is editable only when it has not failed. otherwise, show errors. -->
- @if( $expVal["editable"] == false)
+{{-- @if( $expVal["editable"] == false)--}}
<tr>
<td><strong>Errors</strong></td>
<td>
@@ -139,7 +139,7 @@
@endif
</td>
</tr>
- @endif
+ {{--@endif--}}
</table>
[44/50] [abbrv] airavata-php-gateway git commit: fixing cannot
download input
Posted by sc...@apache.org.
fixing cannot download input
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/b0dc024b
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b0dc024b
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b0dc024b
Branch: refs/heads/develop
Commit: b0dc024bd81259bd3ca6d7c604768ab032e68793
Parents: 7b8cd11
Author: scnakandala <su...@gmail.com>
Authored: Tue Jan 12 08:45:55 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Jan 12 08:45:55 2016 -0500
----------------------------------------------------------------------
app/routes.php | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b0dc024b/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index c925610..c32dd48 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -93,6 +93,13 @@ Route::get("download/{exp_data_dir}/{exp_folder}/{exp_file}", function($exp_data
. '/' . $exp_data_dir . "/" . $exp_folder . '/' . $exp_file;
return Response::download( $downloadLink);
});
+
+Route::get("download/{exp_data_dir}/{exp_file}", function($exp_data_dir, $exp_file){
+ $downloadLink = Config::get('pga_config.airavata')['experiment-data-absolute-path'] . '/' . Session::get('username')
+ . '/' . $exp_data_dir . '/' . $exp_file;
+ return Response::download( $downloadLink);
+});
+
/*
* Compute Resources Routes
*/
[42/50] [abbrv] airavata-php-gateway git commit: fixing routing issue
Posted by sc...@apache.org.
fixing routing issue
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/91d7391a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/91d7391a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/91d7391a
Branch: refs/heads/develop
Commit: 91d7391a70308ac146c024807202d1aa23300491
Parents: 9b6f7f1
Author: scnakandala <su...@gmail.com>
Authored: Mon Jan 11 13:55:18 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jan 11 13:55:18 2016 -0500
----------------------------------------------------------------------
app/routes.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/91d7391a/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index 0309614..c925610 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -88,8 +88,9 @@ Route::get("experiment/browse", "ExperimentController@browseView");
Route::post("experiment/browse", "ExperimentController@browseView");
-Route::get("download/{exp_folder}/{exp_file}", function( $exp_folder, $exp_file){
- $downloadLink = Config::get('pga_config.airavata')['experiment-data-absolute-path'] . '/' . Session::get('username') . '/' . $exp_folder . '/' . $exp_file;
+Route::get("download/{exp_data_dir}/{exp_folder}/{exp_file}", function($exp_data_dir, $exp_folder, $exp_file){
+ $downloadLink = Config::get('pga_config.airavata')['experiment-data-absolute-path'] . '/' . Session::get('username')
+ . '/' . $exp_data_dir . "/" . $exp_folder . '/' . $exp_file;
return Response::download( $downloadLink);
});
/*
[46/50] [abbrv] airavata-php-gateway git commit: showing job
submission response for failed jobs
Posted by sc...@apache.org.
showing job submission response for failed jobs
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/d9124880
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d9124880
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d9124880
Branch: refs/heads/develop
Commit: d912488043a1f7b3c79c7428a196c19f2980b99d
Parents: 894346d
Author: scnakandala <su...@gmail.com>
Authored: Wed Jan 13 11:31:16 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jan 13 11:31:16 2016 -0500
----------------------------------------------------------------------
app/views/partials/experiment-info.blade.php | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d9124880/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index bef7c83..f9917bf 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -140,7 +140,15 @@
</td>
</tr>
{{--@endif--}}
-
+ @foreach( $expVal["jobDetails"] as $index => $jobDetail)
+ @if($experiment->experimentStatus->state == \Airavata\Model\Status\ExperimentState::FAILED
+ || $jobDetail->jobStatus->jobStateName == "FAILED")
+ <tr>
+ <th>Job Submission Response</th>
+ <td>{{$jobDetail->stdOut}}</td>
+ </tr>
+ @endif
+ @endforeach
</table>
@if( !isset( $dashboard))
[33/50] [abbrv] airavata-php-gateway git commit: Removing the scigap
word in user roles
Posted by sc...@apache.org.
Removing the scigap word in user roles
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/5c1a7739
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5c1a7739
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5c1a7739
Branch: refs/heads/develop
Commit: 5c1a7739ca3735828bb66e617e973ea338651589
Parents: 48a35a3
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 16:54:23 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 16:54:23 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 2 +-
app/controllers/AccountController.php | 4 ++--
app/controllers/AdminController.php | 2 +-
app/libraries/CRUtilities.php | 2 +-
app/libraries/SRUtilities.php | 2 +-
app/views/admin/manage-gateway.blade.php | 2 +-
app/views/partials/dashboard-block.blade.php | 4 ++--
app/views/resource/browse.blade.php | 10 +++++-----
app/views/resource/edit.blade.php | 2 +-
app/views/storage-resource/browse.blade.php | 8 ++++----
10 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index fa0a7d5..2a11842 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -173,7 +173,7 @@ return array(
/**
* Whether this portal is the SciGaP admin portal
*/
- 'scigap-admin-portal' => false,
+ 'super-admin-portal' => false,
/**
* Set the name of theme in use here
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index e1975cd..dfe7b22 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -144,8 +144,8 @@ class AccountController extends BaseController
}
//only for super admin
- if( Config::get('pga_config.portal')['scigap-admin-portal'] == true){
- Session::put("scigap_admin", true);
+ if( Config::get('pga_config.portal')['super-admin-portal'] == true){
+ Session::put("super-admin", true);
}
CommonUtilities::store_id_in_session($username);
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 5b85235..2b45e4b 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -52,7 +52,7 @@ class AdminController extends BaseController {
public function gatewayView(){
//only for super admin
- //Session::put("scigap_admin", true);
+ //Session::put("super-admin", true);
$crData = CRUtilities::getEditCRData();
$gateways = CRUtilities::getAllGatewayProfilesData();
$tokens = AdminUtilities::get_all_ssh_tokens();
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index 0054d5a..669004d 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -442,7 +442,7 @@ class CRUtilities
public static function getAllGatewayProfilesData()
{
- if (Session::has("scigap_admin"))
+ if (Session::has("super-admin"))
$gateways = Airavata::getAllGateways(Session::get('authz-token'));
else {
$gateways[0] = Airavata::getGateway(Session::get('authz-token'), Session::get("gateway_id"));
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/libraries/SRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/SRUtilities.php b/app/libraries/SRUtilities.php
index a380026..78669c0 100644
--- a/app/libraries/SRUtilities.php
+++ b/app/libraries/SRUtilities.php
@@ -242,7 +242,7 @@ class SRUtilities
public static function getAllGatewayProfilesData()
{
- if (Session::has("scigap_admin"))
+ if (Session::has("super-admin"))
$gateways = Airavata::getAllGateways(Session::get('authz-token'));
else {
$gateways[0] = Airavata::getGateway(Session::get('authz-token'), Session::get("gateway_id"));
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 222f2d5..6c47742 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -30,7 +30,7 @@
<div class="col-md-6">
<h3>Gateway Preferences</h3>
</div>
- @if( Session::has("scigap_admin"))
+ @if( Session::has("super-admin"))
<div class="col-md-6" style="margin-top:2%">
<input type="text" class="col-md-12 filterinput" placeholder="Search by Gateway Name"/>
</div>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/views/partials/dashboard-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/dashboard-block.blade.php b/app/views/partials/dashboard-block.blade.php
index cf0205f..12b63d9 100644
--- a/app/views/partials/dashboard-block.blade.php
+++ b/app/views/partials/dashboard-block.blade.php
@@ -20,7 +20,7 @@
<li>
<a><span class="glyphicon glyphicon-briefcase"></span> Compute Resources</a>
<ul>
- @if(Session::has("scigap_admin"))
+ @if(Session::has("super-admin"))
<li
@if( Session::has("admin-nav") && Session::get("admin-nav") == "cr-create") class="active" @endif>
<a class="dashboard-link" href="{{ URL::to('/')}}/cr/create"><i class="fa fa-fw fa-table"></i>Register</a>
@@ -39,7 +39,7 @@
<li>
<a><span class="glyphicon glyphicon-folder-open"></span> Storage Resources</a>
<ul>
- @if(Session::has("scigap_admin"))
+ @if(Session::has("super-admin"))
<li
@if( Session::has("admin-nav") && Session::get("admin-nav") == "sr-create") class="active" @endif>
<a class="dashboard-link" href="{{ URL::to('/')}}/sr/create"><i class="fa fa-fw fa-table"></i>Register</a>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/views/resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php
index 2f5095f..550cf46 100644
--- a/app/views/resource/browse.blade.php
+++ b/app/views/resource/browse.blade.php
@@ -51,12 +51,12 @@
<th>Id</th>
@if(Session::has("admin"))
<th>Enabled</th>
- @if(Session::has("scigap_admin"))
+ @if(Session::has("super-admin"))
<th>Edit</th>
@endif
@endif
<th>View</th>
- @if(Session::has("scigap_admin"))
+ @if(Session::has("super-admin"))
<th>Delete</th>
@endif
</tr>
@@ -75,7 +75,7 @@
@if(!$enabled)
<div class="checkbox">
<input class="resource-status" resourceId="{{$crId}}" type="checkbox"
- @if(!Session::has("scigap_admin"))
+ @if(!Session::has("super-admin"))
disabled="disabled"
@endif
>
@@ -83,7 +83,7 @@
@else
<div class="checkbox">
<input class="resource-status" type="checkbox" resourceId="{{$crId}}" checked
- @if(!Session::has("scigap_admin"))
+ @if(!Session::has("super-admin"))
disabled="disabled"
@endif
>
@@ -95,7 +95,7 @@
</a>
</td>
@endif
- @if(Session::has("scigap_admin"))
+ @if(Session::has("super-admin"))
<td>
<a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
<span class="glyphicon glyphicon-pencil"></span>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/views/resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php
index 459bbf3..709cf86 100644
--- a/app/views/resource/edit.blade.php
+++ b/app/views/resource/edit.blade.php
@@ -841,7 +841,7 @@
})
</script>
-@if(! Session::has('scigap_admin'))
+@if(! Session::has('super-admin'))
<script>
function disableInputs( elem){
elem.find("input").each( function( i,e){
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5c1a7739/app/views/storage-resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/storage-resource/browse.blade.php b/app/views/storage-resource/browse.blade.php
index 5edde1c..f3b534f 100644
--- a/app/views/storage-resource/browse.blade.php
+++ b/app/views/storage-resource/browse.blade.php
@@ -48,11 +48,11 @@
<tr>
<th>Id</th>
<th>Hostname</th>
- @if(Session::has("scigap_admin"))
+ @if(Session::has("super-admin"))
<th>Edit</th>
@endif
<th>View</th>
- @if(Session::has("scigap_admin"))
+ @if(Session::has("super-admin"))
<th>Delete</th>
@endif
</tr>
@@ -65,7 +65,7 @@
<tr id="srDetails">
<td>{{ $srId }}</td>
<td>{{ $hostName }}</td>
- @if(Session::has("scigap_admin"))
+ @if(Session::has("super-admin"))
<td><a href="{{URL::to('/')}}/sr/edit?srId={{ $srId }}" title="Edit">
<span class="glyphicon glyphicon-pencil"></span>
</a>
@@ -76,7 +76,7 @@
<span class="glyphicon glyphicon-list"></span>
</a>
</td>
- @if(Session::has("scigap_admin"))
+ @if(Session::has("super-admin"))
<td>
<a href="#" title="Delete">
<span class="glyphicon glyphicon-trash del-sr" data-toggle="modal"
[31/50] [abbrv] airavata-php-gateway git commit: fixing cannot delete
storage resource preferences
Posted by sc...@apache.org.
fixing cannot delete storage resource preferences
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/58eb7bee
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/58eb7bee
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/58eb7bee
Branch: refs/heads/develop
Commit: 58eb7bee3ba8c9a03a3bc463225bc67c1a5c1433
Parents: be57aed
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 16:34:34 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 16:34:34 2016 -0500
----------------------------------------------------------------------
app/libraries/CRUtilities.php | 12 ++++++++
app/routes.php | 2 ++
app/views/admin/manage-gateway.blade.php | 43 ++++++++++++++++++++++-----
public/js/gateway.js | 7 ++++-
4 files changed, 56 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/58eb7bee/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index 2e21829..0054d5a 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -509,6 +509,18 @@ class CRUtilities
return Airavata::deleteGatewayComputeResourcePreference(Session::get('authz-token'), $inputs["gpId"], $inputs["rem-crId"]);
}
+ public static function deleteSR($inputs)
+ {
+ if (Config::get('pga_config.airavata')['enable-app-catalog-cache']) {
+ $id = $inputs["rem-srId"];
+ if (Cache::has('SR-' . $id)) {
+ Cache::forget('SR-' . $id);
+ }
+ }
+
+ return Airavata::deleteGatewayStoragePreference(Session::get('authz-token'), $inputs["gpId"], $inputs["rem-srId"]);
+ }
+
/**
* Get the ComputeResourceDescription with the given ID
* @param $id
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/58eb7bee/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index 988cd1c..63e0df0 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -192,6 +192,8 @@ Route::post("gp/add-dsp", "GatewayprofileController@modifyDSP");
Route::post("gp/update-dsp", "GatewayprofileController@modifyDSP");
+Route::post("gp/remove-sr", "GatewayprofileController@delete");
+
Route::post("gp/credential-store-token-change", "GatewayprofileController@cstChange");
//Management Dashboard
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/58eb7bee/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 438c063..222f2d5 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -163,9 +163,9 @@
</a>
@if(Session::has("admin"))
<div class="pull-right col-md-2 gateway-options fade">
- <span class="glyphicon glyphicon-remove remove-resource"
+ <span class="glyphicon glyphicon-remove remove-compute-resource"
style="cursor:pointer;" data-toggle="modal"
- data-target="#remove-resource-block"
+ data-target="#remove-compute-resource-block"
data-cr-name="{{$crp->crDetails->hostName}}"
data-cr-id="{{$crp->computeResourceId}}"
data-gp-id="{{ $gp->gatewayId }}"></span>
@@ -223,7 +223,7 @@
data-target="#remove-storage-resource-block"
data-sr-name="{{$srp->srDetails->hostName}}"
data-sr-id="{{$srp->storageResourceId}}"
- data-sr-id="{{ $gp->gatewayId }}"></span>
+ data-gp-id="{{ $gp->gatewayId }}"></span>
</div>
@endif
</h4>
@@ -283,9 +283,9 @@
</a>
@if(Session::has("admin"))
<div class="pull-right col-md-2 gateway-options fade">
- <span class="glyphicon glyphicon-remove remove-resource"
+ <span class="glyphicon glyphicon-remove remove-storage-resource"
style="cursor:pointer;" data-toggle="modal"
- data-target="#remove-resource-block"
+ data-target="#remove-storage-resource-block"
data-dsp-id="{{$ds->computeResourceId}}"
data-gp-id="{{ $gp->gatewayId }}"></span>
</div>
@@ -376,7 +376,7 @@
</div>
<!-- Remove a Compute Resource from a Gateway -->
-<div class="modal fade" id="remove-resource-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+<div class="modal fade" id="remove-compute-resource-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
aria-hidden="true">
<div class="modal-dialog">
@@ -389,7 +389,36 @@
<input type="hidden" class="form-control remove-crId" name="rem-crId"/>
<input type="hidden" class="form-control cr-gpId" name="gpId"/>
- Do you really want to remove the Compute Resource, <span class="remove-cr-name"> </span>from the
+ Do you really want to remove the Compute Resource, <span class="remove-cr-name"> </span> from the
+ selected Gateway?
+ </div>
+ <div class="modal-footer">
+ <div class="form-group">
+ <input type="submit" class="btn btn-danger" value="Remove"/>
+ <input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
+ </div>
+ </div>
+ </div>
+
+ </form>
+ </div>
+</div>
+
+<!-- Remove a Storage Resource from a Gateway -->
+<div class="modal fade" id="remove-storage-resource-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
+ aria-hidden="true">
+ <div class="modal-dialog">
+
+ <form action="{{URL::to('/')}}/gp/remove-sr" method="POST">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3 class="text-center">Remove Storage Resource Confirmation</h3>
+ </div>
+ <div class="modal-body">
+ <input type="hidden" class="form-control remove-srId" name="rem-srId"/>
+ <input type="hidden" class="form-control sr-gpId" name="gpId"/>
+
+ Do you really want to remove the Storage Resource, <span class="remove-sr-name"> </span> from the
selected Gateway?
</div>
<div class="modal-footer">
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/58eb7bee/public/js/gateway.js
----------------------------------------------------------------------
diff --git a/public/js/gateway.js b/public/js/gateway.js
index b8876c6..9f14209 100644
--- a/public/js/gateway.js
+++ b/public/js/gateway.js
@@ -70,10 +70,15 @@ $(document).ready(function () {
$(".delete-gpId").val( $(this).data("gp-id") );
});
- $(".remove-resource").click( function(){
+ $(".remove-compute-resource").click( function(){
$(".remove-cr-name").html( $(this).data("cr-name") );
$(".remove-crId").val( $(this).data("cr-id") );
$(".cr-gpId").val( $(this).data("gp-id") );
});
+ $(".remove-storage-resource").click( function(){
+ $(".remove-sr-name").html( $(this).data("sr-name") );
+ $(".remove-srId").val( $(this).data("sr-id") );
+ $(".sr-gpId").val( $(this).data("gp-id") );
+ });
});
\ No newline at end of file
[02/50] [abbrv] airavata-php-gateway git commit: changing null to
empty string for tokens
Posted by sc...@apache.org.
changing null to empty string for tokens
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/97280d8f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/97280d8f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/97280d8f
Branch: refs/heads/develop
Commit: 97280d8ff7dc8f289142bbbc09c4643926bd390b
Parents: 8f85afc
Author: smarru <sm...@apache.org>
Authored: Fri Dec 11 14:16:05 2015 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Dec 11 14:16:05 2015 -0500
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 2 +-
app/views/partials/gateway-preferences.blade.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/97280d8f/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 8b18f80..8b69838 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -120,7 +120,7 @@
@else
<option value="">Select a Credential Token from Store</option>
@endif
- <option value="">null</option>
+ <option value=""></option>
@foreach( $tokens as $token => $publicKey)
<option value="{{$token}}">{{$token}}</option>
@endforeach
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/97280d8f/app/views/partials/gateway-preferences.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/gateway-preferences.blade.php b/app/views/partials/gateway-preferences.blade.php
index a8407e5..21b6de8 100644
--- a/app/views/partials/gateway-preferences.blade.php
+++ b/app/views/partials/gateway-preferences.blade.php
@@ -92,7 +92,7 @@
@else
<option value="">Select a Credential Token from Store</option>
@endif
- <option value="">null</option>
+ <option value=""></option>
@foreach( $tokens as $token => $publicKey)
<option value="{{$token}}">{{$token}}</option>
@endforeach
[03/50] [abbrv] airavata-php-gateway git commit: Providing a user
friendly do not set for token
Posted by sc...@apache.org.
Providing a user friendly do not set for token
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/7b89d19e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7b89d19e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7b89d19e
Branch: refs/heads/develop
Commit: 7b89d19e552043d029dcdeb61808bf59433c7f37
Parents: 97280d8
Author: smarru <sm...@apache.org>
Authored: Fri Dec 11 14:37:15 2015 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Dec 11 14:37:15 2015 -0500
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 2 +-
app/views/partials/gateway-preferences.blade.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7b89d19e/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 8b69838..2a105e6 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -120,7 +120,7 @@
@else
<option value="">Select a Credential Token from Store</option>
@endif
- <option value=""></option>
+ <option value="">DO-NO-SET</option>
@foreach( $tokens as $token => $publicKey)
<option value="{{$token}}">{{$token}}</option>
@endforeach
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7b89d19e/app/views/partials/gateway-preferences.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/gateway-preferences.blade.php b/app/views/partials/gateway-preferences.blade.php
index 21b6de8..cc068f5 100644
--- a/app/views/partials/gateway-preferences.blade.php
+++ b/app/views/partials/gateway-preferences.blade.php
@@ -92,7 +92,7 @@
@else
<option value="">Select a Credential Token from Store</option>
@endif
- <option value=""></option>
+ <option value="">DO-NO-SET</option>
@foreach( $tokens as $token => $publicKey)
<option value="{{$token}}">{{$token}}</option>
@endforeach
[49/50] [abbrv] airavata-php-gateway git commit: fixing umask issue
Posted by sc...@apache.org.
fixing umask issue
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/430bf48c
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/430bf48c
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/430bf48c
Branch: refs/heads/develop
Commit: 430bf48c33aa5cc9d73197c951f107e54f0c5812
Parents: f5e39e5
Author: scnakandala <su...@gmail.com>
Authored: Wed Jan 13 16:39:12 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jan 13 16:39:12 2016 -0500
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/430bf48c/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 5c881a4..fafd1f2 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -368,11 +368,13 @@ class ExperimentUtilities
ExperimentUtilities::$relativeExperimentDataDir;
} while (is_dir(ExperimentUtilities::$experimentPath)); // if dir already exists, try again
// create upload directory
+ $old_umask = umask(0);
if (!mkdir(ExperimentUtilities::$experimentPath, 0777, true)) {
CommonUtilities::print_error_message('<p>Error creating upload directory!
Please try again later or report a bug using the link in the Help menu.</p>');
$experimentAssemblySuccessful = false;
}
+ umask($old_umask);
}
/**
[26/50] [abbrv] airavata-php-gateway git commit: Merge branch
'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by sc...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/55cbd9e7
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/55cbd9e7
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/55cbd9e7
Branch: refs/heads/develop
Commit: 55cbd9e79b254340c0115c7c148398ff83113cb6
Parents: 81bab7a b73806a
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 12:37:18 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 12:37:18 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/55cbd9e7/app/config/pga_config.php.template
----------------------------------------------------------------------
[06/50] [abbrv] airavata-php-gateway git commit: Ongoing changes for
storage resources and gateway preferences
Posted by sc...@apache.org.
Ongoing changes for storage resources and gateway preferences
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/de1ae7c5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/de1ae7c5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/de1ae7c5
Branch: refs/heads/develop
Commit: de1ae7c51cb68db03b1ef793515c8c7d46f8294e
Parents: dff6b47
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Sun Dec 13 10:44:30 2015 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Sun Dec 13 10:44:30 2015 -0500
----------------------------------------------------------------------
app/controllers/AdminController.php | 3 +
app/libraries/CRUtilities.php | 3 +
app/views/admin/manage-gateway.blade.php | 73 +++++++++---
.../compute-resource-preferences.blade.php | 111 +++++++++++++++++++
.../partials/gateway-preferences.blade.php | 111 -------------------
.../storage-resource-preferences.blade.php | 64 +++++++++++
6 files changed, 238 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/de1ae7c5/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index a674307..5b85235 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -56,12 +56,15 @@ class AdminController extends BaseController {
$crData = CRUtilities::getEditCRData();
$gateways = CRUtilities::getAllGatewayProfilesData();
$tokens = AdminUtilities::get_all_ssh_tokens();
+ $srData = SRUtilities::getEditSRData();
//$dsData = CRUtilities::getAllDataStoragePreferences( $gateways);
$gatewayData = array(
"gateways" => $gateways,
"computeResources" => CRUtilities::getAllCRObjects(),
"crData" => $crData,
+ "storageResources" => SRUtilities::getAllSRObjects(),
+ "srData" => $srData,
"tokens" => $tokens
);
$view = "admin/manage-gateway";
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/de1ae7c5/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index c8f40fa..2e21829 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -459,6 +459,9 @@ class CRUtilities
foreach ((array)$gp->computeResourcePreferences as $i => $crp) {
$gatewayProfiles[$index]->computeResourcePreferences[$i]->crDetails = Airavata::getComputeResource(Session::get('authz-token'), $crp->computeResourceId);
}
+ foreach( (array)$gp->storagePreferences as $j => $srp){
+ $gatewayProfiles[$index]->storagePreferences[$j]->srDetails = Airavata::getStorageResource( Session::get('authz-token'), $srp->storageResourceId);
+ }
$gateways[$key]->profile = $gatewayProfiles[$index];
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/de1ae7c5/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 2a105e6..3ccc9b5 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -186,7 +186,7 @@
value="{{$crp->computeResourceId}}">
<div class="form-horizontal">
- @include('partials/gateway-preferences',
+ @include('partials/compute-resource-preferences',
array('computeResource' => $crp->crDetails,
'crData' => $crData, 'preferences'=>$crp,
'show'=>true))
@@ -200,20 +200,61 @@
</div>
</div>
@endif
- <!--
- Adding a user as admin will shift to roles. Removing from here.
- <h4><span class="glyphicon glyphicon-plus"></span> Add a user as Admin to this Gateway</h4>
- <form action="{{URL::to('/')}}/admin/addgatewayadmin" method="POST" role="form" enctype="multipart/form-data">
- <div class="form-group required">
- <label for="experiment-name" class="control-label">Enter Username</label>
- <input type="text" class="form-control" name="username" id="experiment-name" placeholder="username" autofocus required="required">
- <input type="hidden" name="gateway_name" value="{{ $gp->gatewayName }}"/>
- </div>
- <div class="btn-toolbar">
- <input name="add" type="submit" class="btn btn-primary" value="Add Admin"/>
+ @if( isset( $gp->profile->storagePreferences) )
+ <div>
+ <h3>Storage Resource Preferences :</h3>
+ </div>
+ <div class="accordion-inner">
+ <div class="panel-group" id="accordion-{{$indexGP}}">
+ @foreach( (array)$gp->profile->storagePreferences as $indexSRP
+ => $srp )
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle collapsed gateway-name"
+ data-toggle="collapse" data-parent="#accordion"
+ href="#collapse-srp-{{$indexGP}}-{{$indexSRP}}">
+ {{ $srp->srDetails->hostName }}
+ </a>
+ @if(Session::has("admin"))
+ <div class="pull-right col-md-2 gateway-options fade">
+ <span class="glyphicon glyphicon-remove remove-storage-resource"
+ style="cursor:pointer;" data-toggle="modal"
+ data-target="#remove-storage-resource-block"
+ data-sr-name="{{$srp->srDetails->hostName}}"
+ data-sr-id="{{$srp->storageResourceId}}"
+ data-sr-id="{{ $gp->gatewayId }}"></span>
+ </div>
+ @endif
+ </h4>
+ </div>
+ <div id="collapse-srp-{{$indexGP}}-{{$indexSRP}}"
+ class="panel-collapse collapse">
+ <div class="panel-body">
+ <div class="app-compute-resource-preferences-block">
+ <form action="{{URL::to('/')}}/gp/update-srp"
+ method="POST">
+ <input type="hidden" name="gatewayId" id="gatewayId"
+ value="{{$gp->gatewayId}}">
+ <input type="hidden" name="storageResourceId"
+ id="gatewayId"
+ value="{{$crp->storageResourceId}}">
+
+ <div class="form-horizontal">
+ @include('partials/storage-resource-preferences',
+ array('storageResource' => $srp->srDetails,
+ 'srData' => $srData, 'preferences'=>$srp,
+ 'show'=>true))
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ @endforeach
</div>
- </form>
- -->
+ </div>
+ @endif
</div>
<div class="col-md-10">
@@ -264,7 +305,7 @@
value="{{$crp->dataMovememtResourceId}}">
<div class="form-horizontal">
- @include('partials/gateway-preferences',
+ @include('partials/compute-resource-preferences',
array('computeResource' => $crp->crDetails,
'crData' => $crData, 'preferences'=>$crp,
'show'=>true))
@@ -363,7 +404,7 @@
<!-- contains all compute resource choices that might get selected on adding a new one to a gateway -->
@foreach( (array)$computeResources as $index => $cr)
-@include('partials/gateway-preferences', array('computeResource' => $cr, 'crData' => $crData))
+@include('partials/compute-resource-preferences', array('computeResource' => $cr, 'crData' => $crData))
@endforeach
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/de1ae7c5/app/views/partials/compute-resource-preferences.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/compute-resource-preferences.blade.php b/app/views/partials/compute-resource-preferences.blade.php
new file mode 100644
index 0000000..cc068f5
--- /dev/null
+++ b/app/views/partials/compute-resource-preferences.blade.php
@@ -0,0 +1,111 @@
+<!-- String replace is done as Jquery creates problems when using period(.) in id or class. -->
+<div id="cr-{{ str_replace( '.', "_", $computeResource->computeResourceId) }}" class="@if(isset( $show) ) @if( !$show) hide @endif @else hide @endif">
+<h3 class="text-center">Set Preferences</h3>
+<div class="form-group">
+ <label class="control-label col-md-3">Override by Airavata</label>
+
+ <div class="col-md-9">
+ <select class="form-control" name="overridebyAiravata">
+ <option value="1"
+ @if( isset( $preferences) ) @if( 1 == $preferences->overridebyAiravata) selected @endif @endif>True</option>
+ <option value="0"
+ @if( isset( $preferences) ) @if( 0 == $preferences->overridebyAiravata) selected @endif
+ @endif>False</option>
+ </select>
+ </div>
+</div><br/>
+<div class="form-group">
+ <label class="control-label col-md-3">Login Username</label>
+
+ <div class="col-md-9">
+ <input type="text" name="loginUserName" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->loginUserName}}@endif"/>
+ </div>
+</div>
+<div class="form-group">
+ <label class="control-label col-md-3">Preferred Job Submission Protocol</label>
+
+ <div class="col-md-9">
+ <select name="preferredJobSubmissionProtocol" class="form-control">
+ @foreach( (array)$computeResource->jobSubmissionInterfaces as $index => $jsi)
+ <option value="{{$jsi->jobSubmissionProtocol}}"
+ @if( isset( $preferences) ) @if( $preferences->preferredJobSubmissionProtocol ==
+ $jsi->jobSubmissionProtocol) selected @endif @endif>{{
+ $crData["jobSubmissionProtocols"][$jsi->jobSubmissionProtocol] }}</option>
+ @endforeach
+ </select>
+
+ </div>
+</div>
+<br/>
+<div class="form-group">
+ <label class="control-label col-md-3">Preferred Data Movement Protocol</label>
+
+ <div class="col-md-9">
+ <select name="preferredDataMovementProtocol" class="form-control">
+ @foreach( (array)$computeResource->dataMovementInterfaces as $index => $dmi)
+ <option value="{{ $dmi->dataMovementProtocol}}"
+ @if( isset( $preferences) ) @if( $preferences->preferredDataMovementProtocol == $dmi->dataMovementProtocol)
+ selected @endif @endif>{{ $crData["dataMovementProtocols"][$dmi->dataMovementProtocol] }}</option>
+ @endforeach
+ </select>
+ </div>
+</div>
+<div class="form-group">
+ <label class="control-label col-md-3">Preferred Batch Queue</label>
+
+ <div class="col-md-9">
+ <select name="preferredBatchQueue" class="form-control">
+ @foreach( (array)$computeResource->batchQueues as $index => $queue)
+ <option value="{{ $queue->queueName}}"
+ @if( isset( $preferences) ) @if( $preferences->preferredBatchQueue == $queue->queueName) selected @endif
+ @endif>{{ $queue->queueName}}</option>
+ @endforeach
+ </select>
+ </div>
+</div>
+<div class="form-group">
+ <label class="control-label col-md-3">Scratch Location</label>
+
+ <div class="col-md-9">
+ <input type="text" name="scratchLocation" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->scratchLocation}}@endif"/>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-md-3">Allocation Project Number</label>
+
+ <div class="col-md-9">
+ <input type="text" name="allocationProjectNumber" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->allocationProjectNumber}}@endif"/>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-md-3">Resource Specific Credential Store Token</label>
+
+ <div class="col-md-9">
+ <select class="form-control gateway-credential-store-token" name="resourceSpecificCredentialStoreToken" >
+ @if( isset( $preferences) )
+ <option value="{{$preferences->resourceSpecificCredentialStoreToken}}">{{$preferences->resourceSpecificCredentialStoreToken}}</option>
+ @else
+ <option value="">Select a Credential Token from Store</option>
+ @endif
+ <option value="">DO-NO-SET</option>
+ @foreach( $tokens as $token => $publicKey)
+ <option value="{{$token}}">{{$token}}</option>
+ @endforeach
+ </select>
+ <!--
+ <input type="text" name="resourceSpecificCredentialStoreToken" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->resourceSpecificCredentialStoreToken}}@endif"/>
+ -->
+ </div>
+</div>
+@if(Session::has("admin"))
+<div class="form-group">
+ <input type="submit" class="form-control btn btn-primary" value="Set preferences"/>
+</div>
+@endif
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/de1ae7c5/app/views/partials/gateway-preferences.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/gateway-preferences.blade.php b/app/views/partials/gateway-preferences.blade.php
deleted file mode 100644
index cc068f5..0000000
--- a/app/views/partials/gateway-preferences.blade.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<!-- String replace is done as Jquery creates problems when using period(.) in id or class. -->
-<div id="cr-{{ str_replace( '.', "_", $computeResource->computeResourceId) }}" class="@if(isset( $show) ) @if( !$show) hide @endif @else hide @endif">
-<h3 class="text-center">Set Preferences</h3>
-<div class="form-group">
- <label class="control-label col-md-3">Override by Airavata</label>
-
- <div class="col-md-9">
- <select class="form-control" name="overridebyAiravata">
- <option value="1"
- @if( isset( $preferences) ) @if( 1 == $preferences->overridebyAiravata) selected @endif @endif>True</option>
- <option value="0"
- @if( isset( $preferences) ) @if( 0 == $preferences->overridebyAiravata) selected @endif
- @endif>False</option>
- </select>
- </div>
-</div><br/>
-<div class="form-group">
- <label class="control-label col-md-3">Login Username</label>
-
- <div class="col-md-9">
- <input type="text" name="loginUserName" class="form-control"
- value="@if( isset( $preferences) ){{$preferences->loginUserName}}@endif"/>
- </div>
-</div>
-<div class="form-group">
- <label class="control-label col-md-3">Preferred Job Submission Protocol</label>
-
- <div class="col-md-9">
- <select name="preferredJobSubmissionProtocol" class="form-control">
- @foreach( (array)$computeResource->jobSubmissionInterfaces as $index => $jsi)
- <option value="{{$jsi->jobSubmissionProtocol}}"
- @if( isset( $preferences) ) @if( $preferences->preferredJobSubmissionProtocol ==
- $jsi->jobSubmissionProtocol) selected @endif @endif>{{
- $crData["jobSubmissionProtocols"][$jsi->jobSubmissionProtocol] }}</option>
- @endforeach
- </select>
-
- </div>
-</div>
-<br/>
-<div class="form-group">
- <label class="control-label col-md-3">Preferred Data Movement Protocol</label>
-
- <div class="col-md-9">
- <select name="preferredDataMovementProtocol" class="form-control">
- @foreach( (array)$computeResource->dataMovementInterfaces as $index => $dmi)
- <option value="{{ $dmi->dataMovementProtocol}}"
- @if( isset( $preferences) ) @if( $preferences->preferredDataMovementProtocol == $dmi->dataMovementProtocol)
- selected @endif @endif>{{ $crData["dataMovementProtocols"][$dmi->dataMovementProtocol] }}</option>
- @endforeach
- </select>
- </div>
-</div>
-<div class="form-group">
- <label class="control-label col-md-3">Preferred Batch Queue</label>
-
- <div class="col-md-9">
- <select name="preferredBatchQueue" class="form-control">
- @foreach( (array)$computeResource->batchQueues as $index => $queue)
- <option value="{{ $queue->queueName}}"
- @if( isset( $preferences) ) @if( $preferences->preferredBatchQueue == $queue->queueName) selected @endif
- @endif>{{ $queue->queueName}}</option>
- @endforeach
- </select>
- </div>
-</div>
-<div class="form-group">
- <label class="control-label col-md-3">Scratch Location</label>
-
- <div class="col-md-9">
- <input type="text" name="scratchLocation" class="form-control"
- value="@if( isset( $preferences) ){{$preferences->scratchLocation}}@endif"/>
- </div>
-</div>
-
-<div class="form-group">
- <label class="control-label col-md-3">Allocation Project Number</label>
-
- <div class="col-md-9">
- <input type="text" name="allocationProjectNumber" class="form-control"
- value="@if( isset( $preferences) ){{$preferences->allocationProjectNumber}}@endif"/>
- </div>
-</div>
-
-<div class="form-group">
- <label class="control-label col-md-3">Resource Specific Credential Store Token</label>
-
- <div class="col-md-9">
- <select class="form-control gateway-credential-store-token" name="resourceSpecificCredentialStoreToken" >
- @if( isset( $preferences) )
- <option value="{{$preferences->resourceSpecificCredentialStoreToken}}">{{$preferences->resourceSpecificCredentialStoreToken}}</option>
- @else
- <option value="">Select a Credential Token from Store</option>
- @endif
- <option value="">DO-NO-SET</option>
- @foreach( $tokens as $token => $publicKey)
- <option value="{{$token}}">{{$token}}</option>
- @endforeach
- </select>
- <!--
- <input type="text" name="resourceSpecificCredentialStoreToken" class="form-control"
- value="@if( isset( $preferences) ){{$preferences->resourceSpecificCredentialStoreToken}}@endif"/>
- -->
- </div>
-</div>
-@if(Session::has("admin"))
-<div class="form-group">
- <input type="submit" class="form-control btn btn-primary" value="Set preferences"/>
-</div>
-@endif
-</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/de1ae7c5/app/views/partials/storage-resource-preferences.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/storage-resource-preferences.blade.php b/app/views/partials/storage-resource-preferences.blade.php
new file mode 100644
index 0000000..42b056b
--- /dev/null
+++ b/app/views/partials/storage-resource-preferences.blade.php
@@ -0,0 +1,64 @@
+<!-- String replace is done as Jquery creates problems when using period(.) in id or class. -->
+<div id="sr-{{ str_replace( '.', "_", $storageResource->storageResourceId) }}" class="@if(isset( $show) ) @if( !$show) hide @endif @else hide @endif">
+<h3 class="text-center">Set Preferences</h3>
+<div class="form-group">
+ <label class="control-label col-md-3">Login Username</label>
+
+ <div class="col-md-9">
+ <input type="text" name="loginUserName" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->loginUserName}}@endif"/>
+ </div>
+</div>
+<!--
+dmi preference might be needed in the future
+<div class="form-group">
+ <label class="control-label col-md-3">Preferred Data Movement Protocol</label>
+
+ <div class="col-md-9">
+ <select name="preferredDataMovementProtocol" class="form-control">
+ @foreach( (array)$computeResource->dataMovementInterfaces as $index => $dmi)
+ <option value="{{ $dmi->dataMovementProtocol}}"
+ @if( isset( $preferences) ) @if( $preferences->preferredDataMovementProtocol == $dmi->dataMovementProtocol)
+ selected @endif @endif>{{ $crData["dataMovementProtocols"][$dmi->dataMovementProtocol] }}</option>
+ @endforeach
+ </select>
+ </div>
+</div>
+-->
+<div class="form-group">
+ <label class="control-label col-md-3">File System Root Location</label>
+
+ <div class="col-md-9">
+ <input type="text" name="fileSystemRootLocation" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->fileSystemRootLocation}}@endif"/>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-md-3">Resource Specific Credential Store Token</label>
+
+ <div class="col-md-9">
+ <select class="form-control gateway-credential-store-token" name="resourceSpecificCredentialStoreToken" >
+ @if( isset( $preferences) )
+ <option value="{{$preferences->resourceSpecificCredentialStoreToken}}">{{$preferences->resourceSpecificCredentialStoreToken}}</option>
+ @else
+ <option value="">Select a Credential Token from Store</option>
+ @endif
+ <option value="">DO-NO-SET</option>
+ @foreach( $tokens as $token => $publicKey)
+ <option value="{{$token}}">{{$token}}</option>
+ @endforeach
+ </select>
+ <!--
+ <input type="text" name="resourceSpecificCredentialStoreToken" class="form-control"
+ value="@if( isset( $preferences) ){{$preferences->resourceSpecificCredentialStoreToken}}@endif"/>
+ -->
+ </div>
+</div>
+
+@if(Session::has("admin"))
+<div class="form-group">
+ <input type="submit" class="form-control btn btn-primary" value="Set preferences"/>
+</div>
+@endif
+</div>
\ No newline at end of file
[47/50] [abbrv] airavata-php-gateway git commit: hiding
static-working-dir
Posted by sc...@apache.org.
hiding static-working-dir
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/d6fe629b
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d6fe629b
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d6fe629b
Branch: refs/heads/develop
Commit: d6fe629bf0ce56a804b9ff69a1f9ceb121125651
Parents: d912488
Author: scnakandala <su...@gmail.com>
Authored: Wed Jan 13 11:51:30 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jan 13 11:51:30 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php | 224 +++++++++++++++++++
app/libraries/ExperimentUtilities.php | 2 +-
.../partials/experiment-queue-block.blade.php | 14 +-
3 files changed, 232 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d6fe629b/app/config/pga_config.php
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php b/app/config/pga_config.php
new file mode 100644
index 0000000..cfdd6b0
--- /dev/null
+++ b/app/config/pga_config.php
@@ -0,0 +1,224 @@
+<?php
+return array(
+ /**
+ * *****************************************************************
+ * These are WSO2 Identity Server Related Configurations
+ * *****************************************************************
+ */
+
+ 'wsis' => [
+
+ /**
+ * Admin Role Name
+ */
+ 'admin-role-name' => 'Internal/everyone',
+
+ /**
+ * Read only Admin Role Name
+ */
+ 'read-only-admin-role-name' => 'admin-read-only',
+
+ /**
+ * Gateway user role
+ */
+ 'user-role-name' => 'airavata-user',
+
+ /**
+ * Tenant Domain
+ */
+ 'tenant-domain' => 'master.airavata',
+
+ /**
+ * Tenant admin's username
+ */
+ 'admin-username' => 'master',
+
+ /**
+ * Tenant admin's password
+ */
+ 'admin-password' => 'master',
+
+ /**
+ * OAuth client key
+ */
+ 'oauth-client-key' => 'O3iUdkkVYyHgzWPiVTQpY_tb96Ma',
+
+ /**
+ * OAuth client secret
+ */
+ 'oauth-client-secret' => '6Ck1jZoa2oRtrzodSqkUZ2iINkUa',
+
+ /**
+ * Identity server domain
+ */
+ 'server' => 'idp.scigap.org',
+
+ /**
+ * Identity server url
+ */
+ 'service-url' => 'https://idp.scigap.org:7443/',
+
+ /**
+ * Enable HTTPS server verification
+ */
+ 'verify-peer' => true,
+
+ /**
+ * Path to the server certificate file
+ */
+ 'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem',
+
+ /**
+ * Allow self signed server certificates
+ */
+ 'allow-self-signed-cert' => false
+ ],
+
+
+ /**
+ * *****************************************************************
+ * These are Airavata Related Configurations
+ * *****************************************************************
+ */
+ 'airavata' => [
+
+ /**
+ * Airavata API server location. Use tls:// as the protocol to
+ * connect TLS enabled Airavata
+ */
+ 'airavata-server' => 'gw77.iu.xsede.org',
+
+ /**
+ * Airavata API server port
+ */
+ 'airavata-port' => '8930',
+
+ /**
+ * Airavata API server thrift communication timeout
+ */
+ 'airavata-timeout' => '1000000',
+
+ /**
+ * Data Manager CPI server host
+ */
+ 'data-manager-server' => 'localhost',
+
+ /**
+ * Data Manager CPI server port
+ */
+ 'data-manager-port' => '8990',
+
+ /**
+ * Data Manager CPI server thrift communication timeout
+ */
+ 'data-manager-timeout' => '1000000',
+
+ /**
+ * PGA Gateway ID
+ */
+ 'gateway-id' => 'seagrid',
+
+ /**
+ * Maximum size of a file which is allowed to upload to the server
+ */
+ 'server-allowed-file-size' => 64,
+
+ /**
+ * absolute path of the data dir
+ */
+ 'experiment-data-absolute-path' => '/Library/WebServer/Documents/experimentData',
+
+ /**
+ * username for the user for accessing the experiment data over ssh
+ */
+ 'ssh-user' => 'root',
+
+ /**
+ * Advanced experiments options
+ */
+ 'advanced-experiment-options' => '',
+
+ /**
+ * Default queue name
+ */
+ 'queue-name' => 'long',
+
+ /**
+ * Default node count
+ */
+ 'node-count' => '1',
+
+ /**
+ * Default total core count
+ */
+ 'total-cpu-count' => '16',
+
+ /**
+ * Default wall time limit
+ */
+ 'wall-time-limit' => '30',
+
+ /**
+ * Enable app-catalog cache
+ */
+ 'enable-app-catalog-cache' => true,
+
+ /**
+ * Life time of app catalog data cache in minutes
+ */
+ 'app-catalog-cache-duration' => 5,
+
+ /**
+ * Gateway data store resource id
+ */
+ 'gateway-data-store-resource-id' => ''
+ ],
+ /**
+ * *****************************************************************
+ * Portal Related Configurations
+ * *****************************************************************
+ */
+ 'portal' => [
+
+ /**
+ * Whether this portal is the super admin portal
+ */
+ 'super-admin-portal' => true,
+
+ /**
+ * Set the name of theme in use here
+ */
+ 'theme' => 'base',
+
+ /**
+ * Portal titles
+ */
+ 'portal-title' => 'Airavata PHP Gateway',
+
+ /**
+ * Email addresses of the portal admins. Portal admins well get email notifications for events
+ * such as new user creation
+ */
+ 'admin-emails' => ['eroma.abeysinghe@gmail.com','supun.nakandala@gmail.com'],
+
+ /**
+ * Email account that the portal should login to send emails
+ */
+ 'portal-email-username' => 'pga.airavata@gmail.com',
+
+ /**
+ * Password for the portal's email account
+ */
+ 'portal-email-password' => 'airavata12',
+
+ /**
+ * SMTP server on which the portal should connect
+ */
+ 'portal-smtp-server-host' => 'smtp.gmail.com',
+
+ /**
+ * SMTP server port on which the portal should connect
+ */
+ 'portal-smtp-server-port' => '587'
+ ]
+);
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d6fe629b/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 1598eba..5c881a4 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -181,7 +181,7 @@ class ExperimentUtilities
$scheduling->wallTimeLimit = $_POST['wall-time'];
$scheduling->totalPhysicalMemory = $_POST['total-physical-memory'];
$scheduling->resourceHostId = $_POST['compute-resource'];
- $scheduling->staticWorkingDir = $_POST['static-working-dir'];
+// $scheduling->staticWorkingDir = $_POST['static-working-dir'];
$userConfigData = new UserConfigurationDataModel();
$userConfigData->computationalResourceScheduling = $scheduling;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d6fe629b/app/views/partials/experiment-queue-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-queue-block.blade.php b/app/views/partials/experiment-queue-block.blade.php
index af2390b..c585ea2 100644
--- a/app/views/partials/experiment-queue-block.blade.php
+++ b/app/views/partials/experiment-queue-block.blade.php
@@ -59,13 +59,13 @@
<span class="input-group-addon">MB</span>
</div>
</div>
- <div class="form-group">
- <label for="static-working-dir">Static Working Directory<span
- class="static-working-dir alert-warning"></span></label>
- <input type="text" class="form-control" name="static-working-dir" id="static-working-dir"
- value="@if(isset($expVal) ){{ $expVal['scheduling']->staticWorkingDir }}@endif"
- @if(isset($expVal)) @if(!$expVal['editable']){{"disabled"}} @endif @endif>
- </div>
+ {{--<div class="form-group">--}}
+ {{--<label for="static-working-dir">Static Working Directory<span--}}
+ {{--class="static-working-dir alert-warning"></span></label>--}}
+ {{--<input type="text" class="form-control" name="static-working-dir" id="static-working-dir"--}}
+ {{--value="@if(isset($expVal) ){{ $expVal['scheduling']->staticWorkingDir }}@endif"--}}
+ {{--@if(isset($expVal)) @if(!$expVal['editable']){{"disabled"}} @endif @endif>--}}
+ {{--</div>--}}
</div>
[27/50] [abbrv] airavata-php-gateway git commit: ammendments to the
previous commit
Posted by sc...@apache.org.
ammendments to the previous commit
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/0d8fb566
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/0d8fb566
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/0d8fb566
Branch: refs/heads/develop
Commit: 0d8fb566e923cffbbf62e34ecf032dbdb70d044c
Parents: 55cbd9e
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 13:00:45 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 13:00:45 2016 -0500
----------------------------------------------------------------------
app/views/resource/browse.blade.php | 30 ++++++++++++++----------
app/views/storage-resource/browse.blade.php | 8 +++----
2 files changed, 22 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0d8fb566/app/views/resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php
index 6b3ffa1..2f5095f 100644
--- a/app/views/resource/browse.blade.php
+++ b/app/views/resource/browse.blade.php
@@ -74,28 +74,34 @@
<td>
@if(!$enabled)
<div class="checkbox">
- <input class="resource-status" resourceId="{{$crId}}" type="checkbox">
+ <input class="resource-status" resourceId="{{$crId}}" type="checkbox"
+ @if(!Session::has("scigap_admin"))
+ disabled="disabled"
+ @endif
+ >
</div>
@else
<div class="checkbox">
- <input class="resource-status" type="checkbox" resourceId="{{$crId}}" checked>
+ <input class="resource-status" type="checkbox" resourceId="{{$crId}}" checked
+ @if(!Session::has("scigap_admin"))
+ disabled="disabled"
+ @endif
+ >
</div>
@endif
</td>
- <td><a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
- <span class="glyphicon glyphicon-pencil"></span>
+ <td><a href="{{URL::to('/')}}/cr/view?crId={{ $crId }}" title="View">
+ <span class="glyphicon glyphicon-list"></span>
</a>
</td>
@endif
@if(Session::has("scigap_admin"))
- <td>
- <a href="{{URL::to('/')}}/cr/view?crId={{ $crId }}" title="View">
- <span class="glyphicon glyphicon-list"></span>
- </a>
- </td>
- @endif
- @if(Session::has("scigap_admin"))
- <td>
+ <td>
+ <a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
+ <span class="glyphicon glyphicon-pencil"></span>
+ </a>
+ </td>
+ <td>
<a href="#" title="Delete">
<span class="glyphicon glyphicon-trash del-cr" data-toggle="modal"
data-target="#delete-cr-block" data-delete-cr-name="{{$crName}}"
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0d8fb566/app/views/storage-resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/storage-resource/browse.blade.php b/app/views/storage-resource/browse.blade.php
index a15307d..5edde1c 100644
--- a/app/views/storage-resource/browse.blade.php
+++ b/app/views/storage-resource/browse.blade.php
@@ -48,11 +48,11 @@
<tr>
<th>Id</th>
<th>Hostname</th>
- @if(Session::has("admin"))
+ @if(Session::has("scigap_admin"))
<th>Edit</th>
@endif
<th>View</th>
- @if(Session::has("admin"))
+ @if(Session::has("scigap_admin"))
<th>Delete</th>
@endif
</tr>
@@ -65,7 +65,7 @@
<tr id="srDetails">
<td>{{ $srId }}</td>
<td>{{ $hostName }}</td>
- @if(Session::has("admin"))
+ @if(Session::has("scigap_admin"))
<td><a href="{{URL::to('/')}}/sr/edit?srId={{ $srId }}" title="Edit">
<span class="glyphicon glyphicon-pencil"></span>
</a>
@@ -76,7 +76,7 @@
<span class="glyphicon glyphicon-list"></span>
</a>
</td>
- @if(Session::has("admin"))
+ @if(Session::has("scigap_admin"))
<td>
<a href="#" title="Delete">
<span class="glyphicon glyphicon-trash del-sr" data-toggle="modal"
[17/50] [abbrv] airavata-php-gateway git commit: updating the thrift
0.9.3 generated code
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Data/Resource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Resource/Types.php b/app/libraries/Airavata/Model/Data/Resource/Types.php
index 84e6c9c..cd5542a 100644
--- a/app/libraries/Airavata/Model/Data/Resource/Types.php
+++ b/app/libraries/Airavata/Model/Data/Resource/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Data\Resource;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -39,6 +39,15 @@ final class ReplicaPersistentType {
);
}
+final class DataResourceType {
+ const COLLECTION = 0;
+ const FILE = 1;
+ static public $__names = array(
+ 0 => 'COLLECTION',
+ 1 => 'FILE',
+ );
+}
+
class DataResourceModel {
static $_TSPEC;
@@ -53,6 +62,10 @@ class DataResourceModel {
/**
* @var string
*/
+ public $parentResourceId = null;
+ /**
+ * @var string
+ */
public $resourceName = null;
/**
* @var string
@@ -65,6 +78,10 @@ class DataResourceModel {
/**
* @var int
*/
+ public $dataResourceType = null;
+ /**
+ * @var int
+ */
public $resourceSize = null;
/**
* @var int
@@ -81,7 +98,11 @@ class DataResourceModel {
/**
* @var \Airavata\Model\Data\Resource\DataReplicaLocationModel[]
*/
- public $dataReplicaLocations = null;
+ public $replicaLocations = null;
+ /**
+ * @var \Airavata\Model\Data\Resource\DataResourceModel[]
+ */
+ public $childResources = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -95,30 +116,38 @@ class DataResourceModel {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'resourceName',
+ 'var' => 'parentResourceId',
'type' => TType::STRING,
),
4 => array(
- 'var' => 'resourceDescription',
+ 'var' => 'resourceName',
'type' => TType::STRING,
),
5 => array(
- 'var' => 'ownerName',
+ 'var' => 'resourceDescription',
'type' => TType::STRING,
),
6 => array(
+ 'var' => 'ownerName',
+ 'type' => TType::STRING,
+ ),
+ 7 => array(
+ 'var' => 'dataResourceType',
+ 'type' => TType::I32,
+ ),
+ 8 => array(
'var' => 'resourceSize',
'type' => TType::I32,
),
- 7 => array(
+ 9 => array(
'var' => 'creationTime',
'type' => TType::I64,
),
- 8 => array(
+ 10 => array(
'var' => 'lastModifiedTime',
'type' => TType::I64,
),
- 9 => array(
+ 11 => array(
'var' => 'resourceMetadata',
'type' => TType::MAP,
'ktype' => TType::STRING,
@@ -130,8 +159,8 @@ class DataResourceModel {
'type' => TType::STRING,
),
),
- 10 => array(
- 'var' => 'dataReplicaLocations',
+ 12 => array(
+ 'var' => 'replicaLocations',
'type' => TType::LST,
'etype' => TType::STRUCT,
'elem' => array(
@@ -139,6 +168,15 @@ class DataResourceModel {
'class' => '\Airavata\Model\Data\Resource\DataReplicaLocationModel',
),
),
+ 13 => array(
+ 'var' => 'childResources',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Data\Resource\DataResourceModel',
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -148,6 +186,9 @@ class DataResourceModel {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
+ if (isset($vals['parentResourceId'])) {
+ $this->parentResourceId = $vals['parentResourceId'];
+ }
if (isset($vals['resourceName'])) {
$this->resourceName = $vals['resourceName'];
}
@@ -157,6 +198,9 @@ class DataResourceModel {
if (isset($vals['ownerName'])) {
$this->ownerName = $vals['ownerName'];
}
+ if (isset($vals['dataResourceType'])) {
+ $this->dataResourceType = $vals['dataResourceType'];
+ }
if (isset($vals['resourceSize'])) {
$this->resourceSize = $vals['resourceSize'];
}
@@ -169,8 +213,11 @@ class DataResourceModel {
if (isset($vals['resourceMetadata'])) {
$this->resourceMetadata = $vals['resourceMetadata'];
}
- if (isset($vals['dataReplicaLocations'])) {
- $this->dataReplicaLocations = $vals['dataReplicaLocations'];
+ if (isset($vals['replicaLocations'])) {
+ $this->replicaLocations = $vals['replicaLocations'];
+ }
+ if (isset($vals['childResources'])) {
+ $this->childResources = $vals['childResources'];
}
}
}
@@ -210,47 +257,61 @@ class DataResourceModel {
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceName);
+ $xfer += $input->readString($this->parentResourceId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 4:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceDescription);
+ $xfer += $input->readString($this->resourceName);
} else {
$xfer += $input->skip($ftype);
}
break;
case 5:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->ownerName);
+ $xfer += $input->readString($this->resourceDescription);
} else {
$xfer += $input->skip($ftype);
}
break;
case 6:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->ownerName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->dataResourceType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->resourceSize);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 7:
+ case 9:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 10:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->lastModifiedTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 11:
if ($ftype == TType::MAP) {
$this->resourceMetadata = array();
$_size0 = 0;
@@ -270,9 +331,9 @@ class DataResourceModel {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 12:
if ($ftype == TType::LST) {
- $this->dataReplicaLocations = array();
+ $this->replicaLocations = array();
$_size7 = 0;
$_etype10 = 0;
$xfer += $input->readListBegin($_etype10, $_size7);
@@ -281,7 +342,25 @@ class DataResourceModel {
$elem12 = null;
$elem12 = new \Airavata\Model\Data\Resource\DataReplicaLocationModel();
$xfer += $elem12->read($input);
- $this->dataReplicaLocations []= $elem12;
+ $this->replicaLocations []= $elem12;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 13:
+ if ($ftype == TType::LST) {
+ $this->childResources = array();
+ $_size13 = 0;
+ $_etype16 = 0;
+ $xfer += $input->readListBegin($_etype16, $_size13);
+ for ($_i17 = 0; $_i17 < $_size13; ++$_i17)
+ {
+ $elem18 = null;
+ $elem18 = new \Airavata\Model\Data\Resource\DataResourceModel();
+ $xfer += $elem18->read($input);
+ $this->childResources []= $elem18;
}
$xfer += $input->readListEnd();
} else {
@@ -311,33 +390,43 @@ class DataResourceModel {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->parentResourceId !== null) {
+ $xfer += $output->writeFieldBegin('parentResourceId', TType::STRING, 3);
+ $xfer += $output->writeString($this->parentResourceId);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->resourceName !== null) {
- $xfer += $output->writeFieldBegin('resourceName', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('resourceName', TType::STRING, 4);
$xfer += $output->writeString($this->resourceName);
$xfer += $output->writeFieldEnd();
}
if ($this->resourceDescription !== null) {
- $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 4);
+ $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 5);
$xfer += $output->writeString($this->resourceDescription);
$xfer += $output->writeFieldEnd();
}
if ($this->ownerName !== null) {
- $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 5);
+ $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 6);
$xfer += $output->writeString($this->ownerName);
$xfer += $output->writeFieldEnd();
}
+ if ($this->dataResourceType !== null) {
+ $xfer += $output->writeFieldBegin('dataResourceType', TType::I32, 7);
+ $xfer += $output->writeI32($this->dataResourceType);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->resourceSize !== null) {
- $xfer += $output->writeFieldBegin('resourceSize', TType::I32, 6);
+ $xfer += $output->writeFieldBegin('resourceSize', TType::I32, 8);
$xfer += $output->writeI32($this->resourceSize);
$xfer += $output->writeFieldEnd();
}
if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 7);
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 9);
$xfer += $output->writeI64($this->creationTime);
$xfer += $output->writeFieldEnd();
}
if ($this->lastModifiedTime !== null) {
- $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 8);
+ $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 10);
$xfer += $output->writeI64($this->lastModifiedTime);
$xfer += $output->writeFieldEnd();
}
@@ -345,31 +434,48 @@ class DataResourceModel {
if (!is_array($this->resourceMetadata)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('resourceMetadata', TType::MAP, 9);
+ $xfer += $output->writeFieldBegin('resourceMetadata', TType::MAP, 11);
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->resourceMetadata));
{
- foreach ($this->resourceMetadata as $kiter13 => $viter14)
+ foreach ($this->resourceMetadata as $kiter19 => $viter20)
{
- $xfer += $output->writeString($kiter13);
- $xfer += $output->writeString($viter14);
+ $xfer += $output->writeString($kiter19);
+ $xfer += $output->writeString($viter20);
}
}
$output->writeMapEnd();
}
$xfer += $output->writeFieldEnd();
}
- if ($this->dataReplicaLocations !== null) {
- if (!is_array($this->dataReplicaLocations)) {
+ if ($this->replicaLocations !== null) {
+ if (!is_array($this->replicaLocations)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('replicaLocations', TType::LST, 12);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->replicaLocations));
+ {
+ foreach ($this->replicaLocations as $iter21)
+ {
+ $xfer += $iter21->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->childResources !== null) {
+ if (!is_array($this->childResources)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataReplicaLocations', TType::LST, 10);
+ $xfer += $output->writeFieldBegin('childResources', TType::LST, 13);
{
- $output->writeListBegin(TType::STRUCT, count($this->dataReplicaLocations));
+ $output->writeListBegin(TType::STRUCT, count($this->childResources));
{
- foreach ($this->dataReplicaLocations as $iter15)
+ foreach ($this->childResources as $iter22)
{
- $xfer += $iter15->write($output);
+ $xfer += $iter22->write($output);
}
}
$output->writeListEnd();
@@ -413,15 +519,23 @@ class DataReplicaLocationModel {
/**
* @var int
*/
+ public $validUntilTime = null;
+ /**
+ * @var int
+ */
public $replicaLocationCategory = null;
/**
* @var int
*/
public $replicaPersistentType = null;
/**
- * @var string[]
+ * @var string
+ */
+ public $storageResourceId = null;
+ /**
+ * @var string
*/
- public $dataLocations = null;
+ public $fileAbsolutePath = null;
/**
* @var array
*/
@@ -455,22 +569,26 @@ class DataReplicaLocationModel {
'type' => TType::I64,
),
7 => array(
- 'var' => 'replicaLocationCategory',
- 'type' => TType::I32,
+ 'var' => 'validUntilTime',
+ 'type' => TType::I64,
),
8 => array(
- 'var' => 'replicaPersistentType',
+ 'var' => 'replicaLocationCategory',
'type' => TType::I32,
),
9 => array(
- 'var' => 'dataLocations',
- 'type' => TType::LST,
- 'etype' => TType::STRING,
- 'elem' => array(
- 'type' => TType::STRING,
- ),
+ 'var' => 'replicaPersistentType',
+ 'type' => TType::I32,
),
10 => array(
+ 'var' => 'storageResourceId',
+ 'type' => TType::STRING,
+ ),
+ 11 => array(
+ 'var' => 'fileAbsolutePath',
+ 'type' => TType::STRING,
+ ),
+ 12 => array(
'var' => 'replicaMetadata',
'type' => TType::MAP,
'ktype' => TType::STRING,
@@ -503,14 +621,20 @@ class DataReplicaLocationModel {
if (isset($vals['lastModifiedTime'])) {
$this->lastModifiedTime = $vals['lastModifiedTime'];
}
+ if (isset($vals['validUntilTime'])) {
+ $this->validUntilTime = $vals['validUntilTime'];
+ }
if (isset($vals['replicaLocationCategory'])) {
$this->replicaLocationCategory = $vals['replicaLocationCategory'];
}
if (isset($vals['replicaPersistentType'])) {
$this->replicaPersistentType = $vals['replicaPersistentType'];
}
- if (isset($vals['dataLocations'])) {
- $this->dataLocations = $vals['dataLocations'];
+ if (isset($vals['storageResourceId'])) {
+ $this->storageResourceId = $vals['storageResourceId'];
+ }
+ if (isset($vals['fileAbsolutePath'])) {
+ $this->fileAbsolutePath = $vals['fileAbsolutePath'];
}
if (isset($vals['replicaMetadata'])) {
$this->replicaMetadata = $vals['replicaMetadata'];
@@ -580,50 +704,54 @@ class DataReplicaLocationModel {
}
break;
case 7:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->replicaLocationCategory);
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->validUntilTime);
} else {
$xfer += $input->skip($ftype);
}
break;
case 8:
if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->replicaPersistentType);
+ $xfer += $input->readI32($this->replicaLocationCategory);
} else {
$xfer += $input->skip($ftype);
}
break;
case 9:
- if ($ftype == TType::LST) {
- $this->dataLocations = array();
- $_size16 = 0;
- $_etype19 = 0;
- $xfer += $input->readListBegin($_etype19, $_size16);
- for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
- {
- $elem21 = null;
- $xfer += $input->readString($elem21);
- $this->dataLocations []= $elem21;
- }
- $xfer += $input->readListEnd();
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->replicaPersistentType);
} else {
$xfer += $input->skip($ftype);
}
break;
case 10:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->storageResourceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 11:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->fileAbsolutePath);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
if ($ftype == TType::MAP) {
$this->replicaMetadata = array();
- $_size22 = 0;
- $_ktype23 = 0;
- $_vtype24 = 0;
- $xfer += $input->readMapBegin($_ktype23, $_vtype24, $_size22);
- for ($_i26 = 0; $_i26 < $_size22; ++$_i26)
+ $_size23 = 0;
+ $_ktype24 = 0;
+ $_vtype25 = 0;
+ $xfer += $input->readMapBegin($_ktype24, $_vtype25, $_size23);
+ for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
{
- $key27 = '';
- $val28 = '';
- $xfer += $input->readString($key27);
- $xfer += $input->readString($val28);
- $this->replicaMetadata[$key27] = $val28;
+ $key28 = '';
+ $val29 = '';
+ $xfer += $input->readString($key28);
+ $xfer += $input->readString($val29);
+ $this->replicaMetadata[$key28] = $val29;
}
$xfer += $input->readMapEnd();
} else {
@@ -673,38 +801,36 @@ class DataReplicaLocationModel {
$xfer += $output->writeI64($this->lastModifiedTime);
$xfer += $output->writeFieldEnd();
}
+ if ($this->validUntilTime !== null) {
+ $xfer += $output->writeFieldBegin('validUntilTime', TType::I64, 7);
+ $xfer += $output->writeI64($this->validUntilTime);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->replicaLocationCategory !== null) {
- $xfer += $output->writeFieldBegin('replicaLocationCategory', TType::I32, 7);
+ $xfer += $output->writeFieldBegin('replicaLocationCategory', TType::I32, 8);
$xfer += $output->writeI32($this->replicaLocationCategory);
$xfer += $output->writeFieldEnd();
}
if ($this->replicaPersistentType !== null) {
- $xfer += $output->writeFieldBegin('replicaPersistentType', TType::I32, 8);
+ $xfer += $output->writeFieldBegin('replicaPersistentType', TType::I32, 9);
$xfer += $output->writeI32($this->replicaPersistentType);
$xfer += $output->writeFieldEnd();
}
- if ($this->dataLocations !== null) {
- if (!is_array($this->dataLocations)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('dataLocations', TType::LST, 9);
- {
- $output->writeListBegin(TType::STRING, count($this->dataLocations));
- {
- foreach ($this->dataLocations as $iter29)
- {
- $xfer += $output->writeString($iter29);
- }
- }
- $output->writeListEnd();
- }
+ if ($this->storageResourceId !== null) {
+ $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 10);
+ $xfer += $output->writeString($this->storageResourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->fileAbsolutePath !== null) {
+ $xfer += $output->writeFieldBegin('fileAbsolutePath', TType::STRING, 11);
+ $xfer += $output->writeString($this->fileAbsolutePath);
$xfer += $output->writeFieldEnd();
}
if ($this->replicaMetadata !== null) {
if (!is_array($this->replicaMetadata)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('replicaMetadata', TType::MAP, 10);
+ $xfer += $output->writeFieldBegin('replicaMetadata', TType::MAP, 12);
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->replicaMetadata));
{
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Experiment/Types.php b/app/libraries/Airavata/Model/Experiment/Types.php
index 1f0e20e..fdca5bd 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Experiment;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Job/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Job/Types.php b/app/libraries/Airavata/Model/Job/Types.php
index c7d3dd8..22453c1 100644
--- a/app/libraries/Airavata/Model/Job/Types.php
+++ b/app/libraries/Airavata/Model/Job/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Job;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Messaging/Event/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Messaging/Event/Types.php b/app/libraries/Airavata/Model/Messaging/Event/Types.php
index 6fa7020..9c6a1e8 100644
--- a/app/libraries/Airavata/Model/Messaging/Event/Types.php
+++ b/app/libraries/Airavata/Model/Messaging/Event/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Messaging\Event;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Process/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Process/Types.php b/app/libraries/Airavata/Model/Process/Types.php
index 2712080..120c078 100644
--- a/app/libraries/Airavata/Model/Process/Types.php
+++ b/app/libraries/Airavata/Model/Process/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Process;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Scheduling/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Scheduling/Types.php b/app/libraries/Airavata/Model/Scheduling/Types.php
index 966792d..44c1180 100644
--- a/app/libraries/Airavata/Model/Scheduling/Types.php
+++ b/app/libraries/Airavata/Model/Scheduling/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Scheduling;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Security/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Security/Types.php b/app/libraries/Airavata/Model/Security/Types.php
index 7904fef..f388971 100644
--- a/app/libraries/Airavata/Model/Security/Types.php
+++ b/app/libraries/Airavata/Model/Security/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Security;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Status/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Status/Types.php b/app/libraries/Airavata/Model/Status/Types.php
index 2a21e14..8457502 100644
--- a/app/libraries/Airavata/Model/Status/Types.php
+++ b/app/libraries/Airavata/Model/Status/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Status;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Task/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Task/Types.php b/app/libraries/Airavata/Model/Task/Types.php
index deae011..fcf5994 100644
--- a/app/libraries/Airavata/Model/Task/Types.php
+++ b/app/libraries/Airavata/Model/Task/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Task;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Types.php b/app/libraries/Airavata/Model/Types.php
index 1304f75..fe337a7 100644
--- a/app/libraries/Airavata/Model/Types.php
+++ b/app/libraries/Airavata/Model/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Airavata/Model/Workspace/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Workspace/Types.php b/app/libraries/Airavata/Model/Workspace/Types.php
index 4523e3d..6903330 100644
--- a/app/libraries/Airavata/Model/Workspace/Types.php
+++ b/app/libraries/Airavata/Model/Workspace/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Workspace;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Thrift/Exception/TProtocolException.php
----------------------------------------------------------------------
diff --git a/app/libraries/Thrift/Exception/TProtocolException.php b/app/libraries/Thrift/Exception/TProtocolException.php
index f2529f5..98a8d9d 100644
--- a/app/libraries/Thrift/Exception/TProtocolException.php
+++ b/app/libraries/Thrift/Exception/TProtocolException.php
@@ -41,8 +41,6 @@ class TProtocolException extends TException {
const NEGATIVE_SIZE = 2;
const SIZE_LIMIT = 3;
const BAD_VERSION = 4;
- const NOT_IMPLEMENTED = 5;
- const DEPTH_LIMIT = 6;
function __construct($message=null, $code=0) {
parent::__construct($message, $code);
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Thrift/Protocol/TBinaryProtocolAccelerated.php
----------------------------------------------------------------------
diff --git a/app/libraries/Thrift/Protocol/TBinaryProtocolAccelerated.php b/app/libraries/Thrift/Protocol/TBinaryProtocolAccelerated.php
index 7a40ce9..392aa21 100644
--- a/app/libraries/Thrift/Protocol/TBinaryProtocolAccelerated.php
+++ b/app/libraries/Thrift/Protocol/TBinaryProtocolAccelerated.php
@@ -33,21 +33,6 @@ class TBinaryProtocolAccelerated extends TBinaryProtocol {
public function __construct($trans, $strictRead=false, $strictWrite=true) {
// If the transport doesn't implement putBack, wrap it in a
// TBufferedTransport (which does)
-
- // NOTE (t.heintz): This is very evil to do, because the TBufferedTransport may swallow bytes, which
- // are then never written to the underlying transport. This happens precisely when a number of bytes
- // less than the max buffer size (512 by default) is written to the transport and then flush() is NOT
- // called. In that case the data stays in the writeBuffer of the transport, from where it can never be
- // accessed again (for example through read()).
- //
- // Since the caller of this method does not know about the wrapping transport, this creates bugs which
- // are very difficult to find. Hence the wrapping of a transport in a buffer should be left to the
- // calling code. An interface could used to mandate the presence of the putBack() method in the transport.
- //
- // I am leaving this code in nonetheless, because there may be applications depending on this behavior.
- //
- // @see THRIFT-1579
-
if (!method_exists($trans, 'putBack')) {
$trans = new TBufferedTransport($trans);
}
@@ -59,4 +44,4 @@ class TBinaryProtocolAccelerated extends TBinaryProtocol {
public function isStrictWrite() {
return $this->strictWrite_;
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Thrift/Protocol/TCompactProtocol.php
----------------------------------------------------------------------
diff --git a/app/libraries/Thrift/Protocol/TCompactProtocol.php b/app/libraries/Thrift/Protocol/TCompactProtocol.php
index b8a71d6..e637a59 100644
--- a/app/libraries/Thrift/Protocol/TCompactProtocol.php
+++ b/app/libraries/Thrift/Protocol/TCompactProtocol.php
@@ -61,7 +61,6 @@ class TCompactProtocol extends TProtocol {
const VERSION = 1;
const PROTOCOL_ID = 0x82;
const TYPE_MASK = 0xe0;
- const TYPE_BITS = 0x07;
const TYPE_SHIFT_AMOUNT = 5;
protected static $ctypes = array(
@@ -309,7 +308,7 @@ class TCompactProtocol extends TProtocol {
public function writeDouble($value) {
$data = pack('d', $value);
- $this->trans_->write($data, 8);
+ $this->trans_->write(strrev($data), 8);
return 8;
}
@@ -382,13 +381,14 @@ class TCompactProtocol extends TProtocol {
}
$verType = 0;
$result += $this->readUByte($verType);
- $type = ($verType >> TCompactProtocol::TYPE_SHIFT_AMOUNT) & TCompactProtocol::TYPE_BITS;
+ $type = ($verType & TCompactProtocol::TYPE_MASK) >>
+ TCompactProtocol::TYPE_SHIFT_AMOUNT;
$version = $verType & TCompactProtocol::VERSION_MASK;
if ($version != TCompactProtocol::VERSION) {
throw new TProtocolException('Bad version in TCompact message');
}
- $result += $this->readVarint($seqid);
- $result += $this->readString($name);
+ $result += $this->readVarint($seqId);
+ $name += $this->readString($name);
return $result;
}
@@ -485,7 +485,7 @@ class TCompactProtocol extends TProtocol {
}
public function readDouble(&$value) {
- $data = $this->trans_->readAll(8);
+ $data = strrev($this->trans_->readAll(8));
$arr = unpack('d', $data);
$value = $arr[1];
return 8;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Thrift/Protocol/TJSONProtocol.php
----------------------------------------------------------------------
diff --git a/app/libraries/Thrift/Protocol/TJSONProtocol.php b/app/libraries/Thrift/Protocol/TJSONProtocol.php
index 402401a..3d39583 100644
--- a/app/libraries/Thrift/Protocol/TJSONProtocol.php
+++ b/app/libraries/Thrift/Protocol/TJSONProtocol.php
@@ -57,10 +57,10 @@ class TJSONProtocol extends TProtocol
1, 1, '"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 2
);
- public static $ESCAPE_CHARS = array('"', '\\', '/', "b", "f", "n", "r", "t");
+ public static $ESCAPE_CHARS = array('"', '\\', "b", "f", "n", "r", "t");
public static $ESCAPE_CHAR_VALS = array(
- '"', '\\', '/', "\x08", "\f", "\n", "\r", "\t",
+ '"', '\\', "\x08", "\f", "\n", "\r", "\t",
);
const NAME_BOOL = "tf";
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Thrift/Serializer/TBinarySerializer.php
----------------------------------------------------------------------
diff --git a/app/libraries/Thrift/Serializer/TBinarySerializer.php b/app/libraries/Thrift/Serializer/TBinarySerializer.php
index 4e0af87..2a7cc3e 100644
--- a/app/libraries/Thrift/Serializer/TBinarySerializer.php
+++ b/app/libraries/Thrift/Serializer/TBinarySerializer.php
@@ -59,14 +59,8 @@ class TBinarySerializer {
$transport = new TMemoryBuffer();
$protocol = new TBinaryProtocolAccelerated($transport);
if (function_exists('thrift_protocol_read_binary')) {
- // NOTE (t.heintz) TBinaryProtocolAccelerated internally wraps our TMemoryBuffer in a
- // TBufferedTransport, so we have to retrieve it again or risk losing data when writing
- // less than 512 bytes to the transport (see the comment there as well).
- // @see THRIFT-1579
$protocol->writeMessageBegin('', TMessageType::REPLY, 0);
- $protocolTransport = $protocol->getTransport();
- $protocolTransport->write($string_object);
- $protocolTransport->flush();
+ $transport->write($string_object);
return thrift_protocol_read_binary($protocol, $class_name,
$protocol->isStrictRead());
} else {
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Thrift/Thrift.php
----------------------------------------------------------------------
diff --git a/app/libraries/Thrift/Thrift.php b/app/libraries/Thrift/Thrift.php
new file mode 100644
index 0000000..c845395
--- /dev/null
+++ b/app/libraries/Thrift/Thrift.php
@@ -0,0 +1,789 @@
+<?php
+/*
+ * 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.
+ *
+ * @package thrift
+ */
+
+
+/**
+ * Data types that can be sent via Thrift
+ */
+class TType {
+ const STOP = 0;
+ const VOID = 1;
+ const BOOL = 2;
+ const BYTE = 3;
+ const I08 = 3;
+ const DOUBLE = 4;
+ const I16 = 6;
+ const I32 = 8;
+ const I64 = 10;
+ const STRING = 11;
+ const UTF7 = 11;
+ const STRUCT = 12;
+ const MAP = 13;
+ const SET = 14;
+ const LST = 15; // N.B. cannot use LIST keyword in PHP!
+ const UTF8 = 16;
+ const UTF16 = 17;
+}
+
+/**
+ * Message types for RPC
+ */
+class TMessageType {
+ const CALL = 1;
+ const REPLY = 2;
+ const EXCEPTION = 3;
+ const ONEWAY = 4;
+}
+
+/**
+ * NOTE(mcslee): This currently contains a ton of duplicated code from TBase
+ * because we need to save CPU cycles and this is not yet in an extension.
+ * Ideally we'd multiply-inherit TException from both Exception and Base, but
+ * that's not possible in PHP and there are no modules either, so for now we
+ * apologetically take a trip to HackTown.
+ *
+ * Can be called with standard Exception constructor (message, code) or with
+ * Thrift Base object constructor (spec, vals).
+ *
+ * @param mixed $p1 Message (string) or type-spec (array)
+ * @param mixed $p2 Code (integer) or values (array)
+ */
+class TException extends Exception {
+ function __construct($p1=null, $p2=0) {
+ if (is_array($p1) && is_array($p2)) {
+ $spec = $p1;
+ $vals = $p2;
+ foreach ($spec as $fid => $fspec) {
+ $var = $fspec['var'];
+ if (isset($vals[$var])) {
+ $this->$var = $vals[$var];
+ }
+ }
+ } else {
+ parent::__construct($p1, $p2);
+ }
+ }
+
+ static $tmethod = array(TType::BOOL => 'Bool',
+ TType::BYTE => 'Byte',
+ TType::I16 => 'I16',
+ TType::I32 => 'I32',
+ TType::I64 => 'I64',
+ TType::DOUBLE => 'Double',
+ TType::STRING => 'String');
+
+ private function _readMap(&$var, $spec, $input) {
+ $xfer = 0;
+ $ktype = $spec['ktype'];
+ $vtype = $spec['vtype'];
+ $kread = $vread = null;
+ if (isset(TBase::$tmethod[$ktype])) {
+ $kread = 'read'.TBase::$tmethod[$ktype];
+ } else {
+ $kspec = $spec['key'];
+ }
+ if (isset(TBase::$tmethod[$vtype])) {
+ $vread = 'read'.TBase::$tmethod[$vtype];
+ } else {
+ $vspec = $spec['val'];
+ }
+ $var = array();
+ $_ktype = $_vtype = $size = 0;
+ $xfer += $input->readMapBegin($_ktype, $_vtype, $size);
+ for ($i = 0; $i < $size; ++$i) {
+ $key = $val = null;
+ if ($kread !== null) {
+ $xfer += $input->$kread($key);
+ } else {
+ switch ($ktype) {
+ case TType::STRUCT:
+ $class = $kspec['class'];
+ $key = new $class();
+ $xfer += $key->read($input);
+ break;
+ case TType::MAP:
+ $xfer += $this->_readMap($key, $kspec, $input);
+ break;
+ case TType::LST:
+ $xfer += $this->_readList($key, $kspec, $input, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_readList($key, $kspec, $input, true);
+ break;
+ }
+ }
+ if ($vread !== null) {
+ $xfer += $input->$vread($val);
+ } else {
+ switch ($vtype) {
+ case TType::STRUCT:
+ $class = $vspec['class'];
+ $val = new $class();
+ $xfer += $val->read($input);
+ break;
+ case TType::MAP:
+ $xfer += $this->_readMap($val, $vspec, $input);
+ break;
+ case TType::LST:
+ $xfer += $this->_readList($val, $vspec, $input, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_readList($val, $vspec, $input, true);
+ break;
+ }
+ }
+ $var[$key] = $val;
+ }
+ $xfer += $input->readMapEnd();
+ return $xfer;
+ }
+
+ private function _readList(&$var, $spec, $input, $set=false) {
+ $xfer = 0;
+ $etype = $spec['etype'];
+ $eread = $vread = null;
+ if (isset(TBase::$tmethod[$etype])) {
+ $eread = 'read'.TBase::$tmethod[$etype];
+ } else {
+ $espec = $spec['elem'];
+ }
+ $var = array();
+ $_etype = $size = 0;
+ if ($set) {
+ $xfer += $input->readSetBegin($_etype, $size);
+ } else {
+ $xfer += $input->readListBegin($_etype, $size);
+ }
+ for ($i = 0; $i < $size; ++$i) {
+ $elem = null;
+ if ($eread !== null) {
+ $xfer += $input->$eread($elem);
+ } else {
+ $espec = $spec['elem'];
+ switch ($etype) {
+ case TType::STRUCT:
+ $class = $espec['class'];
+ $elem = new $class();
+ $xfer += $elem->read($input);
+ break;
+ case TType::MAP:
+ $xfer += $this->_readMap($elem, $espec, $input);
+ break;
+ case TType::LST:
+ $xfer += $this->_readList($elem, $espec, $input, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_readList($elem, $espec, $input, true);
+ break;
+ }
+ }
+ if ($set) {
+ $var[$elem] = true;
+ } else {
+ $var []= $elem;
+ }
+ }
+ if ($set) {
+ $xfer += $input->readSetEnd();
+ } else {
+ $xfer += $input->readListEnd();
+ }
+ return $xfer;
+ }
+
+ protected function _read($class, $spec, $input) {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true) {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ if (isset($spec[$fid])) {
+ $fspec = $spec[$fid];
+ $var = $fspec['var'];
+ if ($ftype == $fspec['type']) {
+ $xfer = 0;
+ if (isset(TBase::$tmethod[$ftype])) {
+ $func = 'read'.TBase::$tmethod[$ftype];
+ $xfer += $input->$func($this->$var);
+ } else {
+ switch ($ftype) {
+ case TType::STRUCT:
+ $class = $fspec['class'];
+ $this->$var = new $class();
+ $xfer += $this->$var->read($input);
+ break;
+ case TType::MAP:
+ $xfer += $this->_readMap($this->$var, $fspec, $input);
+ break;
+ case TType::LST:
+ $xfer += $this->_readList($this->$var, $fspec, $input, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_readList($this->$var, $fspec, $input, true);
+ break;
+ }
+ }
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ private function _writeMap($var, $spec, $output) {
+ $xfer = 0;
+ $ktype = $spec['ktype'];
+ $vtype = $spec['vtype'];
+ $kwrite = $vwrite = null;
+ if (isset(TBase::$tmethod[$ktype])) {
+ $kwrite = 'write'.TBase::$tmethod[$ktype];
+ } else {
+ $kspec = $spec['key'];
+ }
+ if (isset(TBase::$tmethod[$vtype])) {
+ $vwrite = 'write'.TBase::$tmethod[$vtype];
+ } else {
+ $vspec = $spec['val'];
+ }
+ $xfer += $output->writeMapBegin($ktype, $vtype, count($var));
+ foreach ($var as $key => $val) {
+ if (isset($kwrite)) {
+ $xfer += $output->$kwrite($key);
+ } else {
+ switch ($ktype) {
+ case TType::STRUCT:
+ $xfer += $key->write($output);
+ break;
+ case TType::MAP:
+ $xfer += $this->_writeMap($key, $kspec, $output);
+ break;
+ case TType::LST:
+ $xfer += $this->_writeList($key, $kspec, $output, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_writeList($key, $kspec, $output, true);
+ break;
+ }
+ }
+ if (isset($vwrite)) {
+ $xfer += $output->$vwrite($val);
+ } else {
+ switch ($vtype) {
+ case TType::STRUCT:
+ $xfer += $val->write($output);
+ break;
+ case TType::MAP:
+ $xfer += $this->_writeMap($val, $vspec, $output);
+ break;
+ case TType::LST:
+ $xfer += $this->_writeList($val, $vspec, $output, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_writeList($val, $vspec, $output, true);
+ break;
+ }
+ }
+ }
+ $xfer += $output->writeMapEnd();
+ return $xfer;
+ }
+
+ private function _writeList($var, $spec, $output, $set=false) {
+ $xfer = 0;
+ $etype = $spec['etype'];
+ $ewrite = null;
+ if (isset(TBase::$tmethod[$etype])) {
+ $ewrite = 'write'.TBase::$tmethod[$etype];
+ } else {
+ $espec = $spec['elem'];
+ }
+ if ($set) {
+ $xfer += $output->writeSetBegin($etype, count($var));
+ } else {
+ $xfer += $output->writeListBegin($etype, count($var));
+ }
+ foreach ($var as $key => $val) {
+ $elem = $set ? $key : $val;
+ if (isset($ewrite)) {
+ $xfer += $output->$ewrite($elem);
+ } else {
+ switch ($etype) {
+ case TType::STRUCT:
+ $xfer += $elem->write($output);
+ break;
+ case TType::MAP:
+ $xfer += $this->_writeMap($elem, $espec, $output);
+ break;
+ case TType::LST:
+ $xfer += $this->_writeList($elem, $espec, $output, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_writeList($elem, $espec, $output, true);
+ break;
+ }
+ }
+ }
+ if ($set) {
+ $xfer += $output->writeSetEnd();
+ } else {
+ $xfer += $output->writeListEnd();
+ }
+ return $xfer;
+ }
+
+ protected function _write($class, $spec, $output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin($class);
+ foreach ($spec as $fid => $fspec) {
+ $var = $fspec['var'];
+ if ($this->$var !== null) {
+ $ftype = $fspec['type'];
+ $xfer += $output->writeFieldBegin($var, $ftype, $fid);
+ if (isset(TBase::$tmethod[$ftype])) {
+ $func = 'write'.TBase::$tmethod[$ftype];
+ $xfer += $output->$func($this->$var);
+ } else {
+ switch ($ftype) {
+ case TType::STRUCT:
+ $xfer += $this->$var->write($output);
+ break;
+ case TType::MAP:
+ $xfer += $this->_writeMap($this->$var, $fspec, $output);
+ break;
+ case TType::LST:
+ $xfer += $this->_writeList($this->$var, $fspec, $output, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_writeList($this->$var, $fspec, $output, true);
+ break;
+ }
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+/**
+ * Base class from which other Thrift structs extend. This is so that we can
+ * cut back on the size of the generated code which is turning out to have a
+ * nontrivial cost just to load thanks to the wondrously abysmal implementation
+ * of PHP. Note that code is intentionally duplicated in here to avoid making
+ * function calls for every field or member of a container..
+ */
+abstract class TBase {
+
+ static $tmethod = array(TType::BOOL => 'Bool',
+ TType::BYTE => 'Byte',
+ TType::I16 => 'I16',
+ TType::I32 => 'I32',
+ TType::I64 => 'I64',
+ TType::DOUBLE => 'Double',
+ TType::STRING => 'String');
+
+ abstract function read($input);
+
+ abstract function write($output);
+
+ public function __construct($spec=null, $vals=null) {
+ if (is_array($spec) && is_array($vals)) {
+ foreach ($spec as $fid => $fspec) {
+ $var = $fspec['var'];
+ if (isset($vals[$var])) {
+ $this->$var = $vals[$var];
+ }
+ }
+ }
+ }
+
+ private function _readMap(&$var, $spec, $input) {
+ $xfer = 0;
+ $ktype = $spec['ktype'];
+ $vtype = $spec['vtype'];
+ $kread = $vread = null;
+ if (isset(TBase::$tmethod[$ktype])) {
+ $kread = 'read'.TBase::$tmethod[$ktype];
+ } else {
+ $kspec = $spec['key'];
+ }
+ if (isset(TBase::$tmethod[$vtype])) {
+ $vread = 'read'.TBase::$tmethod[$vtype];
+ } else {
+ $vspec = $spec['val'];
+ }
+ $var = array();
+ $_ktype = $_vtype = $size = 0;
+ $xfer += $input->readMapBegin($_ktype, $_vtype, $size);
+ for ($i = 0; $i < $size; ++$i) {
+ $key = $val = null;
+ if ($kread !== null) {
+ $xfer += $input->$kread($key);
+ } else {
+ switch ($ktype) {
+ case TType::STRUCT:
+ $class = $kspec['class'];
+ $key = new $class();
+ $xfer += $key->read($input);
+ break;
+ case TType::MAP:
+ $xfer += $this->_readMap($key, $kspec, $input);
+ break;
+ case TType::LST:
+ $xfer += $this->_readList($key, $kspec, $input, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_readList($key, $kspec, $input, true);
+ break;
+ }
+ }
+ if ($vread !== null) {
+ $xfer += $input->$vread($val);
+ } else {
+ switch ($vtype) {
+ case TType::STRUCT:
+ $class = $vspec['class'];
+ $val = new $class();
+ $xfer += $val->read($input);
+ break;
+ case TType::MAP:
+ $xfer += $this->_readMap($val, $vspec, $input);
+ break;
+ case TType::LST:
+ $xfer += $this->_readList($val, $vspec, $input, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_readList($val, $vspec, $input, true);
+ break;
+ }
+ }
+ $var[$key] = $val;
+ }
+ $xfer += $input->readMapEnd();
+ return $xfer;
+ }
+
+ private function _readList(&$var, $spec, $input, $set=false) {
+ $xfer = 0;
+ $etype = $spec['etype'];
+ $eread = $vread = null;
+ if (isset(TBase::$tmethod[$etype])) {
+ $eread = 'read'.TBase::$tmethod[$etype];
+ } else {
+ $espec = $spec['elem'];
+ }
+ $var = array();
+ $_etype = $size = 0;
+ if ($set) {
+ $xfer += $input->readSetBegin($_etype, $size);
+ } else {
+ $xfer += $input->readListBegin($_etype, $size);
+ }
+ for ($i = 0; $i < $size; ++$i) {
+ $elem = null;
+ if ($eread !== null) {
+ $xfer += $input->$eread($elem);
+ } else {
+ $espec = $spec['elem'];
+ switch ($etype) {
+ case TType::STRUCT:
+ $class = $espec['class'];
+ $elem = new $class();
+ $xfer += $elem->read($input);
+ break;
+ case TType::MAP:
+ $xfer += $this->_readMap($elem, $espec, $input);
+ break;
+ case TType::LST:
+ $xfer += $this->_readList($elem, $espec, $input, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_readList($elem, $espec, $input, true);
+ break;
+ }
+ }
+ if ($set) {
+ $var[$elem] = true;
+ } else {
+ $var []= $elem;
+ }
+ }
+ if ($set) {
+ $xfer += $input->readSetEnd();
+ } else {
+ $xfer += $input->readListEnd();
+ }
+ return $xfer;
+ }
+
+ protected function _read($class, $spec, $input) {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true) {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ if (isset($spec[$fid])) {
+ $fspec = $spec[$fid];
+ $var = $fspec['var'];
+ if ($ftype == $fspec['type']) {
+ $xfer = 0;
+ if (isset(TBase::$tmethod[$ftype])) {
+ $func = 'read'.TBase::$tmethod[$ftype];
+ $xfer += $input->$func($this->$var);
+ } else {
+ switch ($ftype) {
+ case TType::STRUCT:
+ $class = $fspec['class'];
+ $this->$var = new $class();
+ $xfer += $this->$var->read($input);
+ break;
+ case TType::MAP:
+ $xfer += $this->_readMap($this->$var, $fspec, $input);
+ break;
+ case TType::LST:
+ $xfer += $this->_readList($this->$var, $fspec, $input, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_readList($this->$var, $fspec, $input, true);
+ break;
+ }
+ }
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ private function _writeMap($var, $spec, $output) {
+ $xfer = 0;
+ $ktype = $spec['ktype'];
+ $vtype = $spec['vtype'];
+ $kwrite = $vwrite = null;
+ if (isset(TBase::$tmethod[$ktype])) {
+ $kwrite = 'write'.TBase::$tmethod[$ktype];
+ } else {
+ $kspec = $spec['key'];
+ }
+ if (isset(TBase::$tmethod[$vtype])) {
+ $vwrite = 'write'.TBase::$tmethod[$vtype];
+ } else {
+ $vspec = $spec['val'];
+ }
+ $xfer += $output->writeMapBegin($ktype, $vtype, count($var));
+ foreach ($var as $key => $val) {
+ if (isset($kwrite)) {
+ $xfer += $output->$kwrite($key);
+ } else {
+ switch ($ktype) {
+ case TType::STRUCT:
+ $xfer += $key->write($output);
+ break;
+ case TType::MAP:
+ $xfer += $this->_writeMap($key, $kspec, $output);
+ break;
+ case TType::LST:
+ $xfer += $this->_writeList($key, $kspec, $output, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_writeList($key, $kspec, $output, true);
+ break;
+ }
+ }
+ if (isset($vwrite)) {
+ $xfer += $output->$vwrite($val);
+ } else {
+ switch ($vtype) {
+ case TType::STRUCT:
+ $xfer += $val->write($output);
+ break;
+ case TType::MAP:
+ $xfer += $this->_writeMap($val, $vspec, $output);
+ break;
+ case TType::LST:
+ $xfer += $this->_writeList($val, $vspec, $output, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_writeList($val, $vspec, $output, true);
+ break;
+ }
+ }
+ }
+ $xfer += $output->writeMapEnd();
+ return $xfer;
+ }
+
+ private function _writeList($var, $spec, $output, $set=false) {
+ $xfer = 0;
+ $etype = $spec['etype'];
+ $ewrite = null;
+ if (isset(TBase::$tmethod[$etype])) {
+ $ewrite = 'write'.TBase::$tmethod[$etype];
+ } else {
+ $espec = $spec['elem'];
+ }
+ if ($set) {
+ $xfer += $output->writeSetBegin($etype, count($var));
+ } else {
+ $xfer += $output->writeListBegin($etype, count($var));
+ }
+ foreach ($var as $key => $val) {
+ $elem = $set ? $key : $val;
+ if (isset($ewrite)) {
+ $xfer += $output->$ewrite($elem);
+ } else {
+ switch ($etype) {
+ case TType::STRUCT:
+ $xfer += $elem->write($output);
+ break;
+ case TType::MAP:
+ $xfer += $this->_writeMap($elem, $espec, $output);
+ break;
+ case TType::LST:
+ $xfer += $this->_writeList($elem, $espec, $output, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_writeList($elem, $espec, $output, true);
+ break;
+ }
+ }
+ }
+ if ($set) {
+ $xfer += $output->writeSetEnd();
+ } else {
+ $xfer += $output->writeListEnd();
+ }
+ return $xfer;
+ }
+
+ protected function _write($class, $spec, $output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin($class);
+ foreach ($spec as $fid => $fspec) {
+ $var = $fspec['var'];
+ if ($this->$var !== null) {
+ $ftype = $fspec['type'];
+ $xfer += $output->writeFieldBegin($var, $ftype, $fid);
+ if (isset(TBase::$tmethod[$ftype])) {
+ $func = 'write'.TBase::$tmethod[$ftype];
+ $xfer += $output->$func($this->$var);
+ } else {
+ switch ($ftype) {
+ case TType::STRUCT:
+ $xfer += $this->$var->write($output);
+ break;
+ case TType::MAP:
+ $xfer += $this->_writeMap($this->$var, $fspec, $output);
+ break;
+ case TType::LST:
+ $xfer += $this->_writeList($this->$var, $fspec, $output, false);
+ break;
+ case TType::SET:
+ $xfer += $this->_writeList($this->$var, $fspec, $output, true);
+ break;
+ }
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+}
+
+class TApplicationException extends TException {
+ static $_TSPEC =
+ array(1 => array('var' => 'message',
+ 'type' => TType::STRING),
+ 2 => array('var' => 'code',
+ 'type' => TType::I32));
+
+ const UNKNOWN = 0;
+ const UNKNOWN_METHOD = 1;
+ const INVALID_MESSAGE_TYPE = 2;
+ const WRONG_METHOD_NAME = 3;
+ const BAD_SEQUENCE_ID = 4;
+ const MISSING_RESULT = 5;
+ const INTERNAL_ERROR = 6;
+ const PROTOCOL_ERROR = 7;
+
+ function __construct($message=null, $code=0) {
+ parent::__construct($message, $code);
+ }
+
+ public function read($output) {
+ return $this->_read('TApplicationException', self::$_TSPEC, $output);
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('TApplicationException');
+ if ($message = $this->getMessage()) {
+ $xfer += $output->writeFieldBegin('message', TType::STRING, 1);
+ $xfer += $output->writeString($message);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($code = $this->getCode()) {
+ $xfer += $output->writeFieldBegin('type', TType::I32, 2);
+ $xfer += $output->writeI32($code);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+}
+
+/**
+ * Set global THRIFT ROOT automatically via inclusion here
+ */
+if (!isset($GLOBALS['THRIFT_ROOT'])) {
+ $GLOBALS['THRIFT_ROOT'] = dirname(__FILE__);
+}
+include_once $GLOBALS['THRIFT_ROOT'].'/protocol/TProtocol.php';
+include_once $GLOBALS['THRIFT_ROOT'].'/transport/TTransport.php';
+include_once $GLOBALS['THRIFT_ROOT'].'/TStringUtils.php';
+
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Thrift/Transport/TBufferedTransport.php
----------------------------------------------------------------------
diff --git a/app/libraries/Thrift/Transport/TBufferedTransport.php b/app/libraries/Thrift/Transport/TBufferedTransport.php
index 270c004..0d3ad98 100644
--- a/app/libraries/Thrift/Transport/TBufferedTransport.php
+++ b/app/libraries/Thrift/Transport/TBufferedTransport.php
@@ -156,13 +156,8 @@ class TBufferedTransport extends TTransport {
public function flush() {
if (TStringFuncFactory::create()->strlen($this->wBuf_) > 0) {
- $out = $this->wBuf_;
-
- // Note that we clear the internal wBuf_ prior to the underlying write
- // to ensure we're in a sane state (i.e. internal buffer cleaned)
- // if the underlying write throws up an exception
+ $this->transport_->write($this->wBuf_);
$this->wBuf_ = '';
- $this->transport_->write($out);
}
$this->transport_->flush();
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Thrift/Transport/TSocket.php
----------------------------------------------------------------------
diff --git a/app/libraries/Thrift/Transport/TSocket.php b/app/libraries/Thrift/Transport/TSocket.php
index eb7275c..3ad3bf7 100644
--- a/app/libraries/Thrift/Transport/TSocket.php
+++ b/app/libraries/Thrift/Transport/TSocket.php
@@ -261,8 +261,7 @@ class TSocket extends TTransport {
$readable = @stream_select($read, $null, $null, $this->recvTimeoutSec_, $this->recvTimeoutUsec_);
if ($readable > 0) {
- //$data = @stream_socket_recvfrom($this->handle_, $len);
- $data = @fread($this->handle_, $len);
+ $data = @stream_socket_recvfrom($this->handle_, $len);
if ($data === false) {
throw new TTransportException('TSocket: Could not read '.$len.' bytes from '.
$this->host_.':'.$this->port_);
@@ -295,8 +294,7 @@ class TSocket extends TTransport {
$writable = @stream_select($null, $write, $null, $this->sendTimeoutSec_, $this->sendTimeoutUsec_);
if ($writable > 0) {
// write buffer to stream
- //$written = @stream_socket_sendto($this->handle_, $buf);
- $written = @fwrite($this->handle_, $buf);
+ $written = @stream_socket_sendto($this->handle_, $buf);
if ($written === -1 || $written === false) {
throw new TTransportException('TSocket: Could not write '.TStringFuncFactory::create()->strlen($buf).' bytes '.
$this->host_.':'.$this->port_);
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e5e190ef/app/libraries/Thrift/autoload.php
----------------------------------------------------------------------
diff --git a/app/libraries/Thrift/autoload.php b/app/libraries/Thrift/autoload.php
new file mode 100644
index 0000000..3a35545
--- /dev/null
+++ b/app/libraries/Thrift/autoload.php
@@ -0,0 +1,51 @@
+<?php
+/*
+ * 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.
+ *
+ * @package thrift
+ */
+
+
+/**
+ * Include this file if you wish to use autoload with your PHP generated Thrift
+ * code. The generated code will *not* include any defined Thrift classes by
+ * default, except for the service interfaces. The generated code will populate
+ * values into $GLOBALS['THRIFT_AUTOLOAD'] which can be used by the autoload
+ * method below. If you have your own autoload system already in place, rename your
+ * __autoload function to something else and then do:
+ * $GLOBALS['AUTOLOAD_HOOKS'][] = 'my_autoload_func';
+ *
+ * Generate this code using the --gen php:autoload Thrift generator flag.
+ */
+
+$GLOBALS['THRIFT_AUTOLOAD'] = array();
+$GLOBALS['AUTOLOAD_HOOKS'] = array();
+
+if (!function_exists('__autoload')) {
+ function __autoload($class) {
+ global $THRIFT_AUTOLOAD;
+ $classl = strtolower($class);
+ if (isset($THRIFT_AUTOLOAD[$classl])) {
+ include_once $GLOBALS['THRIFT_ROOT'].'/packages/'.$THRIFT_AUTOLOAD[$classl];
+ } else if (!empty($GLOBALS['AUTOLOAD_HOOKS'])) {
+ foreach ($GLOBALS['AUTOLOAD_HOOKS'] as $hook) {
+ $hook($class);
+ }
+ }
+ }
+}
[28/50] [abbrv] airavata-php-gateway git commit: setting defaule
value in is_data_staged to false
Posted by sc...@apache.org.
setting defaule value in is_data_staged to false
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/d131087f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d131087f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d131087f
Branch: refs/heads/develop
Commit: d131087f56ee4ae9ae81193d3fe43383a07c4cab
Parents: 0d8fb56
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 13:13:00 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 13:13:00 2016 -0500
----------------------------------------------------------------------
app/views/partials/interface-input-block.blade.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d131087f/app/views/partials/interface-input-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/interface-input-block.blade.php b/app/views/partials/interface-input-block.blade.php
index ca02ca9..0906d88 100644
--- a/app/views/partials/interface-input-block.blade.php
+++ b/app/views/partials/interface-input-block.blade.php
@@ -74,11 +74,10 @@
<div class="col-md-8">
<select name="dataStaged[]" readonly class="form-control">
- <option>select</option>
+ <option value="0"
+ @if( isset( $appInputs) ) @if( $appInputs->dataStaged == 0) selected @endif @endif>False</option>
<option value="1"
@if( isset( $appInputs) ) @if( $appInputs->dataStaged == 1) selected @endif @endif>True</option>
- <option value="0"
- @if( isset( $appInputs) ) @if( $appInputs->dataStaged == 0) selected @endif @endif>False</option>
</select>
</div>
<!-- Removed Radio button because it creates problems with multiple inputs
[50/50] [abbrv] airavata-php-gateway git commit: Merge branch
'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into
develop
Posted by sc...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/2b0a8601
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2b0a8601
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2b0a8601
Branch: refs/heads/develop
Commit: 2b0a8601bfc20ea7c83d962907be6edcc7110de4
Parents: b3adcfe 430bf48
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 14 10:42:21 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 14 10:42:21 2016 -0500
----------------------------------------------------------------------
.gitignore | 3 +-
app/config/pga_config.php.template | 26 +-
app/controllers/AccountController.php | 54 +-
app/controllers/AdminController.php | 71 +-
app/controllers/GatewayprofileController.php | 16 +-
app/libraries/AdminUtilities.php | 26 +-
app/libraries/Airavata/API/Airavata.php | 12814 +++++++++++------
app/libraries/Airavata/API/Error/Types.php | 4 +-
app/libraries/Airavata/API/Types.php | 4 +-
.../Model/AppCatalog/AppDeployment/Types.php | 2 +-
.../Model/AppCatalog/AppInterface/Types.php | 2 +-
.../Model/AppCatalog/ComputeResource/Types.php | 11 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 2 +-
.../Model/AppCatalog/StorageResource/Types.php | 2 +-
.../Airavata/Model/Application/Io/Types.php | 2 +-
app/libraries/Airavata/Model/Commons/Types.php | 2 +-
.../Airavata/Model/Data/Movement/Types.php | 4 +-
.../Airavata/Model/Data/Resource/Types.php | 854 ++
.../Airavata/Model/Experiment/Types.php | 25 +-
app/libraries/Airavata/Model/Job/Types.php | 2 +-
.../Airavata/Model/Messaging/Event/Types.php | 2 +-
app/libraries/Airavata/Model/Process/Types.php | 71 +-
.../Airavata/Model/Scheduling/Types.php | 2 +-
app/libraries/Airavata/Model/Security/Types.php | 2 +-
app/libraries/Airavata/Model/Status/Types.php | 2 +-
app/libraries/Airavata/Model/Task/Types.php | 2 +-
app/libraries/Airavata/Model/Types.php | 2 +-
.../Airavata/Model/Workspace/Types.php | 2 +-
app/libraries/CRUtilities.php | 17 +-
app/libraries/ExperimentUtilities.php | 43 +-
app/libraries/ProjectUtilities.php | 1 -
app/libraries/SRUtilities.php | 18 +-
.../Thrift/Exception/TProtocolException.php | 2 -
.../Protocol/TBinaryProtocolAccelerated.php | 17 +-
.../Thrift/Protocol/TCompactProtocol.php | 12 +-
app/libraries/Thrift/Protocol/TJSONProtocol.php | 4 +-
.../Thrift/Serializer/TBinarySerializer.php | 8 +-
app/libraries/Thrift/Thrift.php | 789 +
.../Thrift/Transport/TBufferedTransport.php | 7 +-
app/libraries/Thrift/Transport/TSocket.php | 6 +-
app/libraries/Thrift/autoload.php | 51 +
app/libraries/Wsis/Wsis.php | 8 +-
app/libraries/Wsis/WsisServiceProvider.php | 19 +-
app/routes.php | 22 +-
app/views/account/create.blade.php | 6 +-
app/views/admin/manage-credentials.blade.php | 83 +-
app/views/admin/manage-gateway.blade.php | 287 +-
app/views/application/deployment.blade.php | 4 +-
app/views/application/module.blade.php | 4 +-
app/views/experiment/summary.blade.php | 22 +-
.../compute-resource-preferences.blade.php | 111 +
app/views/partials/dashboard-block.blade.php | 8 +-
.../partials/experiment-container.blade.php | 2 +-
app/views/partials/experiment-info.blade.php | 19 +-
.../partials/experiment-queue-block.blade.php | 14 +-
.../partials/gateway-preferences.blade.php | 110 -
.../partials/interface-input-block.blade.php | 5 +-
.../storage-resource-preferences.blade.php | 64 +
app/views/resource/browse.blade.php | 42 +-
app/views/resource/edit.blade.php | 2 +-
app/views/scigap-admin/manage-gateway.blade.php | 22 +-
app/views/storage-resource/browse.blade.php | 8 +-
app/views/storage-resource/edit.blade.php | 27 -
public/js/gateway.js | 20 +-
64 files changed, 10658 insertions(+), 5237 deletions(-)
----------------------------------------------------------------------
[13/50] [abbrv] airavata-php-gateway git commit: removing debug line
Posted by sc...@apache.org.
removing debug line
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/5dab0ba8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5dab0ba8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5dab0ba8
Branch: refs/heads/develop
Commit: 5dab0ba8a3707c70adf278b5c5ec7b9ead4e60a1
Parents: 9c406fd
Author: scnakandala <su...@gmail.com>
Authored: Tue Dec 15 10:58:38 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Dec 15 10:58:38 2015 -0500
----------------------------------------------------------------------
app/libraries/ProjectUtilities.php | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5dab0ba8/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ProjectUtilities.php b/app/libraries/ProjectUtilities.php
index 7dcfbfe..2e2dd70 100644
--- a/app/libraries/ProjectUtilities.php
+++ b/app/libraries/ProjectUtilities.php
@@ -183,7 +183,6 @@ class ProjectUtilities
$updatedProject->owner = $projectDetails["owner"];
$updatedProject->name = $projectDetails["name"];
$updatedProject->description = $projectDetails["description"];
- var_dump($updatedProject);exit;
try {
Airavata::updateProject(Session::get('authz-token'), $projectId, $updatedProject);
[48/50] [abbrv] airavata-php-gateway git commit: removing the
pga_config.php from repo
Posted by sc...@apache.org.
removing the pga_config.php from repo
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/f5e39e58
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f5e39e58
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f5e39e58
Branch: refs/heads/develop
Commit: f5e39e58cf63998f62e743ba49875c60cc2ae0b5
Parents: d6fe629
Author: scnakandala <su...@gmail.com>
Authored: Wed Jan 13 11:52:59 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jan 13 11:52:59 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php | 224 -----------------------------------------
1 file changed, 224 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f5e39e58/app/config/pga_config.php
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php b/app/config/pga_config.php
deleted file mode 100644
index cfdd6b0..0000000
--- a/app/config/pga_config.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-return array(
- /**
- * *****************************************************************
- * These are WSO2 Identity Server Related Configurations
- * *****************************************************************
- */
-
- 'wsis' => [
-
- /**
- * Admin Role Name
- */
- 'admin-role-name' => 'Internal/everyone',
-
- /**
- * Read only Admin Role Name
- */
- 'read-only-admin-role-name' => 'admin-read-only',
-
- /**
- * Gateway user role
- */
- 'user-role-name' => 'airavata-user',
-
- /**
- * Tenant Domain
- */
- 'tenant-domain' => 'master.airavata',
-
- /**
- * Tenant admin's username
- */
- 'admin-username' => 'master',
-
- /**
- * Tenant admin's password
- */
- 'admin-password' => 'master',
-
- /**
- * OAuth client key
- */
- 'oauth-client-key' => 'O3iUdkkVYyHgzWPiVTQpY_tb96Ma',
-
- /**
- * OAuth client secret
- */
- 'oauth-client-secret' => '6Ck1jZoa2oRtrzodSqkUZ2iINkUa',
-
- /**
- * Identity server domain
- */
- 'server' => 'idp.scigap.org',
-
- /**
- * Identity server url
- */
- 'service-url' => 'https://idp.scigap.org:7443/',
-
- /**
- * Enable HTTPS server verification
- */
- 'verify-peer' => true,
-
- /**
- * Path to the server certificate file
- */
- 'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem',
-
- /**
- * Allow self signed server certificates
- */
- 'allow-self-signed-cert' => false
- ],
-
-
- /**
- * *****************************************************************
- * These are Airavata Related Configurations
- * *****************************************************************
- */
- 'airavata' => [
-
- /**
- * Airavata API server location. Use tls:// as the protocol to
- * connect TLS enabled Airavata
- */
- 'airavata-server' => 'gw77.iu.xsede.org',
-
- /**
- * Airavata API server port
- */
- 'airavata-port' => '8930',
-
- /**
- * Airavata API server thrift communication timeout
- */
- 'airavata-timeout' => '1000000',
-
- /**
- * Data Manager CPI server host
- */
- 'data-manager-server' => 'localhost',
-
- /**
- * Data Manager CPI server port
- */
- 'data-manager-port' => '8990',
-
- /**
- * Data Manager CPI server thrift communication timeout
- */
- 'data-manager-timeout' => '1000000',
-
- /**
- * PGA Gateway ID
- */
- 'gateway-id' => 'seagrid',
-
- /**
- * Maximum size of a file which is allowed to upload to the server
- */
- 'server-allowed-file-size' => 64,
-
- /**
- * absolute path of the data dir
- */
- 'experiment-data-absolute-path' => '/Library/WebServer/Documents/experimentData',
-
- /**
- * username for the user for accessing the experiment data over ssh
- */
- 'ssh-user' => 'root',
-
- /**
- * Advanced experiments options
- */
- 'advanced-experiment-options' => '',
-
- /**
- * Default queue name
- */
- 'queue-name' => 'long',
-
- /**
- * Default node count
- */
- 'node-count' => '1',
-
- /**
- * Default total core count
- */
- 'total-cpu-count' => '16',
-
- /**
- * Default wall time limit
- */
- 'wall-time-limit' => '30',
-
- /**
- * Enable app-catalog cache
- */
- 'enable-app-catalog-cache' => true,
-
- /**
- * Life time of app catalog data cache in minutes
- */
- 'app-catalog-cache-duration' => 5,
-
- /**
- * Gateway data store resource id
- */
- 'gateway-data-store-resource-id' => ''
- ],
- /**
- * *****************************************************************
- * Portal Related Configurations
- * *****************************************************************
- */
- 'portal' => [
-
- /**
- * Whether this portal is the super admin portal
- */
- 'super-admin-portal' => true,
-
- /**
- * Set the name of theme in use here
- */
- 'theme' => 'base',
-
- /**
- * Portal titles
- */
- 'portal-title' => 'Airavata PHP Gateway',
-
- /**
- * Email addresses of the portal admins. Portal admins well get email notifications for events
- * such as new user creation
- */
- 'admin-emails' => ['eroma.abeysinghe@gmail.com','supun.nakandala@gmail.com'],
-
- /**
- * Email account that the portal should login to send emails
- */
- 'portal-email-username' => 'pga.airavata@gmail.com',
-
- /**
- * Password for the portal's email account
- */
- 'portal-email-password' => 'airavata12',
-
- /**
- * SMTP server on which the portal should connect
- */
- 'portal-smtp-server-host' => 'smtp.gmail.com',
-
- /**
- * SMTP server port on which the portal should connect
- */
- 'portal-smtp-server-port' => '587'
- ]
-);
[21/50] [abbrv] airavata-php-gateway git commit: adding storageId
when assembling the experiment
Posted by sc...@apache.org.
adding storageId when assembling the experiment
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/33bd2a7b
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/33bd2a7b
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/33bd2a7b
Branch: refs/heads/develop
Commit: 33bd2a7b4a51bc77d233c2fcfb908b641906d20d
Parents: cdcc0ef
Author: scnakandala <su...@gmail.com>
Authored: Fri Dec 18 09:52:37 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Dec 18 09:52:37 2015 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 7 ++++++-
app/libraries/ExperimentUtilities.php | 12 +-----------
2 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/33bd2a7b/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index 44b81ce..041004d 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -156,7 +156,12 @@ return array(
/**
* Life time of app catalog data cache in minutes
*/
- 'app-catalog-cache-duration' => 5
+ 'app-catalog-cache-duration' => 5,
+
+ /**
+ * Gateway data store resource id
+ */
+ 'gateway-data-store-resource-id' => ''
],
/**
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/33bd2a7b/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 14bbb4c..72fdd74 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -183,6 +183,7 @@ class ExperimentUtilities
$userConfigData = new UserConfigurationDataModel();
$userConfigData->computationalResourceScheduling = $scheduling;
+ $userConfigData->storageId = Config::get('pga_config.airavata')['gateway-data-store-resource-id'];
$userConfigData->airavataAutoSchedule = isset($_POST['enable-auto-scheduling']) ? true : false;
if (isset($_POST["userDN"])) {
$userConfigData->generateCert = 1;
@@ -195,18 +196,7 @@ class ExperimentUtilities
if (ExperimentUtilities::$experimentPath == null) {
ExperimentUtilities::create_experiment_folder_path();
}
-
-// $advHandling = new AdvancedOutputDataHandling();
- $hostName = $_SERVER['SERVER_NAME'];
- $expPathConstant = 'file://' . Config::get('pga_config.airavata')['ssh-user'] . '@' . $hostName . ':' . Config::get('pga_config.airavata')['experiment-data-absolute-path'];
-
-// $advHandling->outputDataDir = str_replace(Config::get('pga_config.airavata')['experiment-data-absolute-path'],
-// $expPathConstant, ExperimentUtilities::$experimentPath);
-// $userConfigData->advanceOutputDataHandling = $advHandling;
-
- //TODO: replace constructor with a call to airvata to get a prepopulated experiment template
$experiment = new ExperimentModel();
-
// required
$experiment->projectId = $_POST['project'];
$experiment->userName = Session::get('username');
[11/50] [abbrv] airavata-php-gateway git commit: fixing
storageResourceId not set issue.
Posted by sc...@apache.org.
fixing storageResourceId not set issue.
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/9db8ceee
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/9db8ceee
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/9db8ceee
Branch: refs/heads/develop
Commit: 9db8ceee6b29868b3a6e186d009554651ee40d18
Parents: 281591e
Author: scnakandala <su...@gmail.com>
Authored: Mon Dec 14 14:35:35 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Dec 14 14:35:35 2015 -0500
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9db8ceee/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index be36325..438c063 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -238,7 +238,7 @@
value="{{$gp->gatewayId}}">
<input type="hidden" name="storageResourceId"
id="gatewayId"
- value="{{$crp->storageResourceId}}">
+ value="{{$srp->storageResourceId}}">
<div class="form-horizontal">
@include('partials/storage-resource-preferences',
[08/50] [abbrv] airavata-php-gateway git commit: implementing add
storage resource preference
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/281591eb/app/libraries/Airavata/Model/Data/Resource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Resource/Types.php b/app/libraries/Airavata/Model/Data/Resource/Types.php
index f0cf287..84e6c9c 100644
--- a/app/libraries/Airavata/Model/Data/Resource/Types.php
+++ b/app/libraries/Airavata/Model/Data/Resource/Types.php
@@ -17,6 +17,28 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
use Thrift\Exception\TApplicationException;
+final class ReplicaLocationCategory {
+ const GATEWAY_DATA_STORE = 0;
+ const COMPUTE_RESOURCE = 1;
+ const LONG_TERM_STORAGE_RESOURCE = 2;
+ const OTHER = 3;
+ static public $__names = array(
+ 0 => 'GATEWAY_DATA_STORE',
+ 1 => 'COMPUTE_RESOURCE',
+ 2 => 'LONG_TERM_STORAGE_RESOURCE',
+ 3 => 'OTHER',
+ );
+}
+
+final class ReplicaPersistentType {
+ const TRANSIENT = 0;
+ const PERSISTENT = 1;
+ static public $__names = array(
+ 0 => 'TRANSIENT',
+ 1 => 'PERSISTENT',
+ );
+}
+
class DataResourceModel {
static $_TSPEC;
@@ -27,6 +49,10 @@ class DataResourceModel {
/**
* @var string
*/
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
public $resourceName = null;
/**
* @var string
@@ -48,6 +74,14 @@ class DataResourceModel {
* @var int
*/
public $lastModifiedTime = null;
+ /**
+ * @var array
+ */
+ public $resourceMetadata = null;
+ /**
+ * @var \Airavata\Model\Data\Resource\DataReplicaLocationModel[]
+ */
+ public $dataReplicaLocations = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -57,35 +91,63 @@ class DataResourceModel {
'type' => TType::STRING,
),
2 => array(
- 'var' => 'resourceName',
+ 'var' => 'gatewayId',
'type' => TType::STRING,
),
3 => array(
- 'var' => 'resourceDescription',
+ 'var' => 'resourceName',
'type' => TType::STRING,
),
4 => array(
- 'var' => 'ownerName',
+ 'var' => 'resourceDescription',
'type' => TType::STRING,
),
5 => array(
+ 'var' => 'ownerName',
+ 'type' => TType::STRING,
+ ),
+ 6 => array(
'var' => 'resourceSize',
'type' => TType::I32,
),
- 6 => array(
+ 7 => array(
'var' => 'creationTime',
'type' => TType::I64,
),
- 7 => array(
+ 8 => array(
'var' => 'lastModifiedTime',
'type' => TType::I64,
),
+ 9 => array(
+ 'var' => 'resourceMetadata',
+ 'type' => TType::MAP,
+ 'ktype' => TType::STRING,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::STRING,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
+ 10 => array(
+ 'var' => 'dataReplicaLocations',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Data\Resource\DataReplicaLocationModel',
+ ),
+ ),
);
}
if (is_array($vals)) {
if (isset($vals['resourceId'])) {
$this->resourceId = $vals['resourceId'];
}
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
if (isset($vals['resourceName'])) {
$this->resourceName = $vals['resourceName'];
}
@@ -104,6 +166,12 @@ class DataResourceModel {
if (isset($vals['lastModifiedTime'])) {
$this->lastModifiedTime = $vals['lastModifiedTime'];
}
+ if (isset($vals['resourceMetadata'])) {
+ $this->resourceMetadata = $vals['resourceMetadata'];
+ }
+ if (isset($vals['dataReplicaLocations'])) {
+ $this->dataReplicaLocations = $vals['dataReplicaLocations'];
+ }
}
}
@@ -135,46 +203,91 @@ class DataResourceModel {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceName);
+ $xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceDescription);
+ $xfer += $input->readString($this->resourceName);
} else {
$xfer += $input->skip($ftype);
}
break;
case 4:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->ownerName);
+ $xfer += $input->readString($this->resourceDescription);
} else {
$xfer += $input->skip($ftype);
}
break;
case 5:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->ownerName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->resourceSize);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 6:
+ case 7:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 7:
+ case 8:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->lastModifiedTime);
} else {
$xfer += $input->skip($ftype);
}
break;
+ case 9:
+ if ($ftype == TType::MAP) {
+ $this->resourceMetadata = array();
+ $_size0 = 0;
+ $_ktype1 = 0;
+ $_vtype2 = 0;
+ $xfer += $input->readMapBegin($_ktype1, $_vtype2, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $key5 = '';
+ $val6 = '';
+ $xfer += $input->readString($key5);
+ $xfer += $input->readString($val6);
+ $this->resourceMetadata[$key5] = $val6;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 10:
+ if ($ftype == TType::LST) {
+ $this->dataReplicaLocations = array();
+ $_size7 = 0;
+ $_etype10 = 0;
+ $xfer += $input->readListBegin($_etype10, $_size7);
+ for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ {
+ $elem12 = null;
+ $elem12 = new \Airavata\Model\Data\Resource\DataReplicaLocationModel();
+ $xfer += $elem12->read($input);
+ $this->dataReplicaLocations []= $elem12;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -193,36 +306,76 @@ class DataResourceModel {
$xfer += $output->writeString($this->resourceId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->resourceName !== null) {
- $xfer += $output->writeFieldBegin('resourceName', TType::STRING, 2);
+ $xfer += $output->writeFieldBegin('resourceName', TType::STRING, 3);
$xfer += $output->writeString($this->resourceName);
$xfer += $output->writeFieldEnd();
}
if ($this->resourceDescription !== null) {
- $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 4);
$xfer += $output->writeString($this->resourceDescription);
$xfer += $output->writeFieldEnd();
}
if ($this->ownerName !== null) {
- $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 4);
+ $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 5);
$xfer += $output->writeString($this->ownerName);
$xfer += $output->writeFieldEnd();
}
if ($this->resourceSize !== null) {
- $xfer += $output->writeFieldBegin('resourceSize', TType::I32, 5);
+ $xfer += $output->writeFieldBegin('resourceSize', TType::I32, 6);
$xfer += $output->writeI32($this->resourceSize);
$xfer += $output->writeFieldEnd();
}
if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 6);
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 7);
$xfer += $output->writeI64($this->creationTime);
$xfer += $output->writeFieldEnd();
}
if ($this->lastModifiedTime !== null) {
- $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 7);
+ $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 8);
$xfer += $output->writeI64($this->lastModifiedTime);
$xfer += $output->writeFieldEnd();
}
+ if ($this->resourceMetadata !== null) {
+ if (!is_array($this->resourceMetadata)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('resourceMetadata', TType::MAP, 9);
+ {
+ $output->writeMapBegin(TType::STRING, TType::STRING, count($this->resourceMetadata));
+ {
+ foreach ($this->resourceMetadata as $kiter13 => $viter14)
+ {
+ $xfer += $output->writeString($kiter13);
+ $xfer += $output->writeString($viter14);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->dataReplicaLocations !== null) {
+ if (!is_array($this->dataReplicaLocations)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('dataReplicaLocations', TType::LST, 10);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->dataReplicaLocations));
+ {
+ foreach ($this->dataReplicaLocations as $iter15)
+ {
+ $xfer += $iter15->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -258,9 +411,21 @@ class DataReplicaLocationModel {
*/
public $lastModifiedTime = null;
/**
+ * @var int
+ */
+ public $replicaLocationCategory = null;
+ /**
+ * @var int
+ */
+ public $replicaPersistentType = null;
+ /**
* @var string[]
*/
public $dataLocations = null;
+ /**
+ * @var array
+ */
+ public $replicaMetadata = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -290,6 +455,14 @@ class DataReplicaLocationModel {
'type' => TType::I64,
),
7 => array(
+ 'var' => 'replicaLocationCategory',
+ 'type' => TType::I32,
+ ),
+ 8 => array(
+ 'var' => 'replicaPersistentType',
+ 'type' => TType::I32,
+ ),
+ 9 => array(
'var' => 'dataLocations',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -297,6 +470,18 @@ class DataReplicaLocationModel {
'type' => TType::STRING,
),
),
+ 10 => array(
+ 'var' => 'replicaMetadata',
+ 'type' => TType::MAP,
+ 'ktype' => TType::STRING,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::STRING,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -318,9 +503,18 @@ class DataReplicaLocationModel {
if (isset($vals['lastModifiedTime'])) {
$this->lastModifiedTime = $vals['lastModifiedTime'];
}
+ if (isset($vals['replicaLocationCategory'])) {
+ $this->replicaLocationCategory = $vals['replicaLocationCategory'];
+ }
+ if (isset($vals['replicaPersistentType'])) {
+ $this->replicaPersistentType = $vals['replicaPersistentType'];
+ }
if (isset($vals['dataLocations'])) {
$this->dataLocations = $vals['dataLocations'];
}
+ if (isset($vals['replicaMetadata'])) {
+ $this->replicaMetadata = $vals['replicaMetadata'];
+ }
}
}
@@ -386,22 +580,56 @@ class DataReplicaLocationModel {
}
break;
case 7:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->replicaLocationCategory);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->replicaPersistentType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 9:
if ($ftype == TType::LST) {
$this->dataLocations = array();
- $_size0 = 0;
- $_etype3 = 0;
- $xfer += $input->readListBegin($_etype3, $_size0);
- for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ $_size16 = 0;
+ $_etype19 = 0;
+ $xfer += $input->readListBegin($_etype19, $_size16);
+ for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
{
- $elem5 = null;
- $xfer += $input->readString($elem5);
- $this->dataLocations []= $elem5;
+ $elem21 = null;
+ $xfer += $input->readString($elem21);
+ $this->dataLocations []= $elem21;
}
$xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
break;
+ case 10:
+ if ($ftype == TType::MAP) {
+ $this->replicaMetadata = array();
+ $_size22 = 0;
+ $_ktype23 = 0;
+ $_vtype24 = 0;
+ $xfer += $input->readMapBegin($_ktype23, $_vtype24, $_size22);
+ for ($_i26 = 0; $_i26 < $_size22; ++$_i26)
+ {
+ $key27 = '';
+ $val28 = '';
+ $xfer += $input->readString($key27);
+ $xfer += $input->readString($val28);
+ $this->replicaMetadata[$key27] = $val28;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -445,23 +673,51 @@ class DataReplicaLocationModel {
$xfer += $output->writeI64($this->lastModifiedTime);
$xfer += $output->writeFieldEnd();
}
+ if ($this->replicaLocationCategory !== null) {
+ $xfer += $output->writeFieldBegin('replicaLocationCategory', TType::I32, 7);
+ $xfer += $output->writeI32($this->replicaLocationCategory);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->replicaPersistentType !== null) {
+ $xfer += $output->writeFieldBegin('replicaPersistentType', TType::I32, 8);
+ $xfer += $output->writeI32($this->replicaPersistentType);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->dataLocations !== null) {
if (!is_array($this->dataLocations)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataLocations', TType::LST, 7);
+ $xfer += $output->writeFieldBegin('dataLocations', TType::LST, 9);
{
$output->writeListBegin(TType::STRING, count($this->dataLocations));
{
- foreach ($this->dataLocations as $iter6)
+ foreach ($this->dataLocations as $iter29)
{
- $xfer += $output->writeString($iter6);
+ $xfer += $output->writeString($iter29);
}
}
$output->writeListEnd();
}
$xfer += $output->writeFieldEnd();
}
+ if ($this->replicaMetadata !== null) {
+ if (!is_array($this->replicaMetadata)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('replicaMetadata', TType::MAP, 10);
+ {
+ $output->writeMapBegin(TType::STRING, TType::STRING, count($this->replicaMetadata));
+ {
+ foreach ($this->replicaMetadata as $kiter30 => $viter31)
+ {
+ $xfer += $output->writeString($kiter30);
+ $xfer += $output->writeString($viter31);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/281591eb/app/libraries/SRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/SRUtilities.php b/app/libraries/SRUtilities.php
index 6b8b1ad..a380026 100644
--- a/app/libraries/SRUtilities.php
+++ b/app/libraries/SRUtilities.php
@@ -5,7 +5,7 @@
//Compute Resource classes
use Airavata\Model\Data\Movement\DataMovementProtocol;
use Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription;
-use Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference;
+use Airavata\Model\AppCatalog\GatewayProfile\StoragePreference;
use Airavata\Model\AppCatalog\GatewayProfile\GatewayResourceProfile;
use Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement;
@@ -274,18 +274,19 @@ class SRUtilities
return Airavata::updateGatewayResourceProfile( Session::get('authz-token'), $data["gateway_id"], $gatewayResourceProfile);
}
- public static function add_or_update_CRP($inputs)
+ public static function add_or_update_DSP($inputs)
{
- $computeResourcePreferences = new computeResourcePreference($inputs);
+ $storagePreference = new StoragePreference($inputs);
if (Config::get('pga_config.airavata')['enable-app-catalog-cache']) {
- if (Cache::has('CR-' . $inputs["computeResourceId"])) {
- Cache::forget('CR-' . $inputs["computeResourceId"]);
+ if (Cache::has('SR-' . $inputs["storageResourceId"])) {
+ Cache::forget('SR-' . $inputs["storageResourceId"]);
}
}
//var_dump( $inputs); exit;
- return Airavata::addGatewayComputeResourcePreference(Session::get('authz-token'), $inputs["gatewayId"], $inputs["computeResourceId"], $computeResourcePreferences);
+ return Airavata::addGatewayStoragePreference(Session::get('authz-token'), $inputs["gatewayId"], $inputs["storageResourceId"],
+ $storagePreference);
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/281591eb/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index 474babb..988cd1c 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -188,6 +188,10 @@ Route::post("gp/add-crp", "GatewayprofileController@modifyCRP");
Route::post("gp/update-crp", "GatewayprofileController@modifyCRP");
+Route::post("gp/add-dsp", "GatewayprofileController@modifyDSP");
+
+Route::post("gp/update-dsp", "GatewayprofileController@modifyDSP");
+
Route::post("gp/credential-store-token-change", "GatewayprofileController@cstChange");
//Management Dashboard
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/281591eb/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 3ccc9b5..be36325 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -356,6 +356,24 @@
</div>
</div>
+<div class="add-data-storage-preference-block hide">
+ <div class="well">
+ <form action="{{URL::to('/')}}/gp/add-dsp" method="POST">
+ <input type="hidden" name="gatewayId" id="gatewayId" value="">
+
+ <div class="input-group">
+ <select name="storageResourceId" class="sr-select form-control">
+ <option value="">Select a Data Storage Resource and set its preferences</option>
+ @foreach( (array)$storageResources as $index => $sr)
+ <option value="{{ $sr->storageResourceId}}">{{ $sr->hostName }}</option>
+ @endforeach
+ </select>
+ <span class="input-group-addon remove-cr" style="cursor:pointer;">x</span>
+ </div>
+ <div class="pref-space form-horizontal"></div>
+ </form>
+ </div>
+</div>
<!-- Remove a Compute Resource from a Gateway -->
<div class="modal fade" id="remove-resource-block" tabindex="-1" role="dialog" aria-labelledby="add-modal"
@@ -407,6 +425,10 @@
@include('partials/compute-resource-preferences', array('computeResource' => $cr, 'crData' => $crData))
@endforeach
+<!-- contains all storage resource choices that might get selected on adding a new one to a gateway -->
+@foreach( (array)$storageResources as $index => $sr)
+ @include('partials/storage-resource-preferences', array('storageResource' => $sr, 'srData' => $srData))
+@endforeach
@stop
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/281591eb/app/views/partials/storage-resource-preferences.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/storage-resource-preferences.blade.php b/app/views/partials/storage-resource-preferences.blade.php
index 42b056b..9a18533 100644
--- a/app/views/partials/storage-resource-preferences.blade.php
+++ b/app/views/partials/storage-resource-preferences.blade.php
@@ -16,11 +16,11 @@ dmi preference might be needed in the future
<div class="col-md-9">
<select name="preferredDataMovementProtocol" class="form-control">
- @foreach( (array)$computeResource->dataMovementInterfaces as $index => $dmi)
- <option value="{{ $dmi->dataMovementProtocol}}"
- @if( isset( $preferences) ) @if( $preferences->preferredDataMovementProtocol == $dmi->dataMovementProtocol)
- selected @endif @endif>{{ $crData["dataMovementProtocols"][$dmi->dataMovementProtocol] }}</option>
- @endforeach
+{{-- @foreach( (array)$computeResource->dataMovementInterfaces as $index => $dmi)--}}
+ {{--<option value="{{ $dmi->dataMovementProtocol}}"--}}
+{{-- @if( isset( $preferences) ) @if( $preferences->preferredDataMovementProtocol == $dmi->dataMovementProtocol)--}}
+{{-- selected @endif @endif>{{ $crData["dataMovementProtocols"][$dmi->dataMovementProtocol] }}</option>--}}
+ {{--@endforeach--}}
</select>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/281591eb/public/js/gateway.js
----------------------------------------------------------------------
diff --git a/public/js/gateway.js b/public/js/gateway.js
index 919efeb..b8876c6 100644
--- a/public/js/gateway.js
+++ b/public/js/gateway.js
@@ -39,6 +39,12 @@ $(document).ready(function () {
$(this).after( $(".add-compute-resource-block").html() );
});
+ $(".add-dsp").click( function(){
+
+ $(".add-data-storage-preference-block").find("#gatewayId").val( $(this).data("gpid"));
+ $(this).after( $(".add-data-storage-preference-block").html() );
+ });
+
$("body").on("change", ".cr-select", function(){
crId = $(this).val();
//This is done as Jquery creates problems when using period(.) in id or class.
@@ -46,6 +52,13 @@ $(document).ready(function () {
$(".pref-space").html($("#cr-" + crId).html());
});
+ $("body").on("change", ".sr-select", function(){
+ srId = $(this).val();
+ //This is done as Jquery creates problems when using period(.) in id or class.
+ srId = srId.replace(/\./g,"_");
+ $(".pref-space").html($("#sr-" + srId).html());
+ });
+
$(".edit-gateway").click( function(){
$(".edit-gp-name").val( $(this).data("gp-name") );
$(".edit-gp-desc").val( $(this).data("gp-desc") );
[29/50] [abbrv] airavata-php-gateway git commit: created experiments
cannot be cancelled
Posted by sc...@apache.org.
created experiments cannot be cancelled
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/4f633229
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/4f633229
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/4f633229
Branch: refs/heads/develop
Commit: 4f6332299c46aad51638a5e0ed6bc087f40c3d4c
Parents: d131087
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 13:29:07 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 13:29:07 2016 -0500
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/4f633229/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 72fdd74..108a1c8 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -812,7 +812,6 @@ class ExperimentUtilities
}
switch (ExperimentState::$__names[$experiment->experimentStatus->state]) {
- case 'CREATED':
case 'VALIDATED':
case 'SCHEDULED':
case 'LAUNCHED':
[07/50] [abbrv] airavata-php-gateway git commit: removing monitoring
modes for storage resources
Posted by sc...@apache.org.
removing monitoring modes for storage resources
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/0048a8ca
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/0048a8ca
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/0048a8ca
Branch: refs/heads/develop
Commit: 0048a8cae65e65f7591b687a9f3168a91cbef3c0
Parents: de1ae7c
Author: smarru <sm...@apache.org>
Authored: Mon Dec 14 12:40:54 2015 -0500
Committer: smarru <sm...@apache.org>
Committed: Mon Dec 14 12:40:54 2015 -0500
----------------------------------------------------------------------
app/libraries/SRUtilities.php | 3 ---
app/views/storage-resource/edit.blade.php | 27 --------------------------
2 files changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0048a8ca/app/libraries/SRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/SRUtilities.php b/app/libraries/SRUtilities.php
index 5920c05..6b8b1ad 100644
--- a/app/libraries/SRUtilities.php
+++ b/app/libraries/SRUtilities.php
@@ -13,13 +13,10 @@ use Airavata\Model\AppCatalog\ComputeResource\JobManagerCommand;
use Airavata\Model\AppCatalog\ComputeResource\JobSubmissionProtocol;
use Airavata\Model\Data\Movement\LOCALDataMovement;
use Airavata\Model\Data\Movement\DMType;
-use Airavata\Model\AppCatalog\ComputeResource\LOCALSubmission;
use Airavata\Model\AppCatalog\ComputeResource\MonitorMode;
-use Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager;
use Airavata\Model\AppCatalog\ComputeResource\ResourceJobManagerType;
use Airavata\Model\Data\Movement\SCPDataMovement;
use Airavata\Model\Data\Movement\SecurityProtocol;
-use Airavata\Model\AppCatalog\ComputeResource\SSHJobSubmission;
use Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement;
//Gateway Classes
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0048a8ca/app/views/storage-resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/storage-resource/edit.blade.php b/app/views/storage-resource/edit.blade.php
index 9c0879b..8917fa2 100644
--- a/app/views/storage-resource/edit.blade.php
+++ b/app/views/storage-resource/edit.blade.php
@@ -110,15 +110,6 @@
@endforeach
</select>
</div>
- <!-- <div class="form-group">
- <label class="control-label">Select Monitoring Mode</label>
- <select name="monitorMode">
- @foreach( $monitorModes as $index => $mode)
- <option value="{{ $index }}"
- @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</option>
- @endforeach
- </select>
- </div>-->
<div class="form-group">
<label class="control-label">Alternate SSH Host Name</label>
<input class='form-control' name='alternativeSSHHostName'
@@ -141,15 +132,6 @@
@endforeach
</select>
</div>
- <!-- <div class="form-group">
- <label class="control-label">Select Monitoring Mode</label>
- <select name="monitorMode">
- @foreach( $monitorModes as $index => $mode)
- <option value="{{ $index }}"
- @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</option>
- @endforeach
- </select>
- </div>-->
<div>
<div class="form-group required">
@@ -176,15 +158,6 @@
@endforeach
</select>
</div>
- <!-- <div class="form-group">
- <label class="control-label">Select Monitoring Mode</label>
- <select name="monitorMode">
- @foreach( $monitorModes as $index => $mode)
- <option value="{{ $index }}"
- @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</option>
- @endforeach
- </select>
- </div>-->
<div>
<div class="form-group required">
[38/50] [abbrv] airavata-php-gateway git commit: fixing typo
Posted by sc...@apache.org.
fixing typo
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/ab3b0c85
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ab3b0c85
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ab3b0c85
Branch: refs/heads/develop
Commit: ab3b0c85c00fd74bb004302b0852cba7354809e0
Parents: 93775fe
Author: scnakandala <su...@gmail.com>
Authored: Mon Jan 11 12:05:43 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jan 11 12:05:43 2016 -0500
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ab3b0c85/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 06351b4..c0a6b35 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -636,7 +636,7 @@ class ExperimentUtilities
*
*/
- public static function list_ouatput_files($outputs, $status, $process)
+ public static function list_output_files($outputs, $status, $process)
{
if( $process)
{
[40/50] [abbrv] airavata-php-gateway git commit: updating the file
permissions
Posted by sc...@apache.org.
updating the file permissions
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/9949d78e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/9949d78e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/9949d78e
Branch: refs/heads/develop
Commit: 9949d78e643cd483b46b4d3f1910f0f57a56773d
Parents: c0ac208
Author: scnakandala <su...@gmail.com>
Authored: Mon Jan 11 13:32:55 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jan 11 13:32:55 2016 -0500
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9949d78e/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index e19cab8..dfa7e6d 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -368,7 +368,7 @@ class ExperimentUtilities
ExperimentUtilities::$relativeExperimentDataDir;
} while (is_dir(ExperimentUtilities::$experimentPath)); // if dir already exists, try again
// create upload directory
- if (!mkdir(ExperimentUtilities::$experimentPath, 0755, true)) {
+ if (!mkdir(ExperimentUtilities::$experimentPath, 0777, true)) {
CommonUtilities::print_error_message('<p>Error creating upload directory!
Please try again later or report a bug using the link in the Help menu.</p>');
$experimentAssemblySuccessful = false;
[20/50] [abbrv] airavata-php-gateway git commit: adding thrift 0.9.3
back
Posted by sc...@apache.org.
adding thrift 0.9.3 back
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/cdcc0efa
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/cdcc0efa
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/cdcc0efa
Branch: refs/heads/develop
Commit: cdcc0efac6978e9ac8dc84241e201834a3229e98
Parents: a090e89
Author: scnakandala <su...@gmail.com>
Authored: Thu Dec 17 10:46:48 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Dec 17 10:46:48 2015 -0500
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 2 +-
app/libraries/Airavata/API/Error/Types.php | 2 +-
app/libraries/Airavata/API/Types.php | 2 +-
app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php | 2 +-
app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php | 2 +-
app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php | 2 +-
app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php | 2 +-
app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php | 2 +-
app/libraries/Airavata/Model/Application/Io/Types.php | 2 +-
app/libraries/Airavata/Model/Commons/Types.php | 2 +-
app/libraries/Airavata/Model/Data/Movement/Types.php | 2 +-
app/libraries/Airavata/Model/Data/Resource/Types.php | 2 +-
app/libraries/Airavata/Model/Experiment/Types.php | 2 +-
app/libraries/Airavata/Model/Job/Types.php | 2 +-
app/libraries/Airavata/Model/Messaging/Event/Types.php | 2 +-
app/libraries/Airavata/Model/Process/Types.php | 2 +-
app/libraries/Airavata/Model/Scheduling/Types.php | 2 +-
app/libraries/Airavata/Model/Security/Types.php | 2 +-
app/libraries/Airavata/Model/Status/Types.php | 2 +-
app/libraries/Airavata/Model/Task/Types.php | 2 +-
app/libraries/Airavata/Model/Types.php | 2 +-
app/libraries/Airavata/Model/Workspace/Types.php | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index 52f2310..4cc073b 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -1,7 +1,7 @@
<?php
namespace Airavata\API;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/API/Error/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Error/Types.php b/app/libraries/Airavata/API/Error/Types.php
index d0a1ab6..edaa6de 100644
--- a/app/libraries/Airavata/API/Error/Types.php
+++ b/app/libraries/Airavata/API/Error/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\API\Error;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/API/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Types.php b/app/libraries/Airavata/API/Types.php
index 2261a42..389e1ca 100644
--- a/app/libraries/Airavata/API/Types.php
+++ b/app/libraries/Airavata/API/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\API;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
index e35f999..ab599e6 100644
--- a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\AppDeployment;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php b/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
index 3c03cc7..1d09112 100644
--- a/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/AppInterface/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\AppInterface;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 57a4574..00f7e6c 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\ComputeResource;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index 9152391..46f89a0 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\GatewayProfile;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php b/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
index cf8f4b3..93df378 100644
--- a/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/StorageResource/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\AppCatalog\StorageResource;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Application/Io/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Application/Io/Types.php b/app/libraries/Airavata/Model/Application/Io/Types.php
index e04650d..cc208a6 100644
--- a/app/libraries/Airavata/Model/Application/Io/Types.php
+++ b/app/libraries/Airavata/Model/Application/Io/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Application\Io;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Commons/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Commons/Types.php b/app/libraries/Airavata/Model/Commons/Types.php
index a4b8b85..ecc9532 100644
--- a/app/libraries/Airavata/Model/Commons/Types.php
+++ b/app/libraries/Airavata/Model/Commons/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Commons;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Data/Movement/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Movement/Types.php b/app/libraries/Airavata/Model/Data/Movement/Types.php
index bacee47..274a4a8 100644
--- a/app/libraries/Airavata/Model/Data/Movement/Types.php
+++ b/app/libraries/Airavata/Model/Data/Movement/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Data\Movement;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Data/Resource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Resource/Types.php b/app/libraries/Airavata/Model/Data/Resource/Types.php
index ea5798f..cd5542a 100644
--- a/app/libraries/Airavata/Model/Data/Resource/Types.php
+++ b/app/libraries/Airavata/Model/Data/Resource/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Data\Resource;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Experiment/Types.php b/app/libraries/Airavata/Model/Experiment/Types.php
index 1f0e20e..fdca5bd 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Experiment;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Job/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Job/Types.php b/app/libraries/Airavata/Model/Job/Types.php
index c7d3dd8..22453c1 100644
--- a/app/libraries/Airavata/Model/Job/Types.php
+++ b/app/libraries/Airavata/Model/Job/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Job;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Messaging/Event/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Messaging/Event/Types.php b/app/libraries/Airavata/Model/Messaging/Event/Types.php
index 6fa7020..9c6a1e8 100644
--- a/app/libraries/Airavata/Model/Messaging/Event/Types.php
+++ b/app/libraries/Airavata/Model/Messaging/Event/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Messaging\Event;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Process/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Process/Types.php b/app/libraries/Airavata/Model/Process/Types.php
index 2712080..120c078 100644
--- a/app/libraries/Airavata/Model/Process/Types.php
+++ b/app/libraries/Airavata/Model/Process/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Process;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Scheduling/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Scheduling/Types.php b/app/libraries/Airavata/Model/Scheduling/Types.php
index 966792d..44c1180 100644
--- a/app/libraries/Airavata/Model/Scheduling/Types.php
+++ b/app/libraries/Airavata/Model/Scheduling/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Scheduling;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Security/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Security/Types.php b/app/libraries/Airavata/Model/Security/Types.php
index 7904fef..f388971 100644
--- a/app/libraries/Airavata/Model/Security/Types.php
+++ b/app/libraries/Airavata/Model/Security/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Security;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Status/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Status/Types.php b/app/libraries/Airavata/Model/Status/Types.php
index 2a21e14..8457502 100644
--- a/app/libraries/Airavata/Model/Status/Types.php
+++ b/app/libraries/Airavata/Model/Status/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Status;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Task/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Task/Types.php b/app/libraries/Airavata/Model/Task/Types.php
index deae011..fcf5994 100644
--- a/app/libraries/Airavata/Model/Task/Types.php
+++ b/app/libraries/Airavata/Model/Task/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Task;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Types.php b/app/libraries/Airavata/Model/Types.php
index 1304f75..fe337a7 100644
--- a/app/libraries/Airavata/Model/Types.php
+++ b/app/libraries/Airavata/Model/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cdcc0efa/app/libraries/Airavata/Model/Workspace/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Workspace/Types.php b/app/libraries/Airavata/Model/Workspace/Types.php
index 4523e3d..6903330 100644
--- a/app/libraries/Airavata/Model/Workspace/Types.php
+++ b/app/libraries/Airavata/Model/Workspace/Types.php
@@ -2,7 +2,7 @@
namespace Airavata\Model\Workspace;
/**
- * Autogenerated by Thrift Compiler (0.9.2)
+ * Autogenerated by Thrift Compiler (0.9.3)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
[04/50] [abbrv] airavata-php-gateway git commit: Warning Message to
enter correct email added for user creating account
Posted by sc...@apache.org.
Warning Message to enter correct email added for user creating account
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/3df20e8f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3df20e8f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3df20e8f
Branch: refs/heads/develop
Commit: 3df20e8fca7386709dad65f0657e6bfaeae19912
Parents: 8f85afc
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Dec 11 14:56:08 2015 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Dec 11 14:56:08 2015 -0500
----------------------------------------------------------------------
app/controllers/AdminController.php | 5 ++++-
app/views/account/create.blade.php | 6 +++++-
app/views/admin/manage-credentials.blade.php | 4 +---
3 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3df20e8f/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index dd08220..a674307 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -223,7 +223,10 @@ class AdminController extends BaseController {
public function removeSSH(){
$removeToken = Input::get("token");
- return AdminUtilities::remove_ssh_token( $removeToken);
+ if( AdminUtilities::remove_ssh_token( $removeToken) )
+ return 1;
+ else
+ return 0;
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3df20e8f/app/views/account/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/create.blade.php b/app/views/account/create.blade.php
index 6b03173..fe8def1 100644
--- a/app/views/account/create.blade.php
+++ b/app/views/account/create.blade.php
@@ -51,7 +51,8 @@
<div class="form-group required"><label class="control-label">E-mail</label>
<div><input class="form-control" id="email" name="email" placeholder="email@example.com"
- required="required" title="" type="email" value="{{Input::old('email') }}"/></div>
+ required="required" title="" type="email" value="{{Input::old('email') }}"
+ data-toggle="popover" data-placement="left" data-content="Please make sure that you enter a correct email address as a verification mail will be sent to this addresss."/></div>
</div>
<div class="form-group required"><label class="control-label">First Name</label>
@@ -129,5 +130,8 @@
$("#password").popover({
'trigger':'focus'
});
+ $("#email").popover({
+ 'trigger':'focus'
+ });
</script>
@stop
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3df20e8f/app/views/admin/manage-credentials.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-credentials.blade.php b/app/views/admin/manage-credentials.blade.php
index 6b0b476..14708c4 100644
--- a/app/views/admin/manage-credentials.blade.php
+++ b/app/views/admin/manage-credentials.blade.php
@@ -220,9 +220,7 @@
}).success( function( data){
if( data.responseText == 1)
tr.addClass("alert").addClass("alert-danger");
- setTimeout( function(){
- tr.slideUp(1000);
- }, 2000);
+ tr.fadeOut(1000);
}).fail( function( data){
tr.after("<tr class='alert alert-danger'><td></td><td>Error occurred : " + $.parseJSON( data.responseText).error.message + "</td><td></td></tr>");
}).complete( function(){
[39/50] [abbrv] airavata-php-gateway git commit: setting relative
experimentDataDir
Posted by sc...@apache.org.
setting relative experimentDataDir
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/c0ac2080
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c0ac2080
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c0ac2080
Branch: refs/heads/develop
Commit: c0ac208064a3c6051e487d093c1d4415944d74da
Parents: ab3b0c8
Author: scnakandala <su...@gmail.com>
Authored: Mon Jan 11 12:41:41 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Jan 11 12:41:41 2016 -0500
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c0ac2080/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index c0a6b35..e19cab8 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -21,6 +21,8 @@ class ExperimentUtilities
{
private static $experimentPath;
+ private static $relativeExperimentDataDir;
+
/**
* Launch the experiment with the given ID
* @param $expId
@@ -196,7 +198,7 @@ class ExperimentUtilities
if (ExperimentUtilities::$experimentPath == null) {
ExperimentUtilities::create_experiment_folder_path();
}
- $userConfigData->experimentDataDir = ExperimentUtilities::$experimentPath;
+ $userConfigData->experimentDataDir = ExperimentUtilities::$relativeExperimentDataDir;
$experiment = new ExperimentModel();
// required
@@ -361,8 +363,9 @@ class ExperimentUtilities
public static function create_experiment_folder_path()
{
do {
+ ExperimentUtilities::$relativeExperimentDataDir = "/" . Session::get('username') . "/" . md5(rand() * time()) . '/';
ExperimentUtilities::$experimentPath = Config::get('pga_config.airavata')['experiment-data-absolute-path'] .
- "/" . Session::get('username') . "/" . md5(rand() * time()) . '/';
+ ExperimentUtilities::$relativeExperimentDataDir;
} while (is_dir(ExperimentUtilities::$experimentPath)); // if dir already exists, try again
// create upload directory
if (!mkdir(ExperimentUtilities::$experimentPath, 0755, true)) {
@@ -454,7 +457,7 @@ class ExperimentUtilities
$experimentInput->value = $hostPathConstant . $newInputPath;
}
}
- $experiment->userConfigurationData->experimentDataDir = ExperimentUtilities::$experimentPath;
+ $experiment->userConfigurationData->experimentDataDir = ExperimentUtilities::$relativeExperimentDataDir;
Airavata::updateExperiment(Session::get('authz-token'), $cloneId, $experiment);
return $cloneId;
} catch (InvalidRequestException $ire) {
@@ -1111,7 +1114,7 @@ class ExperimentUtilities
$experimentInputs = $experiment->experimentInputs; // get current inputs
//var_dump($experimentInputs);
$experimentInputs = ExperimentUtilities::process_inputs($applicationInputs, $experimentInputs); // get new inputs
- $experiment->userConfigurationData->experimentDataDir = ExperimentUtilities::$experimentPath;
+ $experiment->userConfigurationData->experimentDataDir = ExperimentUtilities::$relativeExperimentDataDir;
//var_dump($experimentInputs);
if ($experimentInputs) {
[16/50] [abbrv] airavata-php-gateway git commit: hiding internal
roles from IS
Posted by sc...@apache.org.
hiding internal roles from IS
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/b545744c
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b545744c
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b545744c
Branch: refs/heads/develop
Commit: b545744c8a73a9eccba6a3436be126e487bfca80
Parents: cd0cba9
Author: scnakandala <su...@gmail.com>
Authored: Tue Dec 15 11:24:07 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Dec 15 11:24:07 2015 -0500
----------------------------------------------------------------------
app/libraries/Wsis/Wsis.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b545744c/app/libraries/Wsis/Wsis.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Wsis.php b/app/libraries/Wsis/Wsis.php
index f3e1e55..b62b254 100755
--- a/app/libraries/Wsis/Wsis.php
+++ b/app/libraries/Wsis/Wsis.php
@@ -291,12 +291,18 @@ class Wsis {
*/
public function getAllRoles(){
try {
- return $this->userStoreManager->getRoleNames();
+ $roles = $this->userStoreManager->getRoleNames();
+ return array_filter($roles, "Wsis::nonInternalRoles");
+ var_dump($roles);exit;
} catch (Exception $ex) {
throw new Exception("Unable to get all roles", 0, $ex);
}
}
+ public function nonInternalRoles($var){
+ return 0 !== strpos($var, 'Internal/');
+ }
+
/**
* Function to get role of a user
*
[05/50] [abbrv] airavata-php-gateway git commit: Merge branch
'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by sc...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/dff6b473
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/dff6b473
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/dff6b473
Branch: refs/heads/develop
Commit: dff6b4735834d3c098151a7684a1bd37dbd82efb
Parents: 3df20e8 7b89d19
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Dec 11 14:58:42 2015 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Dec 11 14:58:42 2015 -0500
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 2 +-
app/views/partials/gateway-preferences.blade.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[32/50] [abbrv] airavata-php-gateway git commit: adding missing file
changes
Posted by sc...@apache.org.
adding missing file changes
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/48a35a31
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/48a35a31
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/48a35a31
Branch: refs/heads/develop
Commit: 48a35a319bbf6bd11435ba6878e79ce08ce2ae26
Parents: 58eb7be
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 7 16:35:50 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 7 16:35:50 2016 -0500
----------------------------------------------------------------------
app/controllers/GatewayprofileController.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/48a35a31/app/controllers/GatewayprofileController.php
----------------------------------------------------------------------
diff --git a/app/controllers/GatewayprofileController.php b/app/controllers/GatewayprofileController.php
index 38260cc..0fcbde4 100644
--- a/app/controllers/GatewayprofileController.php
+++ b/app/controllers/GatewayprofileController.php
@@ -54,7 +54,6 @@ class GatewayprofileController extends BaseController {
public function delete()
{
- //var_dump( Input::all()); exit;
$error = false;
if( Input::has("del-gpId")) // if Gateway has to be deleted
{
@@ -70,6 +69,13 @@ class GatewayprofileController extends BaseController {
else
$error = true;
}
+ else if( Input::has("rem-srId")) // if Compute Resource has to be removed from Gateway
+ {
+ if(CRUtilities::deleteSR( Input::all()) )
+ return Redirect::to("admin/dashboard/gateway")->with("message", "The selected Compute Resource has been successfully removed");
+ else
+ $error = true;
+ }
else
$error = true;
[14/50] [abbrv] airavata-php-gateway git commit: changing the url
Posted by sc...@apache.org.
changing the url
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/5308fe89
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5308fe89
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5308fe89
Branch: refs/heads/develop
Commit: 5308fe89181445a68346c00eaca111fbc3125ae0
Parents: 5dab0ba
Author: scnakandala <su...@gmail.com>
Authored: Tue Dec 15 11:00:21 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Dec 15 11:00:21 2015 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5308fe89/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 324de20..bb469dd 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -350,7 +350,7 @@ class AccountController extends BaseController
else
$username = $username . "@" . $wsisConfig['tenant-domain'];
- $str = "Gateway Portal: " . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'] ."<br/>";
+ $str = "Gateway Portal: " . $_SERVER['SERVER_NAME'] ."<br/>";
$str = $str . "Username: " . $username ."<br/>";
$str = $str . "Name: " . $userProfile["firstname"] . " " . $userProfile["lastname"] . "<br/>";
$str = $str . "Email: " . $userProfile["email"];
[09/50] [abbrv] airavata-php-gateway git commit: implementing add
storage resource preference
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/281591eb/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index 063b421..7171104 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -2811,6 +2811,47 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AuthorizationException
*/
public function isWorkflowExistWithName(\Airavata\Model\Security\AuthzToken $authzToken, $workflowName);
+ /**
+ * * Replica Catalog Related API Methods
+ * *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel
+ * @return string
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function updateDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $resourceId
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function removeDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $resourceId
+ * @return \Airavata\Model\Data\Resource\DataResourceModel
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -11370,276 +11411,267 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("isWorkflowExistWithName failed: unknown result");
}
-}
-
-// HELPER FUNCTIONS AND STRUCTURES
+ public function publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
+ {
+ $this->send_publishDataResource($authzToken, $dataResourceModel);
+ return $this->recv_publishDataResource();
+ }
-class Airavata_getAPIVersion_args {
- static $_TSPEC;
+ public function send_publishDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
+ {
+ $args = new \Airavata\API\Airavata_publishDataResource_args();
+ $args->authzToken = $authzToken;
+ $args->dataResourceModel = $dataResourceModel;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'publishDataResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('publishDataResource', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
+ public function recv_publishDataResource()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_publishDataResource_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'authzToken',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Security\AuthzToken',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
}
+ $result = new \Airavata\API\Airavata_publishDataResource_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
}
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("publishDataResource failed: unknown result");
}
- public function getName() {
- return 'Airavata_getAPIVersion_args';
+ public function updateDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
+ {
+ $this->send_updateDataResource($authzToken, $dataResourceModel);
+ $this->recv_updateDataResource();
}
- public function read($input)
+ public function send_updateDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
{
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
+ $args = new \Airavata\API\Airavata_updateDataResource_args();
+ $args->authzToken = $authzToken;
+ $args->dataResourceModel = $dataResourceModel;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
{
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->authzToken = new \Airavata\Model\Security\AuthzToken();
- $xfer += $this->authzToken->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
+ thrift_protocol_write_binary($this->output_, 'updateDataResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('updateDataResource', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
}
- $xfer += $input->readStructEnd();
- return $xfer;
}
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAPIVersion_args');
- if ($this->authzToken !== null) {
- if (!is_object($this->authzToken)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ public function recv_updateDataResource()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateDataResource_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
}
- $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1);
- $xfer += $this->authzToken->write($output);
- $xfer += $output->writeFieldEnd();
+ $result = new \Airavata\API\Airavata_updateDataResource_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
}
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ return;
}
-}
+ public function removeDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId)
+ {
+ $this->send_removeDataResource($authzToken, $resourceId);
+ $this->recv_removeDataResource();
+ }
-class Airavata_getAPIVersion_result {
- static $_TSPEC;
+ public function send_removeDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId)
+ {
+ $args = new \Airavata\API\Airavata_removeDataResource_args();
+ $args->authzToken = $authzToken;
+ $args->resourceId = $resourceId;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'removeDataResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('removeDataResource', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
- /**
- * @var string
- */
- public $success = null;
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\AiravataClientException
- */
- public $ace = null;
- /**
- * @var \Airavata\API\Error\AiravataSystemException
- */
- public $ase = null;
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
+ public function recv_removeDataResource()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_removeDataResource_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::STRING,
- ),
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 3 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 4 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
- if (isset($vals['ire'])) {
- $this->ire = $vals['ire'];
- }
- if (isset($vals['ace'])) {
- $this->ace = $vals['ace'];
- }
- if (isset($vals['ase'])) {
- $this->ase = $vals['ase'];
- }
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
}
+ $result = new \Airavata\API\Airavata_removeDataResource_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
}
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ return;
}
- public function getName() {
- return 'Airavata_getAPIVersion_result';
+ public function getDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId)
+ {
+ $this->send_getDataResource($authzToken, $resourceId);
+ return $this->recv_getDataResource();
}
- public function read($input)
+ public function send_getDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId)
{
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
+ $args = new \Airavata\API\Airavata_getDataResource_args();
+ $args->authzToken = $authzToken;
+ $args->resourceId = $resourceId;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
{
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 0:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->success);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->ire = new \Airavata\API\Error\InvalidRequestException();
- $xfer += $this->ire->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ae = new \Airavata\API\Error\AuthorizationException();
- $xfer += $this->ae->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
+ thrift_protocol_write_binary($this->output_, 'getDataResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getDataResource', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
}
- $xfer += $input->readStructEnd();
- return $xfer;
}
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAPIVersion_result');
- if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
- $xfer += $output->writeString($this->success);
- $xfer += $output->writeFieldEnd();
+ public function recv_getDataResource()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getDataResource_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_getDataResource_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
}
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
+ if ($result->success !== null) {
+ return $result->success;
}
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
+ if ($result->ire !== null) {
+ throw $result->ire;
}
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
- $xfer += $this->ase->write($output);
- $xfer += $output->writeFieldEnd();
+ if ($result->ace !== null) {
+ throw $result->ace;
}
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
+ if ($result->ase !== null) {
+ throw $result->ase;
}
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("getDataResource failed: unknown result");
}
}
-class Airavata_addGateway_args {
+// HELPER FUNCTIONS AND STRUCTURES
+
+class Airavata_getAPIVersion_args {
static $_TSPEC;
/**
* @var \Airavata\Model\Security\AuthzToken
*/
public $authzToken = null;
- /**
- * @var \Airavata\Model\Workspace\Gateway
- */
- public $gateway = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -11649,25 +11681,17 @@ class Airavata_addGateway_args {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Security\AuthzToken',
),
- 2 => array(
- 'var' => 'gateway',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
- ),
);
}
if (is_array($vals)) {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gateway'])) {
- $this->gateway = $vals['gateway'];
- }
}
}
public function getName() {
- return 'Airavata_addGateway_args';
+ return 'Airavata_getAPIVersion_args';
}
public function read($input)
@@ -11693,14 +11717,6 @@ class Airavata_addGateway_args {
$xfer += $input->skip($ftype);
}
break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->gateway = new \Airavata\Model\Workspace\Gateway();
- $xfer += $this->gateway->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -11713,7 +11729,7 @@ class Airavata_addGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_getAPIVersion_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -11722,14 +11738,6 @@ class Airavata_addGateway_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gateway !== null) {
- if (!is_object($this->gateway)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('gateway', TType::STRUCT, 2);
- $xfer += $this->gateway->write($output);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -11737,7 +11745,7 @@ class Airavata_addGateway_args {
}
-class Airavata_addGateway_result {
+class Airavata_getAPIVersion_result {
static $_TSPEC;
/**
@@ -11810,7 +11818,7 @@ class Airavata_addGateway_result {
}
public function getName() {
- return 'Airavata_addGateway_result';
+ return 'Airavata_getAPIVersion_result';
}
public function read($input)
@@ -11879,7 +11887,7 @@ class Airavata_addGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_getAPIVersion_result');
if ($this->success !== null) {
$xfer += $output->writeFieldBegin('success', TType::STRING, 0);
$xfer += $output->writeString($this->success);
@@ -11912,7 +11920,7 @@ class Airavata_addGateway_result {
}
-class Airavata_updateGateway_args {
+class Airavata_addGateway_args {
static $_TSPEC;
/**
@@ -11920,13 +11928,9 @@ class Airavata_updateGateway_args {
*/
public $authzToken = null;
/**
- * @var string
- */
- public $gatewayId = null;
- /**
* @var \Airavata\Model\Workspace\Gateway
*/
- public $updatedGateway = null;
+ public $gateway = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -11937,11 +11941,7 @@ class Airavata_updateGateway_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'updatedGateway',
+ 'var' => 'gateway',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Workspace\Gateway',
),
@@ -11951,17 +11951,14 @@ class Airavata_updateGateway_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
- if (isset($vals['updatedGateway'])) {
- $this->updatedGateway = $vals['updatedGateway'];
+ if (isset($vals['gateway'])) {
+ $this->gateway = $vals['gateway'];
}
}
}
public function getName() {
- return 'Airavata_updateGateway_args';
+ return 'Airavata_addGateway_args';
}
public function read($input)
@@ -11988,16 +11985,9 @@ class Airavata_updateGateway_args {
}
break;
case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
if ($ftype == TType::STRUCT) {
- $this->updatedGateway = new \Airavata\Model\Workspace\Gateway();
- $xfer += $this->updatedGateway->read($input);
+ $this->gateway = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $this->gateway->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -12014,7 +12004,7 @@ class Airavata_updateGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_addGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -12023,17 +12013,12 @@ class Airavata_updateGateway_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->updatedGateway !== null) {
- if (!is_object($this->updatedGateway)) {
+ if ($this->gateway !== null) {
+ if (!is_object($this->gateway)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('updatedGateway', TType::STRUCT, 3);
- $xfer += $this->updatedGateway->write($output);
+ $xfer += $output->writeFieldBegin('gateway', TType::STRUCT, 2);
+ $xfer += $this->gateway->write($output);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -12043,10 +12028,14 @@ class Airavata_updateGateway_args {
}
-class Airavata_updateGateway_result {
+class Airavata_addGateway_result {
static $_TSPEC;
/**
+ * @var string
+ */
+ public $success = null;
+ /**
* @var \Airavata\API\Error\InvalidRequestException
*/
public $ire = null;
@@ -12066,6 +12055,10 @@ class Airavata_updateGateway_result {
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::STRING,
+ ),
1 => array(
'var' => 'ire',
'type' => TType::STRUCT,
@@ -12089,6 +12082,9 @@ class Airavata_updateGateway_result {
);
}
if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
if (isset($vals['ire'])) {
$this->ire = $vals['ire'];
}
@@ -12105,7 +12101,7 @@ class Airavata_updateGateway_result {
}
public function getName() {
- return 'Airavata_updateGateway_result';
+ return 'Airavata_addGateway_result';
}
public function read($input)
@@ -12123,6 +12119,13 @@ class Airavata_updateGateway_result {
}
switch ($fid)
{
+ case 0:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
case 1:
if ($ftype == TType::STRUCT) {
$this->ire = new \Airavata\API\Error\InvalidRequestException();
@@ -12167,7 +12170,12 @@ class Airavata_updateGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_addGateway_result');
+ if ($this->success !== null) {
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->ire !== null) {
$xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
$xfer += $this->ire->write($output);
@@ -12195,7 +12203,7 @@ class Airavata_updateGateway_result {
}
-class Airavata_getGateway_args {
+class Airavata_updateGateway_args {
static $_TSPEC;
/**
@@ -12206,6 +12214,10 @@ class Airavata_getGateway_args {
* @var string
*/
public $gatewayId = null;
+ /**
+ * @var \Airavata\Model\Workspace\Gateway
+ */
+ public $updatedGateway = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -12219,6 +12231,11 @@ class Airavata_getGateway_args {
'var' => 'gatewayId',
'type' => TType::STRING,
),
+ 3 => array(
+ 'var' => 'updatedGateway',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Gateway',
+ ),
);
}
if (is_array($vals)) {
@@ -12228,11 +12245,14 @@ class Airavata_getGateway_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
+ if (isset($vals['updatedGateway'])) {
+ $this->updatedGateway = $vals['updatedGateway'];
+ }
}
}
public function getName() {
- return 'Airavata_getGateway_args';
+ return 'Airavata_updateGateway_args';
}
public function read($input)
@@ -12265,6 +12285,14 @@ class Airavata_getGateway_args {
$xfer += $input->skip($ftype);
}
break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->updatedGateway = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $this->updatedGateway->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -12277,7 +12305,7 @@ class Airavata_getGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_updateGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -12291,6 +12319,14 @@ class Airavata_getGateway_args {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->updatedGateway !== null) {
+ if (!is_object($this->updatedGateway)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('updatedGateway', TType::STRUCT, 3);
+ $xfer += $this->updatedGateway->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -12298,14 +12334,10 @@ class Airavata_getGateway_args {
}
-class Airavata_getGateway_result {
+class Airavata_updateGateway_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Gateway
- */
- public $success = null;
- /**
* @var \Airavata\API\Error\InvalidRequestException
*/
public $ire = null;
@@ -12325,11 +12357,6 @@ class Airavata_getGateway_result {
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
- ),
1 => array(
'var' => 'ire',
'type' => TType::STRUCT,
@@ -12353,9 +12380,6 @@ class Airavata_getGateway_result {
);
}
if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
if (isset($vals['ire'])) {
$this->ire = $vals['ire'];
}
@@ -12372,7 +12396,7 @@ class Airavata_getGateway_result {
}
public function getName() {
- return 'Airavata_getGateway_result';
+ return 'Airavata_updateGateway_result';
}
public function read($input)
@@ -12390,14 +12414,6 @@ class Airavata_getGateway_result {
}
switch ($fid)
{
- case 0:
- if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\Workspace\Gateway();
- $xfer += $this->success->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
case 1:
if ($ftype == TType::STRUCT) {
$this->ire = new \Airavata\API\Error\InvalidRequestException();
@@ -12442,15 +12458,7 @@ class Airavata_getGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getGateway_result');
- if ($this->success !== null) {
- if (!is_object($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
- $xfer += $this->success->write($output);
- $xfer += $output->writeFieldEnd();
- }
+ $xfer += $output->writeStructBegin('Airavata_updateGateway_result');
if ($this->ire !== null) {
$xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
$xfer += $this->ire->write($output);
@@ -12478,7 +12486,7 @@ class Airavata_getGateway_result {
}
-class Airavata_deleteGateway_args {
+class Airavata_getGateway_args {
static $_TSPEC;
/**
@@ -12515,7 +12523,7 @@ class Airavata_deleteGateway_args {
}
public function getName() {
- return 'Airavata_deleteGateway_args';
+ return 'Airavata_getGateway_args';
}
public function read($input)
@@ -12560,7 +12568,7 @@ class Airavata_deleteGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_getGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -12581,11 +12589,11 @@ class Airavata_deleteGateway_args {
}
-class Airavata_deleteGateway_result {
+class Airavata_getGateway_result {
static $_TSPEC;
/**
- * @var bool
+ * @var \Airavata\Model\Workspace\Gateway
*/
public $success = null;
/**
@@ -12610,7 +12618,8 @@ class Airavata_deleteGateway_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Gateway',
),
1 => array(
'var' => 'ire',
@@ -12654,7 +12663,7 @@ class Airavata_deleteGateway_result {
}
public function getName() {
- return 'Airavata_deleteGateway_result';
+ return 'Airavata_getGateway_result';
}
public function read($input)
@@ -12673,8 +12682,9 @@ class Airavata_deleteGateway_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRUCT) {
+ $this->success = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -12723,10 +12733,13 @@ class Airavata_deleteGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_getGateway_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ if (!is_object($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
+ $xfer += $this->success->write($output);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -12756,13 +12769,17 @@ class Airavata_deleteGateway_result {
}
-class Airavata_getAllGateways_args {
+class Airavata_deleteGateway_args {
static $_TSPEC;
/**
* @var \Airavata\Model\Security\AuthzToken
*/
public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -12772,17 +12789,24 @@ class Airavata_getAllGateways_args {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Security\AuthzToken',
),
+ 2 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
}
}
public function getName() {
- return 'Airavata_getAllGateways_args';
+ return 'Airavata_deleteGateway_args';
}
public function read($input)
@@ -12808,6 +12832,13 @@ class Airavata_getAllGateways_args {
$xfer += $input->skip($ftype);
}
break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -12820,7 +12851,7 @@ class Airavata_getAllGateways_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGateways_args');
+ $xfer += $output->writeStructBegin('Airavata_deleteGateway_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -12829,6 +12860,11 @@ class Airavata_getAllGateways_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -12836,11 +12872,11 @@ class Airavata_getAllGateways_args {
}
-class Airavata_getAllGateways_result {
+class Airavata_deleteGateway_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Gateway[]
+ * @var bool
*/
public $success = null;
/**
@@ -12865,12 +12901,7 @@ class Airavata_getAllGateways_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
- ),
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -12914,7 +12945,7 @@ class Airavata_getAllGateways_result {
}
public function getName() {
- return 'Airavata_getAllGateways_result';
+ return 'Airavata_deleteGateway_result';
}
public function read($input)
@@ -12933,19 +12964,8 @@ class Airavata_getAllGateways_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::LST) {
- $this->success = array();
- $_size0 = 0;
- $_etype3 = 0;
- $xfer += $input->readListBegin($_etype3, $_size0);
- for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
- {
- $elem5 = null;
- $elem5 = new \Airavata\Model\Workspace\Gateway();
- $xfer += $elem5->read($input);
- $this->success []= $elem5;
- }
- $xfer += $input->readListEnd();
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -12994,22 +13014,10 @@ class Airavata_getAllGateways_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGateways_result');
+ $xfer += $output->writeStructBegin('Airavata_deleteGateway_result');
if ($this->success !== null) {
- if (!is_array($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::LST, 0);
- {
- $output->writeListBegin(TType::STRUCT, count($this->success));
- {
- foreach ($this->success as $iter6)
- {
- $xfer += $iter6->write($output);
- }
- }
- $output->writeListEnd();
- }
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -13039,17 +13047,13 @@ class Airavata_getAllGateways_result {
}
-class Airavata_isGatewayExist_args {
+class Airavata_getAllGateways_args {
static $_TSPEC;
/**
* @var \Airavata\Model\Security\AuthzToken
*/
public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -13059,24 +13063,17 @@ class Airavata_isGatewayExist_args {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Security\AuthzToken',
),
- 2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
}
}
public function getName() {
- return 'Airavata_isGatewayExist_args';
+ return 'Airavata_getAllGateways_args';
}
public function read($input)
@@ -13102,13 +13099,6 @@ class Airavata_isGatewayExist_args {
$xfer += $input->skip($ftype);
}
break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -13121,7 +13111,7 @@ class Airavata_isGatewayExist_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isGatewayExist_args');
+ $xfer += $output->writeStructBegin('Airavata_getAllGateways_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -13130,11 +13120,6 @@ class Airavata_isGatewayExist_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -13142,11 +13127,11 @@ class Airavata_isGatewayExist_args {
}
-class Airavata_isGatewayExist_result {
+class Airavata_getAllGateways_result {
static $_TSPEC;
/**
- * @var bool
+ * @var \Airavata\Model\Workspace\Gateway[]
*/
public $success = null;
/**
@@ -13171,7 +13156,12 @@ class Airavata_isGatewayExist_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Gateway',
+ ),
),
1 => array(
'var' => 'ire',
@@ -13215,7 +13205,7 @@ class Airavata_isGatewayExist_result {
}
public function getName() {
- return 'Airavata_isGatewayExist_result';
+ return 'Airavata_getAllGateways_result';
}
public function read($input)
@@ -13234,8 +13224,19 @@ class Airavata_isGatewayExist_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::LST) {
+ $this->success = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $elem5 = new \Airavata\Model\Workspace\Gateway();
+ $xfer += $elem5->read($input);
+ $this->success []= $elem5;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -13284,10 +13285,22 @@ class Airavata_isGatewayExist_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isGatewayExist_result');
+ $xfer += $output->writeStructBegin('Airavata_getAllGateways_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ if (!is_array($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::LST, 0);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->success));
+ {
+ foreach ($this->success as $iter6)
+ {
+ $xfer += $iter6->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -13317,7 +13330,7 @@ class Airavata_isGatewayExist_result {
}
-class Airavata_generateAndRegisterSSHKeys_args {
+class Airavata_isGatewayExist_args {
static $_TSPEC;
/**
@@ -13328,10 +13341,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
* @var string
*/
public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -13345,10 +13354,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
'var' => 'gatewayId',
'type' => TType::STRING,
),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -13358,14 +13363,11 @@ class Airavata_generateAndRegisterSSHKeys_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
- }
}
}
public function getName() {
- return 'Airavata_generateAndRegisterSSHKeys_args';
+ return 'Airavata_isGatewayExist_args';
}
public function read($input)
@@ -13398,13 +13400,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
$xfer += $input->skip($ftype);
}
break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -13417,7 +13412,7 @@ class Airavata_generateAndRegisterSSHKeys_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeys_args');
+ $xfer += $output->writeStructBegin('Airavata_isGatewayExist_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -13431,11 +13426,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -13443,11 +13433,11 @@ class Airavata_generateAndRegisterSSHKeys_args {
}
-class Airavata_generateAndRegisterSSHKeys_result {
+class Airavata_isGatewayExist_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -13462,13 +13452,17 @@ class Airavata_generateAndRegisterSSHKeys_result {
* @var \Airavata\API\Error\AiravataSystemException
*/
public $ase = null;
+ /**
+ * @var \Airavata\API\Error\AuthorizationException
+ */
+ public $ae = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::STRING,
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -13485,6 +13479,11 @@ class Airavata_generateAndRegisterSSHKeys_result {
'type' => TType::STRUCT,
'class' => '\Airavata\API\Error\AiravataSystemException',
),
+ 4 => array(
+ 'var' => 'ae',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AuthorizationException',
+ ),
);
}
if (is_array($vals)) {
@@ -13500,11 +13499,14 @@ class Airavata_generateAndRegisterSSHKeys_result {
if (isset($vals['ase'])) {
$this->ase = $vals['ase'];
}
+ if (isset($vals['ae'])) {
+ $this->ae = $vals['ae'];
+ }
}
}
public function getName() {
- return 'Airavata_generateAndRegisterSSHKeys_result';
+ return 'Airavata_isGatewayExist_result';
}
public function read($input)
@@ -13523,8 +13525,8 @@ class Airavata_generateAndRegisterSSHKeys_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->success);
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -13553,6 +13555,14 @@ class Airavata_generateAndRegisterSSHKeys_result {
$xfer += $input->skip($ftype);
}
break;
+ case 4:
+ if ($ftype == TType::STRUCT) {
+ $this->ae = new \Airavata\API\Error\AuthorizationException();
+ $xfer += $this->ae->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -13565,10 +13575,10 @@ class Airavata_generateAndRegisterSSHKeys_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeys_result');
+ $xfer += $output->writeStructBegin('Airavata_isGatewayExist_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
- $xfer += $output->writeString($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -13586,6 +13596,11 @@ class Airavata_generateAndRegisterSSHKeys_result {
$xfer += $this->ase->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->ae !== null) {
+ $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
+ $xfer += $this->ae->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -13593,7 +13608,7 @@ class Airavata_generateAndRegisterSSHKeys_result {
}
-class Airavata_getSSHPubKey_args {
+class Airavata_generateAndRegisterSSHKeys_args {
static $_TSPEC;
/**
@@ -13603,11 +13618,11 @@ class Airavata_getSSHPubKey_args {
/**
* @var string
*/
- public $airavataCredStoreToken = null;
+ public $gatewayId = null;
/**
* @var string
*/
- public $gatewayId = null;
+ public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -13618,11 +13633,11 @@ class Airavata_getSSHPubKey_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'airavataCredStoreToken',
+ 'var' => 'gatewayId',
'type' => TType::STRING,
),
3 => array(
- 'var' => 'gatewayId',
+ 'var' => 'userName',
'type' => TType::STRING,
),
);
@@ -13631,17 +13646,17 @@ class Airavata_getSSHPubKey_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['airavataCredStoreToken'])) {
- $this->airavataCredStoreToken = $vals['airavataCredStoreToken'];
- }
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
+ if (isset($vals['userName'])) {
+ $this->userName = $vals['userName'];
+ }
}
}
public function getName() {
- return 'Airavata_getSSHPubKey_args';
+ return 'Airavata_generateAndRegisterSSHKeys_args';
}
public function read($input)
@@ -13669,14 +13684,14 @@ class Airavata_getSSHPubKey_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->airavataCredStoreToken);
+ $xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
+ $xfer += $input->readString($this->userName);
} else {
$xfer += $input->skip($ftype);
}
@@ -13693,7 +13708,7 @@ class Airavata_getSSHPubKey_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getSSHPubKey_args');
+ $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeys_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -13702,16 +13717,16 @@ class Airavata_getSSHPubKey_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->airavataCredStoreToken !== null) {
- $xfer += $output->writeFieldBegin('airavataCredStoreToken', TType::STRING, 2);
- $xfer += $output->writeString($this->airavataCredStoreToken);
- $xfer += $output->writeFieldEnd();
- }
if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->userName !== null) {
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
+ $xfer += $output->writeString($this->userName);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -13719,7 +13734,7 @@ class Airavata_getSSHPubKey_args {
}
-class Airavata_getSSHPubKey_result {
+class Airavata_generateAndRegisterSSHKeys_result {
static $_TSPEC;
/**
@@ -13780,7 +13795,7 @@ class Airavata_getSSHPubKey_result {
}
public function getName() {
- return 'Airavata_getSSHPubKey_result';
+ return 'Airavata_generateAndRegisterSSHKeys_result';
}
public function read($input)
@@ -13841,7 +13856,7 @@ class Airavata_getSSHPubKey_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getSSHPubKey_result');
+ $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeys_result');
if ($this->success !== null) {
$xfer += $output->writeFieldBegin('success', TType::STRING, 0);
$xfer += $output->writeString($this->success);
@@ -13869,7 +13884,7 @@ class Airavata_getSSHPubKey_result {
}
-class Airavata_getAllUserSSHPubKeys_args {
+class Airavata_getSSHPubKey_args {
static $_TSPEC;
/**
@@ -13879,7 +13894,11 @@ class Airavata_getAllUserSSHPubKeys_args {
/**
* @var string
*/
- public $userName = null;
+ public $airavataCredStoreToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -13890,7 +13909,11 @@ class Airavata_getAllUserSSHPubKeys_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'userName',
+ 'var' => 'airavataCredStoreToken',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'gatewayId',
'type' => TType::STRING,
),
);
@@ -13899,14 +13922,17 @@ class Airavata_getAllUserSSHPubKeys_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
+ if (isset($vals['airavataCredStoreToken'])) {
+ $this->airavataCredStoreToken = $vals['airavataCredStoreToken'];
+ }
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
}
}
}
public function getName() {
- return 'Airavata_getAllUserSSHPubKeys_args';
+ return 'Airavata_getSSHPubKey_args';
}
public function read($input)
@@ -13934,7 +13960,14 @@ class Airavata_getAllUserSSHPubKeys_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
+ $xfer += $input->readString($this->airavataCredStoreToken);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
@@ -13951,7 +13984,7 @@ class Airavata_getAllUserSSHPubKeys_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllUserSSHPubKeys_args');
+ $xfer += $output->writeStructBegin('Airavata_getSSHPubKey_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -13960,9 +13993,14 @@ class Airavata_getAllUserSSHPubKeys_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 2);
- $xfer += $output->writeString($this->userName);
+ if ($this->airavataCredStoreToken !== null) {
+ $xfer += $output->writeFieldBegin('airavataCredStoreToken', TType::STRING, 2);
+ $xfer += $output->writeString($this->airavataCredStoreToken);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
+ $xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -13972,11 +14010,11 @@ class Airavata_getAllUserSSHPubKeys_args {
}
-class Airavata_getAllUserSSHPubKeys_result {
+class Airavata_getSSHPubKey_result {
static $_TSPEC;
/**
- * @var array
+ * @var string
*/
public $success = null;
/**
@@ -13997,15 +14035,7 @@ class Airavata_getAllUserSSHPubKeys_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::MAP,
- 'ktype' => TType::STRING,
- 'vtype' => TType::STRING,
- 'key' => array(
- 'type' => TType::STRING,
- ),
- 'val' => array(
- 'type' => TType::STRING,
- ),
+ 'type' => TType::STRING,
),
1 => array(
'var' => 'ire',
@@ -14041,7 +14071,7 @@ class Airavata_getAllUserSSHPubKeys_result {
}
public function getName() {
- return 'Airavata_getAllUserSSHPubKeys_result';
+ return 'Airavata_getSSHPubKey_result';
}
public function read($input)
@@ -14060,21 +14090,8 @@ class Airavata_getAllUserSSHPubKeys_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::MAP) {
- $this->success = array();
- $_size7 = 0;
- $_ktype8 = 0;
- $_vtype9 = 0;
- $xfer += $input->readMapBegin($_ktype8, $_vtype9, $_size7);
- for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
- {
- $key12 = '';
- $val13 = '';
- $xfer += $input->readString($key12);
- $xfer += $input->readString($val13);
- $this->success[$key12] = $val13;
- }
- $xfer += $input->readMapEnd();
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -14115,23 +14132,10 @@ class Airavata_getAllUserSSHPubKeys_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllUserSSHPubKeys_result');
+ $xfer += $output->writeStructBegin('Airavata_getSSHPubKey_result');
if ($this->success !== null) {
- if (!is_array($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::MAP, 0);
- {
- $output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
- {
- foreach ($this->success as $kiter14 => $viter15)
- {
- $xfer += $output->writeString($kiter14);
- $xfer += $output->writeString($viter15);
- }
- }
- $output->writeMapEnd();
- }
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -14156,7 +14160,7 @@ class Airavata_getAllUserSSHPubKeys_result {
}
-class Airavata_getAllGatewaySSHPubKeys_args {
+class Airavata_getAllUserSSHPubKeys_args {
static $_TSPEC;
/**
@@ -14166,7 +14170,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
/**
* @var string
*/
- public $gatewayId = null;
+ public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -14177,7 +14181,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gatewayId',
+ 'var' => 'userName',
'type' => TType::STRING,
),
);
@@ -14186,14 +14190,14 @@ class Airavata_getAllGatewaySSHPubKeys_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
+ if (isset($vals['userName'])) {
+ $this->userName = $vals['userName'];
}
}
}
public function getName() {
- return 'Airavata_getAllGatewaySSHPubKeys_args';
+ return 'Airavata_getAllUserSSHPubKeys_args';
}
public function read($input)
@@ -14221,7 +14225,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
+ $xfer += $input->readString($this->userName);
} else {
$xfer += $input->skip($ftype);
}
@@ -14238,7 +14242,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGatewaySSHPubKeys_args');
+ $xfer += $output->writeStructBegin('Airavata_getAllUserSSHPubKeys_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14247,9 +14251,9 @@ class Airavata_getAllGatewaySSHPubKeys_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
+ if ($this->userName !== null) {
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 2);
+ $xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -14259,7 +14263,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
}
-class Airavata_getAllGatewaySSHPubKeys_result {
+class Airavata_getAllUserSSHPubKeys_result {
static $_TSPEC;
/**
@@ -14328,7 +14332,7 @@ class Airavata_getAllGatewaySSHPubKeys_result {
}
public function getName() {
- return 'Airavata_getAllGatewaySSHPubKeys_result';
+ return 'Airavata_getAllUserSSHPubKeys_result';
}
public function read($input)
@@ -14349,17 +14353,17 @@ class Airavata_getAllGatewaySSHPubKeys_result {
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size16 = 0;
- $_ktype17 = 0;
- $_vtype18 = 0;
- $xfer += $input->readMapBegin($_ktype17, $_vtype18, $_size16);
- for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
+ $_size7 = 0;
+ $_ktype8 = 0;
+ $_vtype9 = 0;
+ $xfer += $input->readMapBegin($_ktype8, $_vtype9, $_size7);
+ for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
{
- $key21 = '';
- $val22 = '';
- $xfer += $input->readString($key21);
- $xfer += $input->readString($val22);
- $this->success[$key21] = $val22;
+ $key12 = '';
+ $val13 = '';
+ $xfer += $input->readString($key12);
+ $xfer += $input->readString($val13);
+ $this->success[$key12] = $val13;
}
$xfer += $input->readMapEnd();
} else {
@@ -14402,7 +14406,7 @@ class Airavata_getAllGatewaySSHPubKeys_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGatewaySSHPubKeys_result');
+ $xfer += $output->writeStructBegin('Airavata_getAllUserSSHPubKeys_result');
if ($this->success !== null) {
if (!is_array($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14411,10 +14415,10 @@ class Airavata_getAllGatewaySSHPubKeys_result {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter23 => $viter24)
+ foreach ($this->success as $kiter14 => $viter15)
{
- $xfer += $output->writeString($kiter23);
- $xfer += $output->writeString($viter24);
+ $xfer += $output->writeString($kiter14);
+ $xfer += $output->writeString($viter15);
}
}
$output->writeMapEnd();
@@ -14443,7 +14447,7 @@ class Airavata_getAllGatewaySSHPubKeys_result {
}
-class Airavata_deleteSSHPubKey_args {
+class Airavata_getAllGatewaySSHPubKeys_args {
static $_TSPEC;
/**
@@ -14453,10 +14457,6 @@ class Airavata_deleteSSHPubKey_args {
/**
* @var string
*/
- public $airavataCredStoreToken = null;
- /**
- * @var string
- */
public $gatewayId = null;
public function __construct($vals=null) {
@@ -14468,10 +14468,6 @@ class Airavata_deleteSSHPubKey_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'airavataCredStoreToken',
- 'type' => TType::STRING,
- ),
- 3 => array(
'var' => 'gatewayId',
'type' => TType::STRING,
),
@@ -14481,9 +14477,6 @@ class Airavata_deleteSSHPubKey_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['airavataCredStoreToken'])) {
- $this->airavataCredStoreToken = $vals['airavataCredStoreToken'];
- }
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
@@ -14491,7 +14484,7 @@ class Airavata_deleteSSHPubKey_args {
}
public function getName() {
- return 'Airavata_deleteSSHPubKey_args';
+ return 'Airavata_getAllGatewaySSHPubKeys_args';
}
public function read($input)
@@ -14519,13 +14512,6 @@ class Airavata_deleteSSHPubKey_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->airavataCredStoreToken);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
@@ -14543,7 +14529,7 @@ class Airavata_deleteSSHPubKey_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteSSHPubKey_args');
+ $xfer += $output->writeStructBegin('Airavata_getAllGatewaySSHPubKeys_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14552,13 +14538,8 @@ class Airavata_deleteSSHPubKey_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->airavataCredStoreToken !== null) {
- $xfer += $output->writeFieldBegin('airavataCredStoreToken', TType::STRING, 2);
- $xfer += $output->writeString($this->airavataCredStoreToken);
- $xfer += $output->writeFieldEnd();
- }
if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
@@ -14569,11 +14550,11 @@ class Airavata_deleteSSHPubKey_args {
}
-class Airavata_deleteSSHPubKey_result {
+class Airavata_getAllGatewaySSHPubKeys_result {
static $_TSPEC;
/**
- * @var bool
+ * @var array
*/
public $success = null;
/**
@@ -14594,7 +14575,15 @@ class Airavata_deleteSSHPubKey_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::MAP,
+ 'ktype' => TType::STRING,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::STRING,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
),
1 => array(
'var' => 'ire',
@@ -14630,7 +14619,7 @@ class Airavata_deleteSSHPubKey_result {
}
public function getName() {
- return 'Airavata_deleteSSHPubKey_result';
+ return 'Airavata_getAllGatewaySSHPubKeys_result';
}
public function read($input)
@@ -14649,8 +14638,21 @@ class Airavata_deleteSSHPubKey_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::MAP) {
+ $this->success = array();
+ $_size16 = 0;
+ $_ktype17 = 0;
+ $_vtype18 = 0;
+ $xfer += $input->readMapBegin($_ktype17, $_vtype18, $_size16);
+ for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
+ {
+ $key21 = '';
+ $val22 = '';
+ $xfer += $input->readString($key21);
+ $xfer += $input->readString($val22);
+ $this->success[$key21] = $val22;
+ }
+ $xfer += $input->readMapEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -14691,10 +14693,23 @@ class Airavata_deleteSSHPubKey_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteSSHPubKey_result');
+ $xfer += $output->writeStructBegin('Airavata_getAllGatewaySSHPubKeys_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ if (!is_array($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::MAP, 0);
+ {
+ $output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
+ {
+ foreach ($this->success as $kiter23 => $viter24)
+ {
+ $xfer += $output->writeString($kiter23);
+ $xfer += $output->writeString($viter24);
+ }
+ }
+ $output->writeMapEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -14719,7 +14734,7 @@ class Airavata_deleteSSHPubKey_result {
}
-class Airavata_createProject_args {
+class Airavata_deleteSSHPubKey_args {
static $_TSPEC;
/**
@@ -14729,11 +14744,11 @@ class Airavata_createProject_args {
/**
* @var string
*/
- public $gatewayId = null;
+ public $airavataCredStoreToken = null;
/**
- * @var \Airavata\Model\Workspace\Project
+ * @var string
*/
- public $project = null;
+ public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -14744,13 +14759,12 @@ class Airavata_createProject_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gatewayId',
+ 'var' => 'airavataCredStoreToken',
'type' => TType::STRING,
),
3 => array(
- 'var' => 'project',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Project',
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
),
);
}
@@ -14758,17 +14772,17 @@ class Airavata_createProject_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
+ if (isset($vals['airavataCredStoreToken'])) {
+ $this->airavataCredStoreToken = $vals['airavataCredStoreToken'];
+ }
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
- if (isset($vals['project'])) {
- $this->project = $vals['project'];
- }
}
}
public function getName() {
- return 'Airavata_createProject_args';
+ return 'Airavata_deleteSSHPubKey_args';
}
public function read($input)
@@ -14796,15 +14810,14 @@ class Airavata_createProject_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
+ $xfer += $input->readString($this->airavataCredStoreToken);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
- if ($ftype == TType::STRUCT) {
- $this->project = new \Airavata\Model\Workspace\Project();
- $xfer += $this->project->read($input);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
@@ -14821,7 +14834,7 @@ class Airavata_createProject_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_createProject_args');
+ $xfer += $output->writeStructBegin('Airavata_deleteSSHPubKey_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -14830,17 +14843,14 @@ class Airavata_createProject_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
+ if ($this->airavataCredStoreToken !== null) {
+ $xfer += $output->writeFieldBegin('airavataCredStoreToken', TType::STRING, 2);
+ $xfer += $output->writeString($this->airavataCredStoreToken);
$xfer += $output->writeFieldEnd();
}
- if ($this->project !== null) {
- if (!is_object($this->project)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('project', TType::STRUCT, 3);
- $xfer += $this->project->write($output);
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
+ $xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -14850,11 +14860,11 @@ class Airavata_createProject_args {
}
-class Airavata_createProject_result {
+class Airavata_deleteSSHPubKey_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -14869,17 +14879,13 @@ class Airavata_createProject_result {
* @var \Airavata\API\Error\AiravataSystemException
*/
public $ase = null;
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::STRING,
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -14896,11 +14902,6 @@ class Airavata_createProject_result {
'type' => TType::STRUCT,
'class' => '\Airavata\API\Error\AiravataSystemException',
),
- 4 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
);
}
if (is_array($vals)) {
@@ -14916,14 +14917,11 @@ class Airavata_createProject_result {
if (isset($vals['ase'])) {
$this->ase = $vals['ase'];
}
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
- }
}
}
public function getName() {
- return 'Airavata_createProject_result';
+ return 'Airavata_deleteSSHPubKey_result';
}
public function read($input)
@@ -14942,8 +14940,8 @@ class Airavata_createProject_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->success);
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -14972,14 +14970,6 @@ class Airavata_createProject_result {
$xfer += $input->skip($ftype);
}
break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ae = new \Airavata\API\Error\AuthorizationException();
- $xfer += $this->ae->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -14992,10 +14982,10 @@ class Airavata_createProject_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_createProject_result');
+ $xfer += $output->writeStructBegin('Airavata_deleteSSHPubKey_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
- $xfer += $output->writeString($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -15013,11 +15003,6 @@ class Airavata_createProject_result {
$xfer += $this->ase->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -15025,7 +15010,7 @@ class Airavata_createProject_result {
}
-class Airavata_updateProject_args {
+class Airavata_createProject_args {
static $_TSPEC;
/**
@@ -15035,11 +15020,11 @@ class Airavata_updateProject_args {
/**
* @var string
*/
- public $projectId = null;
+ public $gatewayId = null;
/**
* @var \Airavata\Model\Workspace\Project
*/
- public $updatedProject = null;
+ public $project = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -15050,11 +15035,11 @@ class Airavata_updateProject_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'projectId',
+ 'var' => 'gatewayId',
'type' => TType::STRING,
),
3 => array(
- 'var' => 'updatedProject',
+ 'var' => 'project',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Workspace\Project',
),
@@ -15064,17 +15049,17 @@ class Airavata_updateProject_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['projectId'])) {
- $this->projectId = $vals['projectId'];
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
}
- if (isset($vals['updatedProject'])) {
- $this->updatedProject = $vals['updatedProject'];
+ if (isset($vals['project'])) {
+ $this->project = $vals['project'];
}
}
}
public function getName() {
- return 'Airavata_updateProject_args';
+ return 'Airavata_createProject_args';
}
public function read($input)
@@ -15102,15 +15087,15 @@ class Airavata_updateProject_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->projectId);
+ $xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
if ($ftype == TType::STRUCT) {
- $this->updatedProject = new \Airavata\Model\Workspace\Project();
- $xfer += $this->updatedProject->read($input);
+ $this->project = new \Airavata\Model\Workspace\Project();
+ $xfer += $this->project->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -15127,7 +15112,7 @@ class Airavata_updateProject_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateProject_args');
+ $xfer += $output->writeStructBegin('Airavata_createProject_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -15136,17 +15121,17 @@ class Airavata_updateProject_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->projectId !== null) {
- $xfer += $output->writeFieldBegin('projectId', TType::STRING, 2);
- $xfer += $output->writeString($this->projectId);
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
- if ($this->updatedProject !== null) {
- if (!is_object($this->updatedProject)) {
+ if ($this->project !== null) {
+ if (!is_object($this->project)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('updatedProject', TType::STRUCT, 3);
- $xfer += $this->updatedProject->write($output);
+ $xfer += $output->writeFieldBegin('project', TType::STRUCT, 3);
+ $xfer += $this->project->write($output);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -15156,10 +15141,14 @@ class Airavata_updateProject_args {
}
-class Airavata_updateProject_result {
+class Airavata_createProject_result {
static $_TSPEC;
/**
+ * @var string
+ */
+ public $success = null;
+ /**
* @var \Airavata\API\Error\InvalidRequestException
*/
public $ire = null;
@@ -15172,10 +15161,6 @@ class Airavata_updateProject_result {
*/
public $ase = null;
/**
- * @var \Airavata\API\Error\ProjectNotFoundException
- */
- public $pnfe = null;
- /**
* @var \Airavata\API\Error\AuthorizationException
*/
public $ae = null;
@@ -15183,6 +15168,10 @@ class Airavata_updateProject_result {
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::STRING,
+ ),
1 => array(
'var' => 'ire',
'type' => TType::STRUCT,
@@ -15199,11 +15188,6 @@ class Airavata_updateProject_result {
'class' => '\Airavata\API\Error\AiravataSystemException',
),
4 => array(
- 'var' => 'pnfe',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\ProjectNotFoundException',
- ),
- 5 => array(
'var' => 'ae',
'type' => TType::STRUCT,
'class' => '\Airavata\API\Error\AuthorizationException',
@@ -15211,6 +15195,9 @@ class Airavata_updateProject_result {
);
}
if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
if (isset($vals['ire'])) {
$this->ire = $vals['ire'];
}
@@ -15220,9 +15207,6 @@ class Airavata_updateProject_result {
if (isset($vals['ase'])) {
$this->ase = $vals['ase'];
}
- if (isset($vals['pnfe'])) {
- $this->pnfe = $vals['pnfe'];
- }
if (isset($vals['ae'])) {
$this->ae = $vals['ae'];
}
@@ -15230,7 +15214,7 @@ class Airavata_updateProject_result {
}
public function getName() {
- return 'Airavata_updateProject_result';
+ return 'Airavata_createProject_result';
}
public function r
<TRUNCATED>
[35/50] [abbrv] airavata-php-gateway git commit: changing the file
staging directory generation issue
Posted by sc...@apache.org.
changing the file staging directory generation issue
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/ae9ed4a3
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ae9ed4a3
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ae9ed4a3
Branch: refs/heads/develop
Commit: ae9ed4a38d85adf6a123bfc14782ef4f70354fa0
Parents: 961aabc
Author: scnakandala <su...@gmail.com>
Authored: Fri Jan 8 14:44:42 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jan 8 14:44:42 2016 -0500
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 8 ++------
app/routes.php | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ae9ed4a3/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 108a1c8..f19027f 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -360,10 +360,10 @@ class ExperimentUtilities
{
do {
ExperimentUtilities::$experimentPath = Config::get('pga_config.airavata')['experiment-data-absolute-path'] .
- "/" . str_replace(' ', '', Session::get('username')) . md5(rand() * time()) . '/';
+ "/" . Session::get('username') . "/" . md5(rand() * time()) . '/';
} while (is_dir(ExperimentUtilities::$experimentPath)); // if dir already exists, try again
// create upload directory
- if (!mkdir(ExperimentUtilities::$experimentPath)) {
+ if (!mkdir(ExperimentUtilities::$experimentPath, 0755, true)) {
CommonUtilities::print_error_message('<p>Error creating upload directory!
Please try again later or report a bug using the link in the Help menu.</p>');
$experimentAssemblySuccessful = false;
@@ -439,10 +439,6 @@ class ExperimentUtilities
$experimentInputs = $experiment->experimentInputs;
ExperimentUtilities::create_experiment_folder_path();
$hostName = $_SERVER['SERVER_NAME'];
- $expPathConstant = 'file://' . Config::get('pga_config.airavata')['ssh-user'] . '@' . $hostName . ':' . Config::get('pga_config.airavata')['experiment-data-absolute-path'];
- $outputDataDir = str_replace(Config::get('pga_config.airavata')['experiment-data-absolute-path'],
- $expPathConstant, ExperimentUtilities::$experimentPath);
- //$experiment->userConfigurationData->advanceOutputDataHandling->outputDataDir = $outputDataDir;
foreach ($experimentInputs as $experimentInput) {
if ($experimentInput->type == DataType::URI) {
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ae9ed4a3/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index 63e0df0..0309614 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -89,7 +89,7 @@ Route::get("experiment/browse", "ExperimentController@browseView");
Route::post("experiment/browse", "ExperimentController@browseView");
Route::get("download/{exp_folder}/{exp_file}", function( $exp_folder, $exp_file){
- $downloadLink = Config::get('pga_config.airavata')['experiment-data-absolute-path'] . '/' . $exp_folder . '/' . $exp_file;
+ $downloadLink = Config::get('pga_config.airavata')['experiment-data-absolute-path'] . '/' . Session::get('username') . '/' . $exp_folder . '/' . $exp_file;
return Response::download( $downloadLink);
});
/*
[10/50] [abbrv] airavata-php-gateway git commit: implementing add
storage resource preference
Posted by sc...@apache.org.
implementing add storage resource preference
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/281591eb
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/281591eb
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/281591eb
Branch: refs/heads/develop
Commit: 281591ebfe4e5b2fbb1f361214336ebcdb8e0edc
Parents: 0048a8c
Author: scnakandala <su...@gmail.com>
Authored: Mon Dec 14 13:55:59 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Dec 14 13:55:59 2015 -0500
----------------------------------------------------------------------
app/controllers/GatewayprofileController.php | 8 +
app/libraries/Airavata/API/Airavata.php | 12408 +++++++++--------
.../Airavata/Model/Data/Resource/Types.php | 308 +-
app/libraries/SRUtilities.php | 13 +-
app/routes.php | 4 +
app/views/admin/manage-gateway.blade.php | 22 +
.../storage-resource-preferences.blade.php | 10 +-
public/js/gateway.js | 13 +
8 files changed, 7231 insertions(+), 5555 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/281591eb/app/controllers/GatewayprofileController.php
----------------------------------------------------------------------
diff --git a/app/controllers/GatewayprofileController.php b/app/controllers/GatewayprofileController.php
index f39e59f..38260cc 100644
--- a/app/controllers/GatewayprofileController.php
+++ b/app/controllers/GatewayprofileController.php
@@ -44,6 +44,14 @@ class GatewayprofileController extends BaseController {
}
}
+ public function modifyDSP()
+ {
+ if( SRUtilities::add_or_update_DSP( Input::all()) )
+ {
+ return Redirect::to("admin/dashboard/gateway")->with("message","Data Storage Preference for the desired Gateway has been set.");
+ }
+ }
+
public function delete()
{
//var_dump( Input::all()); exit;
[22/50] [abbrv] airavata-php-gateway git commit: updating default
configs to local host
Posted by sc...@apache.org.
updating default configs to local host
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/b73806af
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b73806af
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b73806af
Branch: refs/heads/develop
Commit: b73806af732a8c6f68e7e4b1fe67fa695b61c960
Parents: 33bd2a7
Author: smarru <sm...@apache.org>
Authored: Mon Jan 4 06:42:31 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Mon Jan 4 06:42:31 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b73806af/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index 041004d..ae7fae5 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -2,7 +2,7 @@
return array(
/**
* *****************************************************************
- * These are WSO2 Identity Server Related Configurations
+ * WSO2 Identity Server Client Configurations
* *****************************************************************
*/
@@ -51,12 +51,12 @@ return array(
/**
* Identity server domain
*/
- 'server' => 'idp.scigap.org',
+ 'server' => 'localhost',
/**
* Identity server url
*/
- 'service-url' => 'https://idp.scigap.org:7443/',
+ 'service-url' => 'https://localhost:7443/',
/**
* Enable HTTPS server verification
@@ -77,7 +77,7 @@ return array(
/**
* *****************************************************************
- * These are Airavata Related Configurations
+ * Airavata Client Configurations
* *****************************************************************
*/
'airavata' => [
@@ -86,7 +86,7 @@ return array(
* Airavata API server location. Use tls:// as the protocol to
* connect TLS enabled Airavata
*/
- 'airavata-server' => 'gw56.iu.xsede.org',
+ 'airavata-server' => 'localhost',
/**
* Airavata API server port