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/03/25 21:48:46 UTC
[01/40] airavata-php-gateway git commit: Fix for job submission
interfaces not having a resource job manager object attached.
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master e674a1e88 -> a1f7a49e8
Fix for job submission interfaces not having a resource job manager object attached.
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/24345b7d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/24345b7d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/24345b7d
Branch: refs/heads/master
Commit: 24345b7dc806cc4b38a9237b46275a9db2daa831
Parents: e674a1e
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Mon Mar 21 19:21:33 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Mon Mar 21 19:21:33 2016 -0400
----------------------------------------------------------------------
.../partials/resource-job-manager.blade.php | 88 ++++++++++----------
app/views/resource/edit.blade.php | 2 +-
2 files changed, 47 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/24345b7d/app/views/partials/resource-job-manager.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/resource-job-manager.blade.php b/app/views/partials/resource-job-manager.blade.php
index d6b6242..8780c24 100644
--- a/app/views/partials/resource-job-manager.blade.php
+++ b/app/views/partials/resource-job-manager.blade.php
@@ -1,45 +1,49 @@
-<div class="select-resource-manager-type">
- <div class="form-group required">
- <label class="control-label">Select resource manager type</label>
- <select name="resourceJobManagerType" class="form-control selected-resource-manager"
- required="required">
- @foreach( $resourceJobManagerTypes as $index => $rJmT)
- <option value="{{ $index }}"
+@if( isset( $JSI) )
+ @if( isset( $JSI->resourceJobManager))
+ <div class="select-resource-manager-type">
+ <div class="form-group required">
+ <label class="control-label">Select resource manager type</label>
+ <select name="resourceJobManagerType" class="form-control selected-resource-manager"
+ required="required">
+ @foreach( $resourceJobManagerTypes as $index => $rJmT)
+ <option value="{{ $index }}"
+ @if( isset( $JSI) )
+ @if( $JSI->resourceJobManager->resourceJobManagerType == $index ) selected @endif
+ @endif >
+ {{ $rJmT }}</option>
+ @endforeach
+ </select>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Push Monitoring End Point</label>
+ <input type="text" class="form-control" name="pushMonitoringEndpoint"
@if( isset( $JSI) )
- @if( $JSI->resourceJobManager->resourceJobManagerType == $index ) selected @endif
- @endif >
- {{ $rJmT }}</option>
+ value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/>
+ @endif
+ </div>
+ <div class="form-group">
+ <label class="control-label">Job Manager Bin Path</label>
+ <input type="text" class="form-control" name="jobManagerBinPath"
+ @if( isset( $JSI) )
+ value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/>
+ @endif
+ </div>
+ <div class="form-group">
+ <h3>Job Manager Commands</h3>
+ @foreach( $jobManagerCommands as $index => $jmc)
+ <label class="control-label">{{ $jmc }}</label>
+ <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}"
+ value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index] ) ){{$JSI->resourceJobManager->jobManagerCommands[$index]}}@endif"/>
@endforeach
- </select>
- </div>
- <div class="form-group">
- <label class="control-label">Push Monitoring End Point</label>
- <input type="text" class="form-control" name="pushMonitoringEndpoint"
- @if( isset( $JSI) )
- value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/>
- @endif
- </div>
- <div class="form-group">
- <label class="control-label">Job Manager Bin Path</label>
- <input type="text" class="form-control" name="jobManagerBinPath"
- @if( isset( $JSI) )
- value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/>
- @endif
- </div>
- <div class="form-group">
- <h3>Job Manager Commands</h3>
- @foreach( $jobManagerCommands as $index => $jmc)
- <label class="control-label">{{ $jmc }}</label>
- <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}"
- value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index] ) ){{$JSI->resourceJobManager->jobManagerCommands[$index]}}@endif"/>
- @endforeach
- </div>
- <div class="form-group">
- <h3>Parallelism Prefixes</h3>
- @foreach( $parallelismTypes as $index => $pt)
- <label class="control-label">{{ $pt }}</label>
- <input class="form-control" name="parallelismPrefix[{{ $index }}]" placeholder="{{ $pt }}"
- value="@if( isset( $JSI->resourceJobManager->parallelismPrefix[$index] ) ){{$JSI->resourceJobManager->parallelismPrefix[$index]}}@endif"/>
- @endforeach
+ </div>
+ <div class="form-group">
+ <h3>Parallelism Prefixes</h3>
+ @foreach( $parallelismTypes as $index => $pt)
+ <label class="control-label">{{ $pt }}</label>
+ <input class="form-control" name="parallelismPrefix[{{ $index }}]" placeholder="{{ $pt }}"
+ value="@if( isset( $JSI->resourceJobManager->parallelismPrefix[$index] ) ){{$JSI->resourceJobManager->parallelismPrefix[$index]}}@endif"/>
+ @endforeach
+ </div>
</div>
-</div>
\ No newline at end of file
+ @endif
+@endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/24345b7d/app/views/resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php
index 522e7e5..dbc33fe 100644
--- a/app/views/resource/edit.blade.php
+++ b/app/views/resource/edit.blade.php
@@ -230,7 +230,7 @@
"parallelismTypes" => $parallelismTypes
)
)
- @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::SSH || $jobSubmissionProtocolsObject::SSH_FORK)
+ @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::SSH || $selectedJspIndex == $jobSubmissionProtocolsObject::SSH_FORK)
<div class="form-group required">
<label class="control-label">Select Security Protocol</label>
<select name="securityProtocol" required="required">
[07/40] airavata-php-gateway git commit: updating thrift generated
file
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3c452e19/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index 8605b25..e262b7c 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -3421,6 +3421,39 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AuthorizationException
*/
public function isWorkflowExistWithName(\Airavata\Model\Security\AuthzToken $authzToken, $workflowName);
+ /**
+ * API Methods related to data catalog
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param \Airavata\Model\Data\Product\DataProductModel $dataProductModel
+ * @return string
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function registerDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataProductModel $dataProductModel);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $dataProductUri
+ * @return \Airavata\Model\Data\Product\DataProductModel
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, $dataProductUri);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param \Airavata\Model\Data\Product\DataReplicaLocationModel $replicaLocationModel
+ * @return string
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function registerReplicaLocation(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataReplicaLocationModel $replicaLocationModel);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -12112,280 +12145,209 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("isWorkflowExistWithName failed: unknown result");
}
-}
-
-// HELPER FUNCTIONS AND STRUCTURES
+ public function registerDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataProductModel $dataProductModel)
+ {
+ $this->send_registerDataProduct($authzToken, $dataProductModel);
+ return $this->recv_registerDataProduct();
+ }
-class Airavata_getAPIVersion_args {
- static $_TSPEC;
+ public function send_registerDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataProductModel $dataProductModel)
+ {
+ $args = new \Airavata\API\Airavata_registerDataProduct_args();
+ $args->authzToken = $authzToken;
+ $args->dataProductModel = $dataProductModel;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'registerDataProduct', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('registerDataProduct', 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_registerDataProduct()
+ {
+ $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_registerDataProduct_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_registerDataProduct_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("registerDataProduct failed: unknown result");
}
- public function getName() {
- return 'Airavata_getAPIVersion_args';
+ public function getDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, $dataProductUri)
+ {
+ $this->send_getDataProduct($authzToken, $dataProductUri);
+ return $this->recv_getDataProduct();
}
- public function read($input)
+ public function send_getDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, $dataProductUri)
{
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
+ $args = new \Airavata\API\Airavata_getDataProduct_args();
+ $args->authzToken = $authzToken;
+ $args->dataProductUri = $dataProductUri;
+ $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_, 'getDataProduct', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
- $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);
- }
- $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1);
- $xfer += $this->authzToken->write($output);
- $xfer += $output->writeFieldEnd();
+ else
+ {
+ $this->output_->writeMessageBegin('getDataProduct', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
}
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
}
-}
-
-class Airavata_getAPIVersion_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 recv_getDataProduct()
+ {
+ $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_getDataProduct_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_getDataProduct_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("getDataProduct failed: unknown result");
}
- public function getName() {
- return 'Airavata_getAPIVersion_result';
+ public function registerReplicaLocation(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataReplicaLocationModel $replicaLocationModel)
+ {
+ $this->send_registerReplicaLocation($authzToken, $replicaLocationModel);
+ return $this->recv_registerReplicaLocation();
}
- public function read($input)
+ public function send_registerReplicaLocation(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataReplicaLocationModel $replicaLocationModel)
{
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
+ $args = new \Airavata\API\Airavata_registerReplicaLocation_args();
+ $args->authzToken = $authzToken;
+ $args->replicaLocationModel = $replicaLocationModel;
+ $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_, 'registerReplicaLocation', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('registerReplicaLocation', 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_registerReplicaLocation()
+ {
+ $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_registerReplicaLocation_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_registerReplicaLocation_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("registerReplicaLocation failed: unknown result");
}
}
-class Airavata_isUserExists_args {
+// HELPER FUNCTIONS AND STRUCTURES
+
+class Airavata_getAPIVersion_args {
static $_TSPEC;
/**
* @var \Airavata\Model\Security\AuthzToken
*/
public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -12395,31 +12357,17 @@ class Airavata_isUserExists_args {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Security\AuthzToken',
),
- 2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
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_isUserExists_args';
+ return 'Airavata_getAPIVersion_args';
}
public function read($input)
@@ -12445,20 +12393,6 @@ class Airavata_isUserExists_args {
$xfer += $input->skip($ftype);
}
break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $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;
@@ -12471,7 +12405,7 @@ class Airavata_isUserExists_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isUserExists_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);
@@ -12480,16 +12414,6 @@ class Airavata_isUserExists_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->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;
@@ -12497,11 +12421,11 @@ class Airavata_isUserExists_args {
}
-class Airavata_isUserExists_result {
+class Airavata_getAPIVersion_result {
static $_TSPEC;
/**
- * @var bool
+ * @var string
*/
public $success = null;
/**
@@ -12526,7 +12450,7 @@ class Airavata_isUserExists_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRING,
),
1 => array(
'var' => 'ire',
@@ -12570,7 +12494,7 @@ class Airavata_isUserExists_result {
}
public function getName() {
- return 'Airavata_isUserExists_result';
+ return 'Airavata_getAPIVersion_result';
}
public function read($input)
@@ -12589,8 +12513,8 @@ class Airavata_isUserExists_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -12639,10 +12563,10 @@ class Airavata_isUserExists_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isUserExists_result');
+ $xfer += $output->writeStructBegin('Airavata_getAPIVersion_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -12672,7 +12596,7 @@ class Airavata_isUserExists_result {
}
-class Airavata_addGateway_args {
+class Airavata_isUserExists_args {
static $_TSPEC;
/**
@@ -12680,9 +12604,13 @@ class Airavata_addGateway_args {
*/
public $authzToken = null;
/**
- * @var \Airavata\Model\Workspace\Gateway
+ * @var string
*/
- public $gateway = null;
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -12693,9 +12621,12 @@ class Airavata_addGateway_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gateway',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
),
);
}
@@ -12703,14 +12634,17 @@ class Airavata_addGateway_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gateway'])) {
- $this->gateway = $vals['gateway'];
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['userName'])) {
+ $this->userName = $vals['userName'];
}
}
}
public function getName() {
- return 'Airavata_addGateway_args';
+ return 'Airavata_isUserExists_args';
}
public function read($input)
@@ -12737,9 +12671,15 @@ class Airavata_addGateway_args {
}
break;
case 2:
- if ($ftype == TType::STRUCT) {
- $this->gateway = new \Airavata\Model\Workspace\Gateway();
- $xfer += $this->gateway->read($input);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
} else {
$xfer += $input->skip($ftype);
}
@@ -12756,7 +12696,7 @@ class Airavata_addGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_isUserExists_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -12765,12 +12705,14 @@ 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);
+ if ($this->gatewayId !== null) {
+ $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();
@@ -12780,11 +12722,11 @@ class Airavata_addGateway_args {
}
-class Airavata_addGateway_result {
+class Airavata_isUserExists_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -12809,7 +12751,7 @@ class Airavata_addGateway_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::STRING,
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -12853,7 +12795,7 @@ class Airavata_addGateway_result {
}
public function getName() {
- return 'Airavata_addGateway_result';
+ return 'Airavata_isUserExists_result';
}
public function read($input)
@@ -12872,8 +12814,8 @@ class Airavata_addGateway_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);
}
@@ -12922,10 +12864,10 @@ class Airavata_addGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_isUserExists_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) {
@@ -12955,7 +12897,7 @@ class Airavata_addGateway_result {
}
-class Airavata_updateGateway_args {
+class Airavata_addGateway_args {
static $_TSPEC;
/**
@@ -12963,13 +12905,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)) {
@@ -12980,11 +12918,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',
),
@@ -12994,17 +12928,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)
@@ -13031,16 +12962,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);
}
@@ -13057,7 +12981,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);
@@ -13066,17 +12990,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();
@@ -13086,10 +13005,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;
@@ -13109,6 +13032,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,
@@ -13132,6 +13059,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'];
}
@@ -13148,7 +13078,7 @@ class Airavata_updateGateway_result {
}
public function getName() {
- return 'Airavata_updateGateway_result';
+ return 'Airavata_addGateway_result';
}
public function read($input)
@@ -13166,6 +13096,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();
@@ -13210,7 +13147,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);
@@ -13238,7 +13180,7 @@ class Airavata_updateGateway_result {
}
-class Airavata_getGateway_args {
+class Airavata_updateGateway_args {
static $_TSPEC;
/**
@@ -13249,6 +13191,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)) {
@@ -13262,6 +13208,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)) {
@@ -13271,11 +13222,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)
@@ -13308,6 +13262,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;
@@ -13320,7 +13282,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);
@@ -13334,6 +13296,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;
@@ -13341,14 +13311,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;
@@ -13368,11 +13334,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,
@@ -13396,9 +13357,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'];
}
@@ -13415,7 +13373,7 @@ class Airavata_getGateway_result {
}
public function getName() {
- return 'Airavata_getGateway_result';
+ return 'Airavata_updateGateway_result';
}
public function read($input)
@@ -13433,14 +13391,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();
@@ -13485,15 +13435,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);
@@ -13521,7 +13463,7 @@ class Airavata_getGateway_result {
}
-class Airavata_deleteGateway_args {
+class Airavata_getGateway_args {
static $_TSPEC;
/**
@@ -13558,7 +13500,7 @@ class Airavata_deleteGateway_args {
}
public function getName() {
- return 'Airavata_deleteGateway_args';
+ return 'Airavata_getGateway_args';
}
public function read($input)
@@ -13603,7 +13545,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);
@@ -13624,11 +13566,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;
/**
@@ -13653,7 +13595,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',
@@ -13697,7 +13640,7 @@ class Airavata_deleteGateway_result {
}
public function getName() {
- return 'Airavata_deleteGateway_result';
+ return 'Airavata_getGateway_result';
}
public function read($input)
@@ -13716,8 +13659,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);
}
@@ -13766,10 +13710,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) {
@@ -13799,13 +13746,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)) {
@@ -13815,17 +13766,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)
@@ -13851,6 +13809,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;
@@ -13863,7 +13828,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);
@@ -13872,6 +13837,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;
@@ -13879,11 +13849,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;
/**
@@ -13908,12 +13878,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',
@@ -13957,7 +13922,7 @@ class Airavata_getAllGateways_result {
}
public function getName() {
- return 'Airavata_getAllGateways_result';
+ return 'Airavata_deleteGateway_result';
}
public function read($input)
@@ -13976,19 +13941,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);
}
@@ -14037,22 +13991,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) {
@@ -14082,17 +14024,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)) {
@@ -14102,24 +14040,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)
@@ -14145,13 +14076,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;
@@ -14164,7 +14088,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);
@@ -14173,11 +14097,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;
@@ -14185,11 +14104,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;
/**
@@ -14214,7 +14133,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',
@@ -14258,7 +14182,7 @@ class Airavata_isGatewayExist_result {
}
public function getName() {
- return 'Airavata_isGatewayExist_result';
+ return 'Airavata_getAllGateways_result';
}
public function read($input)
@@ -14277,8 +14201,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);
}
@@ -14327,10 +14262,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) {
@@ -14360,7 +14307,7 @@ class Airavata_isGatewayExist_result {
}
-class Airavata_generateAndRegisterSSHKeys_args {
+class Airavata_isGatewayExist_args {
static $_TSPEC;
/**
@@ -14371,10 +14318,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
* @var string
*/
public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -14388,10 +14331,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
'var' => 'gatewayId',
'type' => TType::STRING,
),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -14401,14 +14340,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)
@@ -14441,13 +14377,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;
@@ -14460,7 +14389,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);
@@ -14474,11 +14403,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;
@@ -14486,11 +14410,11 @@ class Airavata_generateAndRegisterSSHKeys_args {
}
-class Airavata_generateAndRegisterSSHKeys_result {
+class Airavata_isGatewayExist_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -14505,13 +14429,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',
@@ -14528,6 +14456,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)) {
@@ -14543,11 +14476,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)
@@ -14566,8 +14502,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);
}
@@ -14596,6 +14532,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;
@@ -14608,10 +14552,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) {
@@ -14629,6 +14573,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;
@@ -14636,7 +14585,7 @@ class Airavata_generateAndRegisterSSHKeys_result {
}
-class Airavata_getSSHPubKey_args {
+class Airavata_generateAndRegisterSSHKeys_args {
static $_TSPEC;
/**
@@ -14646,11 +14595,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)) {
@@ -14661,11 +14610,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,
),
);
@@ -14674,17 +14623,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)
@@ -14712,14 +14661,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);
}
@@ -14736,7 +14685,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);
@@ -14745,16 +14694,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;
@@ -14762,7 +14711,7 @@ class Airavata_getSSHPubKey_args {
}
-class Airavata_getSSHPubKey_result {
+class Airavata_generateAndRegisterSSHKeys_result {
static $_TSPEC;
/**
@@ -14823,7 +14772,7 @@ class Airavata_getSSHPubKey_result {
}
public function getName() {
- return 'Airavata_getSSHPubKey_result';
+ return 'Airavata_generateAndRegisterSSHKeys_result';
}
public function read($input)
@@ -14884,7 +14833,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);
@@ -14912,7 +14861,7 @@ class Airavata_getSSHPubKey_result {
}
-class Airavata_getAllUserSSHPubKeys_args {
+class Airavata_getSSHPubKey_args {
static $_TSPEC;
/**
@@ -14922,7 +14871,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)) {
@@ -14933,7 +14886,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,
),
);
@@ -14942,14 +14899,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)
@@ -14977,7 +14937,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);
}
@@ -14994,7 +14961,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);
@@ -15003,9 +14970,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();
@@ -15015,11 +14987,11 @@ class Airavata_getAllUserSSHPubKeys_args {
}
-class Airavata_getAllUserSSHPubKeys_result {
+class Airavata_getSSHPubKey_result {
static $_TSPEC;
/**
- * @var array
+ * @var string
*/
public $success = null;
/**
@@ -15040,15 +15012,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',
@@ -15084,7 +15048,7 @@ class Airavata_getAllUserSSHPubKeys_result {
}
public function getName() {
- return 'Airavata_getAllUserSSHPubKeys_result';
+ return 'Airavata_getSSHPubKey_result';
}
public function read($input)
@@ -15103,21 +15067,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);
}
@@ -15158,23 +15109,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) {
@@ -15199,7 +15137,7 @@ class Airavata_getAllUserSSHPubKeys_result {
}
-class Airavata_getAllGatewaySSHPubKeys_args {
+class Airavata_getAllUserSSHPubKeys_args {
static $_TSPEC;
/**
@@ -15209,7 +15147,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
/**
* @var string
*/
- public $gatewayId = null;
+ public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -15220,7 +15158,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gatewayId',
+ 'var' => 'userName',
'type' => TType::STRING,
),
);
@@ -15229,14 +15167,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)
@@ -15264,7 +15202,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);
}
@@ -15281,7 +15219,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);
@@ -15290,9 +15228,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();
@@ -15302,7 +15240,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
}
-class Airavata_getAllGatewaySSHPubKeys_result {
+class Airavata_getAllUserSSHPubKeys_result {
static $_TSPEC;
/**
@@ -15371,7 +15309,7 @@ class Airavata_getAllGatewaySSHPubKeys_result {
}
public function getName() {
- return 'Airavata_getAllGatewaySSHPubKeys_result';
+ return 'Airavata_getAllUserSSHPubKeys_result';
}
public function read($input)
@@ -15392,17 +15330,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 {
@@ -15445,7 +15383,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);
@@ -15454,10 +15392,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();
@@ -15486,7 +15424,7 @@ class Airavata_getAllGatewaySSHPubKeys_result {
}
-class Airavata_deleteSSHPubKey_args {
+class Airavata_getAllGatewaySSHPubKeys_args {
static $_TSPEC;
/**
@@ -15496,10 +15434,6 @@ class Airavata_deleteSSHPubKey_args {
/**
* @var string
*/
- public $airavataCredStoreToken = null;
- /**
- * @var string
- */
public $gatewayId = null;
public function __construct($vals=null) {
@@ -15511,10 +15445,6 @@ class Airavata_deleteSSHPubKey_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'airavataCredStoreToken',
- 'type' => TType::STRING,
- ),
- 3 => array(
'var' => 'gatewayId',
'type' => TType::STRING,
),
@@ -15524,9 +15454,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'];
}
@@ -15534,7 +15461,7 @@ class Airavata_deleteSSHPubKey_args {
}
public function getName() {
- return 'Airavata_deleteSSHPubKey_args';
+ return 'Airavata_getAllGatewaySSHPubKeys_args';
}
public function read($input)
@@ -15562,13 +15489,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);
@@ -15586,7 +15506,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);
@@ -15595,13 +15515,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();
}
@@ -15612,11 +15527,11 @@ class Airavata_deleteSSHPubKey_args {
}
-class Airavata_deleteSSHPubKey_result {
+class Airavata_getAllGatewaySSHPubKeys_result {
static $_TSPEC;
/**
- * @var bool
+ * @var array
*/
public $success = null;
/**
@@ -15637,7 +15552,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',
@@ -15673,7 +15596,7 @@ class Airavata_deleteSSHPubKey_result {
}
public function getName() {
- return 'Airavata_deleteSSHPubKey_result';
+ return 'Airavata_getAllGatewaySSHPubKeys_result';
}
public function read($input)
@@ -15692,8 +15615,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);
}
@@ -15734,10 +15670,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) {
@@ -15762,7 +15711,7 @@ class Airavata_deleteSSHPubKey_result {
}
-class Airavata_createProject_args {
+class Airavata_deleteSSHPubKey_args {
static $_TSPEC;
/**
@@ -15772,11 +15721,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)) {
@@ -15787,13 +15736,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,
),
);
}
@@ -15801,17 +15749,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)
@@ -15839,15 +15787,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);
}
@@ -15864,7 +15811,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);
@@ -15873,17 +15820,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();
@@ -15893,11 +15837,11 @@ class Airavata_createProject_args {
}
-class Airavata_createProject_result {
+class Airavata_deleteSSHPubKey_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -15912,17 +15856,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',
@@ -15939,11 +15879,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)) {
@@ -15959,14 +15894,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)
@@ -15985,8 +15917,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);
}
@@ -16015,14 +15947,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;
@@ -16035,10 +15959,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) {
@@ -16056,11 +15980,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;
@@ -16068,7 +15987,7 @@ class Airavata_createProject_result {
}
-class Airavata_updateProject_args {
+class Airavata_createProject_args {
static $_TSPEC;
/**
@@ -16078,11 +15997,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)) {
@@ -16093,11 +16012,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',
),
@@ -16107,17 +16026,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)
@@ -16145,15 +16064,15 @@ class Airavata_updateProject_args {
break;
case 2:
if ($ftype
<TRUNCATED>
[17/40] airavata-php-gateway git commit: fixing API call issue
Posted by sc...@apache.org.
fixing API call 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/167dee4b
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/167dee4b
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/167dee4b
Branch: refs/heads/master
Commit: 167dee4b2d34551c6f07f3a4a22154d4b539e7ae
Parents: cc4ba94
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 17:15:53 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 17:15:53 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/167dee4b/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 74b1309..2b08772 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -432,7 +432,7 @@ class ExperimentUtilities
if ($experimentInput->type == DataType::URI) {
$currentInputPath = $experimentInput->value;
$hostPathConstant = 'file://' . $hostName . ':';
- $dataProductModel = Airavata::getDataProduct($experimentInput->value);
+ $dataProductModel = Airavata::getDataProduct(Session::get('authz-token'), $experimentInput->value);
$currentInputPath = "";
foreach ($dataProductModel->replicaLocations as $rp) {
if($rp->replicaLocationCategory == ReplicaLocationCategory::GATEWAY_DATA_STORE){
[39/40] airavata-php-gateway git commit: fixing showing experiment
output values in PGA
Posted by sc...@apache.org.
fixing showing experiment output values in 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/7f39a4dc
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7f39a4dc
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7f39a4dc
Branch: refs/heads/master
Commit: 7f39a4dc40894561ac058d70d29641ec936a99bc
Parents: a03f217
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 25 16:09:49 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 25 16:09:49 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7f39a4dc/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index a687e51..03c8e51 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -681,19 +681,21 @@ class ExperimentUtilities
foreach ((array)$outputs as $output) {
if ($output->type == DataType::URI || $output->type == DataType::STDOUT || $output->type == DataType::STDERR) {
- $dataProductModel = Airavata::getDataProduct(Session::get('authz-token'), $output->value);
- $currentInputPath = "";
- foreach ($dataProductModel->replicaLocations as $rp) {
- if ($rp->replicaLocationCategory == ReplicaLocationCategory::GATEWAY_DATA_STORE) {
- $currentInputPath = $rp->filePath;
- break;
+ if(!empty($output->value)){
+ $dataProductModel = Airavata::getDataProduct(Session::get('authz-token'), $output->value);
+ $currentInputPath = "";
+ foreach ($dataProductModel->replicaLocations as $rp) {
+ if ($rp->replicaLocationCategory == ReplicaLocationCategory::GATEWAY_DATA_STORE) {
+ $currentInputPath = $rp->filePath;
+ break;
+ }
}
+ $dataRoot = Config::get("pga_config.airavata")["experiment-data-absolute-path"];
+ if (!ExperimentUtilities::endsWith($dataRoot, "/"))
+ $dataRoot = $dataRoot . "/";
+ $filePath = str_replace($dataRoot, "", parse_url($currentInputPath, PHP_URL_PATH));
+ echo '<p><a target="_blank" href="' . URL::to("/") . '/download/?path=' . $filePath . '">' . basename($filePath) . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
}
- $dataRoot = Config::get("pga_config.airavata")["experiment-data-absolute-path"];
- if (!ExperimentUtilities::endsWith($dataRoot, "/"))
- $dataRoot = $dataRoot . "/";
- $filePath = str_replace($dataRoot, "", $currentInputPath);
- echo '<p><a target="_blank" href="' . URL::to("/") . '/download/?path=' . $filePath . '">' . basename($filePath) . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
} elseif ($output->type == DataType::STRING) {
echo '<p>' . $output->value . '</p>';
} else
[14/40] airavata-php-gateway git commit: fixing wrong parameter issue
Posted by sc...@apache.org.
fixing wrong parameter 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/301b8be4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/301b8be4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/301b8be4
Branch: refs/heads/master
Commit: 301b8be4599fb750656cc889def05f5234a5e2b1
Parents: b31ba8a
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 14:03:16 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 14:03:16 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/301b8be4/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 06b90a4..3382341 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -319,7 +319,7 @@ class ExperimentUtilities
$dataReplicationModel->filePath = $filePath;
$dataProductModel->replicaLocations[] = $dataReplicationModel;
- $uri = Airavata::registerDataProduct(Session::get('authz-token'), $dataReplicationModel);
+ $uri = Airavata::registerDataProduct(Session::get('authz-token'), $dataProductModel);
$experimentInput->value = $uri;
} else {
CommonUtilities::print_error_message('I cannot accept this input type yet!');
[28/40] airavata-php-gateway git commit: fixing import statement issue
Posted by sc...@apache.org.
fixing import statement 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/503d4324
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/503d4324
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/503d4324
Branch: refs/heads/master
Commit: 503d432487314f8dcb70ffaf3afd153a0ca5b118
Parents: 7169192
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 24 11:37:26 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 24 11:37:26 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/503d4324/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 92452e3..5c3c9d4 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -15,11 +15,11 @@ use Airavata\Model\Status\JobState;
use Airavata\Model\Status\TaskState;
use Airavata\Model\Task\TaskTypes;
use Airavata\Model\Experiment\UserConfigurationDataModel;
-use Airavata\Model\Data\Product\DataProductModel;
-use Airavata\Model\Data\Product\DataProductType;
-use Airavata\Model\Data\Product\DataReplicaLocationModel;
-use Airavata\Model\Data\Product\ReplicaLocationCategory;
-use Airavata\Model\Data\Product\ReplicaPersistentType;
+use Airavata\Model\Data\Replica\DataProductModel;
+use Airavata\Model\Data\Replica\DataProductType;
+use Airavata\Model\Data\Replica\DataReplicaLocationModel;
+use Airavata\Model\Data\Replica\ReplicaLocationCategory;
+use Airavata\Model\Data\Replica\ReplicaPersistentType;
class ExperimentUtilities
{
[26/40] airavata-php-gateway git commit: adding user name to logical
path too
Posted by sc...@apache.org.
adding user name to logical path too
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/e3b15b56
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e3b15b56
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e3b15b56
Branch: refs/heads/master
Commit: e3b15b566d938c0b1446744fd2c6f7084db5fbe8
Parents: f6da039
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 18:20:55 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 18:20:55 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e3b15b56/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 6f3e082..92452e3 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -314,7 +314,7 @@ class ExperimentUtilities
$dataProductModel->gatewayId = Config::get("pga_config.airavata")["gateway-id"];
$dataProductModel->ownerName = Session::get("username");
$dataProductModel->productName = basename($filePath);
- $logicalPath = str_replace(Config::get("pga_config.airavata")["experiment-data-absolute-path"] . "/" . Session::get('username'), "", $filePath);
+ $logicalPath = str_replace(Config::get("pga_config.airavata")["experiment-data-absolute-path"], "", $filePath);
$dataProductModel->logicalPath = $logicalPath;
$dataProductModel->dataProductType = DataProductType::FILE;
@@ -456,7 +456,7 @@ class ExperimentUtilities
$dataProductModel->gatewayId = Config::get("pga_config.airavata")["gateway-id"];
$dataProductModel->ownerName = Session::get("username");
$dataProductModel->productName = basename($newInputPath);
- $logicalPath = str_replace(Config::get("pga_config.airavata")["experiment-data-absolute-path"] . "/" . Session::get('username'), "", $newInputPath);
+ $logicalPath = str_replace(Config::get("pga_config.airavata")["experiment-data-absolute-path"] , "", $newInputPath);
$dataProductModel->logicalPath = $logicalPath;
$dataProductModel->dataProductType = DataProductType::FILE;
[10/40] airavata-php-gateway git commit: refactoring the URI input
setting logic
Posted by sc...@apache.org.
refactoring the URI input setting logic
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/72a1cb7e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/72a1cb7e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/72a1cb7e
Branch: refs/heads/master
Commit: 72a1cb7edce63c9c4d8db2b042f902740042f051
Parents: 36d251e
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 12:33:17 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 12:33:17 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 87 +++++++++---------------------
1 file changed, 26 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/72a1cb7e/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index b3c4b8c..ea46ae8 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -229,8 +229,6 @@ class ExperimentUtilities
$experimentAssemblySuccessful = true;
$newExperimentInputs = array();
- //var_dump($_FILES);
-
if (sizeof($_FILES) > 0) {
if (ExperimentUtilities::file_upload_successful()) {
// construct unique path
@@ -248,21 +246,12 @@ class ExperimentUtilities
array_multisort($order, SORT_ASC, $applicationInputs);
foreach ($applicationInputs as $applicationInput) {
- $experimentInput = new InputDataObjectType();
- $experimentInput = $applicationInput;
- //$experimentInput->name = $applicationInput->name;
- //$experimentInput->metaData = $applicationInput->metaData;
-
-
- //$experimentInput->type = $applicationInput->type;
- //$experimentInput->type = DataType::STRING;
+ $experimentInput = $applicationInput;
if (($applicationInput->type == DataType::STRING) ||
($applicationInput->type == DataType::INTEGER) ||
- ($applicationInput->type == DataType::FLOAT) ||
- ($applicationInput->type == DataType::URI && !empty($applicationInput->metaData)
- && json_decode($applicationInput->metaData)->location=="remote")
+ ($applicationInput->type == DataType::FLOAT)
) {
if (isset($_POST[$applicationInput->name]) && (trim($_POST[$applicationInput->name]) != '')) {
$experimentInput->value = $_POST[$applicationInput->name];
@@ -283,64 +272,40 @@ class ExperimentUtilities
}
}
} elseif ($applicationInput->type == DataType::URI) {
- //var_dump($_FILES[$applicationInput->name]->name);
- if ($_FILES[$applicationInput->name]['name']) {
- $file = $_FILES[$applicationInput->name];
-
-
- //
- // move file to experiment data directory
- //
- if(!empty($applicationInput->value)){
- $filePath = ExperimentUtilities::$experimentPath . $applicationInput->value;
- }else{
- $filePath = ExperimentUtilities::$experimentPath . $file['name'];
- }
+ $file = $_FILES[$applicationInput->name];
+
+ //
+ // move file to experiment data directory
+ //
+ if(!empty($applicationInput->value)){
+ $filePath = ExperimentUtilities::$experimentPath . $applicationInput->value;
+ }else{
+ $filePath = ExperimentUtilities::$experimentPath . $file['name'];
+ }
- // check if file already exists
- if (is_file($filePath)) {
- unlink($filePath);
+ // check if file already exists
+ if (is_file($filePath)) {
+ unlink($filePath);
- CommonUtilities::print_warning_message('Uploaded file already exists! Overwriting...');
- }
-
- $moveFile = move_uploaded_file($file['tmp_name'], $filePath);
-
- if ($moveFile) {
- CommonUtilities::print_success_message('Upload: ' . $file['name'] . '<br>' .
- 'Type: ' . $file['type'] . '<br>' .
- 'Size: ' . ($file['size'] / 1024) . ' kB');
- //<br>' .
- //'Stored in: ' . $experimentPath . $file['name']);
- } else {
- CommonUtilities::print_error_message('<p>Error moving uploaded file ' . $file['name'] . '!
- Please try again later or report a bug using the link in the Help menu.</p>');
- $experimentAssemblySuccessful = false;
- }
- $hostName = $_SERVER['SERVER_NAME'];
- $experimentInput->value = 'file://' . $hostName . ':' . $filePath;
- $experimentInput->type = $applicationInput->type;
+ CommonUtilities::print_warning_message('Uploaded file already exists! Overwriting...');
+ }
- } else {
- $index = -1;
- for ($i = 0; $i < sizeof($experimentInputs); $i++) {
- if ($experimentInputs[$i]->name == $applicationInput->name) {
- $index = $i;
- }
- }
+ $moveFile = move_uploaded_file($file['tmp_name'], $filePath);
- if ($index >= 0) {
- $experimentInput->value = $experimentInputs[$index]->value;
- $experimentInput->type = $applicationInput->type;
- }
+ if (!$moveFile) {
+ CommonUtilities::print_error_message('<p>Error moving uploaded file ' . $file['name'] . '!
+ Please try again later or report a bug using the link in the Help menu.</p>');
+ $experimentAssemblySuccessful = false;
}
+ $hostName = $_SERVER['SERVER_NAME'];
+ $experimentInput->value = 'file://' . $hostName . ':' . $filePath;
+ $experimentInput->type = $applicationInput->type;
+
} else {
CommonUtilities::print_error_message('I cannot accept this input type yet!');
}
-
$newExperimentInputs[] = $experimentInput;
-
}
if ($experimentAssemblySuccessful) {
[31/40] airavata-php-gateway git commit: updating thrift files
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c2c493d1/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index d397526..c7065a4 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -3422,7 +3422,7 @@ interface AiravataIf {
*/
public function isWorkflowExistWithName(\Airavata\Model\Security\AuthzToken $authzToken, $workflowName);
/**
- * API Methods related to data catalog
+ * API Methods related to replica catalog
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
@@ -3454,6 +3454,26 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AuthorizationException
*/
public function registerReplicaLocation(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Replica\DataReplicaLocationModel $replicaLocationModel);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $productUri
+ * @return \Airavata\Model\Data\Replica\DataProductModel
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getParentDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, $productUri);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $productUri
+ * @return \Airavata\Model\Data\Replica\DataProductModel[]
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getChildDataProducts(\Airavata\Model\Security\AuthzToken $authzToken, $productUri);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -12337,280 +12357,145 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("registerReplicaLocation failed: unknown result");
}
-}
-
-// HELPER FUNCTIONS AND STRUCTURES
-
-class Airavata_getAPIVersion_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
+ public function getParentDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, $productUri)
+ {
+ $this->send_getParentDataProduct($authzToken, $productUri);
+ return $this->recv_getParentDataProduct();
+ }
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'authzToken',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Security\AuthzToken',
- ),
- );
+ public function send_getParentDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, $productUri)
+ {
+ $args = new \Airavata\API\Airavata_getParentDataProduct_args();
+ $args->authzToken = $authzToken;
+ $args->productUri = $productUri;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'getParentDataProduct', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
- }
+ else
+ {
+ $this->output_->writeMessageBegin('getParentDataProduct', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
}
}
- public function getName() {
- return 'Airavata_getAPIVersion_args';
- }
-
- public function read($input)
+ public function recv_getParentDataProduct()
{
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
+ $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_getParentDataProduct_result', $this->input_->isStrictRead());
+ else
{
- $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();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
- 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);
+ $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_getParentDataProduct_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
}
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_getAPIVersion_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 ($result->success !== null) {
+ return $result->success;
}
- 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'];
- }
+ 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("getParentDataProduct failed: unknown result");
}
- public function getName() {
- return 'Airavata_getAPIVersion_result';
+ public function getChildDataProducts(\Airavata\Model\Security\AuthzToken $authzToken, $productUri)
+ {
+ $this->send_getChildDataProducts($authzToken, $productUri);
+ return $this->recv_getChildDataProducts();
}
- public function read($input)
+ public function send_getChildDataProducts(\Airavata\Model\Security\AuthzToken $authzToken, $productUri)
{
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
+ $args = new \Airavata\API\Airavata_getChildDataProducts_args();
+ $args->authzToken = $authzToken;
+ $args->productUri = $productUri;
+ $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_, 'getChildDataProducts', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getChildDataProducts', 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_getChildDataProducts()
+ {
+ $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_getChildDataProducts_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_getChildDataProducts_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("getChildDataProducts failed: unknown result");
}
}
-class Airavata_isUserExists_args {
+// HELPER FUNCTIONS AND STRUCTURES
+
+class Airavata_getAPIVersion_args {
static $_TSPEC;
/**
* @var \Airavata\Model\Security\AuthzToken
*/
public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -12620,31 +12505,17 @@ class Airavata_isUserExists_args {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Security\AuthzToken',
),
- 2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
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_isUserExists_args';
+ return 'Airavata_getAPIVersion_args';
}
public function read($input)
@@ -12670,20 +12541,6 @@ class Airavata_isUserExists_args {
$xfer += $input->skip($ftype);
}
break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $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;
@@ -12696,7 +12553,7 @@ class Airavata_isUserExists_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isUserExists_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);
@@ -12705,16 +12562,6 @@ class Airavata_isUserExists_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->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;
@@ -12722,11 +12569,11 @@ class Airavata_isUserExists_args {
}
-class Airavata_isUserExists_result {
+class Airavata_getAPIVersion_result {
static $_TSPEC;
/**
- * @var bool
+ * @var string
*/
public $success = null;
/**
@@ -12751,7 +12598,7 @@ class Airavata_isUserExists_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRING,
),
1 => array(
'var' => 'ire',
@@ -12795,7 +12642,7 @@ class Airavata_isUserExists_result {
}
public function getName() {
- return 'Airavata_isUserExists_result';
+ return 'Airavata_getAPIVersion_result';
}
public function read($input)
@@ -12814,8 +12661,8 @@ class Airavata_isUserExists_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -12864,10 +12711,10 @@ class Airavata_isUserExists_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_isUserExists_result');
+ $xfer += $output->writeStructBegin('Airavata_getAPIVersion_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -12897,7 +12744,7 @@ class Airavata_isUserExists_result {
}
-class Airavata_addGateway_args {
+class Airavata_isUserExists_args {
static $_TSPEC;
/**
@@ -12905,9 +12752,13 @@ class Airavata_addGateway_args {
*/
public $authzToken = null;
/**
- * @var \Airavata\Model\Workspace\Gateway
+ * @var string
*/
- public $gateway = null;
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -12918,9 +12769,12 @@ class Airavata_addGateway_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gateway',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Gateway',
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
),
);
}
@@ -12928,14 +12782,17 @@ class Airavata_addGateway_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gateway'])) {
- $this->gateway = $vals['gateway'];
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['userName'])) {
+ $this->userName = $vals['userName'];
}
}
}
public function getName() {
- return 'Airavata_addGateway_args';
+ return 'Airavata_isUserExists_args';
}
public function read($input)
@@ -12962,9 +12819,15 @@ class Airavata_addGateway_args {
}
break;
case 2:
- if ($ftype == TType::STRUCT) {
- $this->gateway = new \Airavata\Model\Workspace\Gateway();
- $xfer += $this->gateway->read($input);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
} else {
$xfer += $input->skip($ftype);
}
@@ -12981,7 +12844,7 @@ class Airavata_addGateway_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addGateway_args');
+ $xfer += $output->writeStructBegin('Airavata_isUserExists_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -12990,12 +12853,14 @@ 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);
+ if ($this->gatewayId !== null) {
+ $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();
@@ -13005,11 +12870,11 @@ class Airavata_addGateway_args {
}
-class Airavata_addGateway_result {
+class Airavata_isUserExists_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -13034,7 +12899,7 @@ class Airavata_addGateway_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::STRING,
+ 'type' => TType::BOOL,
),
1 => array(
'var' => 'ire',
@@ -13078,7 +12943,7 @@ class Airavata_addGateway_result {
}
public function getName() {
- return 'Airavata_addGateway_result';
+ return 'Airavata_isUserExists_result';
}
public function read($input)
@@ -13097,8 +12962,8 @@ class Airavata_addGateway_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);
}
@@ -13147,10 +13012,10 @@ class Airavata_addGateway_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addGateway_result');
+ $xfer += $output->writeStructBegin('Airavata_isUserExists_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) {
@@ -13180,7 +13045,7 @@ class Airavata_addGateway_result {
}
-class Airavata_updateGateway_args {
+class Airavata_addGateway_args {
static $_TSPEC;
/**
@@ -13188,13 +13053,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)) {
@@ -13205,11 +13066,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',
),
@@ -13219,17 +13076,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)
@@ -13256,16 +13110,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);
}
@@ -13282,7 +13129,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);
@@ -13291,17 +13138,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();
@@ -13311,10 +13153,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;
@@ -13334,6 +13180,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,
@@ -13357,6 +13207,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'];
}
@@ -13373,7 +13226,7 @@ class Airavata_updateGateway_result {
}
public function getName() {
- return 'Airavata_updateGateway_result';
+ return 'Airavata_addGateway_result';
}
public function read($input)
@@ -13391,6 +13244,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();
@@ -13435,7 +13295,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);
@@ -13463,7 +13328,7 @@ class Airavata_updateGateway_result {
}
-class Airavata_getGateway_args {
+class Airavata_updateGateway_args {
static $_TSPEC;
/**
@@ -13474,6 +13339,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)) {
@@ -13487,6 +13356,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)) {
@@ -13496,11 +13370,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)
@@ -13533,6 +13410,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;
@@ -13545,7 +13430,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);
@@ -13559,6 +13444,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;
@@ -13566,14 +13459,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;
@@ -13593,11 +13482,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,
@@ -13621,9 +13505,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'];
}
@@ -13640,7 +13521,7 @@ class Airavata_getGateway_result {
}
public function getName() {
- return 'Airavata_getGateway_result';
+ return 'Airavata_updateGateway_result';
}
public function read($input)
@@ -13658,14 +13539,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();
@@ -13710,15 +13583,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);
@@ -13746,7 +13611,7 @@ class Airavata_getGateway_result {
}
-class Airavata_deleteGateway_args {
+class Airavata_getGateway_args {
static $_TSPEC;
/**
@@ -13783,7 +13648,7 @@ class Airavata_deleteGateway_args {
}
public function getName() {
- return 'Airavata_deleteGateway_args';
+ return 'Airavata_getGateway_args';
}
public function read($input)
@@ -13828,7 +13693,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);
@@ -13849,11 +13714,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;
/**
@@ -13878,7 +13743,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',
@@ -13922,7 +13788,7 @@ class Airavata_deleteGateway_result {
}
public function getName() {
- return 'Airavata_deleteGateway_result';
+ return 'Airavata_getGateway_result';
}
public function read($input)
@@ -13941,8 +13807,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);
}
@@ -13991,10 +13858,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) {
@@ -14024,13 +13894,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)) {
@@ -14040,17 +13914,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)
@@ -14076,6 +13957,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;
@@ -14088,7 +13976,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);
@@ -14097,6 +13985,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;
@@ -14104,11 +13997,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;
/**
@@ -14133,12 +14026,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',
@@ -14182,7 +14070,7 @@ class Airavata_getAllGateways_result {
}
public function getName() {
- return 'Airavata_getAllGateways_result';
+ return 'Airavata_deleteGateway_result';
}
public function read($input)
@@ -14201,19 +14089,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);
}
@@ -14262,22 +14139,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) {
@@ -14307,17 +14172,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)) {
@@ -14327,24 +14188,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)
@@ -14370,13 +14224,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;
@@ -14389,7 +14236,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);
@@ -14398,11 +14245,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;
@@ -14410,11 +14252,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;
/**
@@ -14439,7 +14281,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',
@@ -14483,7 +14330,7 @@ class Airavata_isGatewayExist_result {
}
public function getName() {
- return 'Airavata_isGatewayExist_result';
+ return 'Airavata_getAllGateways_result';
}
public function read($input)
@@ -14502,8 +14349,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);
}
@@ -14552,10 +14410,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) {
@@ -14585,7 +14455,7 @@ class Airavata_isGatewayExist_result {
}
-class Airavata_generateAndRegisterSSHKeys_args {
+class Airavata_isGatewayExist_args {
static $_TSPEC;
/**
@@ -14596,10 +14466,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
* @var string
*/
public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -14613,10 +14479,6 @@ class Airavata_generateAndRegisterSSHKeys_args {
'var' => 'gatewayId',
'type' => TType::STRING,
),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -14626,14 +14488,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)
@@ -14666,13 +14525,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;
@@ -14685,7 +14537,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);
@@ -14699,11 +14551,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;
@@ -14711,11 +14558,11 @@ class Airavata_generateAndRegisterSSHKeys_args {
}
-class Airavata_generateAndRegisterSSHKeys_result {
+class Airavata_isGatewayExist_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -14730,13 +14577,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',
@@ -14753,6 +14604,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)) {
@@ -14768,11 +14624,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)
@@ -14791,8 +14650,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);
}
@@ -14821,6 +14680,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;
@@ -14833,10 +14700,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) {
@@ -14854,6 +14721,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;
@@ -14861,7 +14733,7 @@ class Airavata_generateAndRegisterSSHKeys_result {
}
-class Airavata_getSSHPubKey_args {
+class Airavata_generateAndRegisterSSHKeys_args {
static $_TSPEC;
/**
@@ -14871,11 +14743,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)) {
@@ -14886,11 +14758,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,
),
);
@@ -14899,17 +14771,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)
@@ -14937,14 +14809,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);
}
@@ -14961,7 +14833,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);
@@ -14970,16 +14842,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;
@@ -14987,7 +14859,7 @@ class Airavata_getSSHPubKey_args {
}
-class Airavata_getSSHPubKey_result {
+class Airavata_generateAndRegisterSSHKeys_result {
static $_TSPEC;
/**
@@ -15048,7 +14920,7 @@ class Airavata_getSSHPubKey_result {
}
public function getName() {
- return 'Airavata_getSSHPubKey_result';
+ return 'Airavata_generateAndRegisterSSHKeys_result';
}
public function read($input)
@@ -15109,7 +14981,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);
@@ -15137,7 +15009,7 @@ class Airavata_getSSHPubKey_result {
}
-class Airavata_getAllUserSSHPubKeys_args {
+class Airavata_getSSHPubKey_args {
static $_TSPEC;
/**
@@ -15147,7 +15019,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)) {
@@ -15158,7 +15034,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,
),
);
@@ -15167,14 +15047,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)
@@ -15202,7 +15085,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);
}
@@ -15219,7 +15109,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);
@@ -15228,9 +15118,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();
@@ -15240,11 +15135,11 @@ class Airavata_getAllUserSSHPubKeys_args {
}
-class Airavata_getAllUserSSHPubKeys_result {
+class Airavata_getSSHPubKey_result {
static $_TSPEC;
/**
- * @var array
+ * @var string
*/
public $success = null;
/**
@@ -15265,15 +15160,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',
@@ -15309,7 +15196,7 @@ class Airavata_getAllUserSSHPubKeys_result {
}
public function getName() {
- return 'Airavata_getAllUserSSHPubKeys_result';
+ return 'Airavata_getSSHPubKey_result';
}
public function read($input)
@@ -15328,21 +15215,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);
}
@@ -15383,23 +15257,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) {
@@ -15424,7 +15285,7 @@ class Airavata_getAllUserSSHPubKeys_result {
}
-class Airavata_getAllGatewaySSHPubKeys_args {
+class Airavata_getAllUserSSHPubKeys_args {
static $_TSPEC;
/**
@@ -15434,7 +15295,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
/**
* @var string
*/
- public $gatewayId = null;
+ public $userName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -15445,7 +15306,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gatewayId',
+ 'var' => 'userName',
'type' => TType::STRING,
),
);
@@ -15454,14 +15315,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)
@@ -15489,7 +15350,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);
}
@@ -15506,7 +15367,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);
@@ -15515,9 +15376,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();
@@ -15527,7 +15388,7 @@ class Airavata_getAllGatewaySSHPubKeys_args {
}
-class Airavata_getAllGatewaySSHPubKeys_result {
+class Airavata_getAllUserSSHPubKeys_result {
static $_TSPEC;
/**
@@ -15596,7 +15457,7 @@ class Airavata_getAllGatewaySSHPubKeys_result {
}
public function getName() {
- return 'Airavata_getAllGatewaySSHPubKeys_result';
+ return 'Airavata_getAllUserSSHPubKeys_result';
}
public function read($input)
@@ -15617,17 +15478,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 {
@@ -15670,7 +15531,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);
@@ -15679,10 +15540,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();
@@ -15711,7 +15572,7 @@ class Airavata_getAllGatewaySSHPubKeys_result {
}
-class Airavata_deleteSSHPubKey_args {
+class Airavata_getAllGatewaySSHPubKeys_args {
static $_TSPEC;
/**
@@ -15721,10 +15582,6 @@ class Airavata_deleteSSHPubKey_args {
/**
* @var string
*/
- public $airavataCredStoreToken = null;
- /**
- * @var string
- */
public $gatewayId = null;
public function __construct($vals=null) {
@@ -15736,10 +15593,6 @@ class Airavata_deleteSSHPubKey_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'airavataCredStoreToken',
- 'type' => TType::STRING,
- ),
- 3 => array(
'var' => 'gatewayId',
'type' => TType::STRING,
),
@@ -15749,9 +15602,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'];
}
@@ -15759,7 +15609,7 @@ class Airavata_deleteSSHPubKey_args {
}
public function getName() {
- return 'Airavata_deleteSSHPubKey_args';
+ return 'Airavata_getAllGatewaySSHPubKeys_args';
}
public function read($input)
@@ -15787,13 +15637,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);
@@ -15811,7 +15654,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);
@@ -15820,13 +15663,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();
}
@@ -15837,11 +15675,11 @@ class Airavata_deleteSSHPubKey_args {
}
-class Airavata_deleteSSHPubKey_result {
+class Airavata_getAllGatewaySSHPubKeys_result {
static $_TSPEC;
/**
- * @var bool
+ * @var array
*/
public $success = null;
/**
@@ -15862,7 +15700,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',
@@ -15898,7 +15744,7 @@ class Airavata_deleteSSHPubKey_result {
}
public function getName() {
- return 'Airavata_deleteSSHPubKey_result';
+ return 'Airavata_getAllGatewaySSHPubKeys_result';
}
public function read($input)
@@ -15917,8 +15763,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);
}
@@ -15959,10 +15818,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) {
@@ -15987,7 +15859,7 @@ class Airavata_deleteSSHPubKey_result {
}
-class Airavata_createProject_args {
+class Airavata_deleteSSHPubKey_args {
static $_TSPEC;
/**
@@ -15997,11 +15869,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)) {
@@ -16012,13 +15884,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,
),
);
}
@@ -16026,17 +15897,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)
@@ -16064,15 +15935,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);
}
@@ -16089,7 +15959,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);
@@ -16098,17 +15968,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();
@@ -16118,11 +15985,11 @@ class Airavata_createProject_args {
}
-class Airavata_createProject_result {
+class Airavata_deleteSSHPubKey_result {
static $_TSPEC;
/**
- * @var string
+ * @var bool
*/
public $success = null;
/**
@@ -16137,17 +16004,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',
@@ -16164,11 +16027,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)) {
@@ -16184,14 +16042,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)
@@ -16210,8 +16065,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);
}
@@ -16240,14 +16095,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;
@@ -16260,10 +16107,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) {
@@ -16281,11 +16128,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;
@@ -16293,7 +16135,7 @@ class Airavata_createProject_result {
}
-class Airavata_updateProject_args {
+class Airavata_createProject_args {
static $_TSPEC;
/**
@@ -16303,11 +16145,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)) {
@@ -16318,11 +16160,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',
),
@@ -16332,17 +16174,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)
@@ -16370,15 +16212,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);
}
@@ -16395,7 +16237,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);
@@ -16404,17 +16246,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();
@@ -16424,10 +16266,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;
@@ -16440,10 +16286,6 @@ class Airavata_updateProject_result {
*/
public $ase = null;
/**
- * @var \Airavata\API\Error\ProjectNotFoundException
- */
- public $pnfe = null;
- /**
* @var \Airavata\API\Error\AuthorizationException
*/
public $ae = null;
@@ -16451,6 +16293,10 @@ class
<TRUNCATED>
[02/40] airavata-php-gateway git commit: Fixes for Resource Job
Manager object getting picked for every Job Submission Interface
Posted by sc...@apache.org.
Fixes for Resource Job Manager object getting picked for every Job Submission Interface
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/f1d354f5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f1d354f5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f1d354f5
Branch: refs/heads/master
Commit: f1d354f5842d2efacddcb105ed5b23fc78cbac3b
Parents: 24345b7
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Mar 22 11:56:32 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Mar 22 11:56:32 2016 -0400
----------------------------------------------------------------------
app/libraries/CRUtilities.php | 1 +
.../partials/resource-job-manager.blade.php | 91 +-
app/views/resource/edit.blade.php | 993 ++++++++++---------
public/js/script.js | 2 +-
4 files changed, 543 insertions(+), 544 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f1d354f5/app/libraries/CRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CRUtilities.php b/app/libraries/CRUtilities.php
index 2aa0fd6..2c2416d 100755
--- a/app/libraries/CRUtilities.php
+++ b/app/libraries/CRUtilities.php
@@ -264,6 +264,7 @@ class CRUtilities
} else {
$unicoreSub = Airavata::addUNICOREJobSubmissionDetails(Session::get('authz-token'), $computeResource->computeResourceId, 0, $unicoreJobSubmission);
}
+ return;
} else /* Globus does not work currently */ {
print_r("Whoops! We haven't coded for this Job Submission Protocol yet. Still working on it. Please click <a href='" . URL::to('/') . "/cr/edit'>here</a> to go back to edit page for compute resource.");
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f1d354f5/app/views/partials/resource-job-manager.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/resource-job-manager.blade.php b/app/views/partials/resource-job-manager.blade.php
index 8780c24..81453a9 100644
--- a/app/views/partials/resource-job-manager.blade.php
+++ b/app/views/partials/resource-job-manager.blade.php
@@ -1,49 +1,46 @@
-@if( isset( $JSI) )
- @if( isset( $JSI->resourceJobManager))
- <div class="select-resource-manager-type">
- <div class="form-group required">
- <label class="control-label">Select resource manager type</label>
- <select name="resourceJobManagerType" class="form-control selected-resource-manager"
- required="required">
- @foreach( $resourceJobManagerTypes as $index => $rJmT)
- <option value="{{ $index }}"
- @if( isset( $JSI) )
- @if( $JSI->resourceJobManager->resourceJobManagerType == $index ) selected @endif
- @endif >
- {{ $rJmT }}</option>
- @endforeach
- </select>
- </div>
- <div class="form-group">
- <label class="control-label">Push Monitoring End Point</label>
- <input type="text" class="form-control" name="pushMonitoringEndpoint"
- @if( isset( $JSI) )
- value="{{ $JSI->resourceJobManager->pushMonitoringEndpoint }}"/>
- @endif
- </div>
- <div class="form-group">
- <label class="control-label">Job Manager Bin Path</label>
- <input type="text" class="form-control" name="jobManagerBinPath"
- @if( isset( $JSI) )
- value="{{ $JSI->resourceJobManager->jobManagerBinPath }}"/>
- @endif
- </div>
- <div class="form-group">
- <h3>Job Manager Commands</h3>
- @foreach( $jobManagerCommands as $index => $jmc)
- <label class="control-label">{{ $jmc }}</label>
- <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}"
- value="@if( isset( $JSI->resourceJobManager->jobManagerCommands[$index] ) ){{$JSI->resourceJobManager->jobManagerCommands[$index]}}@endif"/>
+
+<div class="select-resource-manager-type">
+ <div class="form-group required">
+ <label class="control-label">Select resource manager type</label>
+ <select name="resourceJobManagerType" class="form-control selected-resource-manager"
+ required="required">
+ @foreach( $resourceJobManagerTypes as $index => $rJmT)
+ <option value="{{ $index }}"
+ @if( isset( $JSInterface) )
+ @if( $JSInterface->resourceJobManager->resourceJobManagerType == $index ) selected @endif
+ @endif >
+ {{ $rJmT }}</option>
@endforeach
- </div>
- <div class="form-group">
- <h3>Parallelism Prefixes</h3>
- @foreach( $parallelismTypes as $index => $pt)
- <label class="control-label">{{ $pt }}</label>
- <input class="form-control" name="parallelismPrefix[{{ $index }}]" placeholder="{{ $pt }}"
- value="@if( isset( $JSI->resourceJobManager->parallelismPrefix[$index] ) ){{$JSI->resourceJobManager->parallelismPrefix[$index]}}@endif"/>
- @endforeach
- </div>
+ </select>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Push Monitoring End Point</label>
+ <input type="text" class="form-control" name="pushMonitoringEndpoint"
+ @if( isset( $JSInterface) )
+ value="{{ $JSInterface->resourceJobManager->pushMonitoringEndpoint }}"
+ @endif />
+ </div>
+ <div class="form-group">
+ <label class="control-label">Job Manager Bin Path</label>
+ <input type="text" class="form-control" name="jobManagerBinPath"
+ @if( isset( $JSInterface) )
+ value="{{ $JSInterface->resourceJobManager->jobManagerBinPath }}"
+ @endif />
+ </div>
+ <div class="form-group">
+ <h3>Job Manager Commands</h3>
+ @foreach( $jobManagerCommands as $index => $jmc)
+ <label class="control-label">{{ $jmc }}</label>
+ <input class="form-control" name="jobManagerCommands[{{ $index }}]" placeholder="{{ $jmc }}"
+ value="@if( isset( $JSInterface->resourceJobManager->jobManagerCommands[$index] ) ){{$JSInterface->resourceJobManager->jobManagerCommands[$index]}}@endif"/>
+ @endforeach
+ </div>
+ <div class="form-group">
+ <h3>Parallelism Prefixes</h3>
+ @foreach( $parallelismTypes as $index => $pt)
+ <label class="control-label">{{ $pt }}</label>
+ <input class="form-control" name="parallelismPrefix[{{ $index }}]" placeholder="{{ $pt }}"
+ value="@if( isset( $JSInterface->resourceJobManager->parallelismPrefix[$index] ) ){{$JSInterface->resourceJobManager->parallelismPrefix[$index]}}@endif"/>
+ @endforeach
</div>
- @endif
-@endif
\ No newline at end of file
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f1d354f5/app/views/resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php
index dbc33fe..f55fddb 100644
--- a/app/views/resource/edit.blade.php
+++ b/app/views/resource/edit.blade.php
@@ -13,562 +13,562 @@
@include( 'partials/dashboard-block')
<div id="page-wrapper">
-<div class="container-fluid">
-<div class="col-md-offset-1 col-md-10 compute-resource-properties">
-
-<input type="hidden" class="base-url" value="{{URL::to('/')}}"/>
-
-<ol class="breadcrumb">
- <li><a href="{{URL::to('/')}}/cr/browse">Compute Resources</a></li>
- <li class="active">{{ $computeResource->hostName }}</li>
-</ol>
-@if( Session::has("message"))
-<span class="alert alert-success col-md-12">{{Session::get("message")}}</span>
-{{Session::forget("message") }}
-@endif
+ <div class="container-fluid">
+ <div class="col-md-offset-1 col-md-10 compute-resource-properties">
+
+ <input type="hidden" class="base-url" value="{{URL::to('/')}}"/>
+
+ <ol class="breadcrumb">
+ <li><a href="{{URL::to('/')}}/cr/browse">Compute Resources</a></li>
+ <li class="active">{{ $computeResource->hostName }}</li>
+ </ol>
+ @if( Session::has("message"))
+ <span class="alert alert-success col-md-12">{{Session::get("message")}}</span>
+ {{Session::forget("message") }}
+ @endif
-<div class="col-md-12">
- <ul class="nav nav-tabs nav-justified" id="tabs" role="tablist">
- <li class="active"><a href="#tab-desc" data-toggle="tab">Description</a></li>
- <li><a href="#tab-queues" data-toggle="tab">Queues</a></a></li>
- <li><a href="#tab-filesystem" data-toggle="tab">FileSystem</a></li>
- <li><a href="#tab-jobSubmission" data-toggle="tab">Job Submission Interfaces</a></li>
- <li><a href="#tab-dataMovement" data-toggle="tab">Data Movement Interfaces</a></li>
- <li><a href="#tab-reporting" data-toggle="tab">Reporting</a></li>
- </ul>
-</div>
+ <div class="col-md-12">
+ <ul class="nav nav-tabs nav-justified" id="tabs" role="tablist">
+ <li class="active"><a href="#tab-desc" data-toggle="tab">Description</a></li>
+ <li><a href="#tab-queues" data-toggle="tab">Queues</a></li>
+ <li><a href="#tab-filesystem" data-toggle="tab">FileSystem</a></li>
+ <li><a href="#tab-jobSubmission" data-toggle="tab">Job Submission Interfaces</a></li>
+ <li><a href="#tab-dataMovement" data-toggle="tab">Data Movement Interfaces</a></li>
+ <li><a href="#tab-reporting" data-toggle="tab">Reporting</a></li>
+ </ul>
+ </div>
-<div class="tab-content col-md-12">
+ <div class="tab-content col-md-12">
-<div class="tab-pane active" id="tab-desc">
+ <div class="tab-pane active" id="tab-desc">
- <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
- <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
- <input type="hidden" name="cr-edit" value="resDesc"/>
+ <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
+ <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
+ <input type="hidden" name="cr-edit" value="resDesc"/>
- <div class="form-group required">
- <label class="control-label">Host Name</label>
- <input class="form-control hostName" value="{{ $computeResource->hostName }}" maxlength="100"
- name="hostname" required="required"/>
- </div>
- <div class="form-group">
- <label class="control-label">Host Aliases</label>
- @if( count( $computeResource->hostAliases) )
- @foreach( $computeResource->hostAliases as $hostAlias )
- <input class="form-control" value="{{$hostAlias}}" maxlength="30" name="hostaliases[]"/>
- @endforeach
- @else
- <input class="form-control" value="" maxlength="30" name="hostaliases[]"/>
- @endif
- <button type="button" class="btn btn-sm btn-default add-alias">Add Aliases</button>
- </div>
- <div class="form-group">
- <label class="control-label">IP Addresses</label>
- @if( count( $computeResource->ipAddresses))
- @foreach( $computeResource->ipAddresses as $ip )
- <input class="form-control" value="{{ $ip }}" maxlength="30" name="ips[]"/>
- @endforeach
- @else
- <input class="form-control" value="" maxlength="30" name="ips[]"/>
- @endif
- <button type="button" class="btn btn-sm btn-default add-ip">Add IP Addresses</button>
- </div>
- <div class="form-group">
- <label class="control-label">Resource Description</label>
- <textarea class="form-control" maxlength="255" name="description">{{ $computeResource->resourceDescription
- }}</textarea>
- </div>
- <div class="form-group">
- <label class="control-label">Maximum Memory Per Node ( In MB )</label>
- <input type="number" min="0" class="form-control" value="{{ $computeResource->maxMemoryPerNode }}"
- maxlength="30" name="maxMemoryPerNode"/>
- </div>
- <div class="form-group">
- <input type="submit" class="btn btn-primary" name="step1" value="Save changes"/>
- </div>
+ <div class="form-group required">
+ <label class="control-label">Host Name</label>
+ <input class="form-control hostName" value="{{ $computeResource->hostName }}" maxlength="100"
+ name="hostname" required="required"/>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Host Aliases</label>
+ @if( count( $computeResource->hostAliases) )
+ @foreach( $computeResource->hostAliases as $hostAlias )
+ <input class="form-control" value="{{$hostAlias}}" maxlength="30" name="hostaliases[]"/>
+ @endforeach
+ @else
+ <input class="form-control" value="" maxlength="30" name="hostaliases[]"/>
+ @endif
+ <button type="button" class="btn btn-sm btn-default add-alias">Add Aliases</button>
+ </div>
+ <div class="form-group">
+ <label class="control-label">IP Addresses</label>
+ @if( count( $computeResource->ipAddresses))
+ @foreach( $computeResource->ipAddresses as $ip )
+ <input class="form-control" value="{{ $ip }}" maxlength="30" name="ips[]"/>
+ @endforeach
+ @else
+ <input class="form-control" value="" maxlength="30" name="ips[]"/>
+ @endif
+ <button type="button" class="btn btn-sm btn-default add-ip">Add IP Addresses</button>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Resource Description</label>
+ <textarea class="form-control" maxlength="255" name="description">{{ $computeResource->resourceDescription
+ }}</textarea>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Maximum Memory Per Node ( In MB )</label>
+ <input type="number" min="0" class="form-control" value="{{ $computeResource->maxMemoryPerNode }}"
+ maxlength="30" name="maxMemoryPerNode"/>
+ </div>
+ <div class="form-group">
+ <input type="submit" class="btn btn-primary" name="step1" value="Save changes"/>
+ </div>
- </form>
+ </form>
-</div>
+ </div>
-<div class="tab-pane" id="tab-queues">
+ <div class="tab-pane" id="tab-queues">
- @if( is_array( $computeResource->batchQueues) )
- <h3>Existing Queues :</h3>
+ @if( is_array( $computeResource->batchQueues) )
+ <h3>Existing Queues :</h3>
- <div class="panel-group" id="accordion">
- @foreach( $computeResource->batchQueues as $index => $queue)
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
- <a class="accordion-toggle collapsed existing-queue-name" data-toggle="collapse"
- data-parent="#accordion" href="#collapse-{{$index}}">{{ $queue->queueName }}</a>
+ <div class="panel-group" id="accordion">
+ @foreach( $computeResource->batchQueues as $index => $queue)
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle collapsed existing-queue-name" data-toggle="collapse"
+ data-parent="#accordion" href="#collapse-{{$index}}">{{ $queue->queueName }}</a>
- <div class="pull-right col-md-1">
- <span class="glyphicon glyphicon-trash delete-queue" style="cursor:pointer;" data-toggle="modal"
- data-target="#delete-queue" data-queue-name="{{ $queue->queueName }}"></span>
+ <div class="pull-right col-md-1">
+ <span class="glyphicon glyphicon-trash delete-queue" style="cursor:pointer;" data-toggle="modal"
+ data-target="#delete-queue" data-queue-name="{{ $queue->queueName }}"></span>
+ </div>
+ </h4>
+ </div>
+ <div id="collapse-{{$index}}" class="panel-collapse collapse">
+ <div class="panel-body">
+ <form role="form" method="POST" action="{{ URL::to('/')}}/cr/edit">
+ <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
+
+ <div class="queue">
+ <input type="hidden" name="cr-edit" value="queue"/>
+
+ <div class="form-group required">
+ <label class="control-label">Queue Name
+ <small> ( cannot be changed.)</small>
+ </label>
+ <input class="form-control" value="{{ $queue->queueName }}" maxlength="30" name="qname"
+ placeholder="Queue Name" readonly/>
+ </div>
+ @include('partials/queue-block', array('queueData'=>$queue))
+ <div class="form-group">
+ <input type="submit" min="0" class="btn" name="step1" value="Update"/>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ @endforeach
+ </div>
+ @endif
+ <div class="queue-block hide">
+ <form role="form" method="POST" action="{{ URL::to('/')}}/cr/edit">
+ <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
+
+ <div class="queue">
+ <div class="queue">
+ <input type="hidden" name="cr-edit" value="queue"/>
+
+ <div class="form-group required">
+ <label class="control-label">Queue Name
+ <small> ( A queue name is unique and cannot be changed later.)</small>
+ </label>
+ <input class="form-control create-queue-name" maxlength="30" name="qname"
+ placeholder="Queue Name" required="required"/>
+ </div>
+ @include('partials/queue-block')
+
+ </div>
+ <div class="form-group">
+ <input type="button" class="btn create-queue-form btn-primary" name="step1" value="Create"/>
+ <input type="reset" class="btn btn-success" value="Reset"/>
+ </div>
+ </div>
+ </form>
+ </div>
+ <div class="form-group well add-queue-block">
+ <button type="button" class="btn btn-sm btn-default add-queue">Add a Queue</button>
</div>
- </h4>
- </div>
- <div id="collapse-{{$index}}" class="panel-collapse collapse">
- <div class="panel-body">
- <form role="form" method="POST" action="{{ URL::to('/')}}/cr/edit">
- <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
- <div class="queue">
- <input type="hidden" name="cr-edit" value="queue"/>
+ </div>
- <div class="form-group required">
- <label class="control-label">Queue Name
- <small> ( cannot be changed.)</small>
- </label>
- <input class="form-control" value="{{ $queue->queueName }}" maxlength="30" name="qname"
- placeholder="Queue Name" readonly/>
- </div>
- @include('partials/queue-block', array('queueData'=>$queue))
- <div class="form-group">
- <input type="submit" min="0" class="btn" name="step1" value="Update"/>
- </div>
+ <div class="tab-pane" id="tab-filesystem">
+
+ <form role="form" method="POST" action="{{URL::to('/')}}/cr/edit">
+ <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
+ <input type="hidden" name="cr-edit" value="fileSystems"/>
+
+ <div class="form-group">
+ <h3>FileSystem</h3>
+ @foreach( $fileSystems as $index => $fileSystem)
+ <label class="control-label">{{ $fileSystem }}</label>
+ <input class="form-control" name="fileSystems[{{ $index }}]" placeholder="{{ $fileSystem }}"
+ value="@if( isset( $computeResource->fileSystems[ $index]) ){{ $computeResource->fileSystems[ $index] }} @endif"/>
+ @endforeach
+ </div>
+ <div class="form-group">
+ <button class="btn btn-prim">Update</button>
</div>
</form>
+
</div>
- </div>
- </div>
- @endforeach
- </div>
- @endif
- <div class="queue-block hide">
- <form role="form" method="POST" action="{{ URL::to('/')}}/cr/edit">
- <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
- <div class="queue">
- <div class="queue">
- <input type="hidden" name="cr-edit" value="queue"/>
+ <div class="tab-pane" id="tab-jobSubmission">
- <div class="form-group required">
- <label class="control-label">Queue Name
- <small> ( A queue name is unique and cannot be changed later.)</small>
- </label>
- <input class="form-control create-queue-name" maxlength="30" name="qname"
- placeholder="Queue Name" required="required"/>
+ <div class="form-group">
+ <div class="job-submission-info row hide"></div>
+ <button type="button" class="btn btn-sm btn-default add-job-submission">Add a new Job Submission Interface
+ </button>
+ @if( count( $jobSubmissionInterfaces ) > 1)
+ <button type="button" class="btn btn-sm btn-default update-priority" data-type="jsi" data-toggle="modal"
+ data-target="#update-jsi-priority">Update Priority
+ </button>
+ @endif
</div>
- @include('partials/queue-block')
- </div>
- <div class="form-group">
- <input type="button" class="btn create-queue-form btn-primary" name="step1" value="Create"/>
- <input type="reset" class="btn btn-success" value="Reset"/>
- </div>
- </div>
- </form>
- </div>
- <div class="form-group well add-queue-block">
- <button type="button" class="btn btn-sm btn-default add-queue">Add a Queue</button>
- </div>
+ @if( count( $jobSubmissionInterfaces ) > 0)
+ <div class="job-edit-info">
+ @foreach( $jobSubmissionInterfaces as $index => $JSI )
+ <div class="job-protocol-block">
+ <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
+ <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
+ <input type="hidden" name="cr-edit" value="edit-jsp"/>
+ <input type="hidden" name="jsiId" value="{{ $JSI->jobSubmissionInterfaceId }}"/>
+ <?php $selectedJspIndex = $computeResource->jobSubmissionInterfaces[$index]->jobSubmissionProtocol; ?>
+
+ <h4>Job Submission Protocol : {{ $jobSubmissionProtocols[ $selectedJspIndex] }}
+ <button type='button' class='close delete-jsi' data-toggle="modal" data-target="#confirm-delete-jsi"
+ data-jsi-id="{{ $JSI->jobSubmissionInterfaceId }}">
+ <span class="glyphicon glyphicon-trash delete-jsi" data-toggle="modal"
+ data-target="#confirm-delete-jsi"
+ data-jsi-id="{{ $JSI->jobSubmissionInterfaceId }}"></span>
+ </button>
+ </h4>
+ <input type="hidden" name="jobSubmissionProtocol" value="{{ $selectedJspIndex }}"/>
+ @if( $selectedJspIndex == $jobSubmissionProtocolsObject::LOCAL)
+ @include( 'partials/resource-job-manager', array(
+ "resourceJobManagerTypes" => $resourceJobManagerTypes,
+ "JSInterface" => $JSI,
+ "jobManagerCommands" => $jobManagerCommands,
+ "parallelismTypes" => $parallelismTypes
+ )
+ )
+ @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::SSH || $selectedJspIndex == $jobSubmissionProtocolsObject::SSH_FORK)
+ <div class="form-group required">
+ <label class="control-label">Select Security Protocol</label>
+ <select name="securityProtocol" required="required">
+ @foreach( $securityProtocols as $index => $sp)
+ <option value="{{ $index }}"
+ @if( $JSI->securityProtocol == $index ) selected @endif>{{ $sp }}</option>
+ @endforeach
+ </select>
+ </div>
+
+ <div class="form-group">
+ <label class="control-label">Alternate SSH Host Name</label>
+ <input class='form-control' name='alternativeSSHHostName'
+ value="{{ $JSI->alternativeSSHHostName}}"/>
+ </div>
+ <div class="form-group">
+ <label class="control-label">SSH Port</label>
+ <input class='form-control' name='sshPort' value="{{ $JSI->sshPort }}"/>
+ </div>
+
+ <div class="form-group required">
+ <label class="control-label">Select Monitoring Mode</label>
+ <select name="monitorMode" required>
+ @foreach( $monitorModes as $index => $mode)
+ <option value="{{ $index }}"
+ @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</option>
+ @endforeach
+ </select>
+ </div>
+
+ <div class="form-group">
+ @include( 'partials/resource-job-manager', array(
+ "resourceJobManagerTypes" => $resourceJobManagerTypes,
+ "JSInterface" => $JSI,
+ "jobManagerCommands" => $jobManagerCommands,
+ "parallelismTypes" => $parallelismTypes
+ )
+ )
+
+ </div>
+
+ @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::UNICORE)
+ <div class="form-group required">
+ <label class="control-label">Select Security Protocol</label>
+ <select name="securityProtocol" required="required">
+ @foreach( $securityProtocols as $index => $sp)
+ <option value="{{ $index }}"
+ @if( $JSI->securityProtocol == $index ) selected @endif>{{ $sp }}</option>
+ @endforeach
+ </select>
+ </div>
+ <div class="form-group">
+ <label class="form-label">Unicore End Point URL</label>
+ <input class='form-control' name='unicoreEndPointURL' value="{{ $JSI->unicoreEndPointURL }}"/>
+ </div>
+ @endif
+
+ <div class="form-group">
+ <button type="submit" class="btn">Update</button>
+ </div>
+ </form>
-</div>
+ </div>
+ @endforeach
+ </div>
+ @endif
-<div class="tab-pane" id="tab-filesystem">
+ <div class="select-job-protocol hide">
+ <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
+ <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
+ <input type="hidden" name="cr-edit" value="jsp"/>
- <form role="form" method="POST" action="{{URL::to('/')}}/cr/edit">
- <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
- <input type="hidden" name="cr-edit" value="fileSystems"/>
+ <div class="form-group">
+ <label class="control-label">Job Submission Protocol:</label>
+ <select name="jobSubmissionProtocol" class="form-control selected-job-protocol" required="required">
+ <option></option>
+ @foreach( $jobSubmissionProtocols as $index => $jobSubmissionProtocol)
+ @if( ! in_array( $index, $addedJSP))
+ <option value="{{ $index }}">{{ $jobSubmissionProtocol }}</option>
+ @endif
+ @endforeach
+ </select>
+ </div>
- <div class="form-group">
- <h3>FileSystem</h3>
- @foreach( $fileSystems as $index => $fileSystem)
- <label class="control-label">{{ $fileSystem }}</label>
- <input class="form-control" name="fileSystems[{{ $index }}]" placeholder="{{ $fileSystem }}"
- value="@if( isset( $computeResource->fileSystems[ $index]) ){{ $computeResource->fileSystems[ $index] }} @endif"/>
- @endforeach
- </select>
- </div>
- <div class="form-group">
- <button class="btn btn-prim">Update</button>
- </div>
- </form>
+ <div class="form-group">
+ <button type="submit" class="btn btn-primary jspSubmit hide">Add Job Submission Protocol</button>
+ </div>
+ </form>
+ </div>
-</div>
+ </div>
-<div class="tab-pane" id="tab-jobSubmission">
-
- <div class="form-group">
- <div class="job-submission-info row hide"></div>
- <button type="button" class="btn btn-sm btn-default add-job-submission">Add a new Job Submission Interface
- </button>
- @if( count( $jobSubmissionInterfaces ) > 1)
- <button type="button" class="btn btn-sm btn-default update-priority" data-type="jsi" data-toggle="modal"
- data-target="#update-jsi-priority">Update Priority
- </button>
- @endif
- </div>
+ <div class="tab-pane" id="tab-dataMovement">
- @if( count( $jobSubmissionInterfaces ) > 0)
- <div class="job-edit-info">
- @foreach( $jobSubmissionInterfaces as $index => $JSI )
- <div class="job-protocol-block">
- <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
- <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
- <input type="hidden" name="cr-edit" value="edit-jsp"/>
- <input type="hidden" name="jsiId" value="{{ $JSI->jobSubmissionInterfaceId }}"/>
- <?php $selectedJspIndex = $computeResource->jobSubmissionInterfaces[$index]->jobSubmissionProtocol; ?>
-
- <h4>Job Submission Protocol : {{ $jobSubmissionProtocols[ $selectedJspIndex] }}
- <button type='button' class='close delete-jsi' data-toggle="modal" data-target="#confirm-delete-jsi"
- data-jsi-id="{{ $JSI->jobSubmissionInterfaceId }}">
- <span class="glyphicon glyphicon-trash delete-jsi" data-toggle="modal"
- data-target="#confirm-delete-jsi"
- data-jsi-id="{{ $JSI->jobSubmissionInterfaceId }}"></span>
- </button>
- </h4>
- <input type="hidden" name="jobSubmissionProtocol" value="{{ $selectedJspIndex }}"/>
- @if( $selectedJspIndex == $jobSubmissionProtocolsObject::LOCAL)
- @include( 'partials/resource-job-manager', array(
- "resourceJobManagerTypes" => $resourceJobManagerTypes,
- "JSI" => $JSI,
- "jobManagerCommands" => $jobManagerCommands,
- "parallelismTypes" => $parallelismTypes
- )
- )
- @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::SSH || $selectedJspIndex == $jobSubmissionProtocolsObject::SSH_FORK)
- <div class="form-group required">
- <label class="control-label">Select Security Protocol</label>
- <select name="securityProtocol" required="required">
- @foreach( $securityProtocols as $index => $sp)
- <option value="{{ $index }}"
- @if( $JSI->securityProtocol == $index ) selected @endif>{{ $sp }}</option>
+ <div class="form-group">
+ <div class="data-movement-info row hide"></div>
+ <button type="button" class="btn btn-sm btn-default add-data-movement">Add a new Data Movement Interface
+ </button>
+ @if( count( $dataMovementInterfaces ) > 1)
+ <button type="button" class="btn btn-sm btn-default update-priority" data-type="dmi" data-toggle="modal"
+ data-target="#update-dmi-priority">Update Priority
+ </button>
+ @endif
+ </div>
+
+ @if( count( $dataMovementInterfaces ) )
+ <div class="job-edit-info">
+ @foreach( $dataMovementInterfaces as $index => $DMI )
+ <div class="data-movement-block">
+ <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
+ <input type="hidden" name="crId" class="crId" value="{{Input::get('crId') }}"/>
+ <input type="hidden" name="cr-edit" value="edit-dmi"/>
+ <input type="hidden" name="dmiId" value="{{ $DMI->dataMovementInterfaceId }}"/>
+
+ <?php $selectedDMIIndex = $computeResource->dataMovementInterfaces[$index]->dataMovementProtocol; ?>
+
+ <h4>Data Movement Protocol : {{ $dataMovementProtocols[ $selectedDMIIndex] }}
+ <button type='button' class='close delete-dmi' data-toggle="modal" data-target="#confirm-delete-dmi"
+ data-dmi-id="{{ $DMI->dataMovementInterfaceId }}">
+ <span class="glyphicon glyphicon-trash delete-dmi" data-toggle="modal"
+ data-target="#confirm-delete-dmi"
+ data-dmi-id="{{ $DMI->dataMovementInterfaceId }}"></span>
+ </button>
+ </h4>
+ <input type="hidden" name="dataMovementProtocol" value="{{ $selectedDMIIndex }}"/>
+ @if( $selectedDMIIndex == $dataMovementProtocolsObject::LOCAL)
+ <!-- Nothing here on local UI -->
+ @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::SCP)
+ <div class="form-group">
+ <label class="control-label">Select Security Protocol</label>
+ <select name="securityProtocol">
+ @foreach( $securityProtocols as $index => $sp)
+ <option value="{{ $index }}"
+ @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option>
+ @endforeach
+ </select>
+ </div>
+
+ <div class="form-group">
+ <label class="control-label">Alternate SSH Host Name</label>
+ <input class='form-control' name='alternativeSSHHostName'
+ value="{{ $DMI->alternativeSCPHostName }}"/>
+ </div>
+ <div class="form-group">
+ <label class="control-label">SSH Port</label>
+ <input class='form-control' name='sshPort' value="{{ $DMI->sshPort }}"/>
+ </div>
+ <div class="form-group">
+ <button type="submit" class="btn">Update</button>
+ </div>
+ @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::GridFTP)
+ <div class="form-group">
+ <label class="control-label">Select Security Protocol</label>
+ <select name="securityProtocol">
+ @foreach( $securityProtocols as $index => $sp)
+ <option value="{{ $index }}"
+ @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option>
+ @endforeach
+ </select>
+ </div>
+
+ <div>
+ <div class="form-group required">
+ <label class="control-label">Grid FTP End Points</label>
+ @foreach( $DMI->gridFTPEndPoints as $endPoint)
+ <input class="form-control" maxlength="30" name="gridFTPEndPoints[]" required="required"
+ value="{{$endPoint}}"/>
+ @endforeach
+ <button type="button" class="btn btn-sm btn-default add-gridFTPEndPoint">Add More Grid FTP
+ End Points
+ </button>
+ </div>
+ </div>
+ <div class="form-group">
+ <button type="submit" class="btn">Update</button>
+ </div>
+ @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::UNICORE_STORAGE_SERVICE)
+ <div class="form-group">
+ <label class="control-label">Select Security Protocol</label>
+ <select name="securityProtocol">
+ @foreach( $securityProtocols as $index => $sp)
+ <option value="{{ $index }}"
+ @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option>
+ @endforeach
+ </select>
+ </div>
+
+ <div>
+ <div class="form-group required">
+ <label class="control-label">Unicore End Point URL</label>
+ <input class="form-control" maxlength="30" name="unicoreEndPointURL" required="required"
+ value="{{ $DMI->unicoreEndPointURL }}"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <button type="submit" class="btn">Update</button>
+ </div>
+ @endif
+ </form>
+ </div>
@endforeach
- </select>
- </div>
+ </div>
+ @endif
+ <div class="select-data-movement hide">
+
+ <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
+ <input type="hidden" name="crId" class="crId" value="{{Input::get('crId') }}"/>
+ <input type="hidden" name="cr-edit" value="dmp"/>
+ <h4>
+ Select the Data Movement Protocol
+ </h4>
+
+ <select name="dataMovementProtocol" class="form-control selected-data-movement-protocol">
+ <option></option>
+ @foreach( $dataMovementProtocols as $index => $dmp)
+ //GridFTP and SFTP not supported in Airavata backend. Therefore commenting out from UI
+ @if( ! in_array( $index, $addedDMI) && $dmp!="GridFTP" && $dmp!="SFTP")
+ <option value="{{ $index }}">{{ $dmp }}</option>
+ @endif
+ @endforeach
+ </select>
- <div class="form-group">
- <label class="control-label">Alternate SSH Host Name</label>
- <input class='form-control' name='alternativeSSHHostName'
- value="{{ $JSI->alternativeSSHHostName}}"/>
- </div>
- <div class="form-group">
- <label class="control-label">SSH Port</label>
- <input class='form-control' name='sshPort' value="{{ $JSI->sshPort }}"/>
- </div>
+ <div class="form-group">
+ <button type="submit" class="btn btn-primary dmpSubmit hide">Add Data Movement Protocol</button>
+ </div>
- <div class="form-group required">
- <label class="control-label">Select Monitoring Mode</label>
- <select name="monitorMode" required>
- @foreach( $monitorModes as $index => $mode)
- <option value="{{ $index }}"
- @if( $JSI->monitorMode == $index ) selected @endif>{{ $mode}}</option>
- @endforeach
- </select>
- </div>
+ </form>
- <div class="form-group">
- @include( 'partials/resource-job-manager', array(
- "resourceJobManagerTypes" => $resourceJobManagerTypes,
- "JSI" => $JSI,
- "jobManagerCommands" => $jobManagerCommands,
- "parallelismTypes" => $parallelismTypes
- )
- )
-
- </div>
+ </div>
- @elseif( $selectedJspIndex == $jobSubmissionProtocolsObject::UNICORE)
- <div class="form-group required">
- <label class="control-label">Select Security Protocol</label>
- <select name="securityProtocol" required="required">
- @foreach( $securityProtocols as $index => $sp)
- <option value="{{ $index }}"
- @if( $JSI->securityProtocol == $index ) selected @endif>{{ $sp }}</option>
- @endforeach
- </select>
- </div>
- <div class="form-group">
- <label class="form-label">Unicore End Point URL</label>
- <input class='form-control' name='unicoreEndPointURL' value="{{ $JSI->unicoreEndPointURL }}"/>
</div>
- @endif
- <div class="form-group">
- <button type="submit" class="btn">Update</button>
- </div>
- </form>
- </div>
- @endforeach
- </div>
- @endif
- <div class="select-job-protocol hide">
- <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
- <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
- <input type="hidden" name="cr-edit" value="jsp"/>
-
- <div class="form-group">
- <label class="control-label">Job Submission Protocol:</label>
- <select name="jobSubmissionProtocol" class="form-control selected-job-protocol" required="required">
- <option></option>
- @foreach( $jobSubmissionProtocols as $index => $jobSubmissionProtocol)
- @if( ! in_array( $index, $addedJSP))
- <option value="{{ $index }}">{{ $jobSubmissionProtocol }}</option>
- @endif
- @endforeach
- </select>
- </div>
+ <div class="tab-pane" id="tab-reporting">
+
+ <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
+ <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
+ <input type="hidden" name="cr-edit" value="enableReporting"/>
+
+ <div class="form-group required">
+ <div class="checkbox">
+ <input type="checkbox" name="gatewayUsageReporting" class="enable-gateway-check" @if( $computeResource->gatewayUsageReporting == true) checked value="1" @else value="0" @endif>
+ <label class="control-label">Enable Gateway Usage Reporting</label>
+ </div>
+
+ </div>
+
+ <div class="gateway-commands">
+ <div class="form-group required">
+ <label class="control-label">Gateway Module Load Command</label>
+ <input class="form-control hostName" name="gatewayUsageModuleLoadCommand" value="{{ $computeResource->gatewayUsageModuleLoadCommand }}" maxlength="100"
+ name="hostname" required="required" @if( $computeResource->gatewayUsageReporting != true) disabled @endif/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Gateway Usage Executable</label>
+ <input class="form-control hostName" name="gatewayUsageExecutable" value="{{ $computeResource->gatewayUsageExecutable }}" maxlength="100"
+ name="hostname" required="required" @if( $computeResource->gatewayUsageReporting != true) disabled @endif/>
+ </div>
+ </div>
+ <div class="form-group">
+ <input type="submit" class="btn btn-primary" value="Save changes"/>
+ </div>
+
+ </form>
+
+ </div>
+
- <div class="form-group">
- <button type="submit" class="btn btn-primary jspSubmit hide">Add Job Submission Protocol</button>
</div>
- </form>
- </div>
-</div>
-<div class="tab-pane" id="tab-dataMovement">
-
- <div class="form-group">
- <div class="data-movement-info row hide"></div>
- <button type="button" class="btn btn-sm btn-default add-data-movement">Add a new Data Movement Interface
- </button>
- @if( count( $dataMovementInterfaces ) > 1)
- <button type="button" class="btn btn-sm btn-default update-priority" data-type="dmi" data-toggle="modal"
- data-target="#update-dmi-priority">Update Priority
- </button>
- @endif
- </div>
+ <div class="resource-manager-block hide">
+ @include( 'partials/resource-job-manager', array(
+ "resourceJobManagerTypes" => $resourceJobManagerTypes,
+ "jobManagerCommands" => $jobManagerCommands,
+ "parallelismTypes" => $parallelismTypes
+ )
+ )
+ </div>
- @if( count( $dataMovementInterfaces ) )
- <div class="job-edit-info">
- @foreach( $dataMovementInterfaces as $index => $DMI )
- <div class="data-movement-block">
- <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
- <input type="hidden" name="crId" class="crId" value="{{Input::get('crId') }}"/>
- <input type="hidden" name="cr-edit" value="edit-dmi"/>
- <input type="hidden" name="dmiId" value="{{ $DMI->dataMovementInterfaceId }}"/>
-
- <?php $selectedDMIIndex = $computeResource->dataMovementInterfaces[$index]->dataMovementProtocol; ?>
-
- <h4>Data Movement Protocol : {{ $dataMovementProtocols[ $selectedDMIIndex] }}
- <button type='button' class='close delete-dmi' data-toggle="modal" data-target="#confirm-delete-dmi"
- data-dmi-id="{{ $DMI->dataMovementInterfaceId }}">
- <span class="glyphicon glyphicon-trash delete-dmi" data-toggle="modal"
- data-target="#confirm-delete-dmi"
- data-dmi-id="{{ $DMI->dataMovementInterfaceId }}"></span>
- </button>
- </h4>
- <input type="hidden" name="dataMovementProtocol" value="{{ $selectedDMIIndex }}"/>
- @if( $selectedDMIIndex == $dataMovementProtocolsObject::LOCAL)
- <!-- Nothing here on local UI -->
- @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::SCP)
- <div class="form-group">
- <label class="control-label">Select Security Protocol</label>
- <select name="securityProtocol">
+ <div class="ssh-block hide">
+ <div class="form-group required">
+ <label class="control-label">Select Security Protocol </label>
+ <select name="securityProtocol" required>
@foreach( $securityProtocols as $index => $sp)
- <option value="{{ $index }}"
- @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option>
+ <option value="{{ $index }}">{{ $sp }}</option>
@endforeach
</select>
</div>
- <div class="form-group">
+ <!-- <div class="form-group required">-->
+ <!-- <label class="control-label">Select Monitoring Mode </label>-->
+ <!-- <select name="monitorMode" required>-->
+ <!-- @foreach( $monitorModes as $index => $mode)-->
+ <!-- <option value="{{ $index }}">{{ $mode}}</option>-->
+ <!-- @endforeach-->
+ <!-- </select>-->
+ <!-- </div>-->
+
+ <div class="form-group addedScpValue hide">
<label class="control-label">Alternate SSH Host Name</label>
- <input class='form-control' name='alternativeSSHHostName'
- value="{{ $DMI->alternativeSCPHostName }}"/>
+ <input class='form-control' name='alternativeSSHHostName'/>
</div>
- <div class="form-group">
+ <div class="form-group addedScpValue hide">
<label class="control-label">SSH Port</label>
- <input class='form-control' name='sshPort' value="{{ $DMI->sshPort }}"/>
+ <input class='form-control' name='sshPort'/>
</div>
+ </div>
+
+ <div class="cloud-block hide">
<div class="form-group">
- <button type="submit" class="btn">Update</button>
+ <label class="control-label">Node Id</label>
+ <input class="form-control" name="nodeId" placeholder="nodId"/>
</div>
- @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::GridFTP)
<div class="form-group">
- <label class="control-label">Select Security Protocol</label>
- <select name="securityProtocol">
- @foreach( $securityProtocols as $index => $sp)
- <option value="{{ $index }}"
- @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option>
- @endforeach
- </select>
- </div>
-
- <div>
- <div class="form-group required">
- <label class="control-label">Grid FTP End Points</label>
- @foreach( $DMI->gridFTPEndPoints as $endPoint)
- <input class="form-control" maxlength="30" name="gridFTPEndPoints[]" required="required"
- value="{{$endPoint}}"/>
- @endforeach
- <button type="button" class="btn btn-sm btn-default add-gridFTPEndPoint">Add More Grid FTP
- End Points
- </button>
- </div>
+ <label class="control-label">Node Id</label>
+ <input class="form-control" name="nodeId" placeholder="nodId"/>
</div>
<div class="form-group">
- <button type="submit" class="btn">Update</button>
+ <label class="control-label">Executable Type</label>
+ <input class="form-control" name="nodeId" placeholder="executableType"/>
</div>
- @elseif( $selectedDMIIndex == $dataMovementProtocolsObject::UNICORE_STORAGE_SERVICE)
<div class="form-group">
- <label class="control-label">Select Security Protocol</label>
- <select name="securityProtocol">
- @foreach( $securityProtocols as $index => $sp)
- <option value="{{ $index }}"
- @if( $DMI->securityProtocol == $index ) selected @endif>{{ $sp }}</option>
- @endforeach
+ <label class="control-label">Select Provider Name</label>
+ <select class="form-control">
+ <option name="EC2">EC2</option>
+ <option name="AWSEC2">AWEC2</option>
+ <option name="RACKSPACE">RACKSPACE</option>
</select>
</div>
-
- <div>
- <div class="form-group required">
- <label class="control-label">Unicore End Point URL</label>
- <input class="form-control" maxlength="30" name="unicoreEndPointURL" required="required"
- value="{{ $DMI->unicoreEndPointURL }}"/>
- </div>
- </div>
- <div class="form-group">
- <button type="submit" class="btn">Update</button>
- </div>
- @endif
- </form>
- </div>
- @endforeach
- </div>
- @endif
- <div class="select-data-movement hide">
-
- <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
- <input type="hidden" name="crId" class="crId" value="{{Input::get('crId') }}"/>
- <input type="hidden" name="cr-edit" value="dmp"/>
- <h4>
- Select the Data Movement Protocol
- </h4>
-
- <select name="dataMovementProtocol" class="form-control selected-data-movement-protocol">
- <option></option>
- @foreach( $dataMovementProtocols as $index => $dmp)
- //GridFTP and SFTP not supported in Airavata backend. Therefore commenting out from UI
- @if( ! in_array( $index, $addedDMI) && $dmp!="GridFTP" && $dmp!="SFTP")
- <option value="{{ $index }}">{{ $dmp }}</option>
- @endif
- @endforeach
- </select>
-
- <div class="form-group">
- <button type="submit" class="btn btn-primary dmpSubmit hide">Add Data Movement Protocol</button>
</div>
- </form>
-
- </div>
-
-</div>
-
-
-<div class="tab-pane" id="tab-reporting">
-
- <form role="form" method="POST" action="{{ URL::to('/') }}/cr/edit">
- <input type="hidden" name="crId" value="{{Input::get('crId') }}"/>
- <input type="hidden" name="cr-edit" value="enableReporting"/>
-
- <div class="form-group required">
- <div class="checkbox">
- <input type="checkbox" name="gatewayUsageReporting" class="enable-gateway-check" @if( $computeResource->gatewayUsageReporting == true) checked value="1" @else value="0" @endif>
- <label class="control-label">Enable Gateway Usage Reporting</label>
- </div>
-
- </div>
-
- <div class="gateway-commands">
- <div class="form-group required">
- <label class="control-label">Gateway Module Load Command</label>
- <input class="form-control hostName" name="gatewayUsageModuleLoadCommand" value="{{ $computeResource->gatewayUsageModuleLoadCommand }}" maxlength="100"
- name="hostname" required="required" @if( $computeResource->gatewayUsageReporting != true) disabled @endif/>
- </div>
- <div class="form-group required">
- <label class="control-label">Gateway Usage Executable</label>
- <input class="form-control hostName" name="gatewayUsageExecutable" value="{{ $computeResource->gatewayUsageExecutable }}" maxlength="100"
- name="hostname" required="required" @if( $computeResource->gatewayUsageReporting != true) disabled @endif/>
+ <div class="dm-gridftp hide">
+ <div class="form-group required">
+ <label class="control-label">Grid FTP End Points</label>
+ <input class="form-control" maxlength="30" name="gridFTPEndPoints[]" required/>
+ <button type="button" class="btn btn-sm btn-default add-gridFTPEndPoint">Add More Grid FTP End Points</button>
+ </div>
</div>
- </div>
- <div class="form-group">
- <input type="submit" class="btn btn-primary" value="Save changes"/>
- </div>
-
- </form>
-
-</div>
-
-
-</div>
-
-
-<div class="resource-manager-block hide">
-@include( 'partials/resource-job-manager', array(
- "resourceJobManagerTypes" => $resourceJobManagerTypes,
- "jobManagerCommands" => $jobManagerCommands,
- "parallelismTypes" => $parallelismTypes
- )
-)
-</div>
-
-<div class="ssh-block hide">
- <div class="form-group required">
- <label class="control-label">Select Security Protocol </label>
- <select name="securityProtocol" required>
- @foreach( $securityProtocols as $index => $sp)
- <option value="{{ $index }}">{{ $sp }}</option>
- @endforeach
- </select>
- </div>
-
-<!-- <div class="form-group required">-->
-<!-- <label class="control-label">Select Monitoring Mode </label>-->
-<!-- <select name="monitorMode" required>-->
-<!-- @foreach( $monitorModes as $index => $mode)-->
-<!-- <option value="{{ $index }}">{{ $mode}}</option>-->
-<!-- @endforeach-->
-<!-- </select>-->
-<!-- </div>-->
-
- <div class="form-group addedScpValue hide">
- <label class="control-label">Alternate SSH Host Name</label>
- <input class='form-control' name='alternativeSSHHostName'/>
- </div>
- <div class="form-group addedScpValue hide">
- <label class="control-label">SSH Port</label>
- <input class='form-control' name='sshPort'/>
- </div>
-</div>
-
-<div class="cloud-block hide">
- <div class="form-group">
- <label class="control-label">Node Id</label>
- <input class="form-control" name="nodeId" placeholder="nodId"/>
- </div>
- <div class="form-group">
- <label class="control-label">Node Id</label>
- <input class="form-control" name="nodeId" placeholder="nodId"/>
- </div>
- <div class="form-group">
- <label class="control-label">Executable Type</label>
- <input class="form-control" name="nodeId" placeholder="executableType"/>
- </div>
- <div class="form-group">
- <label class="control-label">Select Provider Name</label>
- <select class="form-control">
- <option name="EC2">EC2</option>
- <option name="AWSEC2">AWEC2</option>
- <option name="RACKSPACE">RACKSPACE</option>
- </select>
- </div>
-</div>
-
-<div class="dm-gridftp hide">
- <div class="form-group required">
- <label class="control-label">Grid FTP End Points</label>
- <input class="form-control" maxlength="30" name="gridFTPEndPoints[]" required/>
- <button type="button" class="btn btn-sm btn-default add-gridFTPEndPoint">Add More Grid FTP End Points</button>
- </div>
-</div>
<!--
<div class="form-group">
@@ -577,9 +577,10 @@
</div>
-->
+ </div>
+ </div>
</div>
-</div>
-</div>
+
</div>
<!-- modals -->
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f1d354f5/public/js/script.js
----------------------------------------------------------------------
diff --git a/public/js/script.js b/public/js/script.js
index ae697c2..b3e6732 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -102,7 +102,7 @@ $(document).ready( function(){
}
else if( selectedVal == "globus")
{
- alert("Globus Protool is not being setup right now. Please choose another option.");
+ alert("Globus Protocol is not being setup right now. Please choose another option.");
/*
$(this).parent().append( parentResDiv
+ $(".ssh-block").html()
[34/40] airavata-php-gateway git commit: fupdating thrift files
Posted by sc...@apache.org.
fupdating thrift 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/c17be855
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c17be855
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c17be855
Branch: refs/heads/master
Commit: c17be8554e19055368c17481bed249fc6f63b254
Parents: 1e1ed5d
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 25 13:06:57 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 25 13:06:57 2016 -0400
----------------------------------------------------------------------
.../Airavata/Model/Data/Replica/Types.php | 83 +++++++-------------
app/libraries/ExperimentUtilities.php | 10 +--
2 files changed, 32 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c17be855/app/libraries/Airavata/Model/Data/Replica/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Replica/Types.php b/app/libraries/Airavata/Model/Data/Replica/Types.php
index 03978b0..7fba287 100644
--- a/app/libraries/Airavata/Model/Data/Replica/Types.php
+++ b/app/libraries/Airavata/Model/Data/Replica/Types.php
@@ -40,13 +40,11 @@ final class ReplicaPersistentType {
}
final class DataProductType {
- const DIR = 0;
- const FILE = 1;
- const COLLECTION = 2;
+ const FILE = 0;
+ const COLLECTION = 1;
static public $__names = array(
- 0 => 'DIR',
- 1 => 'FILE',
- 2 => 'COLLECTION',
+ 0 => 'FILE',
+ 1 => 'COLLECTION',
);
}
@@ -68,10 +66,6 @@ class DataProductModel {
/**
* @var string
*/
- public $logicalPath = null;
- /**
- * @var string
- */
public $productName = null;
/**
* @var string
@@ -122,38 +116,34 @@ class DataProductModel {
'type' => TType::STRING,
),
4 => array(
- 'var' => 'logicalPath',
- 'type' => TType::STRING,
- ),
- 5 => array(
'var' => 'productName',
'type' => TType::STRING,
),
- 6 => array(
+ 5 => array(
'var' => 'productDescription',
'type' => TType::STRING,
),
- 7 => array(
+ 6 => array(
'var' => 'ownerName',
'type' => TType::STRING,
),
- 8 => array(
+ 7 => array(
'var' => 'dataProductType',
'type' => TType::I32,
),
- 9 => array(
+ 8 => array(
'var' => 'productSize',
'type' => TType::I32,
),
- 10 => array(
+ 9 => array(
'var' => 'creationTime',
'type' => TType::I64,
),
- 11 => array(
+ 10 => array(
'var' => 'lastModifiedTime',
'type' => TType::I64,
),
- 12 => array(
+ 11 => array(
'var' => 'productMetadata',
'type' => TType::MAP,
'ktype' => TType::STRING,
@@ -165,7 +155,7 @@ class DataProductModel {
'type' => TType::STRING,
),
),
- 13 => array(
+ 12 => array(
'var' => 'replicaLocations',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -186,9 +176,6 @@ class DataProductModel {
if (isset($vals['parentProductUri'])) {
$this->parentProductUri = $vals['parentProductUri'];
}
- if (isset($vals['logicalPath'])) {
- $this->logicalPath = $vals['logicalPath'];
- }
if (isset($vals['productName'])) {
$this->productName = $vals['productName'];
}
@@ -261,61 +248,54 @@ class DataProductModel {
break;
case 4:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->logicalPath);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::STRING) {
$xfer += $input->readString($this->productName);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 6:
+ case 5:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->productDescription);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 7:
+ case 6:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->ownerName);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 7:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->dataProductType);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 8:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->productSize);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 9:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 11:
+ case 10:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->lastModifiedTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 12:
+ case 11:
if ($ftype == TType::MAP) {
$this->productMetadata = array();
$_size0 = 0;
@@ -335,7 +315,7 @@ class DataProductModel {
$xfer += $input->skip($ftype);
}
break;
- case 13:
+ case 12:
if ($ftype == TType::LST) {
$this->replicaLocations = array();
$_size7 = 0;
@@ -381,43 +361,38 @@ class DataProductModel {
$xfer += $output->writeString($this->parentProductUri);
$xfer += $output->writeFieldEnd();
}
- if ($this->logicalPath !== null) {
- $xfer += $output->writeFieldBegin('logicalPath', TType::STRING, 4);
- $xfer += $output->writeString($this->logicalPath);
- $xfer += $output->writeFieldEnd();
- }
if ($this->productName !== null) {
- $xfer += $output->writeFieldBegin('productName', TType::STRING, 5);
+ $xfer += $output->writeFieldBegin('productName', TType::STRING, 4);
$xfer += $output->writeString($this->productName);
$xfer += $output->writeFieldEnd();
}
if ($this->productDescription !== null) {
- $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 6);
+ $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 5);
$xfer += $output->writeString($this->productDescription);
$xfer += $output->writeFieldEnd();
}
if ($this->ownerName !== null) {
- $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 7);
+ $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 6);
$xfer += $output->writeString($this->ownerName);
$xfer += $output->writeFieldEnd();
}
if ($this->dataProductType !== null) {
- $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 8);
+ $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 7);
$xfer += $output->writeI32($this->dataProductType);
$xfer += $output->writeFieldEnd();
}
if ($this->productSize !== null) {
- $xfer += $output->writeFieldBegin('productSize', TType::I32, 9);
+ $xfer += $output->writeFieldBegin('productSize', TType::I32, 8);
$xfer += $output->writeI32($this->productSize);
$xfer += $output->writeFieldEnd();
}
if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 10);
+ $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, 11);
+ $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 10);
$xfer += $output->writeI64($this->lastModifiedTime);
$xfer += $output->writeFieldEnd();
}
@@ -425,7 +400,7 @@ class DataProductModel {
if (!is_array($this->productMetadata)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 12);
+ $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 11);
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->productMetadata));
{
@@ -443,7 +418,7 @@ class DataProductModel {
if (!is_array($this->replicaLocations)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('replicaLocations', TType::LST, 13);
+ $xfer += $output->writeFieldBegin('replicaLocations', TType::LST, 12);
{
$output->writeListBegin(TType::STRUCT, count($this->replicaLocations));
{
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c17be855/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 5c3c9d4..9bb91c1 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -310,17 +310,15 @@ class ExperimentUtilities
}
$experimentInput->type = $applicationInput->type;
- $dataProductModel = new DataProductModel();
+ $dataProductModel = new DataProductModel();
$dataProductModel->gatewayId = Config::get("pga_config.airavata")["gateway-id"];
$dataProductModel->ownerName = Session::get("username");
$dataProductModel->productName = basename($filePath);
- $logicalPath = str_replace(Config::get("pga_config.airavata")["experiment-data-absolute-path"], "", $filePath);
- $dataProductModel->logicalPath = $logicalPath;
$dataProductModel->dataProductType = DataProductType::FILE;
$dataReplicationModel = new DataReplicaLocationModel();
$dataReplicationModel->storageResourceId = Config::get("pga_config.airavata")["gateway-data-store-resource-id"];
- $dataReplicationModel->replicaName = basename($filePath) . "-gateway-datastore-copy";
+ $dataReplicationModel->replicaName = basename($filePath) . " gateway data store copy";
$dataReplicationModel->replicaLocationCategory = ReplicaLocationCategory::GATEWAY_DATA_STORE;
$dataReplicationModel->replicaPersistentType = ReplicaPersistentType::TRANSIENT;
$hostName = $_SERVER['SERVER_NAME'];
@@ -456,13 +454,11 @@ class ExperimentUtilities
$dataProductModel->gatewayId = Config::get("pga_config.airavata")["gateway-id"];
$dataProductModel->ownerName = Session::get("username");
$dataProductModel->productName = basename($newInputPath);
- $logicalPath = str_replace(Config::get("pga_config.airavata")["experiment-data-absolute-path"] , "", $newInputPath);
- $dataProductModel->logicalPath = $logicalPath;
$dataProductModel->dataProductType = DataProductType::FILE;
$dataReplicationModel = new DataReplicaLocationModel();
$dataReplicationModel->storageResourceId = Config::get("pga_config.airavata")["gateway-data-store-resource-id"];
- $dataReplicationModel->replicaName = basename($newInputPath) . "-gateway-datastore-copy";
+ $dataReplicationModel->replicaName = basename($newInputPath) . " gateway data store copy";
$dataReplicationModel->replicaLocationCategory = ReplicaLocationCategory::GATEWAY_DATA_STORE;
$dataReplicationModel->replicaPersistentType = ReplicaPersistentType::TRANSIENT;
$hostName = $_SERVER['SERVER_NAME'];
[15/40] airavata-php-gateway git commit: adding host name to replica
path
Posted by sc...@apache.org.
adding host name to replica path
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/1a02de62
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1a02de62
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1a02de62
Branch: refs/heads/master
Commit: 1a02de62bfe1a0f9ef9cac442bb5cd876668f2e9
Parents: 301b8be
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 14:37:02 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 14:37:02 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1a02de62/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 3382341..fd33150 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -316,7 +316,8 @@ class ExperimentUtilities
$dataReplicationModel->replicaName = basename($filePath) . "-gateway-datastore-copy";
$dataReplicationModel->replicaLocationCategory = ReplicaLocationCategory::GATEWAY_DATA_STORE;
$dataReplicationModel->replicaPersistentType = ReplicaPersistentType::TRANSIENT;
- $dataReplicationModel->filePath = $filePath;
+ $hostName = $_SERVER['SERVER_NAME'];
+ $dataReplicationModel->filePath = "file://" . $hostName . $filePath;
$dataProductModel->replicaLocations[] = $dataReplicationModel;
$uri = Airavata::registerDataProduct(Session::get('authz-token'), $dataProductModel);
[36/40] airavata-php-gateway git commit: fixing cloning issue
Posted by sc...@apache.org.
fixing cloning 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/f31c17c8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f31c17c8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f31c17c8
Branch: refs/heads/master
Commit: f31c17c89310bd64bd263d2188d85fac515b38e2
Parents: be798e6
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 25 14:06:36 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 25 14:06:36 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f31c17c8/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 9ba0028..44b4d6e 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -328,6 +328,18 @@ class ExperimentUtilities
$dataProductModel->replicaLocations[] = $dataReplicationModel;
$uri = Airavata::registerDataProduct(Session::get('authz-token'), $dataProductModel);
$experimentInput->value = $uri;
+ } else {
+ $index = -1;
+ for ($i = 0; $i < sizeof($experimentInputs); $i++) {
+ if ($experimentInputs[$i]->name == $applicationInput->name) {
+ $index = $i;
+ }
+ }
+
+ if ($index >= 0) {
+ $experimentInput->value = $experimentInputs[$index]->value;
+ $experimentInput->type = $applicationInput->type;
+ }
}
} else {
CommonUtilities::print_error_message('I cannot accept this input type yet!');
[33/40] airavata-php-gateway git commit: updating thrift files
Posted by sc...@apache.org.
updating thrift 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/1e1ed5d0
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1e1ed5d0
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1e1ed5d0
Branch: refs/heads/master
Commit: 1e1ed5d04746e597df670fd19429accba5c029f3
Parents: c2c493d
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 24 16:42:23 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 24 16:42:23 2016 -0400
----------------------------------------------------------------------
.../Airavata/Model/Application/Io/Types.php | 46 ++++++++++++++++++++
1 file changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1e1ed5d0/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..b2890c1 100644
--- a/app/libraries/Airavata/Model/Application/Io/Types.php
+++ b/app/libraries/Airavata/Model/Application/Io/Types.php
@@ -111,6 +111,10 @@ class InputDataObjectType {
* @var bool
*/
public $dataStaged = null;
+ /**
+ * @var string
+ */
+ public $storageResourceId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -159,6 +163,10 @@ class InputDataObjectType {
'var' => 'dataStaged',
'type' => TType::BOOL,
),
+ 12 => array(
+ 'var' => 'storageResourceId',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -195,6 +203,9 @@ class InputDataObjectType {
if (isset($vals['dataStaged'])) {
$this->dataStaged = $vals['dataStaged'];
}
+ if (isset($vals['storageResourceId'])) {
+ $this->storageResourceId = $vals['storageResourceId'];
+ }
}
}
@@ -294,6 +305,13 @@ class InputDataObjectType {
$xfer += $input->skip($ftype);
}
break;
+ case 12:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->storageResourceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -362,6 +380,11 @@ class InputDataObjectType {
$xfer += $output->writeBool($this->dataStaged);
$xfer += $output->writeFieldEnd();
}
+ if ($this->storageResourceId !== null) {
+ $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 12);
+ $xfer += $output->writeString($this->storageResourceId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -438,6 +461,10 @@ class OutputDataObjectType {
* @var bool
*/
public $outputStreaming = null;
+ /**
+ * @var string
+ */
+ public $storageResourceId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -482,6 +509,10 @@ class OutputDataObjectType {
'var' => 'outputStreaming',
'type' => TType::BOOL,
),
+ 11 => array(
+ 'var' => 'storageResourceId',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -515,6 +546,9 @@ class OutputDataObjectType {
if (isset($vals['outputStreaming'])) {
$this->outputStreaming = $vals['outputStreaming'];
}
+ if (isset($vals['storageResourceId'])) {
+ $this->storageResourceId = $vals['storageResourceId'];
+ }
}
}
@@ -607,6 +641,13 @@ class OutputDataObjectType {
$xfer += $input->skip($ftype);
}
break;
+ case 11:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->storageResourceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -670,6 +711,11 @@ class OutputDataObjectType {
$xfer += $output->writeBool($this->outputStreaming);
$xfer += $output->writeFieldEnd();
}
+ if ($this->storageResourceId !== null) {
+ $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 11);
+ $xfer += $output->writeString($this->storageResourceId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
[22/40] airavata-php-gateway git commit: fixing html issue
Posted by sc...@apache.org.
fixing html 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/69de925f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/69de925f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/69de925f
Branch: refs/heads/master
Commit: 69de925f56642219b11d06f2716125e56dd2e8b3
Parents: 7a825b3
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 17:57:05 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 17:57:05 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/69de925f/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 78403ac..41bb779 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -73,7 +73,6 @@ class ExperimentUtilities
$order[$index] = $input->inputOrder;
}
array_multisort($order, SORT_ASC, $experimentInputs);
- $html = "";
foreach ($experimentInputs as $input) {
$matchingAppInput = null;
@@ -92,14 +91,12 @@ class ExperimentUtilities
if(!ExperimentUtilities::endsWith($dataRoot, "/"))
$dataRoot += "/";
$filePath = str_replace($hostPathConstant . $dataRoot . Session::get('username'), "", $currentInputPath);
- $html .= '<p><a target="_blank" href="' . URL::to("/") . '/download?path=' . $filePath . '>' . basename($filePath) . '<span class="glyphicon glyphicon-new-window"></span></a></p>';
+ echo '<p><a target="_blank" href="' . URL::to("/") . '/download/?path=' . $filePath . '">' . basename($filePath) . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
} elseif ($input->type == DataType::STRING || $input->type == DataType::INTEGER
|| $input->type == DataType::FLOAT) {
- $html .= '<p>' . $input->name . ': ' . $input->value . '</p>';
+ echo '<p>' . $input->name . ': ' . $input->value . '</p>';
}
}
-
- return $html;
}
private static function endsWith($haystack, $needle) {
[21/40] airavata-php-gateway git commit: ammending the last commit
Posted by sc...@apache.org.
ammending the last 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/7a825b33
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7a825b33
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7a825b33
Branch: refs/heads/master
Commit: 7a825b33bb3f42e9224071a700af08c2befa39de
Parents: 3e6d93b
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 17:49:49 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 17:49:49 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7a825b33/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 872cf71..78403ac 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -73,7 +73,7 @@ class ExperimentUtilities
$order[$index] = $input->inputOrder;
}
array_multisort($order, SORT_ASC, $experimentInputs);
-
+ $html = "";
foreach ($experimentInputs as $input) {
$matchingAppInput = null;
@@ -88,15 +88,23 @@ class ExperimentUtilities
break;
}
}
- $filePath = str_replace($hostPathConstant . Config::get("pga_config.airavata")["experiment-data-absolute-path"], "", $currentInputPath);
- echo '<p><a target="_blank"
- href="' . URL::to("/") . '/download?path=' . $filePath . '>' . basename($filePath) .
- ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
+ $dataRoot = Config::get("pga_config.airavata")["experiment-data-absolute-path"];
+ if(!ExperimentUtilities::endsWith($dataRoot, "/"))
+ $dataRoot += "/";
+ $filePath = str_replace($hostPathConstant . $dataRoot . Session::get('username'), "", $currentInputPath);
+ $html .= '<p><a target="_blank" href="' . URL::to("/") . '/download?path=' . $filePath . '>' . basename($filePath) . '<span class="glyphicon glyphicon-new-window"></span></a></p>';
} elseif ($input->type == DataType::STRING || $input->type == DataType::INTEGER
|| $input->type == DataType::FLOAT) {
- echo '<p>' . $input->name . ': ' . $input->value . '</p>';
+ $html .= '<p>' . $input->name . ': ' . $input->value . '</p>';
}
}
+
+ return $html;
+ }
+
+ private static function endsWith($haystack, $needle) {
+ // search forward starting from end minus needle length characters
+ return $needle === "" || (($temp = strlen($haystack) - strlen($needle)) >= 0 && strpos($haystack, $needle, $temp) !== false);
}
/**
[20/40] airavata-php-gateway git commit: ammending the last commit
Posted by sc...@apache.org.
ammending the last 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/3e6d93b5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3e6d93b5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3e6d93b5
Branch: refs/heads/master
Commit: 3e6d93b56da97d91ba5dd86db2ee31a39f5a4868
Parents: 02fb211
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 17:38:52 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 17:38:52 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3e6d93b5/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index d03eaab..872cf71 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -77,7 +77,7 @@ class ExperimentUtilities
foreach ($experimentInputs as $input) {
$matchingAppInput = null;
- if ($input->type == DataType::URI && empty($input->metaData)) {
+ if ($input->type == DataType::URI) {
$hostName = $_SERVER['SERVER_NAME'];
$hostPathConstant = 'file://' . $hostName . ':';
$dataProductModel = Airavata::getDataProduct(Session::get('authz-token'), $input->value);
[35/40] airavata-php-gateway git commit: fixing cloning issue
Posted by sc...@apache.org.
fixing cloning 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/be798e60
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/be798e60
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/be798e60
Branch: refs/heads/master
Commit: be798e60d127a6c406c455c93fb2061f75df08c4
Parents: c17be85
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 25 14:01:05 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 25 14:01:05 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 74 +++++++++++++++---------------
1 file changed, 38 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/be798e60/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 9bb91c1..9ba0028 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -283,50 +283,52 @@ class ExperimentUtilities
}
}
} elseif ($applicationInput->type == DataType::URI) {
- $file = $_FILES[$applicationInput->name];
-
- //
- // move file to experiment data directory
- //
- if(!empty($applicationInput->value)){
- $filePath = ExperimentUtilities::$experimentPath . $applicationInput->value;
- }else{
- $filePath = ExperimentUtilities::$experimentPath . $file['name'];
- }
+ if ($_FILES[$applicationInput->name]['name']) {
+ $file = $_FILES[$applicationInput->name];
+
+ //
+ // move file to experiment data directory
+ //
+ if (!empty($applicationInput->value)) {
+ $filePath = ExperimentUtilities::$experimentPath . $applicationInput->value;
+ } else {
+ $filePath = ExperimentUtilities::$experimentPath . $file['name'];
+ }
- // check if file already exists
- if (is_file($filePath)) {
- unlink($filePath);
+ // check if file already exists
+ if (is_file($filePath)) {
+ unlink($filePath);
- CommonUtilities::print_warning_message('Uploaded file already exists! Overwriting...');
- }
+ CommonUtilities::print_warning_message('Uploaded file already exists! Overwriting...');
+ }
- $moveFile = move_uploaded_file($file['tmp_name'], $filePath);
+ $moveFile = move_uploaded_file($file['tmp_name'], $filePath);
- if (!$moveFile) {
- CommonUtilities::print_error_message('<p>Error moving uploaded file ' . $file['name'] . '!
+ if (!$moveFile) {
+ CommonUtilities::print_error_message('<p>Error moving uploaded file ' . $file['name'] . '!
Please try again later or report a bug using the link in the Help menu.</p>');
- $experimentAssemblySuccessful = false;
- }
+ $experimentAssemblySuccessful = false;
+ }
- $experimentInput->type = $applicationInput->type;
+ $experimentInput->type = $applicationInput->type;
$dataProductModel = new DataProductModel();
- $dataProductModel->gatewayId = Config::get("pga_config.airavata")["gateway-id"];
- $dataProductModel->ownerName = Session::get("username");
- $dataProductModel->productName = basename($filePath);
- $dataProductModel->dataProductType = DataProductType::FILE;
-
- $dataReplicationModel = new DataReplicaLocationModel();
- $dataReplicationModel->storageResourceId = Config::get("pga_config.airavata")["gateway-data-store-resource-id"];
- $dataReplicationModel->replicaName = basename($filePath) . " gateway data store copy";
- $dataReplicationModel->replicaLocationCategory = ReplicaLocationCategory::GATEWAY_DATA_STORE;
- $dataReplicationModel->replicaPersistentType = ReplicaPersistentType::TRANSIENT;
- $hostName = $_SERVER['SERVER_NAME'];
- $dataReplicationModel->filePath = "file://" . $hostName . ":" . $filePath;
+ $dataProductModel->gatewayId = Config::get("pga_config.airavata")["gateway-id"];
+ $dataProductModel->ownerName = Session::get("username");
+ $dataProductModel->productName = basename($filePath);
+ $dataProductModel->dataProductType = DataProductType::FILE;
- $dataProductModel->replicaLocations[] = $dataReplicationModel;
- $uri = Airavata::registerDataProduct(Session::get('authz-token'), $dataProductModel);
- $experimentInput->value = $uri;
+ $dataReplicationModel = new DataReplicaLocationModel();
+ $dataReplicationModel->storageResourceId = Config::get("pga_config.airavata")["gateway-data-store-resource-id"];
+ $dataReplicationModel->replicaName = basename($filePath) . " gateway data store copy";
+ $dataReplicationModel->replicaLocationCategory = ReplicaLocationCategory::GATEWAY_DATA_STORE;
+ $dataReplicationModel->replicaPersistentType = ReplicaPersistentType::TRANSIENT;
+ $hostName = $_SERVER['SERVER_NAME'];
+ $dataReplicationModel->filePath = "file://" . $hostName . ":" . $filePath;
+
+ $dataProductModel->replicaLocations[] = $dataReplicationModel;
+ $uri = Airavata::registerDataProduct(Session::get('authz-token'), $dataProductModel);
+ $experimentInput->value = $uri;
+ }
} else {
CommonUtilities::print_error_message('I cannot accept this input type yet!');
}
[18/40] airavata-php-gateway git commit: adding colon to file path
Posted by sc...@apache.org.
adding colon to file path
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/93aa91ee
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/93aa91ee
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/93aa91ee
Branch: refs/heads/master
Commit: 93aa91ee6f5512bc12bb5bd5a34a946b0c8b95e5
Parents: 167dee4
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 17:20:53 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 17:20:53 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/93aa91ee/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 2b08772..108904b 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -317,7 +317,7 @@ class ExperimentUtilities
$dataReplicationModel->replicaLocationCategory = ReplicaLocationCategory::GATEWAY_DATA_STORE;
$dataReplicationModel->replicaPersistentType = ReplicaPersistentType::TRANSIENT;
$hostName = $_SERVER['SERVER_NAME'];
- $dataReplicationModel->filePath = "file://" . $hostName . $filePath;
+ $dataReplicationModel->filePath = "file://" . $hostName . ":" . $filePath;
$dataProductModel->replicaLocations[] = $dataReplicationModel;
$uri = Airavata::registerDataProduct(Session::get('authz-token'), $dataProductModel);
@@ -430,7 +430,6 @@ class ExperimentUtilities
foreach ($experimentInputs as $experimentInput) {
if ($experimentInput->type == DataType::URI) {
- $currentInputPath = $experimentInput->value;
$hostPathConstant = 'file://' . $hostName . ':';
$dataProductModel = Airavata::getDataProduct(Session::get('authz-token'), $experimentInput->value);
$currentInputPath = "";
@@ -460,7 +459,7 @@ class ExperimentUtilities
$dataReplicationModel->replicaLocationCategory = ReplicaLocationCategory::GATEWAY_DATA_STORE;
$dataReplicationModel->replicaPersistentType = ReplicaPersistentType::TRANSIENT;
$hostName = $_SERVER['SERVER_NAME'];
- $dataReplicationModel->filePath = "file://" . $hostName . $newInputPath;
+ $dataReplicationModel->filePath = "file://" . $hostName . ":" . $newInputPath;
$dataProductModel->replicaLocations[] = $dataReplicationModel;
$uri = Airavata::registerDataProduct(Session::get('authz-token'), $dataProductModel);
[29/40] airavata-php-gateway git commit: updating thrift files
Posted by sc...@apache.org.
updating thrift 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/1939187f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1939187f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1939187f
Branch: refs/heads/master
Commit: 1939187f1d94099a840d164c4039d4db6e83cd2a
Parents: 503d432
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 24 11:38:45 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 24 11:38:45 2016 -0400
----------------------------------------------------------------------
.../Airavata/Model/Data/Product/Types.php | 879 -------------------
.../Airavata/Model/Data/Replica/Types.php | 879 +++++++++++++++++++
.../Airavata/Model/Data/Resource/Types.php | 854 ------------------
3 files changed, 879 insertions(+), 1733 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1939187f/app/libraries/Airavata/Model/Data/Product/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Product/Types.php b/app/libraries/Airavata/Model/Data/Product/Types.php
deleted file mode 100644
index aa26196..0000000
--- a/app/libraries/Airavata/Model/Data/Product/Types.php
+++ /dev/null
@@ -1,879 +0,0 @@
-<?php
-namespace Airavata\Model\Data\Product;
-
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-use Thrift\Base\TBase;
-use Thrift\Type\TType;
-use Thrift\Type\TMessageType;
-use Thrift\Exception\TException;
-use Thrift\Exception\TProtocolException;
-use Thrift\Protocol\TProtocol;
-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',
- );
-}
-
-final class DataProductType {
- const DIR = 0;
- const FILE = 1;
- const COLLECTION = 2;
- static public $__names = array(
- 0 => 'DIR',
- 1 => 'FILE',
- 2 => 'COLLECTION',
- );
-}
-
-class DataProductModel {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $productUri = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $parentProductUri = null;
- /**
- * @var string
- */
- public $logicalPath = null;
- /**
- * @var string
- */
- public $productName = null;
- /**
- * @var string
- */
- public $productDescription = null;
- /**
- * @var string
- */
- public $ownerName = null;
- /**
- * @var int
- */
- public $dataProductType = null;
- /**
- * @var int
- */
- public $productSize = null;
- /**
- * @var int
- */
- public $creationTime = null;
- /**
- * @var int
- */
- public $lastModifiedTime = null;
- /**
- * @var array
- */
- public $productMetadata = null;
- /**
- * @var \Airavata\Model\Data\Product\DataReplicaLocationModel[]
- */
- public $replicaLocations = null;
- /**
- * @var \Airavata\Model\Data\Product\DataProductModel[]
- */
- public $childProducts = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'productUri',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'parentProductUri',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'logicalPath',
- 'type' => TType::STRING,
- ),
- 5 => array(
- 'var' => 'productName',
- 'type' => TType::STRING,
- ),
- 6 => array(
- 'var' => 'productDescription',
- 'type' => TType::STRING,
- ),
- 7 => array(
- 'var' => 'ownerName',
- 'type' => TType::STRING,
- ),
- 8 => array(
- 'var' => 'dataProductType',
- 'type' => TType::I32,
- ),
- 9 => array(
- 'var' => 'productSize',
- 'type' => TType::I32,
- ),
- 10 => array(
- 'var' => 'creationTime',
- 'type' => TType::I64,
- ),
- 11 => array(
- 'var' => 'lastModifiedTime',
- 'type' => TType::I64,
- ),
- 12 => array(
- 'var' => 'productMetadata',
- 'type' => TType::MAP,
- 'ktype' => TType::STRING,
- 'vtype' => TType::STRING,
- 'key' => array(
- 'type' => TType::STRING,
- ),
- 'val' => array(
- 'type' => TType::STRING,
- ),
- ),
- 13 => array(
- 'var' => 'replicaLocations',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Data\Product\DataReplicaLocationModel',
- ),
- ),
- 14 => array(
- 'var' => 'childProducts',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Data\Product\DataProductModel',
- ),
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['productUri'])) {
- $this->productUri = $vals['productUri'];
- }
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
- if (isset($vals['parentProductUri'])) {
- $this->parentProductUri = $vals['parentProductUri'];
- }
- if (isset($vals['logicalPath'])) {
- $this->logicalPath = $vals['logicalPath'];
- }
- if (isset($vals['productName'])) {
- $this->productName = $vals['productName'];
- }
- if (isset($vals['productDescription'])) {
- $this->productDescription = $vals['productDescription'];
- }
- if (isset($vals['ownerName'])) {
- $this->ownerName = $vals['ownerName'];
- }
- if (isset($vals['dataProductType'])) {
- $this->dataProductType = $vals['dataProductType'];
- }
- if (isset($vals['productSize'])) {
- $this->productSize = $vals['productSize'];
- }
- if (isset($vals['creationTime'])) {
- $this->creationTime = $vals['creationTime'];
- }
- if (isset($vals['lastModifiedTime'])) {
- $this->lastModifiedTime = $vals['lastModifiedTime'];
- }
- if (isset($vals['productMetadata'])) {
- $this->productMetadata = $vals['productMetadata'];
- }
- if (isset($vals['replicaLocations'])) {
- $this->replicaLocations = $vals['replicaLocations'];
- }
- if (isset($vals['childProducts'])) {
- $this->childProducts = $vals['childProducts'];
- }
- }
- }
-
- public function getName() {
- return 'DataProductModel';
- }
-
- 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::STRING) {
- $xfer += $input->readString($this->productUri);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->parentProductUri);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->logicalPath);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->productName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->productDescription);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 7:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->ownerName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 8:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->dataProductType);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 9:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->productSize);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 10:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->creationTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 11:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->lastModifiedTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 12:
- if ($ftype == TType::MAP) {
- $this->productMetadata = 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->productMetadata[$key5] = $val6;
- }
- $xfer += $input->readMapEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 13:
- if ($ftype == TType::LST) {
- $this->replicaLocations = array();
- $_size7 = 0;
- $_etype10 = 0;
- $xfer += $input->readListBegin($_etype10, $_size7);
- for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
- {
- $elem12 = null;
- $elem12 = new \Airavata\Model\Data\Product\DataReplicaLocationModel();
- $xfer += $elem12->read($input);
- $this->replicaLocations []= $elem12;
- }
- $xfer += $input->readListEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 14:
- if ($ftype == TType::LST) {
- $this->childProducts = array();
- $_size13 = 0;
- $_etype16 = 0;
- $xfer += $input->readListBegin($_etype16, $_size13);
- for ($_i17 = 0; $_i17 < $_size13; ++$_i17)
- {
- $elem18 = null;
- $elem18 = new \Airavata\Model\Data\Product\DataProductModel();
- $xfer += $elem18->read($input);
- $this->childProducts []= $elem18;
- }
- $xfer += $input->readListEnd();
- } 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('DataProductModel');
- if ($this->productUri !== null) {
- $xfer += $output->writeFieldBegin('productUri', TType::STRING, 1);
- $xfer += $output->writeString($this->productUri);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->parentProductUri !== null) {
- $xfer += $output->writeFieldBegin('parentProductUri', TType::STRING, 3);
- $xfer += $output->writeString($this->parentProductUri);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->logicalPath !== null) {
- $xfer += $output->writeFieldBegin('logicalPath', TType::STRING, 4);
- $xfer += $output->writeString($this->logicalPath);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->productName !== null) {
- $xfer += $output->writeFieldBegin('productName', TType::STRING, 5);
- $xfer += $output->writeString($this->productName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->productDescription !== null) {
- $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 6);
- $xfer += $output->writeString($this->productDescription);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ownerName !== null) {
- $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 7);
- $xfer += $output->writeString($this->ownerName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->dataProductType !== null) {
- $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 8);
- $xfer += $output->writeI32($this->dataProductType);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->productSize !== null) {
- $xfer += $output->writeFieldBegin('productSize', TType::I32, 9);
- $xfer += $output->writeI32($this->productSize);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 10);
- $xfer += $output->writeI64($this->creationTime);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->lastModifiedTime !== null) {
- $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 11);
- $xfer += $output->writeI64($this->lastModifiedTime);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->productMetadata !== null) {
- if (!is_array($this->productMetadata)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 12);
- {
- $output->writeMapBegin(TType::STRING, TType::STRING, count($this->productMetadata));
- {
- foreach ($this->productMetadata as $kiter19 => $viter20)
- {
- $xfer += $output->writeString($kiter19);
- $xfer += $output->writeString($viter20);
- }
- }
- $output->writeMapEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- 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, 13);
- {
- $output->writeListBegin(TType::STRUCT, count($this->replicaLocations));
- {
- foreach ($this->replicaLocations as $iter21)
- {
- $xfer += $iter21->write($output);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- if ($this->childProducts !== null) {
- if (!is_array($this->childProducts)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('childProducts', TType::LST, 14);
- {
- $output->writeListBegin(TType::STRUCT, count($this->childProducts));
- {
- foreach ($this->childProducts as $iter22)
- {
- $xfer += $iter22->write($output);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class DataReplicaLocationModel {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $replicaId = null;
- /**
- * @var string
- */
- public $productUri = null;
- /**
- * @var string
- */
- public $replicaName = null;
- /**
- * @var string
- */
- public $replicaDescription = null;
- /**
- * @var int
- */
- public $creationTime = null;
- /**
- * @var int
- */
- public $lastModifiedTime = null;
- /**
- * @var int
- */
- public $validUntilTime = null;
- /**
- * @var int
- */
- public $replicaLocationCategory = null;
- /**
- * @var int
- */
- public $replicaPersistentType = null;
- /**
- * @var string
- */
- public $storageResourceId = null;
- /**
- * @var string
- */
- public $filePath = null;
- /**
- * @var array
- */
- public $replicaMetadata = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'replicaId',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'productUri',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'replicaName',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'replicaDescription',
- 'type' => TType::STRING,
- ),
- 5 => array(
- 'var' => 'creationTime',
- 'type' => TType::I64,
- ),
- 6 => array(
- 'var' => 'lastModifiedTime',
- 'type' => TType::I64,
- ),
- 7 => array(
- 'var' => 'validUntilTime',
- 'type' => TType::I64,
- ),
- 8 => array(
- 'var' => 'replicaLocationCategory',
- 'type' => TType::I32,
- ),
- 9 => array(
- 'var' => 'replicaPersistentType',
- 'type' => TType::I32,
- ),
- 10 => array(
- 'var' => 'storageResourceId',
- 'type' => TType::STRING,
- ),
- 11 => array(
- 'var' => 'filePath',
- 'type' => TType::STRING,
- ),
- 12 => 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)) {
- if (isset($vals['replicaId'])) {
- $this->replicaId = $vals['replicaId'];
- }
- if (isset($vals['productUri'])) {
- $this->productUri = $vals['productUri'];
- }
- if (isset($vals['replicaName'])) {
- $this->replicaName = $vals['replicaName'];
- }
- if (isset($vals['replicaDescription'])) {
- $this->replicaDescription = $vals['replicaDescription'];
- }
- if (isset($vals['creationTime'])) {
- $this->creationTime = $vals['creationTime'];
- }
- 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['storageResourceId'])) {
- $this->storageResourceId = $vals['storageResourceId'];
- }
- if (isset($vals['filePath'])) {
- $this->filePath = $vals['filePath'];
- }
- if (isset($vals['replicaMetadata'])) {
- $this->replicaMetadata = $vals['replicaMetadata'];
- }
- }
- }
-
- public function getName() {
- return 'DataReplicaLocationModel';
- }
-
- 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::STRING) {
- $xfer += $input->readString($this->replicaId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->productUri);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->replicaName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->replicaDescription);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->creationTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->lastModifiedTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 7:
- 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->replicaLocationCategory);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 9:
- 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->filePath);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 12:
- if ($ftype == TType::MAP) {
- $this->replicaMetadata = array();
- $_size23 = 0;
- $_ktype24 = 0;
- $_vtype25 = 0;
- $xfer += $input->readMapBegin($_ktype24, $_vtype25, $_size23);
- for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
- {
- $key28 = '';
- $val29 = '';
- $xfer += $input->readString($key28);
- $xfer += $input->readString($val29);
- $this->replicaMetadata[$key28] = $val29;
- }
- $xfer += $input->readMapEnd();
- } 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('DataReplicaLocationModel');
- if ($this->replicaId !== null) {
- $xfer += $output->writeFieldBegin('replicaId', TType::STRING, 1);
- $xfer += $output->writeString($this->replicaId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->productUri !== null) {
- $xfer += $output->writeFieldBegin('productUri', TType::STRING, 2);
- $xfer += $output->writeString($this->productUri);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->replicaName !== null) {
- $xfer += $output->writeFieldBegin('replicaName', TType::STRING, 3);
- $xfer += $output->writeString($this->replicaName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->replicaDescription !== null) {
- $xfer += $output->writeFieldBegin('replicaDescription', TType::STRING, 4);
- $xfer += $output->writeString($this->replicaDescription);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5);
- $xfer += $output->writeI64($this->creationTime);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->lastModifiedTime !== null) {
- $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 6);
- $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, 8);
- $xfer += $output->writeI32($this->replicaLocationCategory);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->replicaPersistentType !== null) {
- $xfer += $output->writeFieldBegin('replicaPersistentType', TType::I32, 9);
- $xfer += $output->writeI32($this->replicaPersistentType);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->storageResourceId !== null) {
- $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 10);
- $xfer += $output->writeString($this->storageResourceId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->filePath !== null) {
- $xfer += $output->writeFieldBegin('filePath', TType::STRING, 11);
- $xfer += $output->writeString($this->filePath);
- $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, 12);
- {
- $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/1939187f/app/libraries/Airavata/Model/Data/Replica/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Replica/Types.php b/app/libraries/Airavata/Model/Data/Replica/Types.php
new file mode 100644
index 0000000..a2970ee
--- /dev/null
+++ b/app/libraries/Airavata/Model/Data/Replica/Types.php
@@ -0,0 +1,879 @@
+<?php
+namespace Airavata\Model\Data\Replica;
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+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',
+ );
+}
+
+final class DataProductType {
+ const DIR = 0;
+ const FILE = 1;
+ const COLLECTION = 2;
+ static public $__names = array(
+ 0 => 'DIR',
+ 1 => 'FILE',
+ 2 => 'COLLECTION',
+ );
+}
+
+class DataProductModel {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $productUri = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $parentProductUri = null;
+ /**
+ * @var string
+ */
+ public $logicalPath = null;
+ /**
+ * @var string
+ */
+ public $productName = null;
+ /**
+ * @var string
+ */
+ public $productDescription = null;
+ /**
+ * @var string
+ */
+ public $ownerName = null;
+ /**
+ * @var int
+ */
+ public $dataProductType = null;
+ /**
+ * @var int
+ */
+ public $productSize = null;
+ /**
+ * @var int
+ */
+ public $creationTime = null;
+ /**
+ * @var int
+ */
+ public $lastModifiedTime = null;
+ /**
+ * @var array
+ */
+ public $productMetadata = null;
+ /**
+ * @var \Airavata\Model\Data\Replica\DataReplicaLocationModel[]
+ */
+ public $replicaLocations = null;
+ /**
+ * @var \Airavata\Model\Data\Replica\DataProductModel[]
+ */
+ public $childProducts = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'productUri',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'parentProductUri',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'logicalPath',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
+ 'var' => 'productName',
+ 'type' => TType::STRING,
+ ),
+ 6 => array(
+ 'var' => 'productDescription',
+ 'type' => TType::STRING,
+ ),
+ 7 => array(
+ 'var' => 'ownerName',
+ 'type' => TType::STRING,
+ ),
+ 8 => array(
+ 'var' => 'dataProductType',
+ 'type' => TType::I32,
+ ),
+ 9 => array(
+ 'var' => 'productSize',
+ 'type' => TType::I32,
+ ),
+ 10 => array(
+ 'var' => 'creationTime',
+ 'type' => TType::I64,
+ ),
+ 11 => array(
+ 'var' => 'lastModifiedTime',
+ 'type' => TType::I64,
+ ),
+ 12 => array(
+ 'var' => 'productMetadata',
+ 'type' => TType::MAP,
+ 'ktype' => TType::STRING,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::STRING,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
+ 13 => array(
+ 'var' => 'replicaLocations',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Data\Replica\DataReplicaLocationModel',
+ ),
+ ),
+ 14 => array(
+ 'var' => 'childProducts',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Data\Replica\DataProductModel',
+ ),
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['productUri'])) {
+ $this->productUri = $vals['productUri'];
+ }
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['parentProductUri'])) {
+ $this->parentProductUri = $vals['parentProductUri'];
+ }
+ if (isset($vals['logicalPath'])) {
+ $this->logicalPath = $vals['logicalPath'];
+ }
+ if (isset($vals['productName'])) {
+ $this->productName = $vals['productName'];
+ }
+ if (isset($vals['productDescription'])) {
+ $this->productDescription = $vals['productDescription'];
+ }
+ if (isset($vals['ownerName'])) {
+ $this->ownerName = $vals['ownerName'];
+ }
+ if (isset($vals['dataProductType'])) {
+ $this->dataProductType = $vals['dataProductType'];
+ }
+ if (isset($vals['productSize'])) {
+ $this->productSize = $vals['productSize'];
+ }
+ if (isset($vals['creationTime'])) {
+ $this->creationTime = $vals['creationTime'];
+ }
+ if (isset($vals['lastModifiedTime'])) {
+ $this->lastModifiedTime = $vals['lastModifiedTime'];
+ }
+ if (isset($vals['productMetadata'])) {
+ $this->productMetadata = $vals['productMetadata'];
+ }
+ if (isset($vals['replicaLocations'])) {
+ $this->replicaLocations = $vals['replicaLocations'];
+ }
+ if (isset($vals['childProducts'])) {
+ $this->childProducts = $vals['childProducts'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'DataProductModel';
+ }
+
+ 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::STRING) {
+ $xfer += $input->readString($this->productUri);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->parentProductUri);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->logicalPath);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->productName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->productDescription);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->ownerName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->dataProductType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 9:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->productSize);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 10:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->creationTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 11:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->lastModifiedTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
+ if ($ftype == TType::MAP) {
+ $this->productMetadata = 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->productMetadata[$key5] = $val6;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 13:
+ if ($ftype == TType::LST) {
+ $this->replicaLocations = array();
+ $_size7 = 0;
+ $_etype10 = 0;
+ $xfer += $input->readListBegin($_etype10, $_size7);
+ for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ {
+ $elem12 = null;
+ $elem12 = new \Airavata\Model\Data\Replica\DataReplicaLocationModel();
+ $xfer += $elem12->read($input);
+ $this->replicaLocations []= $elem12;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 14:
+ if ($ftype == TType::LST) {
+ $this->childProducts = array();
+ $_size13 = 0;
+ $_etype16 = 0;
+ $xfer += $input->readListBegin($_etype16, $_size13);
+ for ($_i17 = 0; $_i17 < $_size13; ++$_i17)
+ {
+ $elem18 = null;
+ $elem18 = new \Airavata\Model\Data\Replica\DataProductModel();
+ $xfer += $elem18->read($input);
+ $this->childProducts []= $elem18;
+ }
+ $xfer += $input->readListEnd();
+ } 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('DataProductModel');
+ if ($this->productUri !== null) {
+ $xfer += $output->writeFieldBegin('productUri', TType::STRING, 1);
+ $xfer += $output->writeString($this->productUri);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->parentProductUri !== null) {
+ $xfer += $output->writeFieldBegin('parentProductUri', TType::STRING, 3);
+ $xfer += $output->writeString($this->parentProductUri);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->logicalPath !== null) {
+ $xfer += $output->writeFieldBegin('logicalPath', TType::STRING, 4);
+ $xfer += $output->writeString($this->logicalPath);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->productName !== null) {
+ $xfer += $output->writeFieldBegin('productName', TType::STRING, 5);
+ $xfer += $output->writeString($this->productName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->productDescription !== null) {
+ $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 6);
+ $xfer += $output->writeString($this->productDescription);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ownerName !== null) {
+ $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 7);
+ $xfer += $output->writeString($this->ownerName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->dataProductType !== null) {
+ $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 8);
+ $xfer += $output->writeI32($this->dataProductType);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->productSize !== null) {
+ $xfer += $output->writeFieldBegin('productSize', TType::I32, 9);
+ $xfer += $output->writeI32($this->productSize);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->creationTime !== null) {
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 10);
+ $xfer += $output->writeI64($this->creationTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->lastModifiedTime !== null) {
+ $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 11);
+ $xfer += $output->writeI64($this->lastModifiedTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->productMetadata !== null) {
+ if (!is_array($this->productMetadata)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 12);
+ {
+ $output->writeMapBegin(TType::STRING, TType::STRING, count($this->productMetadata));
+ {
+ foreach ($this->productMetadata as $kiter19 => $viter20)
+ {
+ $xfer += $output->writeString($kiter19);
+ $xfer += $output->writeString($viter20);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ 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, 13);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->replicaLocations));
+ {
+ foreach ($this->replicaLocations as $iter21)
+ {
+ $xfer += $iter21->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->childProducts !== null) {
+ if (!is_array($this->childProducts)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('childProducts', TType::LST, 14);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->childProducts));
+ {
+ foreach ($this->childProducts as $iter22)
+ {
+ $xfer += $iter22->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class DataReplicaLocationModel {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $replicaId = null;
+ /**
+ * @var string
+ */
+ public $productUri = null;
+ /**
+ * @var string
+ */
+ public $replicaName = null;
+ /**
+ * @var string
+ */
+ public $replicaDescription = null;
+ /**
+ * @var int
+ */
+ public $creationTime = null;
+ /**
+ * @var int
+ */
+ public $lastModifiedTime = null;
+ /**
+ * @var int
+ */
+ public $validUntilTime = null;
+ /**
+ * @var int
+ */
+ public $replicaLocationCategory = null;
+ /**
+ * @var int
+ */
+ public $replicaPersistentType = null;
+ /**
+ * @var string
+ */
+ public $storageResourceId = null;
+ /**
+ * @var string
+ */
+ public $filePath = null;
+ /**
+ * @var array
+ */
+ public $replicaMetadata = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'replicaId',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'productUri',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'replicaName',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'replicaDescription',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
+ 'var' => 'creationTime',
+ 'type' => TType::I64,
+ ),
+ 6 => array(
+ 'var' => 'lastModifiedTime',
+ 'type' => TType::I64,
+ ),
+ 7 => array(
+ 'var' => 'validUntilTime',
+ 'type' => TType::I64,
+ ),
+ 8 => array(
+ 'var' => 'replicaLocationCategory',
+ 'type' => TType::I32,
+ ),
+ 9 => array(
+ 'var' => 'replicaPersistentType',
+ 'type' => TType::I32,
+ ),
+ 10 => array(
+ 'var' => 'storageResourceId',
+ 'type' => TType::STRING,
+ ),
+ 11 => array(
+ 'var' => 'filePath',
+ 'type' => TType::STRING,
+ ),
+ 12 => 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)) {
+ if (isset($vals['replicaId'])) {
+ $this->replicaId = $vals['replicaId'];
+ }
+ if (isset($vals['productUri'])) {
+ $this->productUri = $vals['productUri'];
+ }
+ if (isset($vals['replicaName'])) {
+ $this->replicaName = $vals['replicaName'];
+ }
+ if (isset($vals['replicaDescription'])) {
+ $this->replicaDescription = $vals['replicaDescription'];
+ }
+ if (isset($vals['creationTime'])) {
+ $this->creationTime = $vals['creationTime'];
+ }
+ 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['storageResourceId'])) {
+ $this->storageResourceId = $vals['storageResourceId'];
+ }
+ if (isset($vals['filePath'])) {
+ $this->filePath = $vals['filePath'];
+ }
+ if (isset($vals['replicaMetadata'])) {
+ $this->replicaMetadata = $vals['replicaMetadata'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'DataReplicaLocationModel';
+ }
+
+ 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::STRING) {
+ $xfer += $input->readString($this->replicaId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->productUri);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->replicaName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->replicaDescription);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->creationTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->lastModifiedTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ 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->replicaLocationCategory);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 9:
+ 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->filePath);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
+ if ($ftype == TType::MAP) {
+ $this->replicaMetadata = array();
+ $_size23 = 0;
+ $_ktype24 = 0;
+ $_vtype25 = 0;
+ $xfer += $input->readMapBegin($_ktype24, $_vtype25, $_size23);
+ for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
+ {
+ $key28 = '';
+ $val29 = '';
+ $xfer += $input->readString($key28);
+ $xfer += $input->readString($val29);
+ $this->replicaMetadata[$key28] = $val29;
+ }
+ $xfer += $input->readMapEnd();
+ } 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('DataReplicaLocationModel');
+ if ($this->replicaId !== null) {
+ $xfer += $output->writeFieldBegin('replicaId', TType::STRING, 1);
+ $xfer += $output->writeString($this->replicaId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->productUri !== null) {
+ $xfer += $output->writeFieldBegin('productUri', TType::STRING, 2);
+ $xfer += $output->writeString($this->productUri);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->replicaName !== null) {
+ $xfer += $output->writeFieldBegin('replicaName', TType::STRING, 3);
+ $xfer += $output->writeString($this->replicaName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->replicaDescription !== null) {
+ $xfer += $output->writeFieldBegin('replicaDescription', TType::STRING, 4);
+ $xfer += $output->writeString($this->replicaDescription);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->creationTime !== null) {
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5);
+ $xfer += $output->writeI64($this->creationTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->lastModifiedTime !== null) {
+ $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 6);
+ $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, 8);
+ $xfer += $output->writeI32($this->replicaLocationCategory);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->replicaPersistentType !== null) {
+ $xfer += $output->writeFieldBegin('replicaPersistentType', TType::I32, 9);
+ $xfer += $output->writeI32($this->replicaPersistentType);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->storageResourceId !== null) {
+ $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 10);
+ $xfer += $output->writeString($this->storageResourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->filePath !== null) {
+ $xfer += $output->writeFieldBegin('filePath', TType::STRING, 11);
+ $xfer += $output->writeString($this->filePath);
+ $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, 12);
+ {
+ $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/1939187f/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
deleted file mode 100644
index cd5542a..0000000
--- a/app/libraries/Airavata/Model/Data/Resource/Types.php
+++ /dev/null
@@ -1,854 +0,0 @@
-<?php
-namespace Airavata\Model\Data\Resource;
-
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-use Thrift\Base\TBase;
-use Thrift\Type\TType;
-use Thrift\Type\TMessageType;
-use Thrift\Exception\TException;
-use Thrift\Exception\TProtocolException;
-use Thrift\Protocol\TProtocol;
-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',
- );
-}
-
-final class DataResourceType {
- const COLLECTION = 0;
- const FILE = 1;
- static public $__names = array(
- 0 => 'COLLECTION',
- 1 => 'FILE',
- );
-}
-
-class DataResourceModel {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $resourceId = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $parentResourceId = null;
- /**
- * @var string
- */
- public $resourceName = null;
- /**
- * @var string
- */
- public $resourceDescription = null;
- /**
- * @var string
- */
- public $ownerName = null;
- /**
- * @var int
- */
- public $dataResourceType = null;
- /**
- * @var int
- */
- public $resourceSize = null;
- /**
- * @var int
- */
- public $creationTime = null;
- /**
- * @var int
- */
- public $lastModifiedTime = null;
- /**
- * @var array
- */
- public $resourceMetadata = null;
- /**
- * @var \Airavata\Model\Data\Resource\DataReplicaLocationModel[]
- */
- public $replicaLocations = null;
- /**
- * @var \Airavata\Model\Data\Resource\DataResourceModel[]
- */
- public $childResources = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'resourceId',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'parentResourceId',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'resourceName',
- 'type' => TType::STRING,
- ),
- 5 => array(
- '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,
- ),
- 9 => array(
- 'var' => 'creationTime',
- 'type' => TType::I64,
- ),
- 10 => array(
- 'var' => 'lastModifiedTime',
- 'type' => TType::I64,
- ),
- 11 => array(
- 'var' => 'resourceMetadata',
- 'type' => TType::MAP,
- 'ktype' => TType::STRING,
- 'vtype' => TType::STRING,
- 'key' => array(
- 'type' => TType::STRING,
- ),
- 'val' => array(
- 'type' => TType::STRING,
- ),
- ),
- 12 => array(
- 'var' => 'replicaLocations',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- '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)) {
- if (isset($vals['resourceId'])) {
- $this->resourceId = $vals['resourceId'];
- }
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
- if (isset($vals['parentResourceId'])) {
- $this->parentResourceId = $vals['parentResourceId'];
- }
- if (isset($vals['resourceName'])) {
- $this->resourceName = $vals['resourceName'];
- }
- if (isset($vals['resourceDescription'])) {
- $this->resourceDescription = $vals['resourceDescription'];
- }
- if (isset($vals['ownerName'])) {
- $this->ownerName = $vals['ownerName'];
- }
- if (isset($vals['dataResourceType'])) {
- $this->dataResourceType = $vals['dataResourceType'];
- }
- if (isset($vals['resourceSize'])) {
- $this->resourceSize = $vals['resourceSize'];
- }
- if (isset($vals['creationTime'])) {
- $this->creationTime = $vals['creationTime'];
- }
- if (isset($vals['lastModifiedTime'])) {
- $this->lastModifiedTime = $vals['lastModifiedTime'];
- }
- if (isset($vals['resourceMetadata'])) {
- $this->resourceMetadata = $vals['resourceMetadata'];
- }
- if (isset($vals['replicaLocations'])) {
- $this->replicaLocations = $vals['replicaLocations'];
- }
- if (isset($vals['childResources'])) {
- $this->childResources = $vals['childResources'];
- }
- }
- }
-
- public function getName() {
- return 'DataResourceModel';
- }
-
- 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::STRING) {
- $xfer += $input->readString($this->resourceId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->parentResourceId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::STRING) {
- $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 9:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->creationTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 10:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->lastModifiedTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 11:
- 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 12:
- if ($ftype == TType::LST) {
- $this->replicaLocations = 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->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 {
- $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('DataResourceModel');
- if ($this->resourceId !== null) {
- $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 1);
- $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->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, 4);
- $xfer += $output->writeString($this->resourceName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->resourceDescription !== null) {
- $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, 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, 8);
- $xfer += $output->writeI32($this->resourceSize);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->creationTime !== null) {
- $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, 10);
- $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, 11);
- {
- $output->writeMapBegin(TType::STRING, TType::STRING, count($this->resourceMetadata));
- {
- foreach ($this->resourceMetadata as $kiter19 => $viter20)
- {
- $xfer += $output->writeString($kiter19);
- $xfer += $output->writeString($viter20);
- }
- }
- $output->writeMapEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- 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('childResources', TType::LST, 13);
- {
- $output->writeListBegin(TType::STRUCT, count($this->childResources));
- {
- foreach ($this->childResources as $iter22)
- {
- $xfer += $iter22->write($output);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class DataReplicaLocationModel {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $replicaId = null;
- /**
- * @var string
- */
- public $resourceId = null;
- /**
- * @var string
- */
- public $replicaName = null;
- /**
- * @var string
- */
- public $replicaDescription = null;
- /**
- * @var int
- */
- public $creationTime = null;
- /**
- * @var int
- */
- public $lastModifiedTime = null;
- /**
- * @var int
- */
- public $validUntilTime = null;
- /**
- * @var int
- */
- public $replicaLocationCategory = null;
- /**
- * @var int
- */
- public $replicaPersistentType = null;
- /**
- * @var string
- */
- public $storageResourceId = null;
- /**
- * @var string
- */
- public $fileAbsolutePath = null;
- /**
- * @var array
- */
- public $replicaMetadata = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'replicaId',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'resourceId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'replicaName',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'replicaDescription',
- 'type' => TType::STRING,
- ),
- 5 => array(
- 'var' => 'creationTime',
- 'type' => TType::I64,
- ),
- 6 => array(
- 'var' => 'lastModifiedTime',
- 'type' => TType::I64,
- ),
- 7 => array(
- 'var' => 'validUntilTime',
- 'type' => TType::I64,
- ),
- 8 => array(
- 'var' => 'replicaLocationCategory',
- 'type' => TType::I32,
- ),
- 9 => array(
- '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,
- 'vtype' => TType::STRING,
- 'key' => array(
- 'type' => TType::STRING,
- ),
- 'val' => array(
- 'type' => TType::STRING,
- ),
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['replicaId'])) {
- $this->replicaId = $vals['replicaId'];
- }
- if (isset($vals['resourceId'])) {
- $this->resourceId = $vals['resourceId'];
- }
- if (isset($vals['replicaName'])) {
- $this->replicaName = $vals['replicaName'];
- }
- if (isset($vals['replicaDescription'])) {
- $this->replicaDescription = $vals['replicaDescription'];
- }
- if (isset($vals['creationTime'])) {
- $this->creationTime = $vals['creationTime'];
- }
- 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['storageResourceId'])) {
- $this->storageResourceId = $vals['storageResourceId'];
- }
- if (isset($vals['fileAbsolutePath'])) {
- $this->fileAbsolutePath = $vals['fileAbsolutePath'];
- }
- if (isset($vals['replicaMetadata'])) {
- $this->replicaMetadata = $vals['replicaMetadata'];
- }
- }
- }
-
- public function getName() {
- return 'DataReplicaLocationModel';
- }
-
- 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::STRING) {
- $xfer += $input->readString($this->replicaId);
- } 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->replicaName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->replicaDescription);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->creationTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->lastModifiedTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 7:
- 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->replicaLocationCategory);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 9:
- 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();
- $_size23 = 0;
- $_ktype24 = 0;
- $_vtype25 = 0;
- $xfer += $input->readMapBegin($_ktype24, $_vtype25, $_size23);
- for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
- {
- $key28 = '';
- $val29 = '';
- $xfer += $input->readString($key28);
- $xfer += $input->readString($val29);
- $this->replicaMetadata[$key28] = $val29;
- }
- $xfer += $input->readMapEnd();
- } 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('DataReplicaLocationModel');
- if ($this->replicaId !== null) {
- $xfer += $output->writeFieldBegin('replicaId', TType::STRING, 1);
- $xfer += $output->writeString($this->replicaId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->resourceId !== null) {
- $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->resourceId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->replicaName !== null) {
- $xfer += $output->writeFieldBegin('replicaName', TType::STRING, 3);
- $xfer += $output->writeString($this->replicaName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->replicaDescription !== null) {
- $xfer += $output->writeFieldBegin('replicaDescription', TType::STRING, 4);
- $xfer += $output->writeString($this->replicaDescription);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5);
- $xfer += $output->writeI64($this->creationTime);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->lastModifiedTime !== null) {
- $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 6);
- $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, 8);
- $xfer += $output->writeI32($this->replicaLocationCategory);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->replicaPersistentType !== null) {
- $xfer += $output->writeFieldBegin('replicaPersistentType', TType::I32, 9);
- $xfer += $output->writeI32($this->replicaPersistentType);
- $xfer += $output->writeFieldEnd();
- }
- 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, 12);
- {
- $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;
- }
-
-}
-
-
[40/40] airavata-php-gateway git commit: fixing ouput list issue
Posted by sc...@apache.org.
fixing ouput list 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/a1f7a49e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a1f7a49e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a1f7a49e
Branch: refs/heads/master
Commit: a1f7a49e881fb76f22b9ca954a1e07fb877cc16e
Parents: 7f39a4d
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 25 16:35:51 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 25 16:35:51 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a1f7a49e/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 03c8e51..9c120b2 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -681,7 +681,7 @@ class ExperimentUtilities
foreach ((array)$outputs as $output) {
if ($output->type == DataType::URI || $output->type == DataType::STDOUT || $output->type == DataType::STDERR) {
- if(!empty($output->value)){
+ if(!empty($output->value) && filter_var($output->value, FILTER_VALIDATE_URL)){
$dataProductModel = Airavata::getDataProduct(Session::get('authz-token'), $output->value);
$currentInputPath = "";
foreach ($dataProductModel->replicaLocations as $rp) {
[09/40] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' 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/36d251ed
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/36d251ed
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/36d251ed
Branch: refs/heads/master
Commit: 36d251ed8c7ce2de841502c9265a7695ff7e8fcf
Parents: 3c452e1 3a92859
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 22 17:36:28 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 22 17:36:28 2016 -0400
----------------------------------------------------------------------
app/libraries/SRUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[06/40] airavata-php-gateway git commit: UnicoreDataMovement class
moved.
Posted by sc...@apache.org.
UnicoreDataMovement class moved.
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/3a92859d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3a92859d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3a92859d
Branch: refs/heads/master
Commit: 3a92859df9527bd14a6e0b31bcf7a815941eb383
Parents: 89b8258
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Mar 22 15:38:00 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Mar 22 15:38:00 2016 -0400
----------------------------------------------------------------------
app/libraries/SRUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3a92859d/app/libraries/SRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/SRUtilities.php b/app/libraries/SRUtilities.php
index 6bf70b5..22ae80b 100644
--- a/app/libraries/SRUtilities.php
+++ b/app/libraries/SRUtilities.php
@@ -17,7 +17,7 @@ use Airavata\Model\AppCatalog\ComputeResource\MonitorMode;
use Airavata\Model\AppCatalog\ComputeResource\ResourceJobManagerType;
use Airavata\Model\Data\Movement\SCPDataMovement;
use Airavata\Model\Data\Movement\SecurityProtocol;
-use Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement;
+use Airavata\Model\Data\Movement\UnicoreDataMovement;
//Gateway Classes
[23/40] airavata-php-gateway git commit: fixing html issue
Posted by sc...@apache.org.
fixing html 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/77c41141
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/77c41141
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/77c41141
Branch: refs/heads/master
Commit: 77c4114144c18f26bc95f23bc5ae38dd98f4f798
Parents: 69de925
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 17:59:30 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 17:59:30 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/77c41141/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 41bb779..4a4c2b2 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -89,7 +89,8 @@ class ExperimentUtilities
}
$dataRoot = Config::get("pga_config.airavata")["experiment-data-absolute-path"];
if(!ExperimentUtilities::endsWith($dataRoot, "/"))
- $dataRoot += "/";
+ $dataRoot .= "/";
+ echo $hostPathConstant . $dataRoot . Session::get('username');
$filePath = str_replace($hostPathConstant . $dataRoot . Session::get('username'), "", $currentInputPath);
echo '<p><a target="_blank" href="' . URL::to("/") . '/download/?path=' . $filePath . '">' . basename($filePath) . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
} elseif ($input->type == DataType::STRING || $input->type == DataType::INTEGER
[25/40] airavata-php-gateway git commit: fixing html issue
Posted by sc...@apache.org.
fixing html 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/f6da0390
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f6da0390
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f6da0390
Branch: refs/heads/master
Commit: f6da0390214f9885dd92db06f94c4592ddd9f977
Parents: c6ce39f
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 18:01:25 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 18:01:25 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f6da0390/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index bcd6e99..6f3e082 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -90,7 +90,7 @@ class ExperimentUtilities
$dataRoot = Config::get("pga_config.airavata")["experiment-data-absolute-path"];
if(!ExperimentUtilities::endsWith($dataRoot, "/"))
$dataRoot = $dataRoot . "/";
- $filePath = str_replace($hostPathConstant . $dataRoot . Session::get('username'), "", $currentInputPath);
+ $filePath = str_replace($hostPathConstant . $dataRoot, "", $currentInputPath);
echo '<p><a target="_blank" href="' . URL::to("/") . '/download/?path=' . $filePath . '">' . basename($filePath) . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
} elseif ($input->type == DataType::STRING || $input->type == DataType::INTEGER
|| $input->type == DataType::FLOAT) {
[12/40] airavata-php-gateway git commit: using replica model uris
Posted by sc...@apache.org.
using replica model uris
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/6aacbc8e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6aacbc8e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6aacbc8e
Branch: refs/heads/master
Commit: 6aacbc8edc9d26d36c3943a3ec23e6cdd875b2fd
Parents: bfff10f
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 13:46:24 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 13:46:24 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6aacbc8e/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 978e5ec..06b90a4 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -306,11 +306,21 @@ class ExperimentUtilities
$dataProductModel = new DataProductModel();
$dataProductModel->gatewayId = Config::get("pga_config.airavata")["gateway-id"];
$dataProductModel->ownerName = Session::get("username");
-
- $hostName = $_SERVER['SERVER_NAME'];
- $experimentInput->value = 'file://' . $hostName . ':' . $filePath;
-
-
+ $dataProductModel->productName = basename($filePath);
+ $logicalPath = str_replace(Config::get("pga_config.airavata")["experiment-data-absolute-path"],"", $filePath);
+ $dataProductModel->logicalPath = $logicalPath;
+ $dataProductModel->dataProductType = DataProductType::FILE;
+
+ $dataReplicationModel = new DataReplicaLocationModel();
+ $dataReplicationModel->storageResourceId = Config::get("pga_config.airavata")["gateway-data-store-resource-id"];
+ $dataReplicationModel->replicaName = basename($filePath) . "-gateway-datastore-copy";
+ $dataReplicationModel->replicaLocationCategory = ReplicaLocationCategory::GATEWAY_DATA_STORE;
+ $dataReplicationModel->replicaPersistentType = ReplicaPersistentType::TRANSIENT;
+ $dataReplicationModel->filePath = $filePath;
+
+ $dataProductModel->replicaLocations[] = $dataReplicationModel;
+ $uri = Airavata::registerDataProduct(Session::get('authz-token'), $dataReplicationModel);
+ $experimentInput->value = $uri;
} else {
CommonUtilities::print_error_message('I cannot accept this input type yet!');
}
[13/40] airavata-php-gateway git commit: adding missing thrift
generated files
Posted by sc...@apache.org.
adding missing thrift generated 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/b31ba8ac
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b31ba8ac
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b31ba8ac
Branch: refs/heads/master
Commit: b31ba8ac0abe61376e2648ad2627cfaf80411205
Parents: 6aacbc8
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 14:01:48 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 14:01:48 2016 -0400
----------------------------------------------------------------------
.../Airavata/Model/Data/Product/Types.php | 879 +++++++++++++++++++
1 file changed, 879 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b31ba8ac/app/libraries/Airavata/Model/Data/Product/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Product/Types.php b/app/libraries/Airavata/Model/Data/Product/Types.php
new file mode 100644
index 0000000..aa26196
--- /dev/null
+++ b/app/libraries/Airavata/Model/Data/Product/Types.php
@@ -0,0 +1,879 @@
+<?php
+namespace Airavata\Model\Data\Product;
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+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',
+ );
+}
+
+final class DataProductType {
+ const DIR = 0;
+ const FILE = 1;
+ const COLLECTION = 2;
+ static public $__names = array(
+ 0 => 'DIR',
+ 1 => 'FILE',
+ 2 => 'COLLECTION',
+ );
+}
+
+class DataProductModel {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $productUri = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $parentProductUri = null;
+ /**
+ * @var string
+ */
+ public $logicalPath = null;
+ /**
+ * @var string
+ */
+ public $productName = null;
+ /**
+ * @var string
+ */
+ public $productDescription = null;
+ /**
+ * @var string
+ */
+ public $ownerName = null;
+ /**
+ * @var int
+ */
+ public $dataProductType = null;
+ /**
+ * @var int
+ */
+ public $productSize = null;
+ /**
+ * @var int
+ */
+ public $creationTime = null;
+ /**
+ * @var int
+ */
+ public $lastModifiedTime = null;
+ /**
+ * @var array
+ */
+ public $productMetadata = null;
+ /**
+ * @var \Airavata\Model\Data\Product\DataReplicaLocationModel[]
+ */
+ public $replicaLocations = null;
+ /**
+ * @var \Airavata\Model\Data\Product\DataProductModel[]
+ */
+ public $childProducts = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'productUri',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'parentProductUri',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'logicalPath',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
+ 'var' => 'productName',
+ 'type' => TType::STRING,
+ ),
+ 6 => array(
+ 'var' => 'productDescription',
+ 'type' => TType::STRING,
+ ),
+ 7 => array(
+ 'var' => 'ownerName',
+ 'type' => TType::STRING,
+ ),
+ 8 => array(
+ 'var' => 'dataProductType',
+ 'type' => TType::I32,
+ ),
+ 9 => array(
+ 'var' => 'productSize',
+ 'type' => TType::I32,
+ ),
+ 10 => array(
+ 'var' => 'creationTime',
+ 'type' => TType::I64,
+ ),
+ 11 => array(
+ 'var' => 'lastModifiedTime',
+ 'type' => TType::I64,
+ ),
+ 12 => array(
+ 'var' => 'productMetadata',
+ 'type' => TType::MAP,
+ 'ktype' => TType::STRING,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::STRING,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
+ 13 => array(
+ 'var' => 'replicaLocations',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Data\Product\DataReplicaLocationModel',
+ ),
+ ),
+ 14 => array(
+ 'var' => 'childProducts',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Data\Product\DataProductModel',
+ ),
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['productUri'])) {
+ $this->productUri = $vals['productUri'];
+ }
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['parentProductUri'])) {
+ $this->parentProductUri = $vals['parentProductUri'];
+ }
+ if (isset($vals['logicalPath'])) {
+ $this->logicalPath = $vals['logicalPath'];
+ }
+ if (isset($vals['productName'])) {
+ $this->productName = $vals['productName'];
+ }
+ if (isset($vals['productDescription'])) {
+ $this->productDescription = $vals['productDescription'];
+ }
+ if (isset($vals['ownerName'])) {
+ $this->ownerName = $vals['ownerName'];
+ }
+ if (isset($vals['dataProductType'])) {
+ $this->dataProductType = $vals['dataProductType'];
+ }
+ if (isset($vals['productSize'])) {
+ $this->productSize = $vals['productSize'];
+ }
+ if (isset($vals['creationTime'])) {
+ $this->creationTime = $vals['creationTime'];
+ }
+ if (isset($vals['lastModifiedTime'])) {
+ $this->lastModifiedTime = $vals['lastModifiedTime'];
+ }
+ if (isset($vals['productMetadata'])) {
+ $this->productMetadata = $vals['productMetadata'];
+ }
+ if (isset($vals['replicaLocations'])) {
+ $this->replicaLocations = $vals['replicaLocations'];
+ }
+ if (isset($vals['childProducts'])) {
+ $this->childProducts = $vals['childProducts'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'DataProductModel';
+ }
+
+ 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::STRING) {
+ $xfer += $input->readString($this->productUri);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->parentProductUri);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->logicalPath);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->productName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->productDescription);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->ownerName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->dataProductType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 9:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->productSize);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 10:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->creationTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 11:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->lastModifiedTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
+ if ($ftype == TType::MAP) {
+ $this->productMetadata = 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->productMetadata[$key5] = $val6;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 13:
+ if ($ftype == TType::LST) {
+ $this->replicaLocations = array();
+ $_size7 = 0;
+ $_etype10 = 0;
+ $xfer += $input->readListBegin($_etype10, $_size7);
+ for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ {
+ $elem12 = null;
+ $elem12 = new \Airavata\Model\Data\Product\DataReplicaLocationModel();
+ $xfer += $elem12->read($input);
+ $this->replicaLocations []= $elem12;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 14:
+ if ($ftype == TType::LST) {
+ $this->childProducts = array();
+ $_size13 = 0;
+ $_etype16 = 0;
+ $xfer += $input->readListBegin($_etype16, $_size13);
+ for ($_i17 = 0; $_i17 < $_size13; ++$_i17)
+ {
+ $elem18 = null;
+ $elem18 = new \Airavata\Model\Data\Product\DataProductModel();
+ $xfer += $elem18->read($input);
+ $this->childProducts []= $elem18;
+ }
+ $xfer += $input->readListEnd();
+ } 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('DataProductModel');
+ if ($this->productUri !== null) {
+ $xfer += $output->writeFieldBegin('productUri', TType::STRING, 1);
+ $xfer += $output->writeString($this->productUri);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->parentProductUri !== null) {
+ $xfer += $output->writeFieldBegin('parentProductUri', TType::STRING, 3);
+ $xfer += $output->writeString($this->parentProductUri);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->logicalPath !== null) {
+ $xfer += $output->writeFieldBegin('logicalPath', TType::STRING, 4);
+ $xfer += $output->writeString($this->logicalPath);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->productName !== null) {
+ $xfer += $output->writeFieldBegin('productName', TType::STRING, 5);
+ $xfer += $output->writeString($this->productName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->productDescription !== null) {
+ $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 6);
+ $xfer += $output->writeString($this->productDescription);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ownerName !== null) {
+ $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 7);
+ $xfer += $output->writeString($this->ownerName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->dataProductType !== null) {
+ $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 8);
+ $xfer += $output->writeI32($this->dataProductType);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->productSize !== null) {
+ $xfer += $output->writeFieldBegin('productSize', TType::I32, 9);
+ $xfer += $output->writeI32($this->productSize);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->creationTime !== null) {
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 10);
+ $xfer += $output->writeI64($this->creationTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->lastModifiedTime !== null) {
+ $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 11);
+ $xfer += $output->writeI64($this->lastModifiedTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->productMetadata !== null) {
+ if (!is_array($this->productMetadata)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 12);
+ {
+ $output->writeMapBegin(TType::STRING, TType::STRING, count($this->productMetadata));
+ {
+ foreach ($this->productMetadata as $kiter19 => $viter20)
+ {
+ $xfer += $output->writeString($kiter19);
+ $xfer += $output->writeString($viter20);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ 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, 13);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->replicaLocations));
+ {
+ foreach ($this->replicaLocations as $iter21)
+ {
+ $xfer += $iter21->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->childProducts !== null) {
+ if (!is_array($this->childProducts)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('childProducts', TType::LST, 14);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->childProducts));
+ {
+ foreach ($this->childProducts as $iter22)
+ {
+ $xfer += $iter22->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class DataReplicaLocationModel {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $replicaId = null;
+ /**
+ * @var string
+ */
+ public $productUri = null;
+ /**
+ * @var string
+ */
+ public $replicaName = null;
+ /**
+ * @var string
+ */
+ public $replicaDescription = null;
+ /**
+ * @var int
+ */
+ public $creationTime = null;
+ /**
+ * @var int
+ */
+ public $lastModifiedTime = null;
+ /**
+ * @var int
+ */
+ public $validUntilTime = null;
+ /**
+ * @var int
+ */
+ public $replicaLocationCategory = null;
+ /**
+ * @var int
+ */
+ public $replicaPersistentType = null;
+ /**
+ * @var string
+ */
+ public $storageResourceId = null;
+ /**
+ * @var string
+ */
+ public $filePath = null;
+ /**
+ * @var array
+ */
+ public $replicaMetadata = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'replicaId',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'productUri',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'replicaName',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'replicaDescription',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
+ 'var' => 'creationTime',
+ 'type' => TType::I64,
+ ),
+ 6 => array(
+ 'var' => 'lastModifiedTime',
+ 'type' => TType::I64,
+ ),
+ 7 => array(
+ 'var' => 'validUntilTime',
+ 'type' => TType::I64,
+ ),
+ 8 => array(
+ 'var' => 'replicaLocationCategory',
+ 'type' => TType::I32,
+ ),
+ 9 => array(
+ 'var' => 'replicaPersistentType',
+ 'type' => TType::I32,
+ ),
+ 10 => array(
+ 'var' => 'storageResourceId',
+ 'type' => TType::STRING,
+ ),
+ 11 => array(
+ 'var' => 'filePath',
+ 'type' => TType::STRING,
+ ),
+ 12 => 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)) {
+ if (isset($vals['replicaId'])) {
+ $this->replicaId = $vals['replicaId'];
+ }
+ if (isset($vals['productUri'])) {
+ $this->productUri = $vals['productUri'];
+ }
+ if (isset($vals['replicaName'])) {
+ $this->replicaName = $vals['replicaName'];
+ }
+ if (isset($vals['replicaDescription'])) {
+ $this->replicaDescription = $vals['replicaDescription'];
+ }
+ if (isset($vals['creationTime'])) {
+ $this->creationTime = $vals['creationTime'];
+ }
+ 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['storageResourceId'])) {
+ $this->storageResourceId = $vals['storageResourceId'];
+ }
+ if (isset($vals['filePath'])) {
+ $this->filePath = $vals['filePath'];
+ }
+ if (isset($vals['replicaMetadata'])) {
+ $this->replicaMetadata = $vals['replicaMetadata'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'DataReplicaLocationModel';
+ }
+
+ 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::STRING) {
+ $xfer += $input->readString($this->replicaId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->productUri);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->replicaName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->replicaDescription);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->creationTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->lastModifiedTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ 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->replicaLocationCategory);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 9:
+ 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->filePath);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
+ if ($ftype == TType::MAP) {
+ $this->replicaMetadata = array();
+ $_size23 = 0;
+ $_ktype24 = 0;
+ $_vtype25 = 0;
+ $xfer += $input->readMapBegin($_ktype24, $_vtype25, $_size23);
+ for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
+ {
+ $key28 = '';
+ $val29 = '';
+ $xfer += $input->readString($key28);
+ $xfer += $input->readString($val29);
+ $this->replicaMetadata[$key28] = $val29;
+ }
+ $xfer += $input->readMapEnd();
+ } 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('DataReplicaLocationModel');
+ if ($this->replicaId !== null) {
+ $xfer += $output->writeFieldBegin('replicaId', TType::STRING, 1);
+ $xfer += $output->writeString($this->replicaId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->productUri !== null) {
+ $xfer += $output->writeFieldBegin('productUri', TType::STRING, 2);
+ $xfer += $output->writeString($this->productUri);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->replicaName !== null) {
+ $xfer += $output->writeFieldBegin('replicaName', TType::STRING, 3);
+ $xfer += $output->writeString($this->replicaName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->replicaDescription !== null) {
+ $xfer += $output->writeFieldBegin('replicaDescription', TType::STRING, 4);
+ $xfer += $output->writeString($this->replicaDescription);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->creationTime !== null) {
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5);
+ $xfer += $output->writeI64($this->creationTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->lastModifiedTime !== null) {
+ $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 6);
+ $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, 8);
+ $xfer += $output->writeI32($this->replicaLocationCategory);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->replicaPersistentType !== null) {
+ $xfer += $output->writeFieldBegin('replicaPersistentType', TType::I32, 9);
+ $xfer += $output->writeI32($this->replicaPersistentType);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->storageResourceId !== null) {
+ $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 10);
+ $xfer += $output->writeString($this->storageResourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->filePath !== null) {
+ $xfer += $output->writeFieldBegin('filePath', TType::STRING, 11);
+ $xfer += $output->writeString($this->filePath);
+ $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, 12);
+ {
+ $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;
+ }
+
+}
+
+
[16/40] airavata-php-gateway git commit: fixing experiment clone issue
Posted by sc...@apache.org.
fixing experiment clone 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/cc4ba94f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/cc4ba94f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/cc4ba94f
Branch: refs/heads/master
Commit: cc4ba94fe2c891a0ea38f0976e6ce34595279294
Parents: 1a02de6
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 17:12:48 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 17:12:48 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 32 ++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cc4ba94f/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index fd33150..74b1309 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -307,7 +307,7 @@ class ExperimentUtilities
$dataProductModel->gatewayId = Config::get("pga_config.airavata")["gateway-id"];
$dataProductModel->ownerName = Session::get("username");
$dataProductModel->productName = basename($filePath);
- $logicalPath = str_replace(Config::get("pga_config.airavata")["experiment-data-absolute-path"],"", $filePath);
+ $logicalPath = str_replace(Config::get("pga_config.airavata")["experiment-data-absolute-path"] . "/" . Session::get('username'), "", $filePath);
$dataProductModel->logicalPath = $logicalPath;
$dataProductModel->dataProductType = DataProductType::FILE;
@@ -432,12 +432,39 @@ class ExperimentUtilities
if ($experimentInput->type == DataType::URI) {
$currentInputPath = $experimentInput->value;
$hostPathConstant = 'file://' . $hostName . ':';
+ $dataProductModel = Airavata::getDataProduct($experimentInput->value);
+ $currentInputPath = "";
+ foreach ($dataProductModel->replicaLocations as $rp) {
+ if($rp->replicaLocationCategory == ReplicaLocationCategory::GATEWAY_DATA_STORE){
+ $currentInputPath = $rp->filePath;
+ break;
+ }
+ }
$currentInputPath = str_replace($hostPathConstant, '', $currentInputPath);
$parts = explode('/', rtrim($currentInputPath, '/'));
$fileName = array_pop($parts);
$newInputPath = ExperimentUtilities::$experimentPath . $fileName;
copy($currentInputPath, $newInputPath);
- $experimentInput->value = $hostPathConstant . $newInputPath;
+
+ $dataProductModel = new DataProductModel();
+ $dataProductModel->gatewayId = Config::get("pga_config.airavata")["gateway-id"];
+ $dataProductModel->ownerName = Session::get("username");
+ $dataProductModel->productName = basename($newInputPath);
+ $logicalPath = str_replace(Config::get("pga_config.airavata")["experiment-data-absolute-path"] . "/" . Session::get('username'), "", $newInputPath);
+ $dataProductModel->logicalPath = $logicalPath;
+ $dataProductModel->dataProductType = DataProductType::FILE;
+
+ $dataReplicationModel = new DataReplicaLocationModel();
+ $dataReplicationModel->storageResourceId = Config::get("pga_config.airavata")["gateway-data-store-resource-id"];
+ $dataReplicationModel->replicaName = basename($newInputPath) . "-gateway-datastore-copy";
+ $dataReplicationModel->replicaLocationCategory = ReplicaLocationCategory::GATEWAY_DATA_STORE;
+ $dataReplicationModel->replicaPersistentType = ReplicaPersistentType::TRANSIENT;
+ $hostName = $_SERVER['SERVER_NAME'];
+ $dataReplicationModel->filePath = "file://" . $hostName . $newInputPath;
+
+ $dataProductModel->replicaLocations[] = $dataReplicationModel;
+ $uri = Airavata::registerDataProduct(Session::get('authz-token'), $dataProductModel);
+ $experimentInput->value = $uri;
}
}
$experiment->userConfigurationData->experimentDataDir = ExperimentUtilities::$relativeExperimentDataDir;
@@ -468,6 +495,7 @@ class ExperimentUtilities
/**
* Cancel the experiment with the given ID
+ * Cancel the experiment with the given ID
* @param $expId
*/
public static function cancel_experiment($expId)
[05/40] airavata-php-gateway git commit: updating thrift generated
classes
Posted by sc...@apache.org.
updating thrift generated classes
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/89b8258c
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/89b8258c
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/89b8258c
Branch: refs/heads/master
Commit: 89b8258cbe1dba53b12c3e2c3c16019b7fe564fa
Parents: f1d354f
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 22 14:17:42 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 22 14:17:42 2016 -0400
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 10263 +++++++----------
.../Model/AppCatalog/ComputeResource/Types.php | 44 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 23 -
.../Airavata/Model/Experiment/Types.php | 23 -
app/libraries/Airavata/Model/Process/Types.php | 23 -
5 files changed, 4052 insertions(+), 6324 deletions(-)
----------------------------------------------------------------------
[03/40] airavata-php-gateway git commit: updating thrift generated
classes
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89b8258c/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 64a406c..49fdf5a 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -717,13 +717,13 @@ class LOCALSubmission {
*/
public $jobSubmissionInterfaceId = "DO_NOT_SET_AT_CLIENTS";
/**
- * @var int
- */
- public $securityProtocol = null;
- /**
* @var \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager
*/
public $resourceJobManager = null;
+ /**
+ * @var int
+ */
+ public $securityProtocol = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -733,26 +733,26 @@ class LOCALSubmission {
'type' => TType::STRING,
),
2 => array(
- 'var' => 'securityProtocol',
- 'type' => TType::I32,
- ),
- 3 => array(
'var' => 'resourceJobManager',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager',
),
+ 3 => array(
+ 'var' => 'securityProtocol',
+ 'type' => TType::I32,
+ ),
);
}
if (is_array($vals)) {
if (isset($vals['jobSubmissionInterfaceId'])) {
$this->jobSubmissionInterfaceId = $vals['jobSubmissionInterfaceId'];
}
- if (isset($vals['securityProtocol'])) {
- $this->securityProtocol = $vals['securityProtocol'];
- }
if (isset($vals['resourceJobManager'])) {
$this->resourceJobManager = $vals['resourceJobManager'];
}
+ if (isset($vals['securityProtocol'])) {
+ $this->securityProtocol = $vals['securityProtocol'];
+ }
}
}
@@ -783,16 +783,16 @@ class LOCALSubmission {
}
break;
case 2:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->securityProtocol);
+ if ($ftype == TType::STRUCT) {
+ $this->resourceJobManager = new \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager();
+ $xfer += $this->resourceJobManager->read($input);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
- if ($ftype == TType::STRUCT) {
- $this->resourceJobManager = new \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager();
- $xfer += $this->resourceJobManager->read($input);
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->securityProtocol);
} else {
$xfer += $input->skip($ftype);
}
@@ -815,19 +815,19 @@ class LOCALSubmission {
$xfer += $output->writeString($this->jobSubmissionInterfaceId);
$xfer += $output->writeFieldEnd();
}
- if ($this->securityProtocol !== null) {
- $xfer += $output->writeFieldBegin('securityProtocol', TType::I32, 2);
- $xfer += $output->writeI32($this->securityProtocol);
- $xfer += $output->writeFieldEnd();
- }
if ($this->resourceJobManager !== null) {
if (!is_object($this->resourceJobManager)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('resourceJobManager', TType::STRUCT, 3);
+ $xfer += $output->writeFieldBegin('resourceJobManager', TType::STRUCT, 2);
$xfer += $this->resourceJobManager->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->securityProtocol !== null) {
+ $xfer += $output->writeFieldBegin('securityProtocol', TType::I32, 3);
+ $xfer += $output->writeI32($this->securityProtocol);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89b8258c/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 52a5a43..7f0d412 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -509,10 +509,6 @@ class GatewayResourceProfile {
* @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
*/
public $storagePreferences = null;
- /**
- * @var string
- */
- public $usageReportingGatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -543,10 +539,6 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
),
- 5 => array(
- 'var' => 'usageReportingGatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -562,9 +554,6 @@ class GatewayResourceProfile {
if (isset($vals['storagePreferences'])) {
$this->storagePreferences = $vals['storagePreferences'];
}
- if (isset($vals['usageReportingGatewayId'])) {
- $this->usageReportingGatewayId = $vals['usageReportingGatewayId'];
- }
}
}
@@ -637,13 +626,6 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 5:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->usageReportingGatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -701,11 +683,6 @@ class GatewayResourceProfile {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->usageReportingGatewayId !== null) {
- $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 5);
- $xfer += $output->writeString($this->usageReportingGatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89b8258c/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 0335092..20587b6 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -409,10 +409,6 @@ class ExperimentModel {
* @var \Airavata\Model\Process\ProcessModel[]
*/
public $processes = null;
- /**
- * @var bool
- */
- public $archive = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -519,10 +515,6 @@ class ExperimentModel {
'class' => '\Airavata\Model\Process\ProcessModel',
),
),
- 20 => array(
- 'var' => 'archive',
- 'type' => TType::BOOL,
- ),
);
}
if (is_array($vals)) {
@@ -583,9 +575,6 @@ class ExperimentModel {
if (isset($vals['processes'])) {
$this->processes = $vals['processes'];
}
- if (isset($vals['archive'])) {
- $this->archive = $vals['archive'];
- }
}
}
@@ -797,13 +786,6 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 20:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->archive);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -978,11 +960,6 @@ class ExperimentModel {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->archive !== null) {
- $xfer += $output->writeFieldBegin('archive', TType::BOOL, 20);
- $xfer += $output->writeBool($this->archive);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89b8258c/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 41187c5..c0000d0 100644
--- a/app/libraries/Airavata/Model/Process/Types.php
+++ b/app/libraries/Airavata/Model/Process/Types.php
@@ -117,10 +117,6 @@ class ProcessModel {
* @var string
*/
public $experimentDataDir = null;
- /**
- * @var bool
- */
- public $archive = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -235,10 +231,6 @@ class ProcessModel {
'var' => 'experimentDataDir',
'type' => TType::STRING,
),
- 23 => array(
- 'var' => 'archive',
- 'type' => TType::BOOL,
- ),
);
}
if (is_array($vals)) {
@@ -308,9 +300,6 @@ class ProcessModel {
if (isset($vals['experimentDataDir'])) {
$this->experimentDataDir = $vals['experimentDataDir'];
}
- if (isset($vals['archive'])) {
- $this->archive = $vals['archive'];
- }
}
}
@@ -533,13 +522,6 @@ class ProcessModel {
$xfer += $input->skip($ftype);
}
break;
- case 23:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->archive);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -720,11 +702,6 @@ class ProcessModel {
$xfer += $output->writeString($this->experimentDataDir);
$xfer += $output->writeFieldEnd();
}
- if ($this->archive !== null) {
- $xfer += $output->writeFieldBegin('archive', TType::BOOL, 23);
- $xfer += $output->writeBool($this->archive);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
[37/40] airavata-php-gateway git commit: setting experiment data dir
path
Posted by sc...@apache.org.
setting experiment data dir path
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/2805fd73
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2805fd73
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2805fd73
Branch: refs/heads/master
Commit: 2805fd7399e54274f9247d781f07dacd470cdd02
Parents: f31c17c
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 25 15:15:01 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 25 15:15:01 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2805fd73/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 44b4d6e..011e6ed 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -483,7 +483,7 @@ class ExperimentUtilities
$experimentInput->value = $uri;
}
}
- $experiment->userConfigurationData->experimentDataDir = ExperimentUtilities::$relativeExperimentDataDir;
+ $experiment->userConfigurationData->experimentDataDir = ExperimentUtilities::$experimentPath;
Airavata::updateExperiment(Session::get('authz-token'), $cloneId, $experiment);
return $cloneId;
} catch (InvalidRequestException $ire) {
[27/40] airavata-php-gateway git commit: updating thrift generated
files
Posted by sc...@apache.org.
updating thrift generated 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/71691924
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/71691924
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/71691924
Branch: refs/heads/master
Commit: 71691924ccdb35321c82778e4af852b7d619b0a2
Parents: e3b15b5
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 24 11:26:13 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 24 11:26:13 2016 -0400
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 36 ++++++++++++++--------------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/71691924/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index e262b7c..d397526 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -3426,18 +3426,18 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param \Airavata\Model\Data\Product\DataProductModel $dataProductModel
+ * @param \Airavata\Model\Data\Replica\DataProductModel $dataProductModel
* @return string
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function registerDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataProductModel $dataProductModel);
+ public function registerDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Replica\DataProductModel $dataProductModel);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataProductUri
- * @return \Airavata\Model\Data\Product\DataProductModel
+ * @return \Airavata\Model\Data\Replica\DataProductModel
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -3446,14 +3446,14 @@ interface AiravataIf {
public function getDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, $dataProductUri);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param \Airavata\Model\Data\Product\DataReplicaLocationModel $replicaLocationModel
+ * @param \Airavata\Model\Data\Replica\DataReplicaLocationModel $replicaLocationModel
* @return string
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function registerReplicaLocation(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataReplicaLocationModel $replicaLocationModel);
+ public function registerReplicaLocation(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Replica\DataReplicaLocationModel $replicaLocationModel);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -12145,13 +12145,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("isWorkflowExistWithName failed: unknown result");
}
- public function registerDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataProductModel $dataProductModel)
+ public function registerDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Replica\DataProductModel $dataProductModel)
{
$this->send_registerDataProduct($authzToken, $dataProductModel);
return $this->recv_registerDataProduct();
}
- public function send_registerDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataProductModel $dataProductModel)
+ public function send_registerDataProduct(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Replica\DataProductModel $dataProductModel)
{
$args = new \Airavata\API\Airavata_registerDataProduct_args();
$args->authzToken = $authzToken;
@@ -12273,13 +12273,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getDataProduct failed: unknown result");
}
- public function registerReplicaLocation(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataReplicaLocationModel $replicaLocationModel)
+ public function registerReplicaLocation(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Replica\DataReplicaLocationModel $replicaLocationModel)
{
$this->send_registerReplicaLocation($authzToken, $replicaLocationModel);
return $this->recv_registerReplicaLocation();
}
- public function send_registerReplicaLocation(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Product\DataReplicaLocationModel $replicaLocationModel)
+ public function send_registerReplicaLocation(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Replica\DataReplicaLocationModel $replicaLocationModel)
{
$args = new \Airavata\API\Airavata_registerReplicaLocation_args();
$args->authzToken = $authzToken;
@@ -53524,7 +53524,7 @@ class Airavata_registerDataProduct_args {
*/
public $authzToken = null;
/**
- * @var \Airavata\Model\Data\Product\DataProductModel
+ * @var \Airavata\Model\Data\Replica\DataProductModel
*/
public $dataProductModel = null;
@@ -53539,7 +53539,7 @@ class Airavata_registerDataProduct_args {
2 => array(
'var' => 'dataProductModel',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Data\Product\DataProductModel',
+ 'class' => '\Airavata\Model\Data\Replica\DataProductModel',
),
);
}
@@ -53582,7 +53582,7 @@ class Airavata_registerDataProduct_args {
break;
case 2:
if ($ftype == TType::STRUCT) {
- $this->dataProductModel = new \Airavata\Model\Data\Product\DataProductModel();
+ $this->dataProductModel = new \Airavata\Model\Data\Replica\DataProductModel();
$xfer += $this->dataProductModel->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -53906,7 +53906,7 @@ class Airavata_getDataProduct_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Data\Product\DataProductModel
+ * @var \Airavata\Model\Data\Replica\DataProductModel
*/
public $success = null;
/**
@@ -53932,7 +53932,7 @@ class Airavata_getDataProduct_result {
0 => array(
'var' => 'success',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Data\Product\DataProductModel',
+ 'class' => '\Airavata\Model\Data\Replica\DataProductModel',
),
1 => array(
'var' => 'ire',
@@ -53996,7 +53996,7 @@ class Airavata_getDataProduct_result {
{
case 0:
if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\Data\Product\DataProductModel();
+ $this->success = new \Airavata\Model\Data\Replica\DataProductModel();
$xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -54090,7 +54090,7 @@ class Airavata_registerReplicaLocation_args {
*/
public $authzToken = null;
/**
- * @var \Airavata\Model\Data\Product\DataReplicaLocationModel
+ * @var \Airavata\Model\Data\Replica\DataReplicaLocationModel
*/
public $replicaLocationModel = null;
@@ -54105,7 +54105,7 @@ class Airavata_registerReplicaLocation_args {
2 => array(
'var' => 'replicaLocationModel',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Data\Product\DataReplicaLocationModel',
+ 'class' => '\Airavata\Model\Data\Replica\DataReplicaLocationModel',
),
);
}
@@ -54148,7 +54148,7 @@ class Airavata_registerReplicaLocation_args {
break;
case 2:
if ($ftype == TType::STRUCT) {
- $this->replicaLocationModel = new \Airavata\Model\Data\Product\DataReplicaLocationModel();
+ $this->replicaLocationModel = new \Airavata\Model\Data\Replica\DataReplicaLocationModel();
$xfer += $this->replicaLocationModel->read($input);
} else {
$xfer += $input->skip($ftype);
[32/40] airavata-php-gateway git commit: updating thrift files
Posted by sc...@apache.org.
updating thrift 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/c2c493d1
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c2c493d1
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c2c493d1
Branch: refs/heads/master
Commit: c2c493d1b53bac1b791bad1f20bae7babddf24ee
Parents: 1939187
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 24 14:42:42 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 24 14:42:42 2016 -0400
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 11273 +++++++++--------
.../Airavata/Model/Data/Replica/Types.php | 87 +-
2 files changed, 6023 insertions(+), 5337 deletions(-)
----------------------------------------------------------------------
[04/40] airavata-php-gateway git commit: updating thrift generated
classes
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89b8258c/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index 42dd6dc..8605b25 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -2413,7 +2413,7 @@ 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 resourceId
+ * @param productUri
* The identifier of the compute resource to which JobSubmission protocol to be added
*
* @param DMType
@@ -2431,7 +2431,7 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $resourceId
+ * @param string $productUri
* @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement
@@ -2441,7 +2441,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
+ public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
/**
*
* Update the given Local data movement details
@@ -2499,7 +2499,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 resourceId
+ * @param productUri
* The identifier of the compute resource to which JobSubmission protocol to be added
*
* @param priorityOrder
@@ -2513,7 +2513,7 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $resourceId
+ * @param string $productUri
* @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement
@@ -2523,7 +2523,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement);
+ public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement);
/**
*
* Update the given scp data movement details
@@ -2580,7 +2580,7 @@ interface AiravataIf {
* 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
+ * @param productUri
* The identifier of the compute resource to which data movement protocol to be added
*
* @param priorityOrder
@@ -2594,7 +2594,7 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $resourceId
+ * @param string $productUri
* @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement
@@ -2604,7 +2604,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
+ public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
/**
*
* Update a selected UNICORE data movement details
@@ -2660,7 +2660,7 @@ 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 resourceId
+ * @param productUri
* The identifier of the compute resource to which dataMovement protocol to be added
*
* @param DMType
@@ -2678,7 +2678,7 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $resourceId
+ * @param string $productUri
* @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement
@@ -2688,7 +2688,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement);
+ public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement);
/**
* Update the given GridFTP data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -2860,7 +2860,7 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $resourceId
+ * @param string $productUri
* @param string $dataMovementInterfaceId
* @param int $dataMoveType
* @return bool
@@ -2869,7 +2869,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType);
+ public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMovementInterfaceId, $dataMoveType);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager $resourceJobManager
@@ -3421,74 +3421,6 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AuthorizationException
*/
public function isWorkflowExistWithName(\Airavata\Model\Security\AuthzToken $authzToken, $workflowName);
- /**
- * *
- * * Data Manager 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 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
- * @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);
- /**
- * @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);
- /**
- * @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 {
@@ -9269,17 +9201,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("updateUnicoreJobSubmissionDetails failed: unknown result");
}
- public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
+ public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
{
- $this->send_addLocalDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $localDataMovement);
+ $this->send_addLocalDataMovementDetails($authzToken, $productUri, $dataMoveType, $priorityOrder, $localDataMovement);
return $this->recv_addLocalDataMovementDetails();
}
- public function send_addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
+ public function send_addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
{
$args = new \Airavata\API\Airavata_addLocalDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->resourceId = $resourceId;
+ $args->productUri = $productUri;
$args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->localDataMovement = $localDataMovement;
@@ -9465,17 +9397,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getLocalDataMovement failed: unknown result");
}
- public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
+ public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
{
- $this->send_addSCPDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $scpDataMovement);
+ $this->send_addSCPDataMovementDetails($authzToken, $productUri, $dataMoveType, $priorityOrder, $scpDataMovement);
return $this->recv_addSCPDataMovementDetails();
}
- public function send_addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
+ public function send_addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
{
$args = new \Airavata\API\Airavata_addSCPDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->resourceId = $resourceId;
+ $args->productUri = $productUri;
$args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->scpDataMovement = $scpDataMovement;
@@ -9661,17 +9593,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getSCPDataMovement failed: unknown result");
}
- public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
+ public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
{
- $this->send_addUnicoreDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $unicoreDataMovement);
+ $this->send_addUnicoreDataMovementDetails($authzToken, $productUri, $dataMoveType, $priorityOrder, $unicoreDataMovement);
return $this->recv_addUnicoreDataMovementDetails();
}
- public function send_addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
+ public function send_addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
{
$args = new \Airavata\API\Airavata_addUnicoreDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->resourceId = $resourceId;
+ $args->productUri = $productUri;
$args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->unicoreDataMovement = $unicoreDataMovement;
@@ -9857,17 +9789,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getUnicoreDataMovement failed: unknown result");
}
- public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
+ public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
{
- $this->send_addGridFTPDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $gridFTPDataMovement);
+ $this->send_addGridFTPDataMovementDetails($authzToken, $productUri, $dataMoveType, $priorityOrder, $gridFTPDataMovement);
return $this->recv_addGridFTPDataMovementDetails();
}
- public function send_addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
+ public function send_addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
{
$args = new \Airavata\API\Airavata_addGridFTPDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->resourceId = $resourceId;
+ $args->productUri = $productUri;
$args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->gridFTPDataMovement = $gridFTPDataMovement;
@@ -10376,17 +10308,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("deleteJobSubmissionInterface failed: unknown result");
}
- public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType)
+ public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMovementInterfaceId, $dataMoveType)
{
- $this->send_deleteDataMovementInterface($authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType);
+ $this->send_deleteDataMovementInterface($authzToken, $productUri, $dataMovementInterfaceId, $dataMoveType);
return $this->recv_deleteDataMovementInterface();
}
- public function send_deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType)
+ public function send_deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $productUri, $dataMovementInterfaceId, $dataMoveType)
{
$args = new \Airavata\API\Airavata_deleteDataMovementInterface_args();
$args->authzToken = $authzToken;
- $args->resourceId = $resourceId;
+ $args->productUri = $productUri;
$args->dataMovementInterfaceId = $dataMovementInterfaceId;
$args->dataMoveType = $dataMoveType;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -12180,389 +12112,6 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("isWorkflowExistWithName failed: unknown result");
}
- public function registerDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
- {
- $this->send_registerDataResource($authzToken, $dataResourceModel);
- return $this->recv_registerDataResource();
- }
-
- public function send_registerDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
- {
- $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_, 'registerDataResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('registerDataResource', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- 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_registerDataResource_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_registerDataResource_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("registerDataResource failed: unknown result");
- }
-
- public function updateDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
- {
- $this->send_updateDataResource($authzToken, $dataResourceModel);
- $this->recv_updateDataResource();
- }
-
- public function send_updateDataResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\Data\Resource\DataResourceModel $dataResourceModel)
- {
- $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)
- {
- 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();
- }
- }
-
- 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;
- }
- $result = new \Airavata\API\Airavata_updateDataResource_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 removeDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId)
- {
- $this->send_removeDataResource($authzToken, $resourceId);
- $this->recv_removeDataResource();
- }
-
- 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();
- }
- }
-
- 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;
-
- $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 getDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId)
- {
- $this->send_getDataResource($authzToken, $resourceId);
- return $this->recv_getDataResource();
- }
-
- public function send_getDataResource(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId)
- {
- $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)
- {
- 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();
- }
- }
-
- 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 ($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("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");
- }
-
- 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
@@ -22212,1919 +21761,15 @@ class Airavata_createExperiment_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->experiment = new \Airavata\Model\Experiment\ExperimentModel();
- $xfer += $this->experiment->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_createExperiment_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->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->experiment !== null) {
- if (!is_object($this->experiment)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('experiment', TType::STRUCT, 3);
- $xfer += $this->experiment->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_createExperiment_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_createExperiment_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_createExperiment_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;
- }
-
-}
-
-class Airavata_deleteExperiment_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $experimentId = 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' => 'experimentId',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
- }
- if (isset($vals['experimentId'])) {
- $this->experimentId = $vals['experimentId'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_deleteExperiment_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->experimentId);
- } 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_deleteExperiment_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->experimentId !== null) {
- $xfer += $output->writeFieldBegin('experimentId', TType::STRING, 2);
- $xfer += $output->writeString($this->experimentId);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_deleteExperiment_result {
- static $_TSPEC;
-
- /**
- * @var bool
- */
- 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::BOOL,
- ),
- 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_deleteExperiment_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::BOOL) {
- $xfer += $input->readBool($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_deleteExperiment_result');
- if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($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;
- }
-
-}
-
-class Airavata_getExperiment_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $airavataExperimentId = 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' => 'airavataExperimentId',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
- }
- if (isset($vals['airavataExperimentId'])) {
- $this->airavataExperimentId = $vals['airavataExperimentId'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_getExperiment_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->airavataExperimentId);
- } 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_getExperiment_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->airavataExperimentId !== null) {
- $xfer += $output->writeFieldBegin('airavataExperimentId', TType::STRING, 2);
- $xfer += $output->writeString($this->airavataExperimentId);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_getExperiment_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Experiment\ExperimentModel
- */
- public $success = null;
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\ExperimentNotFoundException
- */
- public $enf = 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::STRUCT,
- 'class' => '\Airavata\Model\Experiment\ExperimentModel',
- ),
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'enf',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\ExperimentNotFoundException',
- ),
- 3 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 4 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 5 => 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['enf'])) {
- $this->enf = $vals['enf'];
- }
- 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_getExperiment_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::STRUCT) {
- $this->success = new \Airavata\Model\Experiment\ExperimentModel();
- $xfer += $this->success->read($input);
- } 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->enf = new \Airavata\API\Error\ExperimentNotFoundException();
- $xfer += $this->enf->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- 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_getExperiment_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();
- }
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->enf !== null) {
- $xfer += $output->writeFieldBegin('enf', TType::STRUCT, 2);
- $xfer += $this->enf->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 3);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 4);
- $xfer += $this->ase->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 5);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_getDetailedExperimentTree_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $airavataExperimentId = 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' => 'airavataExperimentId',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
- }
- if (isset($vals['airavataExperimentId'])) {
- $this->airavataExperimentId = $vals['airavataExperimentId'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_getDetailedExperimentTree_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->airavataExperimentId);
- } 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_getDetailedExperimentTree_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->airavataExperimentId !== null) {
- $xfer += $output->writeFieldBegin('airavataExperimentId', TType::STRING, 2);
- $xfer += $output->writeString($this->airavataExperimentId);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_getDetailedExperimentTree_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Experiment\ExperimentModel
- */
- public $success = null;
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\ExperimentNotFoundException
- */
- public $enf = 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::STRUCT,
- 'class' => '\Airavata\Model\Experiment\ExperimentModel',
- ),
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'enf',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\ExperimentNotFoundException',
- ),
- 3 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 4 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 5 => 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['enf'])) {
- $this->enf = $vals['enf'];
- }
- 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_getDetailedExperimentTree_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::STRUCT) {
- $this->success = new \Airavata\Model\Experiment\ExperimentModel();
- $xfer += $this->success->read($input);
- } 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->enf = new \Airavata\API\Error\ExperimentNotFoundException();
- $xfer += $this->enf->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- 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_getDetailedExperimentTree_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();
- }
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->enf !== null) {
- $xfer += $output->writeFieldBegin('enf', TType::STRUCT, 2);
- $xfer += $this->enf->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 3);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 4);
- $xfer += $this->ase->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 5);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_updateExperiment_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $airavataExperimentId = null;
- /**
- * @var \Airavata\Model\Experiment\ExperimentModel
- */
- public $experiment = 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' => 'airavataExperimentId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'experiment',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Experiment\ExperimentModel',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
- }
- if (isset($vals['airavataExperimentId'])) {
- $this->airavataExperimentId = $vals['airavataExperimentId'];
- }
- if (isset($vals['experiment'])) {
- $this->experiment = $vals['experiment'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_updateExperiment_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->airavataExperimentId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->experiment = new \Airavata\Model\Experiment\ExperimentModel();
- $xfer += $this->experiment->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_updateExperiment_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->airavataExperimentId !== null) {
- $xfer += $output->writeFieldBegin('airavataExperimentId', TType::STRING, 2);
- $xfer += $output->writeString($this->airavataExperimentId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->experiment !== null) {
- if (!is_object($this->experiment)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('experiment', TType::STRUCT, 3);
- $xfer += $this->experiment->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_updateExperiment_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\ExperimentNotFoundException
- */
- public $enf = 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(
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'enf',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\ExperimentNotFoundException',
- ),
- 3 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 4 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 5 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['ire'])) {
- $this->ire = $vals['ire'];
- }
- if (isset($vals['enf'])) {
- $this->enf = $vals['enf'];
- }
- 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_updateExperiment_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 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->enf = new \Airavata\API\Error\ExperimentNotFoundException();
- $xfer += $this->enf->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- 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_updateExperiment_result');
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->enf !== null) {
- $xfer += $output->writeFieldBegin('enf', TType::STRUCT, 2);
- $xfer += $this->enf->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 3);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 4);
- $xfer += $this->ase->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 5);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_updateExperimentConfiguration_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $airavataExperimentId = null;
- /**
- * @var \Airavata\Model\Experiment\UserConfigurationDataModel
- */
- public $userConfiguration = 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' => 'airavataExperimentId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'userConfiguration',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Experiment\UserConfigurationDataModel',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
- }
- if (isset($vals['airavataExperimentId'])) {
- $this->airavataExperimentId = $vals['airavataExperimentId'];
- }
- if (isset($vals['userConfiguration'])) {
- $this->userConfiguration = $vals['userConfiguration'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_updateExperimentConfiguration_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->airavataExperimentId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->userConfiguration = new \Airavata\Model\Experiment\UserConfigurationDataModel();
- $xfer += $this->userConfiguration->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_updateExperimentConfiguration_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->airavataExperimentId !== null) {
- $xfer += $output->writeFieldBegin('airavataExperimentId', TType::STRING, 2);
- $xfer += $output->writeString($this->airavataExperimentId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->userConfiguration !== null) {
- if (!is_object($this->userConfiguration)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('userConfiguration', TType::STRUCT, 3);
- $xfer += $this->userConfiguration->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_updateExperimentConfiguration_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_updateExperimentConfiguration_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 1:
- 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_updateExperimentConfiguration_result');
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 1);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_updateResourceScheduleing_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $airavataExperimentId = null;
- /**
- * @var \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel
- */
- public $resourceScheduling = 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' => 'airavataExperimentId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'resourceScheduling',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Scheduling\ComputationalResourceSchedulingModel',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
- }
- if (isset($vals['airavataExperimentId'])) {
- $this->airavataExperimentId = $vals['airavataExperimentId'];
- }
- if (isset($vals['resourceScheduling'])) {
- $this->resourceScheduling = $vals['resourceScheduling'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_updateResourceScheduleing_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->airavataExperimentId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->resourceScheduling = new \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel();
- $xfer += $this->resourceScheduling->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_updateResourceScheduleing_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->airavataExperimentId !== null) {
- $xfer += $output->writeFieldBegin('airavataExperimentId', TType::STRING, 2);
- $xfer += $output->writeString($this->airavataExperimentId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->resourceScheduling !== null) {
- if (!is_object($this->resourceScheduling)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('resourceScheduling', TType::STRUCT, 3);
- $xfer += $this->resourceScheduling->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_updateResourceScheduleing_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_updateResourceScheduleing_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 1:
- 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_updateResourceScheduleing_result');
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 1);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_validateExperiment_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $airavataExperimentId = 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' => 'airavataExperimentId',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
- }
- if (isset($vals['airavataExperimentId'])) {
- $this->airavataExperimentId = $vals['airavataExperimentId'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_validateExperiment_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->airavataExperimentId);
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->experiment = new \Airavata\Model\Experiment\ExperimentModel();
+ $xfer += $this->experiment->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -24141,7 +21786,7 @@ class Airavata_validateExperiment_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_validateExperiment_args');
+ $xfer += $output->writeStructBegin('Airavata
<TRUNCATED>
[19/40] airavata-php-gateway git commit: fixing download inputFiles
issue
Posted by sc...@apache.org.
fixing download inputFiles 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/02fb2111
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/02fb2111
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/02fb2111
Branch: refs/heads/master
Commit: 02fb211128981311862d6be76bd031a91e873eb8
Parents: 93aa91e
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 17:37:53 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 17:37:53 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/02fb2111/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 108904b..d03eaab 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -78,19 +78,21 @@ class ExperimentUtilities
$matchingAppInput = null;
if ($input->type == DataType::URI && empty($input->metaData)) {
- $inputArray = explode('/', $input->value);
+ $hostName = $_SERVER['SERVER_NAME'];
+ $hostPathConstant = 'file://' . $hostName . ':';
+ $dataProductModel = Airavata::getDataProduct(Session::get('authz-token'), $input->value);
+ $currentInputPath = "";
+ foreach ($dataProductModel->replicaLocations as $rp) {
+ if($rp->replicaLocationCategory == ReplicaLocationCategory::GATEWAY_DATA_STORE){
+ $currentInputPath = $rp->filePath;
+ break;
+ }
+ }
+ $filePath = str_replace($hostPathConstant . Config::get("pga_config.airavata")["experiment-data-absolute-path"], "", $currentInputPath);
echo '<p><a target="_blank"
- href="' . URL::to("/") . '/download?path=' .
- $inputArray[ count($inputArray)-4] . "/" .
- $inputArray[ count($inputArray)-3] . '/' .
- $inputArray[ count($inputArray)-2] . '/' .
- $inputArray[ count($inputArray)-1] . '">' .
- $inputArray[ count($inputArray)-1] .
- ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
- }elseif($input->type == DataType::URI && !empty($input->metaData)
- && json_decode($input->metaData)->location=="remote"){
- echo '<p>' . $input->name . ': ' . $input->value . '</p>';
- }elseif ($input->type == DataType::STRING || $input->type == DataType::INTEGER
+ href="' . URL::to("/") . '/download?path=' . $filePath . '>' . basename($filePath) .
+ ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
+ } elseif ($input->type == DataType::STRING || $input->type == DataType::INTEGER
|| $input->type == DataType::FLOAT) {
echo '<p>' . $input->name . ': ' . $input->value . '</p>';
}
[30/40] airavata-php-gateway git commit: updating thrift files
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c2c493d1/app/libraries/Airavata/Model/Data/Replica/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Data/Replica/Types.php b/app/libraries/Airavata/Model/Data/Replica/Types.php
index a2970ee..03978b0 100644
--- a/app/libraries/Airavata/Model/Data/Replica/Types.php
+++ b/app/libraries/Airavata/Model/Data/Replica/Types.php
@@ -105,10 +105,6 @@ class DataProductModel {
* @var \Airavata\Model\Data\Replica\DataReplicaLocationModel[]
*/
public $replicaLocations = null;
- /**
- * @var \Airavata\Model\Data\Replica\DataProductModel[]
- */
- public $childProducts = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -178,15 +174,6 @@ class DataProductModel {
'class' => '\Airavata\Model\Data\Replica\DataReplicaLocationModel',
),
),
- 14 => array(
- 'var' => 'childProducts',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Data\Replica\DataProductModel',
- ),
- ),
);
}
if (is_array($vals)) {
@@ -229,9 +216,6 @@ class DataProductModel {
if (isset($vals['replicaLocations'])) {
$this->replicaLocations = $vals['replicaLocations'];
}
- if (isset($vals['childProducts'])) {
- $this->childProducts = $vals['childProducts'];
- }
}
}
@@ -369,24 +353,6 @@ class DataProductModel {
$xfer += $input->skip($ftype);
}
break;
- case 14:
- if ($ftype == TType::LST) {
- $this->childProducts = array();
- $_size13 = 0;
- $_etype16 = 0;
- $xfer += $input->readListBegin($_etype16, $_size13);
- for ($_i17 = 0; $_i17 < $_size13; ++$_i17)
- {
- $elem18 = null;
- $elem18 = new \Airavata\Model\Data\Replica\DataProductModel();
- $xfer += $elem18->read($input);
- $this->childProducts []= $elem18;
- }
- $xfer += $input->readListEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -463,10 +429,10 @@ class DataProductModel {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->productMetadata));
{
- foreach ($this->productMetadata as $kiter19 => $viter20)
+ foreach ($this->productMetadata as $kiter13 => $viter14)
{
- $xfer += $output->writeString($kiter19);
- $xfer += $output->writeString($viter20);
+ $xfer += $output->writeString($kiter13);
+ $xfer += $output->writeString($viter14);
}
}
$output->writeMapEnd();
@@ -481,26 +447,9 @@ class DataProductModel {
{
$output->writeListBegin(TType::STRUCT, count($this->replicaLocations));
{
- foreach ($this->replicaLocations as $iter21)
- {
- $xfer += $iter21->write($output);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- if ($this->childProducts !== null) {
- if (!is_array($this->childProducts)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('childProducts', TType::LST, 14);
- {
- $output->writeListBegin(TType::STRUCT, count($this->childProducts));
- {
- foreach ($this->childProducts as $iter22)
+ foreach ($this->replicaLocations as $iter15)
{
- $xfer += $iter22->write($output);
+ $xfer += $iter15->write($output);
}
}
$output->writeListEnd();
@@ -766,17 +715,17 @@ class DataReplicaLocationModel {
case 12:
if ($ftype == TType::MAP) {
$this->replicaMetadata = array();
- $_size23 = 0;
- $_ktype24 = 0;
- $_vtype25 = 0;
- $xfer += $input->readMapBegin($_ktype24, $_vtype25, $_size23);
- for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
+ $_size16 = 0;
+ $_ktype17 = 0;
+ $_vtype18 = 0;
+ $xfer += $input->readMapBegin($_ktype17, $_vtype18, $_size16);
+ for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
{
- $key28 = '';
- $val29 = '';
- $xfer += $input->readString($key28);
- $xfer += $input->readString($val29);
- $this->replicaMetadata[$key28] = $val29;
+ $key21 = '';
+ $val22 = '';
+ $xfer += $input->readString($key21);
+ $xfer += $input->readString($val22);
+ $this->replicaMetadata[$key21] = $val22;
}
$xfer += $input->readMapEnd();
} else {
@@ -859,10 +808,10 @@ class DataReplicaLocationModel {
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->replicaMetadata));
{
- foreach ($this->replicaMetadata as $kiter30 => $viter31)
+ foreach ($this->replicaMetadata as $kiter23 => $viter24)
{
- $xfer += $output->writeString($kiter30);
- $xfer += $output->writeString($viter31);
+ $xfer += $output->writeString($kiter23);
+ $xfer += $output->writeString($viter24);
}
}
$output->writeMapEnd();
[11/40] airavata-php-gateway git commit: fixing cannot download output
Posted by sc...@apache.org.
fixing cannot download output
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/bfff10f5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/bfff10f5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/bfff10f5
Branch: refs/heads/master
Commit: bfff10f58468ddbd25dabc112974f5ea6aa5acde
Parents: 72a1cb7
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 12:56:25 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 12:56:25 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bfff10f5/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index ea46ae8..978e5ec 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -7,7 +7,6 @@ use Airavata\API\Error\InvalidRequestException;
use Airavata\Facades\Airavata;
use Airavata\Model\Application\Io\DataType;
use Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription;
-use Airavata\Model\Application\Io\InputDataObjectType;
use Airavata\Model\Scheduling\ComputationalResourceSchedulingModel;
use Airavata\Model\Experiment\ExperimentModel;
use Airavata\Model\Status\ExperimentState;
@@ -16,6 +15,11 @@ use Airavata\Model\Status\JobState;
use Airavata\Model\Status\TaskState;
use Airavata\Model\Task\TaskTypes;
use Airavata\Model\Experiment\UserConfigurationDataModel;
+use Airavata\Model\Data\Product\DataProductModel;
+use Airavata\Model\Data\Product\DataProductType;
+use Airavata\Model\Data\Product\DataReplicaLocationModel;
+use Airavata\Model\Data\Product\ReplicaLocationCategory;
+use Airavata\Model\Data\Product\ReplicaPersistentType;
class ExperimentUtilities
{
@@ -298,9 +302,14 @@ class ExperimentUtilities
$experimentAssemblySuccessful = false;
}
+ $experimentInput->type = $applicationInput->type;
+ $dataProductModel = new DataProductModel();
+ $dataProductModel->gatewayId = Config::get("pga_config.airavata")["gateway-id"];
+ $dataProductModel->ownerName = Session::get("username");
+
$hostName = $_SERVER['SERVER_NAME'];
$experimentInput->value = 'file://' . $hostName . ':' . $filePath;
- $experimentInput->type = $applicationInput->type;
+
} else {
CommonUtilities::print_error_message('I cannot accept this input type yet!');
@@ -625,7 +634,6 @@ class ExperimentUtilities
echo '<p>' . $output->name . ' : ' . '<a target="_blank"
href="' . URL::to("/") . '/download?path=' .
- $outputPathArray[ count($outputPathArray)-5] . "/" .
$outputPathArray[ count($outputPathArray)-4] . "/" .
$outputPathArray[ count($outputPathArray)-3] . "/" .
$outputPathArray[ count($outputPathArray)-2] . '/' .
[24/40] airavata-php-gateway git commit: fixing html issue
Posted by sc...@apache.org.
fixing html 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/c6ce39f9
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c6ce39f9
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c6ce39f9
Branch: refs/heads/master
Commit: c6ce39f919761f86ad398e043204c7df9fc84481
Parents: 77c4114
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 23 18:00:30 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 23 18:00:30 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c6ce39f9/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 4a4c2b2..bcd6e99 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -89,8 +89,7 @@ class ExperimentUtilities
}
$dataRoot = Config::get("pga_config.airavata")["experiment-data-absolute-path"];
if(!ExperimentUtilities::endsWith($dataRoot, "/"))
- $dataRoot .= "/";
- echo $hostPathConstant . $dataRoot . Session::get('username');
+ $dataRoot = $dataRoot . "/";
$filePath = str_replace($hostPathConstant . $dataRoot . Session::get('username'), "", $currentInputPath);
echo '<p><a target="_blank" href="' . URL::to("/") . '/download/?path=' . $filePath . '">' . basename($filePath) . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
} elseif ($input->type == DataType::STRING || $input->type == DataType::INTEGER
[38/40] airavata-php-gateway git commit: fixing showing experiment
output values in PGA
Posted by sc...@apache.org.
fixing showing experiment output values in 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/a03f217a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a03f217a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a03f217a
Branch: refs/heads/master
Commit: a03f217a6950a454e7c68cffe9f0e9992051a216
Parents: 2805fd7
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 25 15:56:54 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 25 15:56:54 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 40 ++++++++++++------------------
1 file changed, 16 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a03f217a/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 011e6ed..a687e51 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -670,42 +670,34 @@ class ExperimentUtilities
{
if( $process)
{
- $processStatusVal = array_search($status, ProcessState::$__names);
if ($status != ProcessState::COMPLETED)
echo "Process hasn't completed. Process Status is : " . ProcessState::$__names[ $status] . '<br/>';
}
else
{
- $expStatusVal = array_search($status, ExperimentState::$__names);
if ( $status != ExperimentState::COMPLETED)
echo "Experiment hasn't completed. Experiment Status is : " . ExperimentState::$__names[ $status] . '<br/>';
}
- //$outputs = $experiment->experimentOutputs;
- //print_r( $outputs); exit;
+
foreach ((array)$outputs as $output) {
if ($output->type == DataType::URI || $output->type == DataType::STDOUT || $output->type == DataType::STDERR) {
- if(file_exists(str_replace('//','/',$output->value))){
- $outputPathArray = explode("/", $output->value);
-
- echo '<p>' . $output->name . ' : ' . '<a target="_blank"
- href="' . URL::to("/") . '/download?path=' .
- $outputPathArray[ count($outputPathArray)-4] . "/" .
- $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>';
+ $dataProductModel = Airavata::getDataProduct(Session::get('authz-token'), $output->value);
+ $currentInputPath = "";
+ foreach ($dataProductModel->replicaLocations as $rp) {
+ if ($rp->replicaLocationCategory == ReplicaLocationCategory::GATEWAY_DATA_STORE) {
+ $currentInputPath = $rp->filePath;
+ break;
+ }
}
-// 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) {
+ $dataRoot = Config::get("pga_config.airavata")["experiment-data-absolute-path"];
+ if (!ExperimentUtilities::endsWith($dataRoot, "/"))
+ $dataRoot = $dataRoot . "/";
+ $filePath = str_replace($dataRoot, "", $currentInputPath);
+ echo '<p><a target="_blank" href="' . URL::to("/") . '/download/?path=' . $filePath . '">' . basename($filePath) . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
+ } elseif ($output->type == DataType::STRING) {
echo '<p>' . $output->value . '</p>';
- }
- else
- echo 'output : '. $output;
- //echo 'output-type : ' . $output->type;
+ } else
+ echo 'output : ' . $output;
}
}
[08/40] airavata-php-gateway git commit: updating thrift generated
file
Posted by sc...@apache.org.
updating thrift generated file
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/3c452e19
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3c452e19
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3c452e19
Branch: refs/heads/master
Commit: 3c452e1981f7a61314ec5a2ae420f3b208c6f079
Parents: 89b8258
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 22 17:36:21 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 22 17:36:21 2016 -0400
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 10934 ++++++++++++++-----------
1 file changed, 6004 insertions(+), 4930 deletions(-)
----------------------------------------------------------------------