You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2015/12/10 17:50:14 UTC
[01/23] airavata-php-gateway git commit: updating the thrift gen code
and adding get_detailed_exp_tree method to ExperimentUtilities
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 93eb29d41 -> b3adcfe88
updating the thrift gen code and adding get_detailed_exp_tree method to ExperimentUtilities
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/a80e2f25
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a80e2f25
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a80e2f25
Branch: refs/heads/develop
Commit: a80e2f25da61a1186326223ff185926bd07ca052
Parents: 4fa2e7f
Author: scnakandala <su...@gmail.com>
Authored: Mon Nov 16 11:58:00 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Nov 16 11:58:00 2015 -0500
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 2 +-
app/libraries/Airavata/API/Airavata.php | 433 +++++++++++++++++++
.../Model/AppCatalog/ComputeResource/Types.php | 2 +
.../Airavata/Model/Experiment/Types.php | 187 +++++---
app/libraries/Airavata/Model/Task/Types.php | 51 +++
app/libraries/ExperimentUtilities.php | 39 ++
6 files changed, 645 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a80e2f25/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index 3ef331b..1e88d39 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -79,7 +79,7 @@ class ExperimentController extends BaseController
public function summary()
{
- $experiment = ExperimentUtilities::get_experiment($_GET['expId']);
+ $experiment = ExperimentUtilities::get_detailed_experiment_tree($_GET['expId']);
if ($experiment != null) {
$project = ProjectUtilities::get_project($experiment->projectId);
$expVal = ExperimentUtilities::get_experiment_values($experiment, $project);
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a80e2f25/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index edf5211..c3d3122 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -634,6 +634,64 @@ interface AiravataIf {
*/
public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
/**
+ * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ * tasks -> jobs information.
+ *
+ * @param airavataExperimentId
+ * The identifier for the requested experiment. This is returned during the create experiment step.
+ *
+ * @return experimentMetada
+ * This method will return the previously stored experiment metadata.
+ *
+ * @throws org.apache.airavata.model.error.InvalidRequestException
+ * For any incorrect forming of the request itself.
+ *
+ * @throws org.apache.airavata.model.error.ExperimentNotFoundException
+ * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+ *
+ * @throws org.apache.airavata.model.error.AiravataClientException
+ * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+ *
+ * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ * step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ * gateway registration steps and retry this request.
+ *
+ * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ * For now this is a place holder.
+ *
+ * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ * is implemented, the authorization will be more substantial.
+ *
+ * @throws org.apache.airavata.model.error.AiravataSystemException
+ * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ * rather an Airavata Administrator will be notified to take corrective action.
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $airavataExperimentId
+ * @return \Airavata\Model\Experiment\ExperimentModel A structure holding the experiment metadata and its child models.
+ *
+ * userName:
+ * The user name of the targeted gateway end user on whose behalf the experiment is being created.
+ * the associated gateway identity can only be inferred from the security hand-shake so as to avoid
+ * authorized Airavata Clients mimicking an unauthorized request. If a gateway is not registered with
+ * Airavata, an authorization exception is thrown.
+ *
+ * experimentName:
+ * The name of the experiment as defined by the user. The name need not be unique as uniqueness is enforced
+ * by the generated experiment id.
+ *
+ * experimentDescription:
+ * The verbose description of the experiment. This is an optional parameter.
+ *
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\ExperimentNotFoundException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
+ /**
* Configure a previously created experiment with required inputs, scheduling and other quality of service
* parameters. This method only updates the experiment object within the registry. The experiment has to be launched
* to make it actionable by the server.
@@ -4536,6 +4594,73 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getExperiment failed: unknown result");
}
+ public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ {
+ $this->send_getDetailedExperimentTree($authzToken, $airavataExperimentId);
+ return $this->recv_getDetailedExperimentTree();
+ }
+
+ public function send_getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ {
+ $args = new \Airavata\API\Airavata_getDetailedExperimentTree_args();
+ $args->authzToken = $authzToken;
+ $args->airavataExperimentId = $airavataExperimentId;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'getDetailedExperimentTree', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getDetailedExperimentTree', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_getDetailedExperimentTree()
+ {
+ $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_getDetailedExperimentTree_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_getDetailedExperimentTree_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->enf !== null) {
+ throw $result->enf;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("getDetailedExperimentTree failed: unknown result");
+ }
+
public function updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
$this->send_updateExperiment($authzToken, $airavataExperimentId, $experiment);
@@ -20265,6 +20390,314 @@ class Airavata_getExperiment_result {
}
+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;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a80e2f25/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 ce752e3..e2d2461 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -177,6 +177,7 @@ final class JobSubmissionProtocol {
const UNICORE = 3;
const CLOUD = 4;
const SSH_FORK = 5;
+ const LOCAL_FORK = 6;
static public $__names = array(
0 => 'LOCAL',
1 => 'SSH',
@@ -184,6 +185,7 @@ final class JobSubmissionProtocol {
3 => 'UNICORE',
4 => 'CLOUD',
5 => 'SSH_FORK',
+ 6 => 'LOCAL_FORK',
);
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a80e2f25/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 fd56220..d01c0d0 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -355,6 +355,10 @@ class ExperimentModel {
* @var \Airavata\Model\Commons\ErrorModel[]
*/
public $errors = null;
+ /**
+ * @var \Airavata\Model\Process\ProcessModel[]
+ */
+ public $processes = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -448,6 +452,15 @@ class ExperimentModel {
'class' => '\Airavata\Model\Commons\ErrorModel',
),
),
+ 18 => array(
+ 'var' => 'processes',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Process\ProcessModel',
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -502,6 +515,9 @@ class ExperimentModel {
if (isset($vals['errors'])) {
$this->errors = $vals['errors'];
}
+ if (isset($vals['processes'])) {
+ $this->processes = $vals['processes'];
+ }
}
}
@@ -688,6 +704,24 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
+ case 18:
+ if ($ftype == TType::LST) {
+ $this->processes = array();
+ $_size24 = 0;
+ $_etype27 = 0;
+ $xfer += $input->readListBegin($_etype27, $_size24);
+ for ($_i28 = 0; $_i28 < $_size24; ++$_i28)
+ {
+ $elem29 = null;
+ $elem29 = new \Airavata\Model\Process\ProcessModel();
+ $xfer += $elem29->read($input);
+ $this->processes []= $elem29;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -764,9 +798,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRING, count($this->emailAddresses));
{
- foreach ($this->emailAddresses as $iter24)
+ foreach ($this->emailAddresses as $iter30)
{
- $xfer += $output->writeString($iter24);
+ $xfer += $output->writeString($iter30);
}
}
$output->writeListEnd();
@@ -789,9 +823,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->experimentInputs));
{
- foreach ($this->experimentInputs as $iter25)
+ foreach ($this->experimentInputs as $iter31)
{
- $xfer += $iter25->write($output);
+ $xfer += $iter31->write($output);
}
}
$output->writeListEnd();
@@ -806,9 +840,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->experimentOutputs));
{
- foreach ($this->experimentOutputs as $iter26)
+ foreach ($this->experimentOutputs as $iter32)
{
- $xfer += $iter26->write($output);
+ $xfer += $iter32->write($output);
}
}
$output->writeListEnd();
@@ -831,9 +865,26 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->errors));
{
- foreach ($this->errors as $iter27)
+ foreach ($this->errors as $iter33)
+ {
+ $xfer += $iter33->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->processes !== null) {
+ if (!is_array($this->processes)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('processes', TType::LST, 18);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->processes));
+ {
+ foreach ($this->processes as $iter34)
{
- $xfer += $iter27->write($output);
+ $xfer += $iter34->write($output);
}
}
$output->writeListEnd();
@@ -1391,15 +1442,15 @@ class ExperimentStatistics {
case 7:
if ($ftype == TType::LST) {
$this->allExperiments = array();
- $_size28 = 0;
- $_etype31 = 0;
- $xfer += $input->readListBegin($_etype31, $_size28);
- for ($_i32 = 0; $_i32 < $_size28; ++$_i32)
+ $_size35 = 0;
+ $_etype38 = 0;
+ $xfer += $input->readListBegin($_etype38, $_size35);
+ for ($_i39 = 0; $_i39 < $_size35; ++$_i39)
{
- $elem33 = null;
- $elem33 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem33->read($input);
- $this->allExperiments []= $elem33;
+ $elem40 = null;
+ $elem40 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem40->read($input);
+ $this->allExperiments []= $elem40;
}
$xfer += $input->readListEnd();
} else {
@@ -1409,15 +1460,15 @@ class ExperimentStatistics {
case 8:
if ($ftype == TType::LST) {
$this->completedExperiments = array();
- $_size34 = 0;
- $_etype37 = 0;
- $xfer += $input->readListBegin($_etype37, $_size34);
- for ($_i38 = 0; $_i38 < $_size34; ++$_i38)
+ $_size41 = 0;
+ $_etype44 = 0;
+ $xfer += $input->readListBegin($_etype44, $_size41);
+ for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
{
- $elem39 = null;
- $elem39 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem39->read($input);
- $this->completedExperiments []= $elem39;
+ $elem46 = null;
+ $elem46 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem46->read($input);
+ $this->completedExperiments []= $elem46;
}
$xfer += $input->readListEnd();
} else {
@@ -1427,15 +1478,15 @@ class ExperimentStatistics {
case 9:
if ($ftype == TType::LST) {
$this->failedExperiments = array();
- $_size40 = 0;
- $_etype43 = 0;
- $xfer += $input->readListBegin($_etype43, $_size40);
- for ($_i44 = 0; $_i44 < $_size40; ++$_i44)
+ $_size47 = 0;
+ $_etype50 = 0;
+ $xfer += $input->readListBegin($_etype50, $_size47);
+ for ($_i51 = 0; $_i51 < $_size47; ++$_i51)
{
- $elem45 = null;
- $elem45 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem45->read($input);
- $this->failedExperiments []= $elem45;
+ $elem52 = null;
+ $elem52 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem52->read($input);
+ $this->failedExperiments []= $elem52;
}
$xfer += $input->readListEnd();
} else {
@@ -1445,15 +1496,15 @@ class ExperimentStatistics {
case 10:
if ($ftype == TType::LST) {
$this->cancelledExperiments = array();
- $_size46 = 0;
- $_etype49 = 0;
- $xfer += $input->readListBegin($_etype49, $_size46);
- for ($_i50 = 0; $_i50 < $_size46; ++$_i50)
+ $_size53 = 0;
+ $_etype56 = 0;
+ $xfer += $input->readListBegin($_etype56, $_size53);
+ for ($_i57 = 0; $_i57 < $_size53; ++$_i57)
{
- $elem51 = null;
- $elem51 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem51->read($input);
- $this->cancelledExperiments []= $elem51;
+ $elem58 = null;
+ $elem58 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem58->read($input);
+ $this->cancelledExperiments []= $elem58;
}
$xfer += $input->readListEnd();
} else {
@@ -1463,15 +1514,15 @@ class ExperimentStatistics {
case 11:
if ($ftype == TType::LST) {
$this->createdExperiments = array();
- $_size52 = 0;
- $_etype55 = 0;
- $xfer += $input->readListBegin($_etype55, $_size52);
- for ($_i56 = 0; $_i56 < $_size52; ++$_i56)
+ $_size59 = 0;
+ $_etype62 = 0;
+ $xfer += $input->readListBegin($_etype62, $_size59);
+ for ($_i63 = 0; $_i63 < $_size59; ++$_i63)
{
- $elem57 = null;
- $elem57 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem57->read($input);
- $this->createdExperiments []= $elem57;
+ $elem64 = null;
+ $elem64 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem64->read($input);
+ $this->createdExperiments []= $elem64;
}
$xfer += $input->readListEnd();
} else {
@@ -1481,15 +1532,15 @@ class ExperimentStatistics {
case 12:
if ($ftype == TType::LST) {
$this->runningExperiments = array();
- $_size58 = 0;
- $_etype61 = 0;
- $xfer += $input->readListBegin($_etype61, $_size58);
- for ($_i62 = 0; $_i62 < $_size58; ++$_i62)
+ $_size65 = 0;
+ $_etype68 = 0;
+ $xfer += $input->readListBegin($_etype68, $_size65);
+ for ($_i69 = 0; $_i69 < $_size65; ++$_i69)
{
- $elem63 = null;
- $elem63 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem63->read($input);
- $this->runningExperiments []= $elem63;
+ $elem70 = null;
+ $elem70 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem70->read($input);
+ $this->runningExperiments []= $elem70;
}
$xfer += $input->readListEnd();
} else {
@@ -1547,9 +1598,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->allExperiments));
{
- foreach ($this->allExperiments as $iter64)
+ foreach ($this->allExperiments as $iter71)
{
- $xfer += $iter64->write($output);
+ $xfer += $iter71->write($output);
}
}
$output->writeListEnd();
@@ -1564,9 +1615,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->completedExperiments));
{
- foreach ($this->completedExperiments as $iter65)
+ foreach ($this->completedExperiments as $iter72)
{
- $xfer += $iter65->write($output);
+ $xfer += $iter72->write($output);
}
}
$output->writeListEnd();
@@ -1581,9 +1632,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->failedExperiments));
{
- foreach ($this->failedExperiments as $iter66)
+ foreach ($this->failedExperiments as $iter73)
{
- $xfer += $iter66->write($output);
+ $xfer += $iter73->write($output);
}
}
$output->writeListEnd();
@@ -1598,9 +1649,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->cancelledExperiments));
{
- foreach ($this->cancelledExperiments as $iter67)
+ foreach ($this->cancelledExperiments as $iter74)
{
- $xfer += $iter67->write($output);
+ $xfer += $iter74->write($output);
}
}
$output->writeListEnd();
@@ -1615,9 +1666,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->createdExperiments));
{
- foreach ($this->createdExperiments as $iter68)
+ foreach ($this->createdExperiments as $iter75)
{
- $xfer += $iter68->write($output);
+ $xfer += $iter75->write($output);
}
}
$output->writeListEnd();
@@ -1632,9 +1683,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->runningExperiments));
{
- foreach ($this->runningExperiments as $iter69)
+ foreach ($this->runningExperiments as $iter76)
{
- $xfer += $iter69->write($output);
+ $xfer += $iter76->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a80e2f25/app/libraries/Airavata/Model/Task/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Task/Types.php b/app/libraries/Airavata/Model/Task/Types.php
index 2e3f678..6d666f1 100644
--- a/app/libraries/Airavata/Model/Task/Types.php
+++ b/app/libraries/Airavata/Model/Task/Types.php
@@ -100,6 +100,10 @@ class TaskModel {
* @var \Airavata\Model\Commons\ErrorModel
*/
public $taskError = null;
+ /**
+ * @var \Airavata\Model\Job\JobModel[]
+ */
+ public $jobs = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -142,6 +146,15 @@ class TaskModel {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Commons\ErrorModel',
),
+ 10 => array(
+ 'var' => 'jobs',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Job\JobModel',
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -172,6 +185,9 @@ class TaskModel {
if (isset($vals['taskError'])) {
$this->taskError = $vals['taskError'];
}
+ if (isset($vals['jobs'])) {
+ $this->jobs = $vals['jobs'];
+ }
}
}
@@ -259,6 +275,24 @@ class TaskModel {
$xfer += $input->skip($ftype);
}
break;
+ case 10:
+ if ($ftype == TType::LST) {
+ $this->jobs = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $elem5 = new \Airavata\Model\Job\JobModel();
+ $xfer += $elem5->read($input);
+ $this->jobs []= $elem5;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -323,6 +357,23 @@ class TaskModel {
$xfer += $this->taskError->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->jobs !== null) {
+ if (!is_array($this->jobs)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('jobs', TType::LST, 10);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->jobs));
+ {
+ foreach ($this->jobs as $iter6)
+ {
+ $xfer += $iter6->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a80e2f25/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index b9f8bfd..0d6c960 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -127,6 +127,45 @@ class ExperimentUtilities
}
/**
+ * Get the experiment tree including all nested structures such as proesses, jobs, tasks etc
+ * @param $expId
+ * @return null
+ */
+ public static function get_detailed_experiment_tree($expId)
+ {
+
+ try {
+ return Airavata::getDetailedExperimentTree(Session::get('authz-token'), $expId);
+ } catch (InvalidRequestException $ire) {
+ CommonUtilities::print_error_message('<p>There was a problem getting the experiment.
+ Please try again later or submit a bug report using the link in the Help menu.</p>' .
+ '<p>InvalidRequestException: ' . $ire->getMessage() . '</p>');
+ } catch (ExperimentNotFoundException $enf) {
+ CommonUtilities::print_error_message('<p>There was a problem getting the experiment.
+ Please try again later or submit a bug report using the link in the Help menu.</p>' .
+ '<p>ExperimentNotFoundException: ' . $enf->getMessage() . '</p>');
+ } catch (AiravataClientException $ace) {
+ CommonUtilities::print_error_message('<p>There was a problem getting the experiment.
+ Please try again later or submit a bug report using the link in the Help menu.</p>' .
+ '<p>AiravataClientException: ' . $ace->getMessage() . '</p>');
+ } catch (AiravataSystemException $ase) {
+ CommonUtilities::print_error_message('<p>There was a problem getting the experiment.
+ Please try again later or submit a bug report using the link in the Help menu.</p>' .
+ '<p>AiravataSystemException: ' . $ase->getMessage() . '</p>');
+ } catch (TTransportException $tte) {
+ CommonUtilities::print_error_message('<p>There was a problem getting the experiment.
+ Please try again later or submit a bug report using the link in the Help menu.</p>' .
+ '<p>TTransportException: ' . $tte->getMessage() . '</p>');
+ } catch (Exception $e) {
+ CommonUtilities::print_error_message('<p>There was a problem getting the experiment.
+ Please try again later or submit a bug report using the link in the Help menu.</p>' .
+ '<p>Exception: ' . $e->getMessage() . '</p>');
+ }
+
+ }
+
+
+ /**
* Create and configure a new Experiment
* @return Experiment
*/
[12/23] airavata-php-gateway git commit: fix for experiment utf-8
encode issue
Posted by nd...@apache.org.
fix for experiment utf-8 encode 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/974599e5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/974599e5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/974599e5
Branch: refs/heads/develop
Commit: 974599e522b964e54bec424e5d76a92153f50386
Parents: 3deb14d
Author: scnakandala <su...@gmail.com>
Authored: Wed Nov 25 16:26:11 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Nov 25 16:26:11 2015 -0500
----------------------------------------------------------------------
app/views/partials/experiment-info.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/974599e5/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index de8e212..62bd1b7 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -185,7 +185,7 @@
</div>
</form>
@endif
- <input type="hidden" id="expObj" value="{{ htmlentities( json_encode( $experiment)) }}"/>
+ <input type="hidden" id="expObj" value="{{ htmlentities( json_encode( $experiment, JSON_UNESCAPED_UNICODE)) }}"/>
<!-- check of correct experiment Id ends here -->
@endif
[17/23] airavata-php-gateway git commit: updating thrift generated
files
Posted by nd...@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/57209228
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/57209228
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/57209228
Branch: refs/heads/develop
Commit: 57209228f2a8d6b3f5c45fd1749eca88838d3f61
Parents: 8e2493a
Author: scnakandala <su...@gmail.com>
Authored: Wed Dec 2 11:49:17 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Dec 2 11:49:17 2015 -0500
----------------------------------------------------------------------
.../Model/AppCatalog/GatewayProfile/Types.php | 37 ++++----------------
1 file changed, 7 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/57209228/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 098ec1e..f63f2f0 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -477,10 +477,6 @@ class GatewayResourceProfile {
/**
* @var string
*/
- public $dataStorageHostName = null;
- /**
- * @var string
- */
public $credentialStoreToken = null;
/**
* @var \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference[]
@@ -499,14 +495,10 @@ class GatewayResourceProfile {
'type' => TType::STRING,
),
2 => array(
- 'var' => 'dataStorageHostName',
- 'type' => TType::STRING,
- ),
- 3 => array(
'var' => 'credentialStoreToken',
'type' => TType::STRING,
),
- 4 => array(
+ 3 => array(
'var' => 'computeResourcePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -515,7 +507,7 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference',
),
),
- 5 => array(
+ 4 => array(
'var' => 'dataStoragePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -530,9 +522,6 @@ class GatewayResourceProfile {
if (isset($vals['gatewayID'])) {
$this->gatewayID = $vals['gatewayID'];
}
- if (isset($vals['dataStorageHostName'])) {
- $this->dataStorageHostName = $vals['dataStorageHostName'];
- }
if (isset($vals['credentialStoreToken'])) {
$this->credentialStoreToken = $vals['credentialStoreToken'];
}
@@ -573,19 +562,12 @@ class GatewayResourceProfile {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataStorageHostName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
$xfer += $input->readString($this->credentialStoreToken);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 3:
if ($ftype == TType::LST) {
$this->computeResourcePreferences = array();
$_size0 = 0;
@@ -603,7 +585,7 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 5:
+ case 4:
if ($ftype == TType::LST) {
$this->dataStoragePreferences = array();
$_size6 = 0;
@@ -639,13 +621,8 @@ class GatewayResourceProfile {
$xfer += $output->writeString($this->gatewayID);
$xfer += $output->writeFieldEnd();
}
- if ($this->dataStorageHostName !== null) {
- $xfer += $output->writeFieldBegin('dataStorageHostName', TType::STRING, 2);
- $xfer += $output->writeString($this->dataStorageHostName);
- $xfer += $output->writeFieldEnd();
- }
if ($this->credentialStoreToken !== null) {
- $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 2);
$xfer += $output->writeString($this->credentialStoreToken);
$xfer += $output->writeFieldEnd();
}
@@ -653,7 +630,7 @@ class GatewayResourceProfile {
if (!is_array($this->computeResourcePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 4);
+ $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 3);
{
$output->writeListBegin(TType::STRUCT, count($this->computeResourcePreferences));
{
@@ -670,7 +647,7 @@ class GatewayResourceProfile {
if (!is_array($this->dataStoragePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 5);
+ $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 4);
{
$output->writeListBegin(TType::STRUCT, count($this->dataStoragePreferences));
{
[06/23] airavata-php-gateway git commit: fixing username claim uri
issue
Posted by nd...@apache.org.
fixing username claim uri 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/7c7c657a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7c7c657a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7c7c657a
Branch: refs/heads/develop
Commit: 7c7c657a4bbf92a19b390f0e7c998231c35caa19
Parents: e576d43
Author: scnakandala <su...@gmail.com>
Authored: Tue Nov 24 18:29:54 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Nov 24 18:32:48 2015 -0500
----------------------------------------------------------------------
app/libraries/Wsis/Wsis.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7c7c657a/app/libraries/Wsis/Wsis.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Wsis.php b/app/libraries/Wsis/Wsis.php
index 69c0e2f..48739e2 100755
--- a/app/libraries/Wsis/Wsis.php
+++ b/app/libraries/Wsis/Wsis.php
@@ -212,7 +212,7 @@ class Wsis {
*/
public function getUserProfileFromOAuthToken($token){
$userProfile = $this->oauthManger->getUserProfile($token);
- return array('username'=>$userProfile->username, 'email'=>$userProfile->email, 'firstname'=>$userProfile->given_name,
+ return array('username'=>$userProfile->sub, 'email'=>$userProfile->email, 'firstname'=>$userProfile->given_name,
'lastname'=>$userProfile->family_name, 'roles'=>explode(",",$userProfile->roles));
}
[13/23] airavata-php-gateway git commit: Fix for experiment summary
unicode issue
Posted by nd...@apache.org.
Fix for experiment summary unicode 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/98f398ad
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/98f398ad
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/98f398ad
Branch: refs/heads/develop
Commit: 98f398ad4ef2550d9e27b0df3de10d4ef5a8e5ef
Parents: 0f017de
Author: Nipurn Doshi <Nipurn Doshi>
Authored: Tue Dec 1 12:28:45 2015 -0500
Committer: Nipurn Doshi <Nipurn Doshi>
Committed: Tue Dec 1 12:28:45 2015 -0500
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 8 ++++++--
app/views/experiment/summary.blade.php | 6 ++++--
app/views/partials/experiment-info.blade.php | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/98f398ad/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index 1e88d39..754c35f 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -79,7 +79,11 @@ class ExperimentController extends BaseController
public function summary()
{
- $experiment = ExperimentUtilities::get_detailed_experiment_tree($_GET['expId']);
+ if (Input::has("dashboard"))
+ $experiment = ExperimentUtilities::get_detailed_experiment_tree($_GET['expId']);
+ else
+ $experiment = ExperimentUtilities::get_experiment( $_GET['expId']);
+
if ($experiment != null) {
$project = ProjectUtilities::get_project($experiment->projectId);
$expVal = ExperimentUtilities::get_experiment_values($experiment, $project);
@@ -111,7 +115,7 @@ class ExperimentController extends BaseController
$data["dashboard"] = true;
return View::make("partials/experiment-info", $data);
} else
- return json_encode($experiment);
+ return json_encode($data);
} else {
return View::make("experiment/summary", $data);
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/98f398ad/app/views/experiment/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/summary.blade.php b/app/views/experiment/summary.blade.php
index 845e9ff..2643b5c 100755
--- a/app/views/experiment/summary.blade.php
+++ b/app/views/experiment/summary.blade.php
@@ -19,8 +19,10 @@
type: "GET",
url: "{{URL::to('/') }}/experiment/summary",
data: {expId: "{{ Input::get('expId') }}" },
- success: function (exp) {
- if ($.trim($("#expObj").val()) != $.trim(exp)) {
+ success: function ( data) {
+ data = $.parseJSON( data);
+ //if ($.trim($("#expObj").val()) != $.trim(exp)) {
+ if ($.trim($("#lastModifiedTime").val()) != $.trim( data.expVal["experimentTimeOfStateChange"])) {
$continue = false;
$(".refresh-exp").click();
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/98f398ad/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index de8e212..bfaf10b 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -185,7 +185,7 @@
</div>
</form>
@endif
- <input type="hidden" id="expObj" value="{{ htmlentities( json_encode( $experiment)) }}"/>
+ <input type="hidden" id="lastModifiedTime" value="{{ $expVal['experimentTimeOfStateChange'] }}"/>
<!-- check of correct experiment Id ends here -->
@endif
[10/23] airavata-php-gateway git commit: updating thirft files
Posted by nd...@apache.org.
updating thirft 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/0f017de5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/0f017de5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/0f017de5
Branch: refs/heads/develop
Commit: 0f017de582e0b1c633c60f1a154cde7d91f04ccc
Parents: 75d7577
Author: scnakandala <su...@gmail.com>
Authored: Wed Nov 25 14:51:40 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Nov 25 14:51:40 2015 -0500
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 7278 +++++++-----------
.../Model/AppCatalog/GatewayProfile/Types.php | 37 +-
.../Airavata/Model/Experiment/Types.php | 187 +-
app/libraries/Airavata/Model/Task/Types.php | 53 +-
4 files changed, 3121 insertions(+), 4434 deletions(-)
----------------------------------------------------------------------
[08/23] airavata-php-gateway git commit: updating thirft files
Posted by nd...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0f017de5/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 f63f2f0..098ec1e 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -477,6 +477,10 @@ class GatewayResourceProfile {
/**
* @var string
*/
+ public $dataStorageHostName = null;
+ /**
+ * @var string
+ */
public $credentialStoreToken = null;
/**
* @var \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference[]
@@ -495,10 +499,14 @@ class GatewayResourceProfile {
'type' => TType::STRING,
),
2 => array(
- 'var' => 'credentialStoreToken',
+ 'var' => 'dataStorageHostName',
'type' => TType::STRING,
),
3 => array(
+ 'var' => 'credentialStoreToken',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
'var' => 'computeResourcePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -507,7 +515,7 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference',
),
),
- 4 => array(
+ 5 => array(
'var' => 'dataStoragePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -522,6 +530,9 @@ class GatewayResourceProfile {
if (isset($vals['gatewayID'])) {
$this->gatewayID = $vals['gatewayID'];
}
+ if (isset($vals['dataStorageHostName'])) {
+ $this->dataStorageHostName = $vals['dataStorageHostName'];
+ }
if (isset($vals['credentialStoreToken'])) {
$this->credentialStoreToken = $vals['credentialStoreToken'];
}
@@ -562,12 +573,19 @@ class GatewayResourceProfile {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->credentialStoreToken);
+ $xfer += $input->readString($this->dataStorageHostName);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->credentialStoreToken);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
if ($ftype == TType::LST) {
$this->computeResourcePreferences = array();
$_size0 = 0;
@@ -585,7 +603,7 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 5:
if ($ftype == TType::LST) {
$this->dataStoragePreferences = array();
$_size6 = 0;
@@ -621,8 +639,13 @@ class GatewayResourceProfile {
$xfer += $output->writeString($this->gatewayID);
$xfer += $output->writeFieldEnd();
}
+ if ($this->dataStorageHostName !== null) {
+ $xfer += $output->writeFieldBegin('dataStorageHostName', TType::STRING, 2);
+ $xfer += $output->writeString($this->dataStorageHostName);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->credentialStoreToken !== null) {
- $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 2);
+ $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 3);
$xfer += $output->writeString($this->credentialStoreToken);
$xfer += $output->writeFieldEnd();
}
@@ -630,7 +653,7 @@ class GatewayResourceProfile {
if (!is_array($this->computeResourcePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 3);
+ $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 4);
{
$output->writeListBegin(TType::STRUCT, count($this->computeResourcePreferences));
{
@@ -647,7 +670,7 @@ class GatewayResourceProfile {
if (!is_array($this->dataStoragePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 4);
+ $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 5);
{
$output->writeListBegin(TType::STRUCT, count($this->dataStoragePreferences));
{
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0f017de5/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 fd56220..d01c0d0 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -355,6 +355,10 @@ class ExperimentModel {
* @var \Airavata\Model\Commons\ErrorModel[]
*/
public $errors = null;
+ /**
+ * @var \Airavata\Model\Process\ProcessModel[]
+ */
+ public $processes = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -448,6 +452,15 @@ class ExperimentModel {
'class' => '\Airavata\Model\Commons\ErrorModel',
),
),
+ 18 => array(
+ 'var' => 'processes',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Process\ProcessModel',
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -502,6 +515,9 @@ class ExperimentModel {
if (isset($vals['errors'])) {
$this->errors = $vals['errors'];
}
+ if (isset($vals['processes'])) {
+ $this->processes = $vals['processes'];
+ }
}
}
@@ -688,6 +704,24 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
+ case 18:
+ if ($ftype == TType::LST) {
+ $this->processes = array();
+ $_size24 = 0;
+ $_etype27 = 0;
+ $xfer += $input->readListBegin($_etype27, $_size24);
+ for ($_i28 = 0; $_i28 < $_size24; ++$_i28)
+ {
+ $elem29 = null;
+ $elem29 = new \Airavata\Model\Process\ProcessModel();
+ $xfer += $elem29->read($input);
+ $this->processes []= $elem29;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -764,9 +798,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRING, count($this->emailAddresses));
{
- foreach ($this->emailAddresses as $iter24)
+ foreach ($this->emailAddresses as $iter30)
{
- $xfer += $output->writeString($iter24);
+ $xfer += $output->writeString($iter30);
}
}
$output->writeListEnd();
@@ -789,9 +823,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->experimentInputs));
{
- foreach ($this->experimentInputs as $iter25)
+ foreach ($this->experimentInputs as $iter31)
{
- $xfer += $iter25->write($output);
+ $xfer += $iter31->write($output);
}
}
$output->writeListEnd();
@@ -806,9 +840,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->experimentOutputs));
{
- foreach ($this->experimentOutputs as $iter26)
+ foreach ($this->experimentOutputs as $iter32)
{
- $xfer += $iter26->write($output);
+ $xfer += $iter32->write($output);
}
}
$output->writeListEnd();
@@ -831,9 +865,26 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->errors));
{
- foreach ($this->errors as $iter27)
+ foreach ($this->errors as $iter33)
+ {
+ $xfer += $iter33->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->processes !== null) {
+ if (!is_array($this->processes)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('processes', TType::LST, 18);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->processes));
+ {
+ foreach ($this->processes as $iter34)
{
- $xfer += $iter27->write($output);
+ $xfer += $iter34->write($output);
}
}
$output->writeListEnd();
@@ -1391,15 +1442,15 @@ class ExperimentStatistics {
case 7:
if ($ftype == TType::LST) {
$this->allExperiments = array();
- $_size28 = 0;
- $_etype31 = 0;
- $xfer += $input->readListBegin($_etype31, $_size28);
- for ($_i32 = 0; $_i32 < $_size28; ++$_i32)
+ $_size35 = 0;
+ $_etype38 = 0;
+ $xfer += $input->readListBegin($_etype38, $_size35);
+ for ($_i39 = 0; $_i39 < $_size35; ++$_i39)
{
- $elem33 = null;
- $elem33 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem33->read($input);
- $this->allExperiments []= $elem33;
+ $elem40 = null;
+ $elem40 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem40->read($input);
+ $this->allExperiments []= $elem40;
}
$xfer += $input->readListEnd();
} else {
@@ -1409,15 +1460,15 @@ class ExperimentStatistics {
case 8:
if ($ftype == TType::LST) {
$this->completedExperiments = array();
- $_size34 = 0;
- $_etype37 = 0;
- $xfer += $input->readListBegin($_etype37, $_size34);
- for ($_i38 = 0; $_i38 < $_size34; ++$_i38)
+ $_size41 = 0;
+ $_etype44 = 0;
+ $xfer += $input->readListBegin($_etype44, $_size41);
+ for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
{
- $elem39 = null;
- $elem39 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem39->read($input);
- $this->completedExperiments []= $elem39;
+ $elem46 = null;
+ $elem46 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem46->read($input);
+ $this->completedExperiments []= $elem46;
}
$xfer += $input->readListEnd();
} else {
@@ -1427,15 +1478,15 @@ class ExperimentStatistics {
case 9:
if ($ftype == TType::LST) {
$this->failedExperiments = array();
- $_size40 = 0;
- $_etype43 = 0;
- $xfer += $input->readListBegin($_etype43, $_size40);
- for ($_i44 = 0; $_i44 < $_size40; ++$_i44)
+ $_size47 = 0;
+ $_etype50 = 0;
+ $xfer += $input->readListBegin($_etype50, $_size47);
+ for ($_i51 = 0; $_i51 < $_size47; ++$_i51)
{
- $elem45 = null;
- $elem45 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem45->read($input);
- $this->failedExperiments []= $elem45;
+ $elem52 = null;
+ $elem52 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem52->read($input);
+ $this->failedExperiments []= $elem52;
}
$xfer += $input->readListEnd();
} else {
@@ -1445,15 +1496,15 @@ class ExperimentStatistics {
case 10:
if ($ftype == TType::LST) {
$this->cancelledExperiments = array();
- $_size46 = 0;
- $_etype49 = 0;
- $xfer += $input->readListBegin($_etype49, $_size46);
- for ($_i50 = 0; $_i50 < $_size46; ++$_i50)
+ $_size53 = 0;
+ $_etype56 = 0;
+ $xfer += $input->readListBegin($_etype56, $_size53);
+ for ($_i57 = 0; $_i57 < $_size53; ++$_i57)
{
- $elem51 = null;
- $elem51 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem51->read($input);
- $this->cancelledExperiments []= $elem51;
+ $elem58 = null;
+ $elem58 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem58->read($input);
+ $this->cancelledExperiments []= $elem58;
}
$xfer += $input->readListEnd();
} else {
@@ -1463,15 +1514,15 @@ class ExperimentStatistics {
case 11:
if ($ftype == TType::LST) {
$this->createdExperiments = array();
- $_size52 = 0;
- $_etype55 = 0;
- $xfer += $input->readListBegin($_etype55, $_size52);
- for ($_i56 = 0; $_i56 < $_size52; ++$_i56)
+ $_size59 = 0;
+ $_etype62 = 0;
+ $xfer += $input->readListBegin($_etype62, $_size59);
+ for ($_i63 = 0; $_i63 < $_size59; ++$_i63)
{
- $elem57 = null;
- $elem57 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem57->read($input);
- $this->createdExperiments []= $elem57;
+ $elem64 = null;
+ $elem64 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem64->read($input);
+ $this->createdExperiments []= $elem64;
}
$xfer += $input->readListEnd();
} else {
@@ -1481,15 +1532,15 @@ class ExperimentStatistics {
case 12:
if ($ftype == TType::LST) {
$this->runningExperiments = array();
- $_size58 = 0;
- $_etype61 = 0;
- $xfer += $input->readListBegin($_etype61, $_size58);
- for ($_i62 = 0; $_i62 < $_size58; ++$_i62)
+ $_size65 = 0;
+ $_etype68 = 0;
+ $xfer += $input->readListBegin($_etype68, $_size65);
+ for ($_i69 = 0; $_i69 < $_size65; ++$_i69)
{
- $elem63 = null;
- $elem63 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem63->read($input);
- $this->runningExperiments []= $elem63;
+ $elem70 = null;
+ $elem70 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem70->read($input);
+ $this->runningExperiments []= $elem70;
}
$xfer += $input->readListEnd();
} else {
@@ -1547,9 +1598,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->allExperiments));
{
- foreach ($this->allExperiments as $iter64)
+ foreach ($this->allExperiments as $iter71)
{
- $xfer += $iter64->write($output);
+ $xfer += $iter71->write($output);
}
}
$output->writeListEnd();
@@ -1564,9 +1615,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->completedExperiments));
{
- foreach ($this->completedExperiments as $iter65)
+ foreach ($this->completedExperiments as $iter72)
{
- $xfer += $iter65->write($output);
+ $xfer += $iter72->write($output);
}
}
$output->writeListEnd();
@@ -1581,9 +1632,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->failedExperiments));
{
- foreach ($this->failedExperiments as $iter66)
+ foreach ($this->failedExperiments as $iter73)
{
- $xfer += $iter66->write($output);
+ $xfer += $iter73->write($output);
}
}
$output->writeListEnd();
@@ -1598,9 +1649,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->cancelledExperiments));
{
- foreach ($this->cancelledExperiments as $iter67)
+ foreach ($this->cancelledExperiments as $iter74)
{
- $xfer += $iter67->write($output);
+ $xfer += $iter74->write($output);
}
}
$output->writeListEnd();
@@ -1615,9 +1666,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->createdExperiments));
{
- foreach ($this->createdExperiments as $iter68)
+ foreach ($this->createdExperiments as $iter75)
{
- $xfer += $iter68->write($output);
+ $xfer += $iter75->write($output);
}
}
$output->writeListEnd();
@@ -1632,9 +1683,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->runningExperiments));
{
- foreach ($this->runningExperiments as $iter69)
+ foreach ($this->runningExperiments as $iter76)
{
- $xfer += $iter69->write($output);
+ $xfer += $iter76->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0f017de5/app/libraries/Airavata/Model/Task/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Task/Types.php b/app/libraries/Airavata/Model/Task/Types.php
index df9e68d..6d666f1 100644
--- a/app/libraries/Airavata/Model/Task/Types.php
+++ b/app/libraries/Airavata/Model/Task/Types.php
@@ -27,14 +27,12 @@ final class TaskTypes {
const JOB_SUBMISSION = 2;
const ENV_CLEANUP = 3;
const MONITORING = 4;
- const OUTPUT_FETCHING = 5;
static public $__names = array(
0 => 'ENV_SETUP',
1 => 'DATA_STAGING',
2 => 'JOB_SUBMISSION',
3 => 'ENV_CLEANUP',
4 => 'MONITORING',
- 5 => 'OUTPUT_FETCHING',
);
}
@@ -102,6 +100,10 @@ class TaskModel {
* @var \Airavata\Model\Commons\ErrorModel
*/
public $taskError = null;
+ /**
+ * @var \Airavata\Model\Job\JobModel[]
+ */
+ public $jobs = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -144,6 +146,15 @@ class TaskModel {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Commons\ErrorModel',
),
+ 10 => array(
+ 'var' => 'jobs',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Job\JobModel',
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -174,6 +185,9 @@ class TaskModel {
if (isset($vals['taskError'])) {
$this->taskError = $vals['taskError'];
}
+ if (isset($vals['jobs'])) {
+ $this->jobs = $vals['jobs'];
+ }
}
}
@@ -261,6 +275,24 @@ class TaskModel {
$xfer += $input->skip($ftype);
}
break;
+ case 10:
+ if ($ftype == TType::LST) {
+ $this->jobs = array();
+ $_size0 = 0;
+ $_etype3 = 0;
+ $xfer += $input->readListBegin($_etype3, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $elem5 = null;
+ $elem5 = new \Airavata\Model\Job\JobModel();
+ $xfer += $elem5->read($input);
+ $this->jobs []= $elem5;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -325,6 +357,23 @@ class TaskModel {
$xfer += $this->taskError->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->jobs !== null) {
+ if (!is_array($this->jobs)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('jobs', TType::LST, 10);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->jobs));
+ {
+ foreach ($this->jobs as $iter6)
+ {
+ $xfer += $iter6->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
[05/23] airavata-php-gateway git commit: updating libraries
Posted by nd...@apache.org.
updating libraries
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/d3d03c15
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d3d03c15
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d3d03c15
Branch: refs/heads/develop
Commit: d3d03c157b9a9bece7aa726212ee630f0ea6bd7b
Parents: e576d43
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Nov 17 14:10:29 2015 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Nov 17 14:10:29 2015 -0500
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 7278 +++++++++++-------
.../Model/AppCatalog/GatewayProfile/Types.php | 37 +-
.../Airavata/Model/Experiment/Types.php | 187 +-
app/libraries/Airavata/Model/Task/Types.php | 53 +-
4 files changed, 4434 insertions(+), 3121 deletions(-)
----------------------------------------------------------------------
[14/23] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by nd...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
# Conflicts:
# app/views/partials/experiment-info.blade.php
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/6296c04f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6296c04f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6296c04f
Branch: refs/heads/develop
Commit: 6296c04f5a6e01fe7c786c11da475d02291e057e
Parents: 98f398a 974599e
Author: Nipurn Doshi <Nipurn Doshi>
Authored: Tue Dec 1 12:32:43 2015 -0500
Committer: Nipurn Doshi <Nipurn Doshi>
Committed: Tue Dec 1 12:32:43 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[23/23] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by nd...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/b3adcfe8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b3adcfe8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b3adcfe8
Branch: refs/heads/develop
Commit: b3adcfe8884a7d752cc28527896aa98c0a94ec61
Parents: 3aeb344 afc639a
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Thu Dec 10 11:48:33 2015 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Thu Dec 10 11:48:33 2015 -0500
----------------------------------------------------------------------
app/config/packages/teepluss/theme/config.php | 2 +-
app/controllers/StorageResourceController.php | 191 ++++++++++++++++++++
app/controllers/StorageresourceController.php | 191 --------------------
app/libraries/AppUtilities.php | 2 +
app/libraries/SRUtilities.php | 2 +-
app/views/project/summary.blade.php | 4 +-
public/themes/base/layouts/default.blade.php | 1 +
public/themes/base/partials/footer.blade.php | 0
public/themes/base/partials/header.php | 0
public/themes/base/partials/template.blade.php | 0
public/themes/base/views/index.blade.php | 0
public/themes/base/views/test.blade.php | 1 +
themes/base/layouts/default.blade.php | 1 -
themes/base/partials/footer.blade.php | 0
themes/base/partials/header.php | 0
themes/base/partials/template.blade.php | 0
themes/base/views/index.blade.php | 0
themes/base/views/test.blade.php | 1 -
18 files changed, 199 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
[19/23] airavata-php-gateway git commit: Moving theme into public
folder
Posted by nd...@apache.org.
Moving theme into public folder
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/442dfa95
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/442dfa95
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/442dfa95
Branch: refs/heads/develop
Commit: 442dfa95cf71c86e41862725ad0ef1ba9e68cd22
Parents: 6f6aae0
Author: smarru <sm...@apache.org>
Authored: Tue Dec 8 13:44:46 2015 -0500
Committer: smarru <sm...@apache.org>
Committed: Tue Dec 8 13:44:46 2015 -0500
----------------------------------------------------------------------
app/config/packages/teepluss/theme/config.php | 2 +-
public/themes/base/layouts/default.blade.php | 1 +
public/themes/base/partials/footer.blade.php | 0
public/themes/base/partials/header.php | 0
public/themes/base/partials/template.blade.php | 0
public/themes/base/views/index.blade.php | 0
public/themes/base/views/test.blade.php | 1 +
themes/base/layouts/default.blade.php | 1 -
themes/base/partials/footer.blade.php | 0
themes/base/partials/header.php | 0
themes/base/partials/template.blade.php | 0
themes/base/views/index.blade.php | 0
themes/base/views/test.blade.php | 1 -
13 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/app/config/packages/teepluss/theme/config.php
----------------------------------------------------------------------
diff --git a/app/config/packages/teepluss/theme/config.php b/app/config/packages/teepluss/theme/config.php
index e36f52c..49689a1 100644
--- a/app/config/packages/teepluss/theme/config.php
+++ b/app/config/packages/teepluss/theme/config.php
@@ -86,7 +86,7 @@ return array(
|
*/
- 'themeDir' => '/../themes',
+ 'themeDir' => 'themes',
/*
|--------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/public/themes/base/layouts/default.blade.php
----------------------------------------------------------------------
diff --git a/public/themes/base/layouts/default.blade.php b/public/themes/base/layouts/default.blade.php
new file mode 100644
index 0000000..5f7513a
--- /dev/null
+++ b/public/themes/base/layouts/default.blade.php
@@ -0,0 +1 @@
+@include('home')
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/public/themes/base/partials/footer.blade.php
----------------------------------------------------------------------
diff --git a/public/themes/base/partials/footer.blade.php b/public/themes/base/partials/footer.blade.php
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/public/themes/base/partials/header.php
----------------------------------------------------------------------
diff --git a/public/themes/base/partials/header.php b/public/themes/base/partials/header.php
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/public/themes/base/partials/template.blade.php
----------------------------------------------------------------------
diff --git a/public/themes/base/partials/template.blade.php b/public/themes/base/partials/template.blade.php
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/public/themes/base/views/index.blade.php
----------------------------------------------------------------------
diff --git a/public/themes/base/views/index.blade.php b/public/themes/base/views/index.blade.php
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/public/themes/base/views/test.blade.php
----------------------------------------------------------------------
diff --git a/public/themes/base/views/test.blade.php b/public/themes/base/views/test.blade.php
new file mode 100644
index 0000000..30d74d2
--- /dev/null
+++ b/public/themes/base/views/test.blade.php
@@ -0,0 +1 @@
+test
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/themes/base/layouts/default.blade.php
----------------------------------------------------------------------
diff --git a/themes/base/layouts/default.blade.php b/themes/base/layouts/default.blade.php
deleted file mode 100644
index 5f7513a..0000000
--- a/themes/base/layouts/default.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-@include('home')
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/themes/base/partials/footer.blade.php
----------------------------------------------------------------------
diff --git a/themes/base/partials/footer.blade.php b/themes/base/partials/footer.blade.php
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/themes/base/partials/header.php
----------------------------------------------------------------------
diff --git a/themes/base/partials/header.php b/themes/base/partials/header.php
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/themes/base/partials/template.blade.php
----------------------------------------------------------------------
diff --git a/themes/base/partials/template.blade.php b/themes/base/partials/template.blade.php
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/themes/base/views/index.blade.php
----------------------------------------------------------------------
diff --git a/themes/base/views/index.blade.php b/themes/base/views/index.blade.php
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/442dfa95/themes/base/views/test.blade.php
----------------------------------------------------------------------
diff --git a/themes/base/views/test.blade.php b/themes/base/views/test.blade.php
deleted file mode 100644
index 30d74d2..0000000
--- a/themes/base/views/test.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-test
\ No newline at end of file
[03/23] airavata-php-gateway git commit: updating libraries
Posted by nd...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d3d03c15/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 098ec1e..f63f2f0 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -477,10 +477,6 @@ class GatewayResourceProfile {
/**
* @var string
*/
- public $dataStorageHostName = null;
- /**
- * @var string
- */
public $credentialStoreToken = null;
/**
* @var \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference[]
@@ -499,14 +495,10 @@ class GatewayResourceProfile {
'type' => TType::STRING,
),
2 => array(
- 'var' => 'dataStorageHostName',
- 'type' => TType::STRING,
- ),
- 3 => array(
'var' => 'credentialStoreToken',
'type' => TType::STRING,
),
- 4 => array(
+ 3 => array(
'var' => 'computeResourcePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -515,7 +507,7 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference',
),
),
- 5 => array(
+ 4 => array(
'var' => 'dataStoragePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -530,9 +522,6 @@ class GatewayResourceProfile {
if (isset($vals['gatewayID'])) {
$this->gatewayID = $vals['gatewayID'];
}
- if (isset($vals['dataStorageHostName'])) {
- $this->dataStorageHostName = $vals['dataStorageHostName'];
- }
if (isset($vals['credentialStoreToken'])) {
$this->credentialStoreToken = $vals['credentialStoreToken'];
}
@@ -573,19 +562,12 @@ class GatewayResourceProfile {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataStorageHostName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
$xfer += $input->readString($this->credentialStoreToken);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 3:
if ($ftype == TType::LST) {
$this->computeResourcePreferences = array();
$_size0 = 0;
@@ -603,7 +585,7 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 5:
+ case 4:
if ($ftype == TType::LST) {
$this->dataStoragePreferences = array();
$_size6 = 0;
@@ -639,13 +621,8 @@ class GatewayResourceProfile {
$xfer += $output->writeString($this->gatewayID);
$xfer += $output->writeFieldEnd();
}
- if ($this->dataStorageHostName !== null) {
- $xfer += $output->writeFieldBegin('dataStorageHostName', TType::STRING, 2);
- $xfer += $output->writeString($this->dataStorageHostName);
- $xfer += $output->writeFieldEnd();
- }
if ($this->credentialStoreToken !== null) {
- $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 2);
$xfer += $output->writeString($this->credentialStoreToken);
$xfer += $output->writeFieldEnd();
}
@@ -653,7 +630,7 @@ class GatewayResourceProfile {
if (!is_array($this->computeResourcePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 4);
+ $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 3);
{
$output->writeListBegin(TType::STRUCT, count($this->computeResourcePreferences));
{
@@ -670,7 +647,7 @@ class GatewayResourceProfile {
if (!is_array($this->dataStoragePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 5);
+ $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 4);
{
$output->writeListBegin(TType::STRUCT, count($this->dataStoragePreferences));
{
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d3d03c15/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 d01c0d0..fd56220 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -355,10 +355,6 @@ class ExperimentModel {
* @var \Airavata\Model\Commons\ErrorModel[]
*/
public $errors = null;
- /**
- * @var \Airavata\Model\Process\ProcessModel[]
- */
- public $processes = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -452,15 +448,6 @@ class ExperimentModel {
'class' => '\Airavata\Model\Commons\ErrorModel',
),
),
- 18 => array(
- 'var' => 'processes',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Process\ProcessModel',
- ),
- ),
);
}
if (is_array($vals)) {
@@ -515,9 +502,6 @@ class ExperimentModel {
if (isset($vals['errors'])) {
$this->errors = $vals['errors'];
}
- if (isset($vals['processes'])) {
- $this->processes = $vals['processes'];
- }
}
}
@@ -704,24 +688,6 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 18:
- if ($ftype == TType::LST) {
- $this->processes = array();
- $_size24 = 0;
- $_etype27 = 0;
- $xfer += $input->readListBegin($_etype27, $_size24);
- for ($_i28 = 0; $_i28 < $_size24; ++$_i28)
- {
- $elem29 = null;
- $elem29 = new \Airavata\Model\Process\ProcessModel();
- $xfer += $elem29->read($input);
- $this->processes []= $elem29;
- }
- $xfer += $input->readListEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -798,9 +764,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRING, count($this->emailAddresses));
{
- foreach ($this->emailAddresses as $iter30)
+ foreach ($this->emailAddresses as $iter24)
{
- $xfer += $output->writeString($iter30);
+ $xfer += $output->writeString($iter24);
}
}
$output->writeListEnd();
@@ -823,9 +789,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->experimentInputs));
{
- foreach ($this->experimentInputs as $iter31)
+ foreach ($this->experimentInputs as $iter25)
{
- $xfer += $iter31->write($output);
+ $xfer += $iter25->write($output);
}
}
$output->writeListEnd();
@@ -840,9 +806,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->experimentOutputs));
{
- foreach ($this->experimentOutputs as $iter32)
+ foreach ($this->experimentOutputs as $iter26)
{
- $xfer += $iter32->write($output);
+ $xfer += $iter26->write($output);
}
}
$output->writeListEnd();
@@ -865,26 +831,9 @@ class ExperimentModel {
{
$output->writeListBegin(TType::STRUCT, count($this->errors));
{
- foreach ($this->errors as $iter33)
- {
- $xfer += $iter33->write($output);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- if ($this->processes !== null) {
- if (!is_array($this->processes)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('processes', TType::LST, 18);
- {
- $output->writeListBegin(TType::STRUCT, count($this->processes));
- {
- foreach ($this->processes as $iter34)
+ foreach ($this->errors as $iter27)
{
- $xfer += $iter34->write($output);
+ $xfer += $iter27->write($output);
}
}
$output->writeListEnd();
@@ -1442,15 +1391,15 @@ class ExperimentStatistics {
case 7:
if ($ftype == TType::LST) {
$this->allExperiments = array();
- $_size35 = 0;
- $_etype38 = 0;
- $xfer += $input->readListBegin($_etype38, $_size35);
- for ($_i39 = 0; $_i39 < $_size35; ++$_i39)
+ $_size28 = 0;
+ $_etype31 = 0;
+ $xfer += $input->readListBegin($_etype31, $_size28);
+ for ($_i32 = 0; $_i32 < $_size28; ++$_i32)
{
- $elem40 = null;
- $elem40 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem40->read($input);
- $this->allExperiments []= $elem40;
+ $elem33 = null;
+ $elem33 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem33->read($input);
+ $this->allExperiments []= $elem33;
}
$xfer += $input->readListEnd();
} else {
@@ -1460,15 +1409,15 @@ class ExperimentStatistics {
case 8:
if ($ftype == TType::LST) {
$this->completedExperiments = array();
- $_size41 = 0;
- $_etype44 = 0;
- $xfer += $input->readListBegin($_etype44, $_size41);
- for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
+ $_size34 = 0;
+ $_etype37 = 0;
+ $xfer += $input->readListBegin($_etype37, $_size34);
+ for ($_i38 = 0; $_i38 < $_size34; ++$_i38)
{
- $elem46 = null;
- $elem46 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem46->read($input);
- $this->completedExperiments []= $elem46;
+ $elem39 = null;
+ $elem39 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem39->read($input);
+ $this->completedExperiments []= $elem39;
}
$xfer += $input->readListEnd();
} else {
@@ -1478,15 +1427,15 @@ class ExperimentStatistics {
case 9:
if ($ftype == TType::LST) {
$this->failedExperiments = array();
- $_size47 = 0;
- $_etype50 = 0;
- $xfer += $input->readListBegin($_etype50, $_size47);
- for ($_i51 = 0; $_i51 < $_size47; ++$_i51)
+ $_size40 = 0;
+ $_etype43 = 0;
+ $xfer += $input->readListBegin($_etype43, $_size40);
+ for ($_i44 = 0; $_i44 < $_size40; ++$_i44)
{
- $elem52 = null;
- $elem52 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem52->read($input);
- $this->failedExperiments []= $elem52;
+ $elem45 = null;
+ $elem45 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem45->read($input);
+ $this->failedExperiments []= $elem45;
}
$xfer += $input->readListEnd();
} else {
@@ -1496,15 +1445,15 @@ class ExperimentStatistics {
case 10:
if ($ftype == TType::LST) {
$this->cancelledExperiments = array();
- $_size53 = 0;
- $_etype56 = 0;
- $xfer += $input->readListBegin($_etype56, $_size53);
- for ($_i57 = 0; $_i57 < $_size53; ++$_i57)
+ $_size46 = 0;
+ $_etype49 = 0;
+ $xfer += $input->readListBegin($_etype49, $_size46);
+ for ($_i50 = 0; $_i50 < $_size46; ++$_i50)
{
- $elem58 = null;
- $elem58 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem58->read($input);
- $this->cancelledExperiments []= $elem58;
+ $elem51 = null;
+ $elem51 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem51->read($input);
+ $this->cancelledExperiments []= $elem51;
}
$xfer += $input->readListEnd();
} else {
@@ -1514,15 +1463,15 @@ class ExperimentStatistics {
case 11:
if ($ftype == TType::LST) {
$this->createdExperiments = array();
- $_size59 = 0;
- $_etype62 = 0;
- $xfer += $input->readListBegin($_etype62, $_size59);
- for ($_i63 = 0; $_i63 < $_size59; ++$_i63)
+ $_size52 = 0;
+ $_etype55 = 0;
+ $xfer += $input->readListBegin($_etype55, $_size52);
+ for ($_i56 = 0; $_i56 < $_size52; ++$_i56)
{
- $elem64 = null;
- $elem64 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem64->read($input);
- $this->createdExperiments []= $elem64;
+ $elem57 = null;
+ $elem57 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem57->read($input);
+ $this->createdExperiments []= $elem57;
}
$xfer += $input->readListEnd();
} else {
@@ -1532,15 +1481,15 @@ class ExperimentStatistics {
case 12:
if ($ftype == TType::LST) {
$this->runningExperiments = array();
- $_size65 = 0;
- $_etype68 = 0;
- $xfer += $input->readListBegin($_etype68, $_size65);
- for ($_i69 = 0; $_i69 < $_size65; ++$_i69)
+ $_size58 = 0;
+ $_etype61 = 0;
+ $xfer += $input->readListBegin($_etype61, $_size58);
+ for ($_i62 = 0; $_i62 < $_size58; ++$_i62)
{
- $elem70 = null;
- $elem70 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem70->read($input);
- $this->runningExperiments []= $elem70;
+ $elem63 = null;
+ $elem63 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem63->read($input);
+ $this->runningExperiments []= $elem63;
}
$xfer += $input->readListEnd();
} else {
@@ -1598,9 +1547,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->allExperiments));
{
- foreach ($this->allExperiments as $iter71)
+ foreach ($this->allExperiments as $iter64)
{
- $xfer += $iter71->write($output);
+ $xfer += $iter64->write($output);
}
}
$output->writeListEnd();
@@ -1615,9 +1564,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->completedExperiments));
{
- foreach ($this->completedExperiments as $iter72)
+ foreach ($this->completedExperiments as $iter65)
{
- $xfer += $iter72->write($output);
+ $xfer += $iter65->write($output);
}
}
$output->writeListEnd();
@@ -1632,9 +1581,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->failedExperiments));
{
- foreach ($this->failedExperiments as $iter73)
+ foreach ($this->failedExperiments as $iter66)
{
- $xfer += $iter73->write($output);
+ $xfer += $iter66->write($output);
}
}
$output->writeListEnd();
@@ -1649,9 +1598,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->cancelledExperiments));
{
- foreach ($this->cancelledExperiments as $iter74)
+ foreach ($this->cancelledExperiments as $iter67)
{
- $xfer += $iter74->write($output);
+ $xfer += $iter67->write($output);
}
}
$output->writeListEnd();
@@ -1666,9 +1615,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->createdExperiments));
{
- foreach ($this->createdExperiments as $iter75)
+ foreach ($this->createdExperiments as $iter68)
{
- $xfer += $iter75->write($output);
+ $xfer += $iter68->write($output);
}
}
$output->writeListEnd();
@@ -1683,9 +1632,9 @@ class ExperimentStatistics {
{
$output->writeListBegin(TType::STRUCT, count($this->runningExperiments));
{
- foreach ($this->runningExperiments as $iter76)
+ foreach ($this->runningExperiments as $iter69)
{
- $xfer += $iter76->write($output);
+ $xfer += $iter69->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d3d03c15/app/libraries/Airavata/Model/Task/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Task/Types.php b/app/libraries/Airavata/Model/Task/Types.php
index 6d666f1..df9e68d 100644
--- a/app/libraries/Airavata/Model/Task/Types.php
+++ b/app/libraries/Airavata/Model/Task/Types.php
@@ -27,12 +27,14 @@ final class TaskTypes {
const JOB_SUBMISSION = 2;
const ENV_CLEANUP = 3;
const MONITORING = 4;
+ const OUTPUT_FETCHING = 5;
static public $__names = array(
0 => 'ENV_SETUP',
1 => 'DATA_STAGING',
2 => 'JOB_SUBMISSION',
3 => 'ENV_CLEANUP',
4 => 'MONITORING',
+ 5 => 'OUTPUT_FETCHING',
);
}
@@ -100,10 +102,6 @@ class TaskModel {
* @var \Airavata\Model\Commons\ErrorModel
*/
public $taskError = null;
- /**
- * @var \Airavata\Model\Job\JobModel[]
- */
- public $jobs = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -146,15 +144,6 @@ class TaskModel {
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Commons\ErrorModel',
),
- 10 => array(
- 'var' => 'jobs',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Job\JobModel',
- ),
- ),
);
}
if (is_array($vals)) {
@@ -185,9 +174,6 @@ class TaskModel {
if (isset($vals['taskError'])) {
$this->taskError = $vals['taskError'];
}
- if (isset($vals['jobs'])) {
- $this->jobs = $vals['jobs'];
- }
}
}
@@ -275,24 +261,6 @@ class TaskModel {
$xfer += $input->skip($ftype);
}
break;
- case 10:
- if ($ftype == TType::LST) {
- $this->jobs = array();
- $_size0 = 0;
- $_etype3 = 0;
- $xfer += $input->readListBegin($_etype3, $_size0);
- for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
- {
- $elem5 = null;
- $elem5 = new \Airavata\Model\Job\JobModel();
- $xfer += $elem5->read($input);
- $this->jobs []= $elem5;
- }
- $xfer += $input->readListEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -357,23 +325,6 @@ class TaskModel {
$xfer += $this->taskError->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->jobs !== null) {
- if (!is_array($this->jobs)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('jobs', TType::LST, 10);
- {
- $output->writeListBegin(TType::STRUCT, count($this->jobs));
- {
- foreach ($this->jobs as $iter6)
- {
- $xfer += $iter6->write($output);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
[11/23] airavata-php-gateway git commit: updating libraries
Posted by nd...@apache.org.
updating libraries
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/3deb14dd
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3deb14dd
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3deb14dd
Branch: refs/heads/develop
Commit: 3deb14dd14d73a6ffc6431ce5676f8f56baa8662
Parents: 0f017de
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Nov 25 14:58:48 2015 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed Nov 25 14:58:48 2015 -0500
----------------------------------------------------------------------
.../Model/AppCatalog/GatewayProfile/Types.php | 37 ++++----------------
1 file changed, 7 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3deb14dd/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 098ec1e..f63f2f0 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -477,10 +477,6 @@ class GatewayResourceProfile {
/**
* @var string
*/
- public $dataStorageHostName = null;
- /**
- * @var string
- */
public $credentialStoreToken = null;
/**
* @var \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference[]
@@ -499,14 +495,10 @@ class GatewayResourceProfile {
'type' => TType::STRING,
),
2 => array(
- 'var' => 'dataStorageHostName',
- 'type' => TType::STRING,
- ),
- 3 => array(
'var' => 'credentialStoreToken',
'type' => TType::STRING,
),
- 4 => array(
+ 3 => array(
'var' => 'computeResourcePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -515,7 +507,7 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference',
),
),
- 5 => array(
+ 4 => array(
'var' => 'dataStoragePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -530,9 +522,6 @@ class GatewayResourceProfile {
if (isset($vals['gatewayID'])) {
$this->gatewayID = $vals['gatewayID'];
}
- if (isset($vals['dataStorageHostName'])) {
- $this->dataStorageHostName = $vals['dataStorageHostName'];
- }
if (isset($vals['credentialStoreToken'])) {
$this->credentialStoreToken = $vals['credentialStoreToken'];
}
@@ -573,19 +562,12 @@ class GatewayResourceProfile {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataStorageHostName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
$xfer += $input->readString($this->credentialStoreToken);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 3:
if ($ftype == TType::LST) {
$this->computeResourcePreferences = array();
$_size0 = 0;
@@ -603,7 +585,7 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 5:
+ case 4:
if ($ftype == TType::LST) {
$this->dataStoragePreferences = array();
$_size6 = 0;
@@ -639,13 +621,8 @@ class GatewayResourceProfile {
$xfer += $output->writeString($this->gatewayID);
$xfer += $output->writeFieldEnd();
}
- if ($this->dataStorageHostName !== null) {
- $xfer += $output->writeFieldBegin('dataStorageHostName', TType::STRING, 2);
- $xfer += $output->writeString($this->dataStorageHostName);
- $xfer += $output->writeFieldEnd();
- }
if ($this->credentialStoreToken !== null) {
- $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 2);
$xfer += $output->writeString($this->credentialStoreToken);
$xfer += $output->writeFieldEnd();
}
@@ -653,7 +630,7 @@ class GatewayResourceProfile {
if (!is_array($this->computeResourcePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 4);
+ $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 3);
{
$output->writeListBegin(TType::STRUCT, count($this->computeResourcePreferences));
{
@@ -670,7 +647,7 @@ class GatewayResourceProfile {
if (!is_array($this->dataStoragePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 5);
+ $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 4);
{
$output->writeListBegin(TType::STRUCT, count($this->dataStoragePreferences));
{
[02/23] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/master'
Posted by nd...@apache.org.
Merge remote-tracking branch 'origin/master'
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/e576d434
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e576d434
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e576d434
Branch: refs/heads/develop
Commit: e576d4340204b27026fdd22e5d3ec3c79f372711
Parents: a80e2f2 258f38b
Author: scnakandala <su...@gmail.com>
Authored: Mon Nov 16 11:58:10 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Nov 16 11:58:10 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[18/23] airavata-php-gateway git commit: merging changes from develop
Posted by nd...@apache.org.
merging changes from 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/6f6aae0f
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6f6aae0f
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6f6aae0f
Branch: refs/heads/develop
Commit: 6f6aae0fd914a3d4a145f3b6d3b8f4ba90e54011
Parents: 5720922 93eb29d
Author: smarru <sm...@apache.org>
Authored: Fri Dec 4 14:56:12 2015 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Dec 4 14:56:12 2015 -0500
----------------------------------------------------------------------
app/config/app.php | 2 +
app/config/packages/markdown/config.php | 30 +
app/controllers/AccountController.php | 4 +-
app/controllers/AdminController.php | 71 +-
app/controllers/ExperimentController.php | 34 +-
app/controllers/GatewayprofileController.php | 5 +-
app/controllers/StorageresourceController.php | 191 +
app/libraries/AdminUtilities.php | 20 +
app/libraries/Airavata/API/Airavata.php | 6175 ++++++++++++------
.../Model/AppCatalog/ComputeResource/Types.php | 943 +--
.../Model/AppCatalog/GatewayProfile/Types.php | 50 +-
.../Model/AppCatalog/StorageResource/Types.php | 232 +
.../Airavata/Model/Data/Movement/Types.php | 742 +++
.../Airavata/Model/Experiment/Types.php | 23 +
app/libraries/Airavata/Model/Process/Types.php | 23 +
app/libraries/Airavata/Model/Task/Types.php | 2 +
app/libraries/CRUtilities.php | 36 +-
app/libraries/ExperimentUtilities.php | 121 +-
app/libraries/SRUtilities.php | 408 ++
app/routes.php | 39 +-
app/views/account/dashboard.blade.php | 220 +
app/views/admin/dashboard.blade.php | 116 -
app/views/admin/manage-credentials.blade.php | 88 +-
app/views/admin/manage-experiments.blade.php | 56 +-
app/views/admin/manage-gateway.blade.php | 86 +-
app/views/experiment/summary.blade.php | 6 +-
app/views/layout/basic.blade.php | 9 +-
app/views/layout/fixed-scripts.blade.php | 2 +
app/views/partials/dashboard-block.blade.php | 56 +-
.../partials/experiment-container.blade.php | 173 +-
app/views/partials/experiment-info.blade.php | 182 +-
app/views/partials/experiment-inputs.blade.php | 2 +-
.../partials/gateway-preferences.blade.php | 12 +
app/views/resource/edit.blade.php | 25 +-
app/views/storage-resource/browse.blade.php | 159 +
app/views/storage-resource/create.blade.php | 43 +
app/views/storage-resource/edit.blade.php | 415 ++
app/views/storage-resource/view.blade.php | 379 ++
composer.bat | 1 +
composer.json | 4 +-
public/css/admin.css | 11 +
public/js/script.js | 8 +
42 files changed, 7804 insertions(+), 3400 deletions(-)
----------------------------------------------------------------------
[15/23] airavata-php-gateway git commit: checking the job status
before setting
Posted by nd...@apache.org.
checking the job status before setting
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/62586cd2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/62586cd2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/62586cd2
Branch: refs/heads/develop
Commit: 62586cd22052bb467ccb4e3dfafc7ff298f9a26c
Parents: 974599e
Author: scnakandala <su...@gmail.com>
Authored: Tue Dec 1 15:21:11 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Dec 1 15:21:11 2015 -0500
----------------------------------------------------------------------
app/libraries/AppUtilities.php | 2 ++
app/libraries/ExperimentUtilities.php | 21 ++++++++++++++-------
app/views/project/summary.blade.php | 4 ++--
3 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/62586cd2/app/libraries/AppUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/AppUtilities.php b/app/libraries/AppUtilities.php
index b239280..3b3102d 100644
--- a/app/libraries/AppUtilities.php
+++ b/app/libraries/AppUtilities.php
@@ -324,6 +324,8 @@ class AppUtilities
CommonUtilities::print_error_message('<p>There was a problem getting the application interface.
Please try again later or submit a bug report using the link in the Help menu.</p>' .
'<p>Airavata System Exception: ' . $ase->getMessage() . '</p>');
+ } catch(Exception $ex){
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/62586cd2/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 0d6c960..c17cb64 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -815,7 +815,20 @@ class ExperimentUtilities
*/
public static function get_job_status(ExperimentModel $experiment)
{
- $jobStatus = Airavata::getJobStatuses(Session::get('authz-token'), $experiment->experimentId);
+ try{
+ $jobStatus = Airavata::getJobStatuses(Session::get('authz-token'), $experiment->experimentId);
+ if (isset($jobStatus) && count($jobStatus) > 0) {
+ $jobState = JobState::$__names[array_values($jobStatus)[0]->jobState];
+ } else {
+ $jobState = null;
+ }
+ return $jobState;
+ }catch (\Thrift\Exception\TException $ex){
+ return null;
+ }catch (Exception $ex){
+ return null;
+ }
+
//TODO - implement following logic with new data model.
/* if(!empty($experiment->workflowNodeDetailsList)){
if(!empty($experiment->workflowNodeDetailsList[0]->taskDetailsList)){
@@ -824,13 +837,7 @@ class ExperimentUtilities
}
}
}*/
- if (isset($jobStatus) && count($jobStatus) > 0) {
- $jobState = JobState::$__names[array_values($jobStatus)[0]->jobState];
- } else {
- $jobState = null;
- }
- return $jobState;
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/62586cd2/app/views/project/summary.blade.php
----------------------------------------------------------------------
diff --git a/app/views/project/summary.blade.php b/app/views/project/summary.blade.php
index 8ba35f6..a59f649 100755
--- a/app/views/project/summary.blade.php
+++ b/app/views/project/summary.blade.php
@@ -44,7 +44,7 @@
echo '</tr>';
foreach ($experiments as $experiment) {
- $expValues = ExperimentUtilities::get_experiment_values($experiment, ProjectUtilities::get_project($experiment->projectId), true);
+ $expValues = ExperimentUtilities::get_experiment_values($experiment, $project, true);
$expValues["jobState"] = ExperimentUtilities::get_job_status($experiment);
$applicationInterface = AppUtilities::get_application_interface($experiment->executionId);
@@ -105,7 +105,7 @@
echo '<td><div class="' . $textClass . '">' . $expValues["experimentStatusString"] . '</div></td>';
- if ($expValues["jobState"]) echo '
+ if (isset($expValues["jobState"])) echo '
<td>' . $expValues["jobState"] . '</td>';
else
echo '<td></td>';
[09/23] airavata-php-gateway git commit: updating thirft files
Posted by nd...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0f017de5/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index 8a0da1b..c3d3122 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -634,6 +634,64 @@ interface AiravataIf {
*/
public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
/**
+ * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
+ * tasks -> jobs information.
+ *
+ * @param airavataExperimentId
+ * The identifier for the requested experiment. This is returned during the create experiment step.
+ *
+ * @return experimentMetada
+ * This method will return the previously stored experiment metadata.
+ *
+ * @throws org.apache.airavata.model.error.InvalidRequestException
+ * For any incorrect forming of the request itself.
+ *
+ * @throws org.apache.airavata.model.error.ExperimentNotFoundException
+ * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
+ *
+ * @throws org.apache.airavata.model.error.AiravataClientException
+ * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
+ *
+ * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
+ * step, then Airavata Registry will not have a provenance area setup. The client has to follow
+ * gateway registration steps and retry this request.
+ *
+ * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
+ * For now this is a place holder.
+ *
+ * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
+ * is implemented, the authorization will be more substantial.
+ *
+ * @throws org.apache.airavata.model.error.AiravataSystemException
+ * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
+ * rather an Airavata Administrator will be notified to take corrective action.
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $airavataExperimentId
+ * @return \Airavata\Model\Experiment\ExperimentModel A structure holding the experiment metadata and its child models.
+ *
+ * userName:
+ * The user name of the targeted gateway end user on whose behalf the experiment is being created.
+ * the associated gateway identity can only be inferred from the security hand-shake so as to avoid
+ * authorized Airavata Clients mimicking an unauthorized request. If a gateway is not registered with
+ * Airavata, an authorization exception is thrown.
+ *
+ * experimentName:
+ * The name of the experiment as defined by the user. The name need not be unique as uniqueness is enforced
+ * by the generated experiment id.
+ *
+ * experimentDescription:
+ * The verbose description of the experiment. This is an optional parameter.
+ *
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\ExperimentNotFoundException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
+ /**
* Configure a previously created experiment with required inputs, scheduling and other quality of service
* parameters. This method only updates the experiment object within the registry. The experiment has to be launched
* to make it actionable by the server.
@@ -1472,116 +1530,6 @@ interface AiravataIf {
*/
public function deleteComputeResource(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId);
/**
- * Register a Storage Resource.
- *
- * @param storageResourceDescription
- * Storge Resource Object created from the datamodel.
- *
- * @return storageResourceId
- * Returns a server-side generated airavata storage resource globally unique identifier.
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription
- * @return string
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function registerStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription);
- /**
- * Fetch the given Storage Resource.
- *
- * @param storageResourceId
- * The identifier for the requested storage resource
- *
- * @return storageResourceDescription
- * Storage Resource Object created from the datamodel..
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $storageResourceId
- * @return \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription Storage Resource Description
- *
- * storageResourceId: Airavata Internal Unique Identifier to distinguish Compute Resource.
- *
- * hostName:
- * Fully Qualified Host Name.
- *
- * storageResourceDescription:
- * A user friendly description of the resource.
- *
- *
- * DataMovementProtocol:
- * Option to specify a prefered data movement mechanism of the available options.
- *
- *
- *
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function getStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId);
- /**
- * Fetch all registered Storage Resources.
- *
- * @return A map of registered compute resource id's and thier corresponding hostnames.
- * Compute Resource Object created from the datamodel..
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @return array
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function getAllStorageResourceNames(\Airavata\Model\Security\AuthzToken $authzToken);
- /**
- * Update a Compute Resource.
- *
- * @param storageResourceId
- * The identifier for the requested compute resource to be updated.
- *
- * @param storageResourceDescription
- * Storage Resource Object created from the datamodel.
- *
- * @return status
- * Returns a success/failure of the update.
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $storageResourceId
- * @param \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription
- * @return bool
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function updateStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription);
- /**
- * Delete a Storage Resource.
- *
- * @param storageResourceId
- * The identifier for the requested compute resource to be deleted.
- *
- * @return status
- * Returns a success/failure of the deletion.
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $storageResourceId
- * @return bool
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function deleteStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId);
- /**
* Add a Local Job Submission details to a compute resource
* App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
*
@@ -4646,36 +4594,35 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getExperiment failed: unknown result");
}
- public function updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
+ public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $this->send_updateExperiment($authzToken, $airavataExperimentId, $experiment);
- $this->recv_updateExperiment();
+ $this->send_getDetailedExperimentTree($authzToken, $airavataExperimentId);
+ return $this->recv_getDetailedExperimentTree();
}
- public function send_updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
+ public function send_getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $args = new \Airavata\API\Airavata_updateExperiment_args();
+ $args = new \Airavata\API\Airavata_getDetailedExperimentTree_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
- $args->experiment = $experiment;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'updateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getDetailedExperimentTree', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('updateExperiment', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getDetailedExperimentTree', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_updateExperiment()
+ public function recv_getDetailedExperimentTree()
{
$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_updateExperiment_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getDetailedExperimentTree_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4689,10 +4636,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_updateExperiment_result();
+ $result = new \Airavata\API\Airavata_getDetailedExperimentTree_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
+ if ($result->success !== null) {
+ return $result->success;
+ }
if ($result->ire !== null) {
throw $result->ire;
}
@@ -4708,39 +4658,39 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- return;
+ throw new \Exception("getDetailedExperimentTree failed: unknown result");
}
- public function updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
+ public function updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
- $this->send_updateExperimentConfiguration($authzToken, $airavataExperimentId, $userConfiguration);
- $this->recv_updateExperimentConfiguration();
+ $this->send_updateExperiment($authzToken, $airavataExperimentId, $experiment);
+ $this->recv_updateExperiment();
}
- public function send_updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
+ public function send_updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
- $args = new \Airavata\API\Airavata_updateExperimentConfiguration_args();
+ $args = new \Airavata\API\Airavata_updateExperiment_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
- $args->userConfiguration = $userConfiguration;
+ $args->experiment = $experiment;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'updateExperimentConfiguration', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'updateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('updateExperimentConfiguration', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('updateExperiment', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_updateExperimentConfiguration()
+ public function recv_updateExperiment()
{
$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_updateExperimentConfiguration_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateExperiment_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4754,62 +4704,21 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_updateExperimentConfiguration_result();
+ $result = new \Airavata\API\Airavata_updateExperiment_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
- if ($result->ae !== null) {
- throw $result->ae;
+ if ($result->ire !== null) {
+ throw $result->ire;
}
- return;
- }
-
- public function updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
- {
- $this->send_updateResourceScheduleing($authzToken, $airavataExperimentId, $resourceScheduling);
- $this->recv_updateResourceScheduleing();
- }
-
- public function send_updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
- {
- $args = new \Airavata\API\Airavata_updateResourceScheduleing_args();
- $args->authzToken = $authzToken;
- $args->airavataExperimentId = $airavataExperimentId;
- $args->resourceScheduling = $resourceScheduling;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'updateResourceScheduleing', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ if ($result->enf !== null) {
+ throw $result->enf;
}
- else
- {
- $this->output_->writeMessageBegin('updateResourceScheduleing', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
+ if ($result->ace !== null) {
+ throw $result->ace;
}
- }
-
- public function recv_updateResourceScheduleing()
- {
- $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_updateResourceScheduleing_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_updateResourceScheduleing_result();
- $result->read($this->input_);
- $this->input_->readMessageEnd();
+ if ($result->ase !== null) {
+ throw $result->ase;
}
if ($result->ae !== null) {
throw $result->ae;
@@ -4817,35 +4726,36 @@ class AiravataClient implements \Airavata\API\AiravataIf {
return;
}
- public function validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ public function updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
{
- $this->send_validateExperiment($authzToken, $airavataExperimentId);
- return $this->recv_validateExperiment();
+ $this->send_updateExperimentConfiguration($authzToken, $airavataExperimentId, $userConfiguration);
+ $this->recv_updateExperimentConfiguration();
}
- public function send_validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ public function send_updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
{
- $args = new \Airavata\API\Airavata_validateExperiment_args();
+ $args = new \Airavata\API\Airavata_updateExperimentConfiguration_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
+ $args->userConfiguration = $userConfiguration;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'validateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'updateExperimentConfiguration', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('validateExperiment', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('updateExperimentConfiguration', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_validateExperiment()
+ public function recv_updateExperimentConfiguration()
{
$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_validateExperiment_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateExperimentConfiguration_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4859,61 +4769,46 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_validateExperiment_result();
+ $result = new \Airavata\API\Airavata_updateExperimentConfiguration_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
- if ($result->success !== null) {
- return $result->success;
- }
- if ($result->ire !== null) {
- throw $result->ire;
- }
- if ($result->enf !== null) {
- throw $result->enf;
- }
- if ($result->ace !== null) {
- throw $result->ace;
- }
- if ($result->ase !== null) {
- throw $result->ase;
- }
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("validateExperiment failed: unknown result");
+ return;
}
- public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
+ public function updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
{
- $this->send_launchExperiment($authzToken, $airavataExperimentId, $gatewayId);
- $this->recv_launchExperiment();
+ $this->send_updateResourceScheduleing($authzToken, $airavataExperimentId, $resourceScheduling);
+ $this->recv_updateResourceScheduleing();
}
- public function send_launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
+ public function send_updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
{
- $args = new \Airavata\API\Airavata_launchExperiment_args();
+ $args = new \Airavata\API\Airavata_updateResourceScheduleing_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
- $args->gatewayId = $gatewayId;
+ $args->resourceScheduling = $resourceScheduling;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'launchExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'updateResourceScheduleing', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('launchExperiment', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('updateResourceScheduleing', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_launchExperiment()
+ public function recv_updateResourceScheduleing()
{
$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_launchExperiment_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateResourceScheduleing_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4927,57 +4822,45 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_launchExperiment_result();
+ $result = new \Airavata\API\Airavata_updateResourceScheduleing_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
- if ($result->ire !== null) {
- throw $result->ire;
- }
- if ($result->enf !== null) {
- throw $result->enf;
- }
- if ($result->ace !== null) {
- throw $result->ace;
- }
- if ($result->ase !== null) {
- throw $result->ase;
- }
if ($result->ae !== null) {
throw $result->ae;
}
return;
}
- public function getExperimentStatus(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ public function validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $this->send_getExperimentStatus($authzToken, $airavataExperimentId);
- return $this->recv_getExperimentStatus();
+ $this->send_validateExperiment($authzToken, $airavataExperimentId);
+ return $this->recv_validateExperiment();
}
- public function send_getExperimentStatus(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ public function send_validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $args = new \Airavata\API\Airavata_getExperimentStatus_args();
+ $args = new \Airavata\API\Airavata_validateExperiment_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'getExperimentStatus', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'validateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getExperimentStatus', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('validateExperiment', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getExperimentStatus()
+ public function recv_validateExperiment()
{
$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_getExperimentStatus_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_validateExperiment_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4991,7 +4874,139 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getExperimentStatus_result();
+ $result = new \Airavata\API\Airavata_validateExperiment_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->enf !== null) {
+ throw $result->enf;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("validateExperiment failed: unknown result");
+ }
+
+ public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
+ {
+ $this->send_launchExperiment($authzToken, $airavataExperimentId, $gatewayId);
+ $this->recv_launchExperiment();
+ }
+
+ public function send_launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
+ {
+ $args = new \Airavata\API\Airavata_launchExperiment_args();
+ $args->authzToken = $authzToken;
+ $args->airavataExperimentId = $airavataExperimentId;
+ $args->gatewayId = $gatewayId;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'launchExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('launchExperiment', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_launchExperiment()
+ {
+ $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_launchExperiment_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_launchExperiment_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->enf !== null) {
+ throw $result->enf;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ return;
+ }
+
+ public function getExperimentStatus(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ {
+ $this->send_getExperimentStatus($authzToken, $airavataExperimentId);
+ return $this->recv_getExperimentStatus();
+ }
+
+ public function send_getExperimentStatus(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ {
+ $args = new \Airavata\API\Airavata_getExperimentStatus_args();
+ $args->authzToken = $authzToken;
+ $args->airavataExperimentId = $airavataExperimentId;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'getExperimentStatus', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getExperimentStatus', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_getExperimentStatus()
+ {
+ $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_getExperimentStatus_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_getExperimentStatus_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -7023,326 +7038,6 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("deleteComputeResource failed: unknown result");
}
- public function registerStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription)
- {
- $this->send_registerStorageResource($authzToken, $storageResourceDescription);
- return $this->recv_registerStorageResource();
- }
-
- public function send_registerStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription)
- {
- $args = new \Airavata\API\Airavata_registerStorageResource_args();
- $args->authzToken = $authzToken;
- $args->storageResourceDescription = $storageResourceDescription;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'registerStorageResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('registerStorageResource', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_registerStorageResource()
- {
- $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_registerStorageResource_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_registerStorageResource_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("registerStorageResource failed: unknown result");
- }
-
- public function getStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId)
- {
- $this->send_getStorageResource($authzToken, $storageResourceId);
- return $this->recv_getStorageResource();
- }
-
- public function send_getStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId)
- {
- $args = new \Airavata\API\Airavata_getStorageResource_args();
- $args->authzToken = $authzToken;
- $args->storageResourceId = $storageResourceId;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getStorageResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getStorageResource', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getStorageResource()
- {
- $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_getStorageResource_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_getStorageResource_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("getStorageResource failed: unknown result");
- }
-
- public function getAllStorageResourceNames(\Airavata\Model\Security\AuthzToken $authzToken)
- {
- $this->send_getAllStorageResourceNames($authzToken);
- return $this->recv_getAllStorageResourceNames();
- }
-
- public function send_getAllStorageResourceNames(\Airavata\Model\Security\AuthzToken $authzToken)
- {
- $args = new \Airavata\API\Airavata_getAllStorageResourceNames_args();
- $args->authzToken = $authzToken;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getAllStorageResourceNames', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getAllStorageResourceNames', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getAllStorageResourceNames()
- {
- $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_getAllStorageResourceNames_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_getAllStorageResourceNames_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("getAllStorageResourceNames failed: unknown result");
- }
-
- public function updateStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription)
- {
- $this->send_updateStorageResource($authzToken, $storageResourceId, $storageResourceDescription);
- return $this->recv_updateStorageResource();
- }
-
- public function send_updateStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription)
- {
- $args = new \Airavata\API\Airavata_updateStorageResource_args();
- $args->authzToken = $authzToken;
- $args->storageResourceId = $storageResourceId;
- $args->storageResourceDescription = $storageResourceDescription;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'updateStorageResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('updateStorageResource', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_updateStorageResource()
- {
- $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_updateStorageResource_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_updateStorageResource_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("updateStorageResource failed: unknown result");
- }
-
- public function deleteStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId)
- {
- $this->send_deleteStorageResource($authzToken, $storageResourceId);
- return $this->recv_deleteStorageResource();
- }
-
- public function send_deleteStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId)
- {
- $args = new \Airavata\API\Airavata_deleteStorageResource_args();
- $args->authzToken = $authzToken;
- $args->storageResourceId = $storageResourceId;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'deleteStorageResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('deleteStorageResource', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_deleteStorageResource()
- {
- $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_deleteStorageResource_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_deleteStorageResource_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("deleteStorageResource failed: unknown result");
- }
-
public function addLocalSubmissionDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALSubmission $localSubmission)
{
$this->send_addLocalSubmissionDetails($authzToken, $computeResourceId, $priorityOrder, $localSubmission);
@@ -14868,1553 +14563,7 @@ class Airavata_deleteProject_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->projectId);
- } 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_deleteProject_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->projectId !== null) {
- $xfer += $output->writeFieldBegin('projectId', TType::STRING, 2);
- $xfer += $output->writeString($this->projectId);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_deleteProject_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\ProjectNotFoundException
- */
- public $pnfe = 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' => 'pnfe',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\ProjectNotFoundException',
- ),
- 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['ace'])) {
- $this->ace = $vals['ace'];
- }
- if (isset($vals['ase'])) {
- $this->ase = $vals['ase'];
- }
- if (isset($vals['pnfe'])) {
- $this->pnfe = $vals['pnfe'];
- }
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_deleteProject_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->pnfe = new \Airavata\API\Error\ProjectNotFoundException();
- $xfer += $this->pnfe->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_deleteProject_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->pnfe !== null) {
- $xfer += $output->writeFieldBegin('pnfe', TType::STRUCT, 4);
- $xfer += $this->pnfe->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_getUserProjects_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
- /**
- * @var int
- */
- public $limit = null;
- /**
- * @var int
- */
- public $offset = 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' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'limit',
- 'type' => TType::I32,
- ),
- 5 => array(
- 'var' => 'offset',
- 'type' => TType::I32,
- ),
- );
- }
- 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'];
- }
- if (isset($vals['limit'])) {
- $this->limit = $vals['limit'];
- }
- if (isset($vals['offset'])) {
- $this->offset = $vals['offset'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_getUserProjects_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->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->limit);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->offset);
- } 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_getUserProjects_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->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->limit !== null) {
- $xfer += $output->writeFieldBegin('limit', TType::I32, 4);
- $xfer += $output->writeI32($this->limit);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->offset !== null) {
- $xfer += $output->writeFieldBegin('offset', TType::I32, 5);
- $xfer += $output->writeI32($this->offset);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_getUserProjects_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Workspace\Project[]
- */
- 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::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Project',
- ),
- ),
- 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_getUserProjects_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::LST) {
- $this->success = array();
- $_size16 = 0;
- $_etype19 = 0;
- $xfer += $input->readListBegin($_etype19, $_size16);
- for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
- {
- $elem21 = null;
- $elem21 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem21->read($input);
- $this->success []= $elem21;
- }
- $xfer += $input->readListEnd();
- } 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_getUserProjects_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 $iter22)
- {
- $xfer += $iter22->write($output);
- }
- }
- $output->writeListEnd();
- }
- $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_searchProjectsByProjectName_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
- /**
- * @var string
- */
- public $projectName = null;
- /**
- * @var int
- */
- public $limit = null;
- /**
- * @var int
- */
- public $offset = 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' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'projectName',
- 'type' => TType::STRING,
- ),
- 5 => array(
- 'var' => 'limit',
- 'type' => TType::I32,
- ),
- 6 => array(
- 'var' => 'offset',
- 'type' => TType::I32,
- ),
- );
- }
- 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'];
- }
- if (isset($vals['projectName'])) {
- $this->projectName = $vals['projectName'];
- }
- if (isset($vals['limit'])) {
- $this->limit = $vals['limit'];
- }
- if (isset($vals['offset'])) {
- $this->offset = $vals['offset'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_searchProjectsByProjectName_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->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->projectName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->limit);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->offset);
- } 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_searchProjectsByProjectName_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->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->projectName !== null) {
- $xfer += $output->writeFieldBegin('projectName', TType::STRING, 4);
- $xfer += $output->writeString($this->projectName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->limit !== null) {
- $xfer += $output->writeFieldBegin('limit', TType::I32, 5);
- $xfer += $output->writeI32($this->limit);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->offset !== null) {
- $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
- $xfer += $output->writeI32($this->offset);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_searchProjectsByProjectName_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Workspace\Project[]
- */
- 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::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Project',
- ),
- ),
- 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_searchProjectsByProjectName_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::LST) {
- $this->success = array();
- $_size23 = 0;
- $_etype26 = 0;
- $xfer += $input->readListBegin($_etype26, $_size23);
- for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
- {
- $elem28 = null;
- $elem28 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem28->read($input);
- $this->success []= $elem28;
- }
- $xfer += $input->readListEnd();
- } 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_searchProjectsByProjectName_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 $iter29)
- {
- $xfer += $iter29->write($output);
- }
- }
- $output->writeListEnd();
- }
- $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_searchProjectsByProjectDesc_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
- /**
- * @var string
- */
- public $description = null;
- /**
- * @var int
- */
- public $limit = null;
- /**
- * @var int
- */
- public $offset = 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' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'description',
- 'type' => TType::STRING,
- ),
- 5 => array(
- 'var' => 'limit',
- 'type' => TType::I32,
- ),
- 6 => array(
- 'var' => 'offset',
- 'type' => TType::I32,
- ),
- );
- }
- 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'];
- }
- if (isset($vals['description'])) {
- $this->description = $vals['description'];
- }
- if (isset($vals['limit'])) {
- $this->limit = $vals['limit'];
- }
- if (isset($vals['offset'])) {
- $this->offset = $vals['offset'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_searchProjectsByProjectDesc_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->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->description);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->limit);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->offset);
- } 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_searchProjectsByProjectDesc_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->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->description !== null) {
- $xfer += $output->writeFieldBegin('description', TType::STRING, 4);
- $xfer += $output->writeString($this->description);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->limit !== null) {
- $xfer += $output->writeFieldBegin('limit', TType::I32, 5);
- $xfer += $output->writeI32($this->limit);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->offset !== null) {
- $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
- $xfer += $output->writeI32($this->offset);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_searchProjectsByProjectDesc_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Workspace\Project[]
- */
- 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::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Project',
- ),
- ),
- 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_searchProjectsByProjectDesc_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::LST) {
- $this->success = array();
- $_size30 = 0;
- $_etype33 = 0;
- $xfer += $input->readListBegin($_etype33, $_size30);
- for ($_i34 = 0; $_i34 < $_size30; ++$_i34)
- {
- $elem35 = null;
- $elem35 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem35->read($input);
- $this->success []= $elem35;
- }
- $xfer += $input->readListEnd();
- } 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_searchProjectsByProjectDesc_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 $iter36)
- {
- $xfer += $iter36->write($output);
- }
- }
- $output->writeListEnd();
- }
- $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_searchExperimentsByName_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
- /**
- * @var string
- */
- public $expName = null;
- /**
- * @var int
- */
- public $limit = null;
- /**
- * @var int
- */
- public $offset = 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' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'expName',
- 'type' => TType::STRING,
- ),
- 5 => array(
- 'var' => 'limit',
- 'type' => TType::I32,
- ),
- 6 => array(
- 'var' => 'offset',
- 'type' => TType::I32,
- ),
- );
- }
- 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'];
- }
- if (isset($vals['expName'])) {
- $this->expName = $vals['expName'];
- }
- if (isset($vals['limit'])) {
- $this->limit = $vals['limit'];
- }
- if (isset($vals['offset'])) {
- $this->offset = $vals['offset'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_searchExperimentsByName_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->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->expName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::
<TRUNCATED>
[22/23] airavata-php-gateway git commit: Super Admin features to add
a gateway + Compute Resource made Uneditable
Posted by nd...@apache.org.
Super Admin features to add a gateway + Compute Resource made Uneditable
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/3aeb3440
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/3aeb3440
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/3aeb3440
Branch: refs/heads/develop
Commit: 3aeb34402d600489b14fb49dba34bc2cf604de37
Parents: 93eb29d
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Thu Dec 10 11:47:50 2015 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Thu Dec 10 11:47:50 2015 -0500
----------------------------------------------------------------------
app/controllers/AdminController.php | 40 +++----------
app/libraries/Wsis/Stubs/TenantManager.php | 6 +-
app/libraries/Wsis/Wsis.php | 6 +-
app/views/admin/manage-gateway.blade.php | 59 ++++++++++++++++++++
app/views/resource/browse.blade.php | 14 +++--
app/views/resource/edit.blade.php | 26 ++++++++-
app/views/scigap-admin/manage-gateway.blade.php | 14 +++--
7 files changed, 115 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3aeb3440/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 8d3cad3..e40a249 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -5,33 +5,12 @@ class AdminController extends BaseController {
public function __construct()
{
$this->beforeFilter('verifyadmin');
+ Session::put("scigap_admin", true);
Session::put("nav-active", "user-console");
}
public function dashboard(){
- //only for super admin
- //Session::put("scigap_admin", true);
-
- if( Session::has("scigap_admin"))
- {
- $crData = CRUtilities::getEditCRData();
- $gateways = CRUtilities::getAllGatewayProfilesData();
-
- $gatewayData = array(
- "gateways" => $gateways,
- "computeResources" => CRUtilities::getAllCRObjects(),
- "crData" => $crData
- );
-
- $view = "scigap-admin/manage-gateway";
-
- Session::put("admin-nav", "gateway-prefs");
- return View::make( $view, $gatewayData);
- }
- else{
- return View::make("account/dashboard");
-
- }
+ return View::make("account/dashboard");
}
public function addAdminSubmit(){
@@ -73,8 +52,7 @@ class AdminController extends BaseController {
}
public function gatewayView(){
- //only for super admin
- //Session::put("scigap_admin", true);
+
$crData = CRUtilities::getEditCRData();
$gateways = CRUtilities::getAllGatewayProfilesData();
$tokens = AdminUtilities::get_ssh_tokens();
@@ -87,11 +65,11 @@ class AdminController extends BaseController {
"tokens" => $tokens
);
//var_dump( $gateways); exit;
- if( Session::has("scigap_admin"))
+ /*if( Session::has("scigap_admin"))
$view = "scigap-admin/manage-gateway";
else{
+ */
$view = "admin/manage-gateway";
- }
Session::put("admin-nav", "gateway-prefs");
return View::make( $view, $gatewayData);
@@ -192,12 +170,12 @@ class AdminController extends BaseController {
$inputs = Input::all();
- $gateway = AdminUtilities::add_gateway(Input::all());
-
- $tm = WSIS::createTenant(1, $inputs["admin-username"] . "@" . $inputs["domain"], $inputs["admin-password"],
+ $tm = WSIS::createTenant(true, $inputs["admin-username"], $inputs["admin-password"],
$inputs["admin-email"], $inputs["admin-firstname"], $inputs["admin-lastname"], $inputs["domain"]);
- return $gateway;
+ $gateway = AdminUtilities::add_gateway(Input::all());
+
+ return Redirect::to("admin/dashboard/gateway")->with("message", "Gateway has been registered successfully.");
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3aeb3440/app/libraries/Wsis/Stubs/TenantManager.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Stubs/TenantManager.php b/app/libraries/Wsis/Stubs/TenantManager.php
index c621b7a..634bc56 100755
--- a/app/libraries/Wsis/Stubs/TenantManager.php
+++ b/app/libraries/Wsis/Stubs/TenantManager.php
@@ -69,13 +69,13 @@ class TenantManager {
$tenantInfoBean->admin = $adminUsername;
$tenantInfoBean->adminPassword = $adminPassword;
$tenantInfoBean->email = $email;
- $tenantInfoBean->firstName = $firstName;
- $tenantInfoBean->lastName = $lastName;
+ $tenantInfoBean->firstname = $firstName;
+ $tenantInfoBean->lastname = $lastName;
$tenantInfoBean->tenantDomain = $tenantDomain;
$addTenant = new addTenant();
$addTenant->tenantInfoBean = $tenantInfoBean;
- $this->serviceStub->addTenant($addTenant);
+ return $this->serviceStub->addTenant($addTenant);
}
/**
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3aeb3440/app/libraries/Wsis/Wsis.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Wsis.php b/app/libraries/Wsis/Wsis.php
index 48739e2..f3e1e55 100755
--- a/app/libraries/Wsis/Wsis.php
+++ b/app/libraries/Wsis/Wsis.php
@@ -401,11 +401,7 @@ class Wsis {
return $this->tenantManager->addTenant($active, $adminUsername, $adminPassword, $email,
$firstName, $lastName, $tenantDomain);
} catch (Exception $ex) {
- /**
- * Fixme - There is an issue in the Remote IS which throws an exception when called this method
- * But the tenant creation works. Therefore ignores the exception for the moment.
- */
- //throw new Exception("Unable to create Tenant.", 0, $ex);
+ throw new Exception("Unable to create Tenant.", 0, $ex);
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3aeb3440/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 4db7980..621ac4e 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -235,6 +235,54 @@
</div>
</div>
@endforeach
+ @if( Session::has("scigap_admin"))
+ <form id="add-tenant-form" action="{{ URL::to("/") }}/admin/add-gateway">
+ <div class="col-md-12">
+ <button type="button" class="btn btn-default toggle-add-tenant"><span
+ class="glyphicon glyphicon-plus"></span>Add a new gateway
+ </button>
+ </div>
+ <div class="add-tenant col-md-6">
+ <div class="form-group required">
+ <label class="control-label">Enter Domain Name</label>
+ <input type="text" name="domain" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Enter Desired Gateway Name</label>
+ <input type="text" name="gatewayName" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Enter Admin Email Address</label>
+ <input type="text" name="admin-email" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Enter Admin First Name</label>
+ <input type="text" name="admin-firstname" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Enter Admin Last Name</label>
+ <input type="text" name="admin-lastname" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Enter Admin Username</label>
+ <input type="text" name="admin-username" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Enter Admin Password</label>
+ <input type="password" name="admin-password" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Re-enter Admin Password</label>
+ <input type="password" name="admin-password-confirm" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <input type="submit" class="col-md-2 form-control btn btn-primary" value="Register"/>
+ </div>
+ </div>
+ <div class="col-md-6 alert alert-danger gateway-error hide">
+ </div>
+ </form>
+ @endif
</div>
</div>
<!-- /.container-fluid -->
@@ -328,5 +376,16 @@
else
alert("Please enter a valid Credential Store Token.");
});
+
+
+ $(".add-tenant").slideUp();
+
+ $(".toggle-add-tenant").click(function () {
+ $('html, body').animate({
+ scrollTop: $(".toggle-add-tenant").offset().top
+ }, 500);
+ $(".add-tenant").slideDown();
+ });
+
</script>
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3aeb3440/app/views/resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php
index c9b5382..1ee5491 100644
--- a/app/views/resource/browse.blade.php
+++ b/app/views/resource/browse.blade.php
@@ -51,11 +51,11 @@
<th>Id</th>
@if(Session::has("admin"))
<th>Enabled</th>
- <th>Edit</th>
+ <!--<th>Edit</th>-->
@endif
<th>View</th>
@if(Session::has("admin"))
- <th>Delete</th>
+ <!--<th>Delete</th>-->
@endif
</tr>
@@ -66,7 +66,7 @@
$enabled = $resource->enabled;
?>
<tr id="crDetails">
- <td>{{ $crName }}</td>
+ <td><a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">{{ $crName }}</a></td>
<td>{{ $crId }}</td>
@if(Session::has("admin"))
<td>
@@ -80,17 +80,20 @@
</div>
@endif
</td>
+ <!--
<td><a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
<span class="glyphicon glyphicon-pencil"></span>
</a>
</td>
+ -->
@endif
<td>
- <a href="{{URL::to('/')}}/cr/view?crId={{ $crId }}" title="Edit">
+ <a href="{{URL::to('/')}}/cr/edit?crId={{ $crId }}" title="Edit">
<span class="glyphicon glyphicon-list"></span>
</a>
</td>
@if(Session::has("admin"))
+ <!--
<td>
<a href="#" title="Delete">
<span class="glyphicon glyphicon-trash del-cr" data-toggle="modal"
@@ -99,6 +102,7 @@
data-crid="{{$crId}}"></span>
</a>
</td>
+ -->
@endif
</tr>
@endforeach
@@ -209,5 +213,5 @@
});
}
});
- </script>
+ </script>
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3aeb3440/app/views/resource/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php
index b52af67..459bbf3 100644
--- a/app/views/resource/edit.blade.php
+++ b/app/views/resource/edit.blade.php
@@ -14,7 +14,7 @@
<div id="page-wrapper">
<div class="container-fluid">
-<div class="col-md-offset-2 col-md-8">
+<div class="col-md-offset-2 col-md-8 compute-resource-properties">
<input type="hidden" class="base-url" value="{{URL::to('/')}}"/>
@@ -840,4 +840,28 @@
$(".delete-queueName").html($(this).data("queue-name"));
})
</script>
+
+@if(! Session::has('scigap_admin'))
+ <script>
+ function disableInputs( elem){
+ elem.find("input").each( function( i,e){
+ if( $(e).attr("type")=='submit' || $(e).attr("type")=='button' )
+ $(e).attr("disabled", "true");
+ else
+ $(e).prop("readonly", "true");
+ });
+ elem.find("textarea").prop("readonly", "true");
+ elem.find("select").attr("disabled", "true");
+ elem.find(".hide").prop("readonly", "true");
+ elem.find("button").attr("disabled", "true");
+ //remove previously created input/output blocks
+ elem.find(".app-inputs").html("");
+ elem.find(".app-outputs").html("");
+ $(".glyphicon").hide();
+ }
+
+ disableInputs( $(".compute-resource-properties"));
+ </script>
+@endif
+
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/3aeb3440/app/views/scigap-admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/scigap-admin/manage-gateway.blade.php b/app/views/scigap-admin/manage-gateway.blade.php
index a07c329..4a663e1 100644
--- a/app/views/scigap-admin/manage-gateway.blade.php
+++ b/app/views/scigap-admin/manage-gateway.blade.php
@@ -59,7 +59,7 @@
</tr>
@endforeach
</table>
- <form id="add-tenant-form">
+ <form id="add-tenant-form" action="{{ URL::to("/") }}/admin/add-gateway">
<div class="col-md-12">
<button type="button" class="btn btn-default toggle-add-tenant"><span
class="glyphicon glyphicon-plus"></span>Add a new gateway
@@ -171,7 +171,7 @@
$(".add-tenant").slideDown();
});
- $("#add-tenant-form").submit(function (event) {
+ /*$("#add-tenant-form").submit(function (event) {
event.preventDefault();
event.stopPropagation();
var formData = $("#add-tenant-form").serialize();
@@ -179,13 +179,17 @@
$.ajax({
type: "POST",
data: formData,
- url: '{{ URL::to(' / ') }}/admin/add-gateway',
+ url: '{{ URL::to("/") }}/admin/add-gateway',
success: function (data) {
- $(".gateway-error").html(data).removeClass("hide");
+
+ },
+ error: function( data){
+ var error = $.parseJSON( data.responseText);
+ $(".gateway-error").html(error.message).removeClass("hide");
}
}).complete(function () {
$("#add-gateway-loading").modal("hide");
});
- });
+ });*/
</script>
@stop
\ No newline at end of file
[04/23] airavata-php-gateway git commit: updating libraries
Posted by nd...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d3d03c15/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index c3d3122..8a0da1b 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -634,64 +634,6 @@ interface AiravataIf {
*/
public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
/**
- * Fetch the completed nested tree structue of previously created experiment metadata which includes processes ->
- * tasks -> jobs information.
- *
- * @param airavataExperimentId
- * The identifier for the requested experiment. This is returned during the create experiment step.
- *
- * @return experimentMetada
- * This method will return the previously stored experiment metadata.
- *
- * @throws org.apache.airavata.model.error.InvalidRequestException
- * For any incorrect forming of the request itself.
- *
- * @throws org.apache.airavata.model.error.ExperimentNotFoundException
- * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown.
- *
- * @throws org.apache.airavata.model.error.AiravataClientException
- * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve:
- *
- * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative
- * step, then Airavata Registry will not have a provenance area setup. The client has to follow
- * gateway registration steps and retry this request.
- *
- * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined.
- * For now this is a place holder.
- *
- * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake
- * is implemented, the authorization will be more substantial.
- *
- * @throws org.apache.airavata.model.error.AiravataSystemException
- * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client
- * rather an Airavata Administrator will be notified to take corrective action.
- *
- *
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $airavataExperimentId
- * @return \Airavata\Model\Experiment\ExperimentModel A structure holding the experiment metadata and its child models.
- *
- * userName:
- * The user name of the targeted gateway end user on whose behalf the experiment is being created.
- * the associated gateway identity can only be inferred from the security hand-shake so as to avoid
- * authorized Airavata Clients mimicking an unauthorized request. If a gateway is not registered with
- * Airavata, an authorization exception is thrown.
- *
- * experimentName:
- * The name of the experiment as defined by the user. The name need not be unique as uniqueness is enforced
- * by the generated experiment id.
- *
- * experimentDescription:
- * The verbose description of the experiment. This is an optional parameter.
- *
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\ExperimentNotFoundException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId);
- /**
* Configure a previously created experiment with required inputs, scheduling and other quality of service
* parameters. This method only updates the experiment object within the registry. The experiment has to be launched
* to make it actionable by the server.
@@ -1530,6 +1472,116 @@ interface AiravataIf {
*/
public function deleteComputeResource(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId);
/**
+ * Register a Storage Resource.
+ *
+ * @param storageResourceDescription
+ * Storge Resource Object created from the datamodel.
+ *
+ * @return storageResourceId
+ * Returns a server-side generated airavata storage resource globally unique identifier.
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription
+ * @return string
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function registerStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription);
+ /**
+ * Fetch the given Storage Resource.
+ *
+ * @param storageResourceId
+ * The identifier for the requested storage resource
+ *
+ * @return storageResourceDescription
+ * Storage Resource Object created from the datamodel..
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $storageResourceId
+ * @return \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription Storage Resource Description
+ *
+ * storageResourceId: Airavata Internal Unique Identifier to distinguish Compute Resource.
+ *
+ * hostName:
+ * Fully Qualified Host Name.
+ *
+ * storageResourceDescription:
+ * A user friendly description of the resource.
+ *
+ *
+ * DataMovementProtocol:
+ * Option to specify a prefered data movement mechanism of the available options.
+ *
+ *
+ *
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId);
+ /**
+ * Fetch all registered Storage Resources.
+ *
+ * @return A map of registered compute resource id's and thier corresponding hostnames.
+ * Compute Resource Object created from the datamodel..
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @return array
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getAllStorageResourceNames(\Airavata\Model\Security\AuthzToken $authzToken);
+ /**
+ * Update a Compute Resource.
+ *
+ * @param storageResourceId
+ * The identifier for the requested compute resource to be updated.
+ *
+ * @param storageResourceDescription
+ * Storage Resource Object created from the datamodel.
+ *
+ * @return status
+ * Returns a success/failure of the update.
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $storageResourceId
+ * @param \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription
+ * @return bool
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function updateStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription);
+ /**
+ * Delete a Storage Resource.
+ *
+ * @param storageResourceId
+ * The identifier for the requested compute resource to be deleted.
+ *
+ * @return status
+ * Returns a success/failure of the deletion.
+ *
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $storageResourceId
+ * @return bool
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function deleteStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId);
+ /**
* Add a Local Job Submission details to a compute resource
* App catalog will return a jobSubmissionInterfaceId which will be added to the jobSubmissionInterfaces.
*
@@ -4594,35 +4646,36 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getExperiment failed: unknown result");
}
- public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ public function updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
- $this->send_getDetailedExperimentTree($authzToken, $airavataExperimentId);
- return $this->recv_getDetailedExperimentTree();
+ $this->send_updateExperiment($authzToken, $airavataExperimentId, $experiment);
+ $this->recv_updateExperiment();
}
- public function send_getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ public function send_updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
{
- $args = new \Airavata\API\Airavata_getDetailedExperimentTree_args();
+ $args = new \Airavata\API\Airavata_updateExperiment_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
+ $args->experiment = $experiment;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'getDetailedExperimentTree', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'updateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getDetailedExperimentTree', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('updateExperiment', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getDetailedExperimentTree()
+ public function recv_updateExperiment()
{
$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_getDetailedExperimentTree_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateExperiment_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4636,13 +4689,10 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getDetailedExperimentTree_result();
+ $result = new \Airavata\API\Airavata_updateExperiment_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
- if ($result->success !== null) {
- return $result->success;
- }
if ($result->ire !== null) {
throw $result->ire;
}
@@ -4658,39 +4708,39 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("getDetailedExperimentTree failed: unknown result");
+ return;
}
- public function updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
+ public function updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
{
- $this->send_updateExperiment($authzToken, $airavataExperimentId, $experiment);
- $this->recv_updateExperiment();
+ $this->send_updateExperimentConfiguration($authzToken, $airavataExperimentId, $userConfiguration);
+ $this->recv_updateExperimentConfiguration();
}
- public function send_updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment)
+ public function send_updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
{
- $args = new \Airavata\API\Airavata_updateExperiment_args();
+ $args = new \Airavata\API\Airavata_updateExperimentConfiguration_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
- $args->experiment = $experiment;
+ $args->userConfiguration = $userConfiguration;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'updateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'updateExperimentConfiguration', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('updateExperiment', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('updateExperimentConfiguration', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_updateExperiment()
+ public function recv_updateExperimentConfiguration()
{
$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_updateExperiment_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateExperimentConfiguration_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4704,21 +4754,62 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_updateExperiment_result();
+ $result = new \Airavata\API\Airavata_updateExperimentConfiguration_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
- if ($result->ire !== null) {
- throw $result->ire;
+ if ($result->ae !== null) {
+ throw $result->ae;
}
- if ($result->enf !== null) {
- throw $result->enf;
+ return;
+ }
+
+ public function updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
+ {
+ $this->send_updateResourceScheduleing($authzToken, $airavataExperimentId, $resourceScheduling);
+ $this->recv_updateResourceScheduleing();
+ }
+
+ public function send_updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
+ {
+ $args = new \Airavata\API\Airavata_updateResourceScheduleing_args();
+ $args->authzToken = $authzToken;
+ $args->airavataExperimentId = $airavataExperimentId;
+ $args->resourceScheduling = $resourceScheduling;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'updateResourceScheduleing', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
- if ($result->ace !== null) {
- throw $result->ace;
+ else
+ {
+ $this->output_->writeMessageBegin('updateResourceScheduleing', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
}
- if ($result->ase !== null) {
- throw $result->ase;
+ }
+
+ public function recv_updateResourceScheduleing()
+ {
+ $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_updateResourceScheduleing_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_updateResourceScheduleing_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
}
if ($result->ae !== null) {
throw $result->ae;
@@ -4726,36 +4817,35 @@ class AiravataClient implements \Airavata\API\AiravataIf {
return;
}
- public function updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
+ public function validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $this->send_updateExperimentConfiguration($authzToken, $airavataExperimentId, $userConfiguration);
- $this->recv_updateExperimentConfiguration();
+ $this->send_validateExperiment($authzToken, $airavataExperimentId);
+ return $this->recv_validateExperiment();
}
- public function send_updateExperimentConfiguration(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\UserConfigurationDataModel $userConfiguration)
+ public function send_validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $args = new \Airavata\API\Airavata_updateExperimentConfiguration_args();
+ $args = new \Airavata\API\Airavata_validateExperiment_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
- $args->userConfiguration = $userConfiguration;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'updateExperimentConfiguration', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'validateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('updateExperimentConfiguration', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('validateExperiment', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_updateExperimentConfiguration()
+ public function recv_validateExperiment()
{
$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_updateExperimentConfiguration_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_validateExperiment_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4769,46 +4859,61 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_updateExperimentConfiguration_result();
+ $result = new \Airavata\API\Airavata_validateExperiment_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->enf !== null) {
+ throw $result->enf;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
if ($result->ae !== null) {
throw $result->ae;
}
- return;
+ throw new \Exception("validateExperiment failed: unknown result");
}
- public function updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
+ public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
{
- $this->send_updateResourceScheduleing($authzToken, $airavataExperimentId, $resourceScheduling);
- $this->recv_updateResourceScheduleing();
+ $this->send_launchExperiment($authzToken, $airavataExperimentId, $gatewayId);
+ $this->recv_launchExperiment();
}
- public function send_updateResourceScheduleing(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Scheduling\ComputationalResourceSchedulingModel $resourceScheduling)
+ public function send_launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
{
- $args = new \Airavata\API\Airavata_updateResourceScheduleing_args();
+ $args = new \Airavata\API\Airavata_launchExperiment_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
- $args->resourceScheduling = $resourceScheduling;
+ $args->gatewayId = $gatewayId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'updateResourceScheduleing', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'launchExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('updateResourceScheduleing', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('launchExperiment', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_updateResourceScheduleing()
+ public function recv_launchExperiment()
{
$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_updateResourceScheduleing_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_launchExperiment_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4822,45 +4927,57 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_updateResourceScheduleing_result();
+ $result = new \Airavata\API\Airavata_launchExperiment_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->enf !== null) {
+ throw $result->enf;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
if ($result->ae !== null) {
throw $result->ae;
}
return;
}
- public function validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ public function getExperimentStatus(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $this->send_validateExperiment($authzToken, $airavataExperimentId);
- return $this->recv_validateExperiment();
+ $this->send_getExperimentStatus($authzToken, $airavataExperimentId);
+ return $this->recv_getExperimentStatus();
}
- public function send_validateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
+ public function send_getExperimentStatus(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
{
- $args = new \Airavata\API\Airavata_validateExperiment_args();
+ $args = new \Airavata\API\Airavata_getExperimentStatus_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'validateExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getExperimentStatus', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('validateExperiment', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getExperimentStatus', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_validateExperiment()
+ public function recv_getExperimentStatus()
{
$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_validateExperiment_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getExperimentStatus_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -4874,139 +4991,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_validateExperiment_result();
- $result->read($this->input_);
- $this->input_->readMessageEnd();
- }
- if ($result->success !== null) {
- return $result->success;
- }
- if ($result->ire !== null) {
- throw $result->ire;
- }
- if ($result->enf !== null) {
- throw $result->enf;
- }
- if ($result->ace !== null) {
- throw $result->ace;
- }
- if ($result->ase !== null) {
- throw $result->ase;
- }
- if ($result->ae !== null) {
- throw $result->ae;
- }
- throw new \Exception("validateExperiment failed: unknown result");
- }
-
- public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
- {
- $this->send_launchExperiment($authzToken, $airavataExperimentId, $gatewayId);
- $this->recv_launchExperiment();
- }
-
- public function send_launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
- {
- $args = new \Airavata\API\Airavata_launchExperiment_args();
- $args->authzToken = $authzToken;
- $args->airavataExperimentId = $airavataExperimentId;
- $args->gatewayId = $gatewayId;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'launchExperiment', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('launchExperiment', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_launchExperiment()
- {
- $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_launchExperiment_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_launchExperiment_result();
- $result->read($this->input_);
- $this->input_->readMessageEnd();
- }
- if ($result->ire !== null) {
- throw $result->ire;
- }
- if ($result->enf !== null) {
- throw $result->enf;
- }
- if ($result->ace !== null) {
- throw $result->ace;
- }
- if ($result->ase !== null) {
- throw $result->ase;
- }
- if ($result->ae !== null) {
- throw $result->ae;
- }
- return;
- }
-
- public function getExperimentStatus(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
- {
- $this->send_getExperimentStatus($authzToken, $airavataExperimentId);
- return $this->recv_getExperimentStatus();
- }
-
- public function send_getExperimentStatus(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId)
- {
- $args = new \Airavata\API\Airavata_getExperimentStatus_args();
- $args->authzToken = $authzToken;
- $args->airavataExperimentId = $airavataExperimentId;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getExperimentStatus', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getExperimentStatus', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getExperimentStatus()
- {
- $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_getExperimentStatus_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_getExperimentStatus_result();
+ $result = new \Airavata\API\Airavata_getExperimentStatus_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -7038,6 +7023,326 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("deleteComputeResource failed: unknown result");
}
+ public function registerStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription)
+ {
+ $this->send_registerStorageResource($authzToken, $storageResourceDescription);
+ return $this->recv_registerStorageResource();
+ }
+
+ public function send_registerStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription)
+ {
+ $args = new \Airavata\API\Airavata_registerStorageResource_args();
+ $args->authzToken = $authzToken;
+ $args->storageResourceDescription = $storageResourceDescription;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'registerStorageResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('registerStorageResource', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_registerStorageResource()
+ {
+ $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_registerStorageResource_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_registerStorageResource_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("registerStorageResource failed: unknown result");
+ }
+
+ public function getStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId)
+ {
+ $this->send_getStorageResource($authzToken, $storageResourceId);
+ return $this->recv_getStorageResource();
+ }
+
+ public function send_getStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId)
+ {
+ $args = new \Airavata\API\Airavata_getStorageResource_args();
+ $args->authzToken = $authzToken;
+ $args->storageResourceId = $storageResourceId;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'getStorageResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getStorageResource', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_getStorageResource()
+ {
+ $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_getStorageResource_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_getStorageResource_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("getStorageResource failed: unknown result");
+ }
+
+ public function getAllStorageResourceNames(\Airavata\Model\Security\AuthzToken $authzToken)
+ {
+ $this->send_getAllStorageResourceNames($authzToken);
+ return $this->recv_getAllStorageResourceNames();
+ }
+
+ public function send_getAllStorageResourceNames(\Airavata\Model\Security\AuthzToken $authzToken)
+ {
+ $args = new \Airavata\API\Airavata_getAllStorageResourceNames_args();
+ $args->authzToken = $authzToken;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'getAllStorageResourceNames', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getAllStorageResourceNames', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_getAllStorageResourceNames()
+ {
+ $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_getAllStorageResourceNames_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_getAllStorageResourceNames_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("getAllStorageResourceNames failed: unknown result");
+ }
+
+ public function updateStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription)
+ {
+ $this->send_updateStorageResource($authzToken, $storageResourceId, $storageResourceDescription);
+ return $this->recv_updateStorageResource();
+ }
+
+ public function send_updateStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId, \Airavata\Model\AppCatalog\StorageResource\StorageResourceDescription $storageResourceDescription)
+ {
+ $args = new \Airavata\API\Airavata_updateStorageResource_args();
+ $args->authzToken = $authzToken;
+ $args->storageResourceId = $storageResourceId;
+ $args->storageResourceDescription = $storageResourceDescription;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'updateStorageResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('updateStorageResource', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_updateStorageResource()
+ {
+ $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_updateStorageResource_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_updateStorageResource_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("updateStorageResource failed: unknown result");
+ }
+
+ public function deleteStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId)
+ {
+ $this->send_deleteStorageResource($authzToken, $storageResourceId);
+ return $this->recv_deleteStorageResource();
+ }
+
+ public function send_deleteStorageResource(\Airavata\Model\Security\AuthzToken $authzToken, $storageResourceId)
+ {
+ $args = new \Airavata\API\Airavata_deleteStorageResource_args();
+ $args->authzToken = $authzToken;
+ $args->storageResourceId = $storageResourceId;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'deleteStorageResource', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('deleteStorageResource', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_deleteStorageResource()
+ {
+ $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_deleteStorageResource_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_deleteStorageResource_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("deleteStorageResource failed: unknown result");
+ }
+
public function addLocalSubmissionDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALSubmission $localSubmission)
{
$this->send_addLocalSubmissionDetails($authzToken, $computeResourceId, $priorityOrder, $localSubmission);
@@ -14563,7 +14868,1553 @@ class Airavata_deleteProject_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->projectId);
+ $xfer += $input->readString($this->projectId);
+ } 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_deleteProject_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->projectId !== null) {
+ $xfer += $output->writeFieldBegin('projectId', TType::STRING, 2);
+ $xfer += $output->writeString($this->projectId);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_deleteProject_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\ProjectNotFoundException
+ */
+ public $pnfe = 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' => 'pnfe',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\ProjectNotFoundException',
+ ),
+ 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['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ if (isset($vals['pnfe'])) {
+ $this->pnfe = $vals['pnfe'];
+ }
+ if (isset($vals['ae'])) {
+ $this->ae = $vals['ae'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_deleteProject_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->pnfe = new \Airavata\API\Error\ProjectNotFoundException();
+ $xfer += $this->pnfe->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_deleteProject_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->pnfe !== null) {
+ $xfer += $output->writeFieldBegin('pnfe', TType::STRUCT, 4);
+ $xfer += $this->pnfe->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_getUserProjects_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
+ /**
+ * @var int
+ */
+ public $limit = null;
+ /**
+ * @var int
+ */
+ public $offset = 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' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'limit',
+ 'type' => TType::I32,
+ ),
+ 5 => array(
+ 'var' => 'offset',
+ 'type' => TType::I32,
+ ),
+ );
+ }
+ 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'];
+ }
+ if (isset($vals['limit'])) {
+ $this->limit = $vals['limit'];
+ }
+ if (isset($vals['offset'])) {
+ $this->offset = $vals['offset'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_getUserProjects_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->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->limit);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->offset);
+ } 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_getUserProjects_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->userName !== null) {
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
+ $xfer += $output->writeString($this->userName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->limit !== null) {
+ $xfer += $output->writeFieldBegin('limit', TType::I32, 4);
+ $xfer += $output->writeI32($this->limit);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->offset !== null) {
+ $xfer += $output->writeFieldBegin('offset', TType::I32, 5);
+ $xfer += $output->writeI32($this->offset);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_getUserProjects_result {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Workspace\Project[]
+ */
+ 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::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Project',
+ ),
+ ),
+ 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_getUserProjects_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::LST) {
+ $this->success = array();
+ $_size16 = 0;
+ $_etype19 = 0;
+ $xfer += $input->readListBegin($_etype19, $_size16);
+ for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
+ {
+ $elem21 = null;
+ $elem21 = new \Airavata\Model\Workspace\Project();
+ $xfer += $elem21->read($input);
+ $this->success []= $elem21;
+ }
+ $xfer += $input->readListEnd();
+ } 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_getUserProjects_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 $iter22)
+ {
+ $xfer += $iter22->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $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_searchProjectsByProjectName_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
+ /**
+ * @var string
+ */
+ public $projectName = null;
+ /**
+ * @var int
+ */
+ public $limit = null;
+ /**
+ * @var int
+ */
+ public $offset = 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' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'projectName',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
+ 'var' => 'limit',
+ 'type' => TType::I32,
+ ),
+ 6 => array(
+ 'var' => 'offset',
+ 'type' => TType::I32,
+ ),
+ );
+ }
+ 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'];
+ }
+ if (isset($vals['projectName'])) {
+ $this->projectName = $vals['projectName'];
+ }
+ if (isset($vals['limit'])) {
+ $this->limit = $vals['limit'];
+ }
+ if (isset($vals['offset'])) {
+ $this->offset = $vals['offset'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_searchProjectsByProjectName_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->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->projectName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->limit);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->offset);
+ } 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_searchProjectsByProjectName_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->userName !== null) {
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
+ $xfer += $output->writeString($this->userName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->projectName !== null) {
+ $xfer += $output->writeFieldBegin('projectName', TType::STRING, 4);
+ $xfer += $output->writeString($this->projectName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->limit !== null) {
+ $xfer += $output->writeFieldBegin('limit', TType::I32, 5);
+ $xfer += $output->writeI32($this->limit);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->offset !== null) {
+ $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
+ $xfer += $output->writeI32($this->offset);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_searchProjectsByProjectName_result {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Workspace\Project[]
+ */
+ 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::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Project',
+ ),
+ ),
+ 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_searchProjectsByProjectName_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::LST) {
+ $this->success = array();
+ $_size23 = 0;
+ $_etype26 = 0;
+ $xfer += $input->readListBegin($_etype26, $_size23);
+ for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
+ {
+ $elem28 = null;
+ $elem28 = new \Airavata\Model\Workspace\Project();
+ $xfer += $elem28->read($input);
+ $this->success []= $elem28;
+ }
+ $xfer += $input->readListEnd();
+ } 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_searchProjectsByProjectName_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 $iter29)
+ {
+ $xfer += $iter29->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $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_searchProjectsByProjectDesc_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
+ /**
+ * @var string
+ */
+ public $description = null;
+ /**
+ * @var int
+ */
+ public $limit = null;
+ /**
+ * @var int
+ */
+ public $offset = 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' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'description',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
+ 'var' => 'limit',
+ 'type' => TType::I32,
+ ),
+ 6 => array(
+ 'var' => 'offset',
+ 'type' => TType::I32,
+ ),
+ );
+ }
+ 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'];
+ }
+ if (isset($vals['description'])) {
+ $this->description = $vals['description'];
+ }
+ if (isset($vals['limit'])) {
+ $this->limit = $vals['limit'];
+ }
+ if (isset($vals['offset'])) {
+ $this->offset = $vals['offset'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_searchProjectsByProjectDesc_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->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->description);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->limit);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->offset);
+ } 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_searchProjectsByProjectDesc_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->userName !== null) {
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
+ $xfer += $output->writeString($this->userName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->description !== null) {
+ $xfer += $output->writeFieldBegin('description', TType::STRING, 4);
+ $xfer += $output->writeString($this->description);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->limit !== null) {
+ $xfer += $output->writeFieldBegin('limit', TType::I32, 5);
+ $xfer += $output->writeI32($this->limit);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->offset !== null) {
+ $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
+ $xfer += $output->writeI32($this->offset);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_searchProjectsByProjectDesc_result {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Workspace\Project[]
+ */
+ 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::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Project',
+ ),
+ ),
+ 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_searchProjectsByProjectDesc_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::LST) {
+ $this->success = array();
+ $_size30 = 0;
+ $_etype33 = 0;
+ $xfer += $input->readListBegin($_etype33, $_size30);
+ for ($_i34 = 0; $_i34 < $_size30; ++$_i34)
+ {
+ $elem35 = null;
+ $elem35 = new \Airavata\Model\Workspace\Project();
+ $xfer += $elem35->read($input);
+ $this->success []= $elem35;
+ }
+ $xfer += $input->readListEnd();
+ } 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_searchProjectsByProjectDesc_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 $iter36)
+ {
+ $xfer += $iter36->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $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_searchExperimentsByName_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
+ /**
+ * @var string
+ */
+ public $expName = null;
+ /**
+ * @var int
+ */
+ public $limit = null;
+ /**
+ * @var int
+ */
+ public $offset = 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' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'expName',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
+ 'var' => 'limit',
+ 'type' => TType::I32,
+ ),
+ 6 => array(
+ 'var' => 'offset',
+ 'type' => TType::I32,
+ ),
+ );
+ }
+ 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'];
+ }
+ if (isset($vals['expName'])) {
+ $this->expName = $vals['expName'];
+ }
+ if (isset($vals['limit'])) {
+ $this->limit = $vals['limit'];
+ }
+ if (isset($vals['offset'])) {
+ $this->offset = $vals['offset'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_searchExperimentsByName_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->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->expName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+
<TRUNCATED>
[20/23] airavata-php-gateway git commit: changing the class name
Posted by nd...@apache.org.
changing the class name
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/72cc4dd0
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/72cc4dd0
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/72cc4dd0
Branch: refs/heads/develop
Commit: 72cc4dd0e32d7978750ab47431e74745ca620b88
Parents: 442dfa9
Author: smarru <sm...@apache.org>
Authored: Tue Dec 8 16:49:42 2015 -0500
Committer: smarru <sm...@apache.org>
Committed: Tue Dec 8 16:49:42 2015 -0500
----------------------------------------------------------------------
app/controllers/StorageResourceController.php | 191 +++++++++++++++++++++
app/controllers/StorageresourceController.php | 191 ---------------------
2 files changed, 191 insertions(+), 191 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/72cc4dd0/app/controllers/StorageResourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/StorageResourceController.php b/app/controllers/StorageResourceController.php
new file mode 100644
index 0000000..0ec4c6e
--- /dev/null
+++ b/app/controllers/StorageResourceController.php
@@ -0,0 +1,191 @@
+<?php
+
+class StorageresourceController extends BaseController
+{
+
+ /**
+ * Instantiate a new Compute Resource Controller Instance
+ **/
+
+ public function __construct()
+ {
+ $this->beforeFilter('verifyadmin');
+ Session::put("nav-active", "storage-resource");
+
+ }
+
+ public function createView()
+ {
+ $this->beforeFilter('verifyeditadmin');
+ Session::put("admin-nav", "sr-create");
+ $data = SRUtilities::getEditSRData();
+ return View::make("storage-resource/create", $data);
+ }
+
+ public function createSubmit()
+ {
+ $this->beforeFilter('verifyeditadmin');
+ //Compute resource is by default enabled
+ $storageDescription = array(
+ "hostName" => trim(Input::get("hostname")),
+ "storageResourceDescription" => trim(Input::get("description")),
+ "enabled" => true
+ );
+ $storageResource = SRUtilities::register_or_update_storage_resource($storageDescription);
+
+ return Redirect::to("sr/edit?srId=" . $storageResource->storageResourceId);
+ }
+
+ public function editView()
+ {
+ $this->beforeFilter('verifyeditadmin');
+ $data = SRUtilities::getEditSRData();
+ $storageResourceId = "";
+ if (Input::has("srId"))
+ $storageResourceId = Input::get("srId");
+ else if (Session::has("storageResource")) {
+ $storageResource = Session::get("storageResource");
+ $storageResourceId = $storageResource->storageResourceId;
+ }
+ if ($storageResourceId != "") {
+ $storageResource = SRUtilities::get_storage_resource($storageResourceId);
+ $dataMovementInterfaces = array();
+ $addedDMI = array();
+ //var_dump( CRUtilities::getJobSubmissionDetails( $data["computeResource"]->jobSubmissionInterfaces[0]->jobSubmissionInterfaceId, 1) ); exit;
+
+ if (count($storageResource->dataMovementInterfaces)) {
+ foreach ($storageResource->dataMovementInterfaces as $DMI) {
+ $dataMovementInterfaces[] = SRUtilities::getDataMovementDetails($DMI->dataMovementInterfaceId, $DMI->dataMovementProtocol);
+ $addedDMI[] = $DMI->dataMovementProtocol;
+ }
+ }
+
+ $data["storageResource"] = $storageResource;
+ $data["dataMovementInterfaces"] = $dataMovementInterfaces;
+ $data["addedDMI"] = $addedDMI;
+ return View::make("storage-resource/edit", $data);
+ } else{
+ Session::put("message", "Unable to retrieve this Storage Resource. Please try again later or submit a bug report using the link in the Help menu.");
+ return View::make("storage-resource/browse");
+ }
+
+ }
+
+ public function editSubmit()
+ {
+ $this->beforeFilter('verifyeditadmin');
+ $tabName = "";
+ if (Input::get("sr-edit") == "resDesc") /* Modify compute Resource description */ {
+ $storageResourceDescription = SRUtilities::get_storage_resource(Input::get("srId"));
+ $storageResourceDescription->hostName = trim(Input::get("hostname"));
+ $storageResourceDescription->resourceDescription = Input::get("description");
+ //var_dump( $computeDescription); exit;
+
+ $storageResource = SRUtilities::register_or_update_storage_resource($storageResourceDescription, true);
+
+ $tabName = "#tab-desc";
+ }
+
+ if (Input::get("sr-edit") == "dmp" || Input::get("sr-edit") == "edit-dmi") /* Add / Modify a Data Movement Interface */ {
+ $update = false;
+ if (Input::get("sr-edit") == "edit-dmi")
+ $update = true;
+ $dataMovementInterface = SRUtilities::create_or_update_DMIObject(Input::all(), $update);
+
+ $tabName = "#tab-dataMovement";
+ } else if (Input::get("sr-edit") == "dmi-priority") {
+ $inputs = Input::all();
+ $storageDescription = SRUtilities::get_storage_resource(Input::get("srId"));
+ foreach ($storageDescription->dataMovementInterfaces as $index => $dmi) {
+ foreach ($inputs["dmi-id"] as $idIndex => $dmiId) {
+ if ($dmiId == $dmi->dataMovementInterfaceId) {
+ $storageDescription->dataMovementInterfaces[$index]->priorityOrder = $inputs["dmi-priority"][$idIndex];
+ break;
+ }
+ }
+ }
+ $storageResource = SRUtilities::register_or_update_storage_resource($storageDescription, true);
+
+ return 1; //currently done by ajax.
+ }
+
+ return Redirect::to("sr/edit?srId=" . Input::get("srId") . $tabName);
+ }
+
+ public function viewView()
+ {
+ $data = CRUtilities::getEditCRData();
+ $computeResourceId = "";
+ if (Input::has("crId"))
+ $computeResourceId = Input::get("crId");
+ else if (Session::has("computeResource")) {
+ $computeResource = Session::get("computeResource");
+ $computeResourceId = $computeResource->computeResourceId;
+ }
+
+ if ($computeResourceId != "") {
+ $computeResource = CRUtilities::get_compute_resource($computeResourceId);
+ $jobSubmissionInterfaces = array();
+ $dataMovementInterfaces = array();
+ $addedJSP = array();
+ $addedDMI = array();
+ //var_dump( $computeResource->jobSubmissionInterfaces); exit;
+ if (count($computeResource->jobSubmissionInterfaces)) {
+ foreach ($computeResource->jobSubmissionInterfaces as $JSI) {
+ $jobSubmissionInterfaces[] = CRUtilities::getJobSubmissionDetails($JSI->jobSubmissionInterfaceId, $JSI->jobSubmissionProtocol);
+ $addedJSP[] = $JSI->jobSubmissionProtocol;
+ }
+ }
+ //var_dump( CRUtilities::getJobSubmissionDetails( $data["computeResource"]->jobSubmissionInterfaces[0]->jobSubmissionInterfaceId, 1) ); exit;
+ if (count($computeResource->dataMovementInterfaces)) {
+ foreach ($computeResource->dataMovementInterfaces as $DMI) {
+ $dataMovementInterfaces[] = CRUtilities::getDataMovementDetails($DMI->dataMovementInterfaceId, $DMI->dataMovementProtocol);
+ $addedDMI[] = $DMI->dataMovementProtocol;
+ }
+ }
+
+ $data["computeResource"] = $computeResource;
+ $data["jobSubmissionInterfaces"] = $jobSubmissionInterfaces;
+ $data["dataMovementInterfaces"] = $dataMovementInterfaces;
+ $data["addedJSP"] = $addedJSP;
+ $data["addedDMI"] = $addedDMI;
+ //var_dump($data["jobSubmissionInterfaces"]); exit;
+ return View::make("resource/view", $data);
+ } else
+ return View::make("resource/browse")->with("login-alert", "Unable to retrieve this Compute Resource. Please report this error to devs.");
+
+ }
+
+ public function deleteActions()
+ {
+ $this->beforeFilter('verifyeditadmin');
+ $result = SRUtilities::deleteActions(Input::all());
+ /*
+ if (Input::has("jsiId")) {
+ return Redirect::to("cr/edit?crId=" . Input::get("crId") . "#tab-jobSubmission")
+ ->with("message", "Job Submission Interface was deleted successfully");
+ }
+ */
+ if (Input::has("dmiId")) {
+ return Redirect::to("sr/edit?crId=" . Input::get("crId") . "#tab-dataMovement")
+ ->with("message", "Data Movement Protocol was deleted successfully");
+ } elseif (Input::has("del-srId")) {
+ return Redirect::to("sr/browse")->with("message", "The Compute Resource has been successfully deleted.");
+ } else
+ return $result;
+ }
+
+ public function browseView()
+ {
+ $data = SRUtilities::getBrowseSRData(false);
+ $allSRs = $data["srObjects"];
+
+ Session::put("admin-nav", "sr-browse");
+ return View::make("storage-resource/browse", array(
+ "allSRs" => $allSRs
+ ));
+
+ }
+}
+
+?>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/72cc4dd0/app/controllers/StorageresourceController.php
----------------------------------------------------------------------
diff --git a/app/controllers/StorageresourceController.php b/app/controllers/StorageresourceController.php
deleted file mode 100644
index 0ec4c6e..0000000
--- a/app/controllers/StorageresourceController.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-class StorageresourceController extends BaseController
-{
-
- /**
- * Instantiate a new Compute Resource Controller Instance
- **/
-
- public function __construct()
- {
- $this->beforeFilter('verifyadmin');
- Session::put("nav-active", "storage-resource");
-
- }
-
- public function createView()
- {
- $this->beforeFilter('verifyeditadmin');
- Session::put("admin-nav", "sr-create");
- $data = SRUtilities::getEditSRData();
- return View::make("storage-resource/create", $data);
- }
-
- public function createSubmit()
- {
- $this->beforeFilter('verifyeditadmin');
- //Compute resource is by default enabled
- $storageDescription = array(
- "hostName" => trim(Input::get("hostname")),
- "storageResourceDescription" => trim(Input::get("description")),
- "enabled" => true
- );
- $storageResource = SRUtilities::register_or_update_storage_resource($storageDescription);
-
- return Redirect::to("sr/edit?srId=" . $storageResource->storageResourceId);
- }
-
- public function editView()
- {
- $this->beforeFilter('verifyeditadmin');
- $data = SRUtilities::getEditSRData();
- $storageResourceId = "";
- if (Input::has("srId"))
- $storageResourceId = Input::get("srId");
- else if (Session::has("storageResource")) {
- $storageResource = Session::get("storageResource");
- $storageResourceId = $storageResource->storageResourceId;
- }
- if ($storageResourceId != "") {
- $storageResource = SRUtilities::get_storage_resource($storageResourceId);
- $dataMovementInterfaces = array();
- $addedDMI = array();
- //var_dump( CRUtilities::getJobSubmissionDetails( $data["computeResource"]->jobSubmissionInterfaces[0]->jobSubmissionInterfaceId, 1) ); exit;
-
- if (count($storageResource->dataMovementInterfaces)) {
- foreach ($storageResource->dataMovementInterfaces as $DMI) {
- $dataMovementInterfaces[] = SRUtilities::getDataMovementDetails($DMI->dataMovementInterfaceId, $DMI->dataMovementProtocol);
- $addedDMI[] = $DMI->dataMovementProtocol;
- }
- }
-
- $data["storageResource"] = $storageResource;
- $data["dataMovementInterfaces"] = $dataMovementInterfaces;
- $data["addedDMI"] = $addedDMI;
- return View::make("storage-resource/edit", $data);
- } else{
- Session::put("message", "Unable to retrieve this Storage Resource. Please try again later or submit a bug report using the link in the Help menu.");
- return View::make("storage-resource/browse");
- }
-
- }
-
- public function editSubmit()
- {
- $this->beforeFilter('verifyeditadmin');
- $tabName = "";
- if (Input::get("sr-edit") == "resDesc") /* Modify compute Resource description */ {
- $storageResourceDescription = SRUtilities::get_storage_resource(Input::get("srId"));
- $storageResourceDescription->hostName = trim(Input::get("hostname"));
- $storageResourceDescription->resourceDescription = Input::get("description");
- //var_dump( $computeDescription); exit;
-
- $storageResource = SRUtilities::register_or_update_storage_resource($storageResourceDescription, true);
-
- $tabName = "#tab-desc";
- }
-
- if (Input::get("sr-edit") == "dmp" || Input::get("sr-edit") == "edit-dmi") /* Add / Modify a Data Movement Interface */ {
- $update = false;
- if (Input::get("sr-edit") == "edit-dmi")
- $update = true;
- $dataMovementInterface = SRUtilities::create_or_update_DMIObject(Input::all(), $update);
-
- $tabName = "#tab-dataMovement";
- } else if (Input::get("sr-edit") == "dmi-priority") {
- $inputs = Input::all();
- $storageDescription = SRUtilities::get_storage_resource(Input::get("srId"));
- foreach ($storageDescription->dataMovementInterfaces as $index => $dmi) {
- foreach ($inputs["dmi-id"] as $idIndex => $dmiId) {
- if ($dmiId == $dmi->dataMovementInterfaceId) {
- $storageDescription->dataMovementInterfaces[$index]->priorityOrder = $inputs["dmi-priority"][$idIndex];
- break;
- }
- }
- }
- $storageResource = SRUtilities::register_or_update_storage_resource($storageDescription, true);
-
- return 1; //currently done by ajax.
- }
-
- return Redirect::to("sr/edit?srId=" . Input::get("srId") . $tabName);
- }
-
- public function viewView()
- {
- $data = CRUtilities::getEditCRData();
- $computeResourceId = "";
- if (Input::has("crId"))
- $computeResourceId = Input::get("crId");
- else if (Session::has("computeResource")) {
- $computeResource = Session::get("computeResource");
- $computeResourceId = $computeResource->computeResourceId;
- }
-
- if ($computeResourceId != "") {
- $computeResource = CRUtilities::get_compute_resource($computeResourceId);
- $jobSubmissionInterfaces = array();
- $dataMovementInterfaces = array();
- $addedJSP = array();
- $addedDMI = array();
- //var_dump( $computeResource->jobSubmissionInterfaces); exit;
- if (count($computeResource->jobSubmissionInterfaces)) {
- foreach ($computeResource->jobSubmissionInterfaces as $JSI) {
- $jobSubmissionInterfaces[] = CRUtilities::getJobSubmissionDetails($JSI->jobSubmissionInterfaceId, $JSI->jobSubmissionProtocol);
- $addedJSP[] = $JSI->jobSubmissionProtocol;
- }
- }
- //var_dump( CRUtilities::getJobSubmissionDetails( $data["computeResource"]->jobSubmissionInterfaces[0]->jobSubmissionInterfaceId, 1) ); exit;
- if (count($computeResource->dataMovementInterfaces)) {
- foreach ($computeResource->dataMovementInterfaces as $DMI) {
- $dataMovementInterfaces[] = CRUtilities::getDataMovementDetails($DMI->dataMovementInterfaceId, $DMI->dataMovementProtocol);
- $addedDMI[] = $DMI->dataMovementProtocol;
- }
- }
-
- $data["computeResource"] = $computeResource;
- $data["jobSubmissionInterfaces"] = $jobSubmissionInterfaces;
- $data["dataMovementInterfaces"] = $dataMovementInterfaces;
- $data["addedJSP"] = $addedJSP;
- $data["addedDMI"] = $addedDMI;
- //var_dump($data["jobSubmissionInterfaces"]); exit;
- return View::make("resource/view", $data);
- } else
- return View::make("resource/browse")->with("login-alert", "Unable to retrieve this Compute Resource. Please report this error to devs.");
-
- }
-
- public function deleteActions()
- {
- $this->beforeFilter('verifyeditadmin');
- $result = SRUtilities::deleteActions(Input::all());
- /*
- if (Input::has("jsiId")) {
- return Redirect::to("cr/edit?crId=" . Input::get("crId") . "#tab-jobSubmission")
- ->with("message", "Job Submission Interface was deleted successfully");
- }
- */
- if (Input::has("dmiId")) {
- return Redirect::to("sr/edit?crId=" . Input::get("crId") . "#tab-dataMovement")
- ->with("message", "Data Movement Protocol was deleted successfully");
- } elseif (Input::has("del-srId")) {
- return Redirect::to("sr/browse")->with("message", "The Compute Resource has been successfully deleted.");
- } else
- return $result;
- }
-
- public function browseView()
- {
- $data = SRUtilities::getBrowseSRData(false);
- $allSRs = $data["srObjects"];
-
- Session::put("admin-nav", "sr-browse");
- return View::make("storage-resource/browse", array(
- "allSRs" => $allSRs
- ));
-
- }
-}
-
-?>
\ No newline at end of file
[21/23] airavata-php-gateway git commit: fixing the include path
Posted by nd...@apache.org.
fixing the include 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/afc639a2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/afc639a2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/afc639a2
Branch: refs/heads/develop
Commit: afc639a259838f41b2ad188cb5c294c6d61c14ae
Parents: 72cc4dd
Author: smarru <sm...@apache.org>
Authored: Tue Dec 8 16:55:22 2015 -0500
Committer: smarru <sm...@apache.org>
Committed: Tue Dec 8 16:55:22 2015 -0500
----------------------------------------------------------------------
app/libraries/SRUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/afc639a2/app/libraries/SRUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/SRUtilities.php b/app/libraries/SRUtilities.php
index 63cd38e..5920c05 100644
--- a/app/libraries/SRUtilities.php
+++ b/app/libraries/SRUtilities.php
@@ -17,7 +17,7 @@ use Airavata\Model\AppCatalog\ComputeResource\LOCALSubmission;
use Airavata\Model\AppCatalog\ComputeResource\MonitorMode;
use Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager;
use Airavata\Model\AppCatalog\ComputeResource\ResourceJobManagerType;
-use Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement;
+use Airavata\Model\Data\Movement\SCPDataMovement;
use Airavata\Model\Data\Movement\SecurityProtocol;
use Airavata\Model\AppCatalog\ComputeResource\SSHJobSubmission;
use Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement;
[07/23] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Posted by nd...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/75d75774
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/75d75774
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/75d75774
Branch: refs/heads/develop
Commit: 75d75774f8fea714044f6e8000074fc36fbcb76e
Parents: 7c7c657 d3d03c1
Author: scnakandala <su...@gmail.com>
Authored: Tue Nov 24 18:33:02 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Nov 24 18:33:02 2015 -0500
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 7278 +++++++++++-------
.../Model/AppCatalog/GatewayProfile/Types.php | 37 +-
.../Airavata/Model/Experiment/Types.php | 187 +-
app/libraries/Airavata/Model/Task/Types.php | 53 +-
4 files changed, 4434 insertions(+), 3121 deletions(-)
----------------------------------------------------------------------
[16/23] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/master'
Posted by nd...@apache.org.
Merge remote-tracking branch 'origin/master'
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/8e2493a6
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/8e2493a6
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/8e2493a6
Branch: refs/heads/develop
Commit: 8e2493a60cc5544fdfc70daf8e71307a9f5486dc
Parents: 62586cd 6296c04
Author: scnakandala <su...@gmail.com>
Authored: Tue Dec 1 15:21:21 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Tue Dec 1 15:21:21 2015 -0500
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 8 +++--
.../Model/AppCatalog/GatewayProfile/Types.php | 37 ++++++++++++++++----
app/views/experiment/summary.blade.php | 6 ++--
app/views/partials/experiment-info.blade.php | 2 +-
4 files changed, 41 insertions(+), 12 deletions(-)
----------------------------------------------------------------------