Repository: airavata-php-gateway Updated Branches: refs/heads/develop 77389a632 -> 40df106a2
removing username from AuthzContext 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/40df106a Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/40df106a Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/40df106a Branch: refs/heads/develop Commit: 40df106a25fe25e99dc7c41b6da37977f1259af2 Parents: 77389a6 Author: scnakandala <[email protected]> Authored: Mon May 2 18:30:40 2016 -0400 Committer: scnakandala <[email protected]> Committed: Mon May 2 18:30:40 2016 -0400 ---------------------------------------------------------------------- app/controllers/AccountController.php | 1 - app/filters.php | 1 - app/libraries/Airavata/API/Airavata.php | 1116 ++++++------------ app/libraries/Airavata/Model/Security/Types.php | 25 +- 4 files changed, 374 insertions(+), 769 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/40df106a/app/controllers/AccountController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 2cc5a11..613c36c 100644 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -121,7 +121,6 @@ class AccountController extends BaseController $authzToken = new Airavata\Model\Security\AuthzToken(); $authzToken->accessToken = $accessToken; $authzToken->gatewayId = Config::get('pga_config.airavata')['gateway-id']; - $authzToken->userName = $username; Session::put('authz-token',$authzToken); Session::put('oauth-refresh-code',$refreshToken); Session::put('oauth-expiration-time',$expirationTime); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/40df106a/app/filters.php ---------------------------------------------------------------------- diff --git a/app/filters.php b/app/filters.php index 89a92b2..398f5b3 100755 --- a/app/filters.php +++ b/app/filters.php @@ -28,7 +28,6 @@ App::before(function ($request) { $authzToken = Session::get('authz-token'); $authzToken->accessToken = $accessToken; $authzToken->gatewayId = Config::get('pga_config.airavata')['gateway-id']; - $authzToken->userName = Session::get('username'); Session::put('authz-token',$authzToken); Session::put('oauth-refresh-code',$refreshToken); Session::put('oauth-expiration-time',$expirationTime); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/40df106a/app/libraries/Airavata/API/Airavata.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php index 9f570e8..a1de78d 100644 --- a/app/libraries/Airavata/API/Airavata.php +++ b/app/libraries/Airavata/API/Airavata.php @@ -302,28 +302,6 @@ interface AiravataIf { public function getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId); /** * - * Get a Public Key by Providing the Token - * - * @param CredStoreToken - * Credential Store Token which you want to find the Public Key for. - * - * @param gatewayId - * This is the unique identifier of your gateway where the token and public key was generated from. - * - * @return SSHpubKey - * - * - * - * @param \Airavata\Model\Security\AuthzToken $authzToken - * @param string $userName - * @return array - * @throws \Airavata\API\Error\InvalidRequestException - * @throws \Airavata\API\Error\AiravataClientException - * @throws \Airavata\API\Error\AiravataSystemException - */ - public function getAllUserSSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $userName); - /** - * * Get all Public Keys of the Gateway * * @param CredStoreToken @@ -4615,67 +4593,6 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("getSSHPubKey failed: unknown result"); } - public function getAllUserSSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $userName) - { - $this->send_getAllUserSSHPubKeys($authzToken, $userName); - return $this->recv_getAllUserSSHPubKeys(); - } - - public function send_getAllUserSSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $userName) - { - $args = new \Airavata\API\Airavata_getAllUserSSHPubKeys_args(); - $args->authzToken = $authzToken; - $args->userName = $userName; - $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); - if ($bin_accel) - { - thrift_protocol_write_binary($this->output_, 'getAllUserSSHPubKeys', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); - } - else - { - $this->output_->writeMessageBegin('getAllUserSSHPubKeys', TMessageType::CALL, $this->seqid_); - $args->write($this->output_); - $this->output_->writeMessageEnd(); - $this->output_->getTransport()->flush(); - } - } - - public function recv_getAllUserSSHPubKeys() - { - $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_getAllUserSSHPubKeys_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_getAllUserSSHPubKeys_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; - } - throw new \Exception("getAllUserSSHPubKeys failed: unknown result"); - } - public function getAllGatewaySSHPubKeys(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId) { $this->send_getAllGatewaySSHPubKeys($authzToken, $gatewayId); @@ -17704,7 +17621,7 @@ class Airavata_getSSHPubKey_result { } -class Airavata_getAllUserSSHPubKeys_args { +class Airavata_getAllGatewaySSHPubKeys_args { static $_TSPEC; /** @@ -17714,7 +17631,7 @@ class Airavata_getAllUserSSHPubKeys_args { /** * @var string */ - public $userName = null; + public $gatewayId = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -17725,7 +17642,7 @@ class Airavata_getAllUserSSHPubKeys_args { 'class' => '\Airavata\Model\Security\AuthzToken', ), 2 => array( - 'var' => 'userName', + 'var' => 'gatewayId', 'type' => TType::STRING, ), ); @@ -17734,14 +17651,14 @@ class Airavata_getAllUserSSHPubKeys_args { if (isset($vals['authzToken'])) { $this->authzToken = $vals['authzToken']; } - if (isset($vals['userName'])) { - $this->userName = $vals['userName']; + if (isset($vals['gatewayId'])) { + $this->gatewayId = $vals['gatewayId']; } } } public function getName() { - return 'Airavata_getAllUserSSHPubKeys_args'; + return 'Airavata_getAllGatewaySSHPubKeys_args'; } public function read($input) @@ -17769,7 +17686,7 @@ class Airavata_getAllUserSSHPubKeys_args { break; case 2: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->userName); + $xfer += $input->readString($this->gatewayId); } else { $xfer += $input->skip($ftype); } @@ -17786,7 +17703,7 @@ class Airavata_getAllUserSSHPubKeys_args { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_getAllUserSSHPubKeys_args'); + $xfer += $output->writeStructBegin('Airavata_getAllGatewaySSHPubKeys_args'); if ($this->authzToken !== null) { if (!is_object($this->authzToken)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -17795,9 +17712,9 @@ class Airavata_getAllUserSSHPubKeys_args { $xfer += $this->authzToken->write($output); $xfer += $output->writeFieldEnd(); } - if ($this->userName !== null) { - $xfer += $output->writeFieldBegin('userName', TType::STRING, 2); - $xfer += $output->writeString($this->userName); + if ($this->gatewayId !== null) { + $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2); + $xfer += $output->writeString($this->gatewayId); $xfer += $output->writeFieldEnd(); } $xfer += $output->writeFieldStop(); @@ -17807,7 +17724,7 @@ class Airavata_getAllUserSSHPubKeys_args { } -class Airavata_getAllUserSSHPubKeys_result { +class Airavata_getAllGatewaySSHPubKeys_result { static $_TSPEC; /** @@ -17876,7 +17793,7 @@ class Airavata_getAllUserSSHPubKeys_result { } public function getName() { - return 'Airavata_getAllUserSSHPubKeys_result'; + return 'Airavata_getAllGatewaySSHPubKeys_result'; } public function read($input) @@ -17950,7 +17867,7 @@ class Airavata_getAllUserSSHPubKeys_result { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_getAllUserSSHPubKeys_result'); + $xfer += $output->writeStructBegin('Airavata_getAllGatewaySSHPubKeys_result'); if ($this->success !== null) { if (!is_array($this->success)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -17991,7 +17908,7 @@ class Airavata_getAllUserSSHPubKeys_result { } -class Airavata_getAllGatewaySSHPubKeys_args { +class Airavata_getAllGatewayPWDCredentials_args { static $_TSPEC; /** @@ -18028,7 +17945,7 @@ class Airavata_getAllGatewaySSHPubKeys_args { } public function getName() { - return 'Airavata_getAllGatewaySSHPubKeys_args'; + return 'Airavata_getAllGatewayPWDCredentials_args'; } public function read($input) @@ -18073,7 +17990,7 @@ class Airavata_getAllGatewaySSHPubKeys_args { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_getAllGatewaySSHPubKeys_args'); + $xfer += $output->writeStructBegin('Airavata_getAllGatewayPWDCredentials_args'); if ($this->authzToken !== null) { if (!is_object($this->authzToken)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -18094,7 +18011,7 @@ class Airavata_getAllGatewaySSHPubKeys_args { } -class Airavata_getAllGatewaySSHPubKeys_result { +class Airavata_getAllGatewayPWDCredentials_result { static $_TSPEC; /** @@ -18163,7 +18080,7 @@ class Airavata_getAllGatewaySSHPubKeys_result { } public function getName() { - return 'Airavata_getAllGatewaySSHPubKeys_result'; + return 'Airavata_getAllGatewayPWDCredentials_result'; } public function read($input) @@ -18237,7 +18154,7 @@ class Airavata_getAllGatewaySSHPubKeys_result { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_getAllGatewaySSHPubKeys_result'); + $xfer += $output->writeStructBegin('Airavata_getAllGatewayPWDCredentials_result'); if ($this->success !== null) { if (!is_array($this->success)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -18278,293 +18195,6 @@ class Airavata_getAllGatewaySSHPubKeys_result { } -class Airavata_getAllGatewayPWDCredentials_args { - static $_TSPEC; - - /** - * @var \Airavata\Model\Security\AuthzToken - */ - public $authzToken = null; - /** - * @var string - */ - public $gatewayId = null; - - public function __construct($vals=null) { - if (!isset(self::$_TSPEC)) { - self::$_TSPEC = array( - 1 => array( - 'var' => 'authzToken', - 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\Security\AuthzToken', - ), - 2 => array( - 'var' => 'gatewayId', - 'type' => TType::STRING, - ), - ); - } - if (is_array($vals)) { - if (isset($vals['authzToken'])) { - $this->authzToken = $vals['authzToken']; - } - if (isset($vals['gatewayId'])) { - $this->gatewayId = $vals['gatewayId']; - } - } - } - - public function getName() { - return 'Airavata_getAllGatewayPWDCredentials_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; - default: - $xfer += $input->skip($ftype); - break; - } - $xfer += $input->readFieldEnd(); - } - $xfer += $input->readStructEnd(); - return $xfer; - } - - public function write($output) { - $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_getAllGatewayPWDCredentials_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(); - } - $xfer += $output->writeFieldStop(); - $xfer += $output->writeStructEnd(); - return $xfer; - } - -} - -class Airavata_getAllGatewayPWDCredentials_result { - static $_TSPEC; - - /** - * @var array - */ - 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; - - public function __construct($vals=null) { - if (!isset(self::$_TSPEC)) { - self::$_TSPEC = array( - 0 => array( - 'var' => 'success', - 'type' => TType::MAP, - 'ktype' => TType::STRING, - 'vtype' => TType::STRING, - 'key' => array( - 'type' => TType::STRING, - ), - 'val' => array( - 'type' => TType::STRING, - ), - ), - 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', - ), - ); - } - 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']; - } - } - } - - public function getName() { - return 'Airavata_getAllGatewayPWDCredentials_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::MAP) { - $this->success = array(); - $_size32 = 0; - $_ktype33 = 0; - $_vtype34 = 0; - $xfer += $input->readMapBegin($_ktype33, $_vtype34, $_size32); - for ($_i36 = 0; $_i36 < $_size32; ++$_i36) - { - $key37 = ''; - $val38 = ''; - $xfer += $input->readString($key37); - $xfer += $input->readString($val38); - $this->success[$key37] = $val38; - } - $xfer += $input->readMapEnd(); - } 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; - default: - $xfer += $input->skip($ftype); - break; - } - $xfer += $input->readFieldEnd(); - } - $xfer += $input->readStructEnd(); - return $xfer; - } - - public function write($output) { - $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_getAllGatewayPWDCredentials_result'); - if ($this->success !== null) { - if (!is_array($this->success)) { - throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); - } - $xfer += $output->writeFieldBegin('success', TType::MAP, 0); - { - $output->writeMapBegin(TType::STRING, TType::STRING, count($this->success)); - { - foreach ($this->success as $kiter39 => $viter40) - { - $xfer += $output->writeString($kiter39); - $xfer += $output->writeString($viter40); - } - } - $output->writeMapEnd(); - } - $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(); - } - $xfer += $output->writeFieldStop(); - $xfer += $output->writeStructEnd(); - return $xfer; - } - -} - class Airavata_deleteSSHPubKey_args { static $_TSPEC; @@ -20613,15 +20243,15 @@ class Airavata_getUserProjects_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size41 = 0; - $_etype44 = 0; - $xfer += $input->readListBegin($_etype44, $_size41); - for ($_i45 = 0; $_i45 < $_size41; ++$_i45) + $_size32 = 0; + $_etype35 = 0; + $xfer += $input->readListBegin($_etype35, $_size32); + for ($_i36 = 0; $_i36 < $_size32; ++$_i36) { - $elem46 = null; - $elem46 = new \Airavata\Model\Workspace\Project(); - $xfer += $elem46->read($input); - $this->success []= $elem46; + $elem37 = null; + $elem37 = new \Airavata\Model\Workspace\Project(); + $xfer += $elem37->read($input); + $this->success []= $elem37; } $xfer += $input->readListEnd(); } else { @@ -20681,9 +20311,9 @@ class Airavata_getUserProjects_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter47) + foreach ($this->success as $iter38) { - $xfer += $iter47->write($output); + $xfer += $iter38->write($output); } } $output->writeListEnd(); @@ -21011,15 +20641,15 @@ class Airavata_searchProjectsByProjectName_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size48 = 0; - $_etype51 = 0; - $xfer += $input->readListBegin($_etype51, $_size48); - for ($_i52 = 0; $_i52 < $_size48; ++$_i52) + $_size39 = 0; + $_etype42 = 0; + $xfer += $input->readListBegin($_etype42, $_size39); + for ($_i43 = 0; $_i43 < $_size39; ++$_i43) { - $elem53 = null; - $elem53 = new \Airavata\Model\Workspace\Project(); - $xfer += $elem53->read($input); - $this->success []= $elem53; + $elem44 = null; + $elem44 = new \Airavata\Model\Workspace\Project(); + $xfer += $elem44->read($input); + $this->success []= $elem44; } $xfer += $input->readListEnd(); } else { @@ -21079,9 +20709,9 @@ class Airavata_searchProjectsByProjectName_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter54) + foreach ($this->success as $iter45) { - $xfer += $iter54->write($output); + $xfer += $iter45->write($output); } } $output->writeListEnd(); @@ -21409,15 +21039,15 @@ class Airavata_searchProjectsByProjectDesc_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size55 = 0; - $_etype58 = 0; - $xfer += $input->readListBegin($_etype58, $_size55); - for ($_i59 = 0; $_i59 < $_size55; ++$_i59) + $_size46 = 0; + $_etype49 = 0; + $xfer += $input->readListBegin($_etype49, $_size46); + for ($_i50 = 0; $_i50 < $_size46; ++$_i50) { - $elem60 = null; - $elem60 = new \Airavata\Model\Workspace\Project(); - $xfer += $elem60->read($input); - $this->success []= $elem60; + $elem51 = null; + $elem51 = new \Airavata\Model\Workspace\Project(); + $xfer += $elem51->read($input); + $this->success []= $elem51; } $xfer += $input->readListEnd(); } else { @@ -21477,9 +21107,9 @@ class Airavata_searchProjectsByProjectDesc_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter61) + foreach ($this->success as $iter52) { - $xfer += $iter61->write($output); + $xfer += $iter52->write($output); } } $output->writeListEnd(); @@ -21807,15 +21437,15 @@ class Airavata_searchExperimentsByName_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size62 = 0; - $_etype65 = 0; - $xfer += $input->readListBegin($_etype65, $_size62); - for ($_i66 = 0; $_i66 < $_size62; ++$_i66) + $_size53 = 0; + $_etype56 = 0; + $xfer += $input->readListBegin($_etype56, $_size53); + for ($_i57 = 0; $_i57 < $_size53; ++$_i57) { - $elem67 = null; - $elem67 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem67->read($input); - $this->success []= $elem67; + $elem58 = null; + $elem58 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem58->read($input); + $this->success []= $elem58; } $xfer += $input->readListEnd(); } else { @@ -21875,9 +21505,9 @@ class Airavata_searchExperimentsByName_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter68) + foreach ($this->success as $iter59) { - $xfer += $iter68->write($output); + $xfer += $iter59->write($output); } } $output->writeListEnd(); @@ -22205,15 +21835,15 @@ class Airavata_searchExperimentsByDesc_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size69 = 0; - $_etype72 = 0; - $xfer += $input->readListBegin($_etype72, $_size69); - for ($_i73 = 0; $_i73 < $_size69; ++$_i73) + $_size60 = 0; + $_etype63 = 0; + $xfer += $input->readListBegin($_etype63, $_size60); + for ($_i64 = 0; $_i64 < $_size60; ++$_i64) { - $elem74 = null; - $elem74 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem74->read($input); - $this->success []= $elem74; + $elem65 = null; + $elem65 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem65->read($input); + $this->success []= $elem65; } $xfer += $input->readListEnd(); } else { @@ -22273,9 +21903,9 @@ class Airavata_searchExperimentsByDesc_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter75) + foreach ($this->success as $iter66) { - $xfer += $iter75->write($output); + $xfer += $iter66->write($output); } } $output->writeListEnd(); @@ -22603,15 +22233,15 @@ class Airavata_searchExperimentsByApplication_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size76 = 0; - $_etype79 = 0; - $xfer += $input->readListBegin($_etype79, $_size76); - for ($_i80 = 0; $_i80 < $_size76; ++$_i80) + $_size67 = 0; + $_etype70 = 0; + $xfer += $input->readListBegin($_etype70, $_size67); + for ($_i71 = 0; $_i71 < $_size67; ++$_i71) { - $elem81 = null; - $elem81 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem81->read($input); - $this->success []= $elem81; + $elem72 = null; + $elem72 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem72->read($input); + $this->success []= $elem72; } $xfer += $input->readListEnd(); } else { @@ -22671,9 +22301,9 @@ class Airavata_searchExperimentsByApplication_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter82) + foreach ($this->success as $iter73) { - $xfer += $iter82->write($output); + $xfer += $iter73->write($output); } } $output->writeListEnd(); @@ -23001,15 +22631,15 @@ class Airavata_searchExperimentsByStatus_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size83 = 0; - $_etype86 = 0; - $xfer += $input->readListBegin($_etype86, $_size83); - for ($_i87 = 0; $_i87 < $_size83; ++$_i87) + $_size74 = 0; + $_etype77 = 0; + $xfer += $input->readListBegin($_etype77, $_size74); + for ($_i78 = 0; $_i78 < $_size74; ++$_i78) { - $elem88 = null; - $elem88 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem88->read($input); - $this->success []= $elem88; + $elem79 = null; + $elem79 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem79->read($input); + $this->success []= $elem79; } $xfer += $input->readListEnd(); } else { @@ -23069,9 +22699,9 @@ class Airavata_searchExperimentsByStatus_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter89) + foreach ($this->success as $iter80) { - $xfer += $iter89->write($output); + $xfer += $iter80->write($output); } } $output->writeListEnd(); @@ -23422,15 +23052,15 @@ class Airavata_searchExperimentsByCreationTime_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size90 = 0; - $_etype93 = 0; - $xfer += $input->readListBegin($_etype93, $_size90); - for ($_i94 = 0; $_i94 < $_size90; ++$_i94) + $_size81 = 0; + $_etype84 = 0; + $xfer += $input->readListBegin($_etype84, $_size81); + for ($_i85 = 0; $_i85 < $_size81; ++$_i85) { - $elem95 = null; - $elem95 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem95->read($input); - $this->success []= $elem95; + $elem86 = null; + $elem86 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem86->read($input); + $this->success []= $elem86; } $xfer += $input->readListEnd(); } else { @@ -23490,9 +23120,9 @@ class Airavata_searchExperimentsByCreationTime_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter96) + foreach ($this->success as $iter87) { - $xfer += $iter96->write($output); + $xfer += $iter87->write($output); } } $output->writeListEnd(); @@ -23658,17 +23288,17 @@ class Airavata_searchExperiments_args { case 4: if ($ftype == TType::MAP) { $this->filters = array(); - $_size97 = 0; - $_ktype98 = 0; - $_vtype99 = 0; - $xfer += $input->readMapBegin($_ktype98, $_vtype99, $_size97); - for ($_i101 = 0; $_i101 < $_size97; ++$_i101) + $_size88 = 0; + $_ktype89 = 0; + $_vtype90 = 0; + $xfer += $input->readMapBegin($_ktype89, $_vtype90, $_size88); + for ($_i92 = 0; $_i92 < $_size88; ++$_i92) { - $key102 = 0; - $val103 = ''; - $xfer += $input->readI32($key102); - $xfer += $input->readString($val103); - $this->filters[$key102] = $val103; + $key93 = 0; + $val94 = ''; + $xfer += $input->readI32($key93); + $xfer += $input->readString($val94); + $this->filters[$key93] = $val94; } $xfer += $input->readMapEnd(); } else { @@ -23728,10 +23358,10 @@ class Airavata_searchExperiments_args { { $output->writeMapBegin(TType::I32, TType::STRING, count($this->filters)); { - foreach ($this->filters as $kiter104 => $viter105) + foreach ($this->filters as $kiter95 => $viter96) { - $xfer += $output->writeI32($kiter104); - $xfer += $output->writeString($viter105); + $xfer += $output->writeI32($kiter95); + $xfer += $output->writeString($viter96); } } $output->writeMapEnd(); @@ -23854,15 +23484,15 @@ class Airavata_searchExperiments_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size106 = 0; - $_etype109 = 0; - $xfer += $input->readListBegin($_etype109, $_size106); - for ($_i110 = 0; $_i110 < $_size106; ++$_i110) + $_size97 = 0; + $_etype100 = 0; + $xfer += $input->readListBegin($_etype100, $_size97); + for ($_i101 = 0; $_i101 < $_size97; ++$_i101) { - $elem111 = null; - $elem111 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem111->read($input); - $this->success []= $elem111; + $elem102 = null; + $elem102 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem102->read($input); + $this->success []= $elem102; } $xfer += $input->readListEnd(); } else { @@ -23922,9 +23552,9 @@ class Airavata_searchExperiments_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter112) + foreach ($this->success as $iter103) { - $xfer += $iter112->write($output); + $xfer += $iter103->write($output); } } $output->writeListEnd(); @@ -24547,15 +24177,15 @@ class Airavata_getExperimentsInProject_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size113 = 0; - $_etype116 = 0; - $xfer += $input->readListBegin($_etype116, $_size113); - for ($_i117 = 0; $_i117 < $_size113; ++$_i117) + $_size104 = 0; + $_etype107 = 0; + $xfer += $input->readListBegin($_etype107, $_size104); + for ($_i108 = 0; $_i108 < $_size104; ++$_i108) { - $elem118 = null; - $elem118 = new \Airavata\Model\Experiment\ExperimentModel(); - $xfer += $elem118->read($input); - $this->success []= $elem118; + $elem109 = null; + $elem109 = new \Airavata\Model\Experiment\ExperimentModel(); + $xfer += $elem109->read($input); + $this->success []= $elem109; } $xfer += $input->readListEnd(); } else { @@ -24623,9 +24253,9 @@ class Airavata_getExperimentsInProject_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter119) + foreach ($this->success as $iter110) { - $xfer += $iter119->write($output); + $xfer += $iter110->write($output); } } $output->writeListEnd(); @@ -24935,15 +24565,15 @@ class Airavata_getUserExperiments_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size120 = 0; - $_etype123 = 0; - $xfer += $input->readListBegin($_etype123, $_size120); - for ($_i124 = 0; $_i124 < $_size120; ++$_i124) + $_size111 = 0; + $_etype114 = 0; + $xfer += $input->readListBegin($_etype114, $_size111); + for ($_i115 = 0; $_i115 < $_size111; ++$_i115) { - $elem125 = null; - $elem125 = new \Airavata\Model\Experiment\ExperimentModel(); - $xfer += $elem125->read($input); - $this->success []= $elem125; + $elem116 = null; + $elem116 = new \Airavata\Model\Experiment\ExperimentModel(); + $xfer += $elem116->read($input); + $this->success []= $elem116; } $xfer += $input->readListEnd(); } else { @@ -25003,9 +24633,9 @@ class Airavata_getUserExperiments_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter126) + foreach ($this->success as $iter117) { - $xfer += $iter126->write($output); + $xfer += $iter117->write($output); } } $output->writeListEnd(); @@ -28091,15 +27721,15 @@ class Airavata_getExperimentOutputs_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size127 = 0; - $_etype130 = 0; - $xfer += $input->readListBegin($_etype130, $_size127); - for ($_i131 = 0; $_i131 < $_size127; ++$_i131) + $_size118 = 0; + $_etype121 = 0; + $xfer += $input->readListBegin($_etype121, $_size118); + for ($_i122 = 0; $_i122 < $_size118; ++$_i122) { - $elem132 = null; - $elem132 = new \Airavata\Model\Application\Io\OutputDataObjectType(); - $xfer += $elem132->read($input); - $this->success []= $elem132; + $elem123 = null; + $elem123 = new \Airavata\Model\Application\Io\OutputDataObjectType(); + $xfer += $elem123->read($input); + $this->success []= $elem123; } $xfer += $input->readListEnd(); } else { @@ -28167,9 +27797,9 @@ class Airavata_getExperimentOutputs_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter133) + foreach ($this->success as $iter124) { - $xfer += $iter133->write($output); + $xfer += $iter124->write($output); } } $output->writeListEnd(); @@ -28422,15 +28052,15 @@ class Airavata_getIntermediateOutputs_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size134 = 0; - $_etype137 = 0; - $xfer += $input->readListBegin($_etype137, $_size134); - for ($_i138 = 0; $_i138 < $_size134; ++$_i138) + $_size125 = 0; + $_etype128 = 0; + $xfer += $input->readListBegin($_etype128, $_size125); + for ($_i129 = 0; $_i129 < $_size125; ++$_i129) { - $elem139 = null; - $elem139 = new \Airavata\Model\Application\Io\OutputDataObjectType(); - $xfer += $elem139->read($input); - $this->success []= $elem139; + $elem130 = null; + $elem130 = new \Airavata\Model\Application\Io\OutputDataObjectType(); + $xfer += $elem130->read($input); + $this->success []= $elem130; } $xfer += $input->readListEnd(); } else { @@ -28498,9 +28128,9 @@ class Airavata_getIntermediateOutputs_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter140) + foreach ($this->success as $iter131) { - $xfer += $iter140->write($output); + $xfer += $iter131->write($output); } } $output->writeListEnd(); @@ -28757,18 +28387,18 @@ class Airavata_getJobStatuses_result { case 0: if ($ftype == TType::MAP) { $this->success = array(); - $_size141 = 0; - $_ktype142 = 0; - $_vtype143 = 0; - $xfer += $input->readMapBegin($_ktype142, $_vtype143, $_size141); - for ($_i145 = 0; $_i145 < $_size141; ++$_i145) + $_size132 = 0; + $_ktype133 = 0; + $_vtype134 = 0; + $xfer += $input->readMapBegin($_ktype133, $_vtype134, $_size132); + for ($_i136 = 0; $_i136 < $_size132; ++$_i136) { - $key146 = ''; - $val147 = new \Airavata\Model\Status\JobStatus(); - $xfer += $input->readString($key146); - $val147 = new \Airavata\Model\Status\JobStatus(); - $xfer += $val147->read($input); - $this->success[$key146] = $val147; + $key137 = ''; + $val138 = new \Airavata\Model\Status\JobStatus(); + $xfer += $input->readString($key137); + $val138 = new \Airavata\Model\Status\JobStatus(); + $xfer += $val138->read($input); + $this->success[$key137] = $val138; } $xfer += $input->readMapEnd(); } else { @@ -28836,10 +28466,10 @@ class Airavata_getJobStatuses_result { { $output->writeMapBegin(TType::STRING, TType::STRUCT, count($this->success)); { - foreach ($this->success as $kiter148 => $viter149) + foreach ($this->success as $kiter139 => $viter140) { - $xfer += $output->writeString($kiter148); - $xfer += $viter149->write($output); + $xfer += $output->writeString($kiter139); + $xfer += $viter140->write($output); } } $output->writeMapEnd(); @@ -29092,15 +28722,15 @@ class Airavata_getJobDetails_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size150 = 0; - $_etype153 = 0; - $xfer += $input->readListBegin($_etype153, $_size150); - for ($_i154 = 0; $_i154 < $_size150; ++$_i154) + $_size141 = 0; + $_etype144 = 0; + $xfer += $input->readListBegin($_etype144, $_size141); + for ($_i145 = 0; $_i145 < $_size141; ++$_i145) { - $elem155 = null; - $elem155 = new \Airavata\Model\Job\JobModel(); - $xfer += $elem155->read($input); - $this->success []= $elem155; + $elem146 = null; + $elem146 = new \Airavata\Model\Job\JobModel(); + $xfer += $elem146->read($input); + $this->success []= $elem146; } $xfer += $input->readListEnd(); } else { @@ -29168,9 +28798,9 @@ class Airavata_getJobDetails_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter156) + foreach ($this->success as $iter147) { - $xfer += $iter156->write($output); + $xfer += $iter147->write($output); } } $output->writeListEnd(); @@ -30935,15 +30565,15 @@ class Airavata_getAllAppModules_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size157 = 0; - $_etype160 = 0; - $xfer += $input->readListBegin($_etype160, $_size157); - for ($_i161 = 0; $_i161 < $_size157; ++$_i161) + $_size148 = 0; + $_etype151 = 0; + $xfer += $input->readListBegin($_etype151, $_size148); + for ($_i152 = 0; $_i152 < $_size148; ++$_i152) { - $elem162 = null; - $elem162 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule(); - $xfer += $elem162->read($input); - $this->success []= $elem162; + $elem153 = null; + $elem153 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationModule(); + $xfer += $elem153->read($input); + $this->success []= $elem153; } $xfer += $input->readListEnd(); } else { @@ -31003,9 +30633,9 @@ class Airavata_getAllAppModules_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter163) + foreach ($this->success as $iter154) { - $xfer += $iter163->write($output); + $xfer += $iter154->write($output); } } $output->writeListEnd(); @@ -32692,15 +32322,15 @@ class Airavata_getAllApplicationDeployments_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size164 = 0; - $_etype167 = 0; - $xfer += $input->readListBegin($_etype167, $_size164); - for ($_i168 = 0; $_i168 < $_size164; ++$_i168) + $_size155 = 0; + $_etype158 = 0; + $xfer += $input->readListBegin($_etype158, $_size155); + for ($_i159 = 0; $_i159 < $_size155; ++$_i159) { - $elem169 = null; - $elem169 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationDeploymentDescription(); - $xfer += $elem169->read($input); - $this->success []= $elem169; + $elem160 = null; + $elem160 = new \Airavata\Model\AppCatalog\AppDeployment\ApplicationDeploymentDescription(); + $xfer += $elem160->read($input); + $this->success []= $elem160; } $xfer += $input->readListEnd(); } else { @@ -32760,9 +32390,9 @@ class Airavata_getAllApplicationDeployments_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter170) + foreach ($this->success as $iter161) { - $xfer += $iter170->write($output); + $xfer += $iter161->write($output); } } $output->writeListEnd(); @@ -32997,14 +32627,14 @@ class Airavata_getAppModuleDeployedResources_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size171 = 0; - $_etype174 = 0; - $xfer += $input->readListBegin($_etype174, $_size171); - for ($_i175 = 0; $_i175 < $_size171; ++$_i175) + $_size162 = 0; + $_etype165 = 0; + $xfer += $input->readListBegin($_etype165, $_size162); + for ($_i166 = 0; $_i166 < $_size162; ++$_i166) { - $elem176 = null; - $xfer += $input->readString($elem176); - $this->success []= $elem176; + $elem167 = null; + $xfer += $input->readString($elem167); + $this->success []= $elem167; } $xfer += $input->readListEnd(); } else { @@ -33064,9 +32694,9 @@ class Airavata_getAppModuleDeployedResources_result { { $output->writeListBegin(TType::STRING, count($this->success)); { - foreach ($this->success as $iter177) + foreach ($this->success as $iter168) { - $xfer += $output->writeString($iter177); + $xfer += $output->writeString($iter168); } } $output->writeListEnd(); @@ -34802,17 +34432,17 @@ class Airavata_getAllApplicationInterfaceNames_result { case 0: if ($ftype == TType::MAP) { $this->success = array(); - $_size178 = 0; - $_ktype179 = 0; - $_vtype180 = 0; - $xfer += $input->readMapBegin($_ktype179, $_vtype180, $_size178); - for ($_i182 = 0; $_i182 < $_size178; ++$_i182) + $_size169 = 0; + $_ktype170 = 0; + $_vtype171 = 0; + $xfer += $input->readMapBegin($_ktype170, $_vtype171, $_size169); + for ($_i173 = 0; $_i173 < $_size169; ++$_i173) { - $key183 = ''; - $val184 = ''; - $xfer += $input->readString($key183); - $xfer += $input->readString($val184); - $this->success[$key183] = $val184; + $key174 = ''; + $val175 = ''; + $xfer += $input->readString($key174); + $xfer += $input->readString($val175); + $this->success[$key174] = $val175; } $xfer += $input->readMapEnd(); } else { @@ -34872,10 +34502,10 @@ class Airavata_getAllApplicationInterfaceNames_result { { $output->writeMapBegin(TType::STRING, TType::STRING, count($this->success)); { - foreach ($this->success as $kiter185 => $viter186) + foreach ($this->success as $kiter176 => $viter177) { - $xfer += $output->writeString($kiter185); - $xfer += $output->writeString($viter186); + $xfer += $output->writeString($kiter176); + $xfer += $output->writeString($viter177); } } $output->writeMapEnd(); @@ -35111,15 +34741,15 @@ class Airavata_getAllApplicationInterfaces_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size187 = 0; - $_etype190 = 0; - $xfer += $input->readListBegin($_etype190, $_size187); - for ($_i191 = 0; $_i191 < $_size187; ++$_i191) + $_size178 = 0; + $_etype181 = 0; + $xfer += $input->readListBegin($_etype181, $_size178); + for ($_i182 = 0; $_i182 < $_size178; ++$_i182) { - $elem192 = null; - $elem192 = new \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription(); - $xfer += $elem192->read($input); - $this->success []= $elem192; + $elem183 = null; + $elem183 = new \Airavata\Model\AppCatalog\AppInterface\ApplicationInterfaceDescription(); + $xfer += $elem183->read($input); + $this->success []= $elem183; } $xfer += $input->readListEnd(); } else { @@ -35179,9 +34809,9 @@ class Airavata_getAllApplicationInterfaces_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter193) + foreach ($this->success as $iter184) { - $xfer += $iter193->write($output); + $xfer += $iter184->write($output); } } $output->writeListEnd(); @@ -35417,15 +35047,15 @@ class Airavata_getApplicationInputs_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size194 = 0; - $_etype197 = 0; - $xfer += $input->readListBegin($_etype197, $_size194); - for ($_i198 = 0; $_i198 < $_size194; ++$_i198) + $_size185 = 0; + $_etype188 = 0; + $xfer += $input->readListBegin($_etype188, $_size185); + for ($_i189 = 0; $_i189 < $_size185; ++$_i189) { - $elem199 = null; - $elem199 = new \Airavata\Model\Application\Io\InputDataObjectType(); - $xfer += $elem199->read($input); - $this->success []= $elem199; + $elem190 = null; + $elem190 = new \Airavata\Model\Application\Io\InputDataObjectType(); + $xfer += $elem190->read($input); + $this->success []= $elem190; } $xfer += $input->readListEnd(); } else { @@ -35485,9 +35115,9 @@ class Airavata_getApplicationInputs_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter200) + foreach ($this->success as $iter191) { - $xfer += $iter200->write($output); + $xfer += $iter191->write($output); } } $output->writeListEnd(); @@ -35723,15 +35353,15 @@ class Airavata_getApplicationOutputs_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size201 = 0; - $_etype204 = 0; - $xfer += $input->readListBegin($_etype204, $_size201); - for ($_i205 = 0; $_i205 < $_size201; ++$_i205) + $_size192 = 0; + $_etype195 = 0; + $xfer += $input->readListBegin($_etype195, $_size192); + for ($_i196 = 0; $_i196 < $_size192; ++$_i196) { - $elem206 = null; - $elem206 = new \Airavata\Model\Application\Io\OutputDataObjectType(); - $xfer += $elem206->read($input); - $this->success []= $elem206; + $elem197 = null; + $elem197 = new \Airavata\Model\Application\Io\OutputDataObjectType(); + $xfer += $elem197->read($input); + $this->success []= $elem197; } $xfer += $input->readListEnd(); } else { @@ -35791,9 +35421,9 @@ class Airavata_getApplicationOutputs_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter207) + foreach ($this->success as $iter198) { - $xfer += $iter207->write($output); + $xfer += $iter198->write($output); } } $output->writeListEnd(); @@ -36032,17 +35662,17 @@ class Airavata_getAvailableAppInterfaceComputeResources_result { case 0: if ($ftype == TType::MAP) { $this->success = array(); - $_size208 = 0; - $_ktype209 = 0; - $_vtype210 = 0; - $xfer += $input->readMapBegin($_ktype209, $_vtype210, $_size208); - for ($_i212 = 0; $_i212 < $_size208; ++$_i212) + $_size199 = 0; + $_ktype200 = 0; + $_vtype201 = 0; + $xfer += $input->readMapBegin($_ktype200, $_vtype201, $_size199); + for ($_i203 = 0; $_i203 < $_size199; ++$_i203) { - $key213 = ''; - $val214 = ''; - $xfer += $input->readString($key213); - $xfer += $input->readString($val214); - $this->success[$key213] = $val214; + $key204 = ''; + $val205 = ''; + $xfer += $input->readString($key204); + $xfer += $input->readString($val205); + $this->success[$key204] = $val205; } $xfer += $input->readMapEnd(); } else { @@ -36102,10 +35732,10 @@ class Airavata_getAvailableAppInterfaceComputeResources_result { { $output->writeMapBegin(TType::STRING, TType::STRING, count($this->success)); { - foreach ($this->success as $kiter215 => $viter216) + foreach ($this->success as $kiter206 => $viter207) { - $xfer += $output->writeString($kiter215); - $xfer += $output->writeString($viter216); + $xfer += $output->writeString($kiter206); + $xfer += $output->writeString($viter207); } } $output->writeMapEnd(); @@ -36887,17 +36517,17 @@ class Airavata_getAllComputeResourceNames_result { case 0: if ($ftype == TType::MAP) { $this->success = array(); - $_size217 = 0; - $_ktype218 = 0; - $_vtype219 = 0; - $xfer += $input->readMapBegin($_ktype218, $_vtype219, $_size217); - for ($_i221 = 0; $_i221 < $_size217; ++$_i221) + $_size208 = 0; + $_ktype209 = 0; + $_vtype210 = 0; + $xfer += $input->readMapBegin($_ktype209, $_vtype210, $_size208); + for ($_i212 = 0; $_i212 < $_size208; ++$_i212) { - $key222 = ''; - $val223 = ''; - $xfer += $input->readString($key222); - $xfer += $input->readString($val223); - $this->success[$key222] = $val223; + $key213 = ''; + $val214 = ''; + $xfer += $input->readString($key213); + $xfer += $input->readString($val214); + $this->success[$key213] = $val214; } $xfer += $input->readMapEnd(); } else { @@ -36957,10 +36587,10 @@ class Airavata_getAllComputeResourceNames_result { { $output->writeMapBegin(TType::STRING, TType::STRING, count($this->success)); { - foreach ($this->success as $kiter224 => $viter225) + foreach ($this->success as $kiter215 => $viter216) { - $xfer += $output->writeString($kiter224); - $xfer += $output->writeString($viter225); + $xfer += $output->writeString($kiter215); + $xfer += $output->writeString($viter216); } } $output->writeMapEnd(); @@ -38326,17 +37956,17 @@ class Airavata_getAllStorageResourceNames_result { case 0: if ($ftype == TType::MAP) { $this->success = array(); - $_size226 = 0; - $_ktype227 = 0; - $_vtype228 = 0; - $xfer += $input->readMapBegin($_ktype227, $_vtype228, $_size226); - for ($_i230 = 0; $_i230 < $_size226; ++$_i230) + $_size217 = 0; + $_ktype218 = 0; + $_vtype219 = 0; + $xfer += $input->readMapBegin($_ktype218, $_vtype219, $_size217); + for ($_i221 = 0; $_i221 < $_size217; ++$_i221) { - $key231 = ''; - $val232 = ''; - $xfer += $input->readString($key231); - $xfer += $input->readString($val232); - $this->success[$key231] = $val232; + $key222 = ''; + $val223 = ''; + $xfer += $input->readString($key222); + $xfer += $input->readString($val223); + $this->success[$key222] = $val223; } $xfer += $input->readMapEnd(); } else { @@ -38396,10 +38026,10 @@ class Airavata_getAllStorageResourceNames_result { { $output->writeMapBegin(TType::STRING, TType::STRING, count($this->success)); { - foreach ($this->success as $kiter233 => $viter234) + foreach ($this->success as $kiter224 => $viter225) { - $xfer += $output->writeString($kiter233); - $xfer += $output->writeString($viter234); + $xfer += $output->writeString($kiter224); + $xfer += $output->writeString($viter225); } } $output->writeMapEnd(); @@ -47458,17 +47088,17 @@ class Airavata_changeJobSubmissionPriorities_args { case 2: if ($ftype == TType::MAP) { $this->jobSubmissionPriorityMap = array(); - $_size235 = 0; - $_ktype236 = 0; - $_vtype237 = 0; - $xfer += $input->readMapBegin($_ktype236, $_vtype237, $_size235); - for ($_i239 = 0; $_i239 < $_size235; ++$_i239) + $_size226 = 0; + $_ktype227 = 0; + $_vtype228 = 0; + $xfer += $input->readMapBegin($_ktype227, $_vtype228, $_size226); + for ($_i230 = 0; $_i230 < $_size226; ++$_i230) { - $key240 = ''; - $val241 = 0; - $xfer += $input->readString($key240); - $xfer += $input->readI32($val241); - $this->jobSubmissionPriorityMap[$key240] = $val241; + $key231 = ''; + $val232 = 0; + $xfer += $input->readString($key231); + $xfer += $input->readI32($val232); + $this->jobSubmissionPriorityMap[$key231] = $val232; } $xfer += $input->readMapEnd(); } else { @@ -47504,10 +47134,10 @@ class Airavata_changeJobSubmissionPriorities_args { { $output->writeMapBegin(TType::STRING, TType::I32, count($this->jobSubmissionPriorityMap)); { - foreach ($this->jobSubmissionPriorityMap as $kiter242 => $viter243) + foreach ($this->jobSubmissionPriorityMap as $kiter233 => $viter234) { - $xfer += $output->writeString($kiter242); - $xfer += $output->writeI32($viter243); + $xfer += $output->writeString($kiter233); + $xfer += $output->writeI32($viter234); } } $output->writeMapEnd(); @@ -47770,17 +47400,17 @@ class Airavata_changeDataMovementPriorities_args { case 2: if ($ftype == TType::MAP) { $this->dataMovementPriorityMap = array(); - $_size244 = 0; - $_ktype245 = 0; - $_vtype246 = 0; - $xfer += $input->readMapBegin($_ktype245, $_vtype246, $_size244); - for ($_i248 = 0; $_i248 < $_size244; ++$_i248) + $_size235 = 0; + $_ktype236 = 0; + $_vtype237 = 0; + $xfer += $input->readMapBegin($_ktype236, $_vtype237, $_size235); + for ($_i239 = 0; $_i239 < $_size235; ++$_i239) { - $key249 = ''; - $val250 = 0; - $xfer += $input->readString($key249); - $xfer += $input->readI32($val250); - $this->dataMovementPriorityMap[$key249] = $val250; + $key240 = ''; + $val241 = 0; + $xfer += $input->readString($key240); + $xfer += $input->readI32($val241); + $this->dataMovementPriorityMap[$key240] = $val241; } $xfer += $input->readMapEnd(); } else { @@ -47816,10 +47446,10 @@ class Airavata_changeDataMovementPriorities_args { { $output->writeMapBegin(TType::STRING, TType::I32, count($this->dataMovementPriorityMap)); { - foreach ($this->dataMovementPriorityMap as $kiter251 => $viter252) + foreach ($this->dataMovementPriorityMap as $kiter242 => $viter243) { - $xfer += $output->writeString($kiter251); - $xfer += $output->writeI32($viter252); + $xfer += $output->writeString($kiter242); + $xfer += $output->writeI32($viter243); } } $output->writeMapEnd(); @@ -52706,15 +52336,15 @@ class Airavata_getAllGatewayComputeResourcePreferences_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size253 = 0; - $_etype256 = 0; - $xfer += $input->readListBegin($_etype256, $_size253); - for ($_i257 = 0; $_i257 < $_size253; ++$_i257) + $_size244 = 0; + $_etype247 = 0; + $xfer += $input->readListBegin($_etype247, $_size244); + for ($_i248 = 0; $_i248 < $_size244; ++$_i248) { - $elem258 = null; - $elem258 = new \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference(); - $xfer += $elem258->read($input); - $this->success []= $elem258; + $elem249 = null; + $elem249 = new \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference(); + $xfer += $elem249->read($input); + $this->success []= $elem249; } $xfer += $input->readListEnd(); } else { @@ -52774,9 +52404,9 @@ class Airavata_getAllGatewayComputeResourcePreferences_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter259) + foreach ($this->success as $iter250) { - $xfer += $iter259->write($output); + $xfer += $iter250->write($output); } } $output->writeListEnd(); @@ -53012,15 +52642,15 @@ class Airavata_getAllGatewayStoragePreferences_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size260 = 0; - $_etype263 = 0; - $xfer += $input->readListBegin($_etype263, $_size260); - for ($_i264 = 0; $_i264 < $_size260; ++$_i264) + $_size251 = 0; + $_etype254 = 0; + $xfer += $input->readListBegin($_etype254, $_size251); + for ($_i255 = 0; $_i255 < $_size251; ++$_i255) { - $elem265 = null; - $elem265 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference(); - $xfer += $elem265->read($input); - $this->success []= $elem265; + $elem256 = null; + $elem256 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference(); + $xfer += $elem256->read($input); + $this->success []= $elem256; } $xfer += $input->readListEnd(); } else { @@ -53080,9 +52710,9 @@ class Airavata_getAllGatewayStoragePreferences_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter266) + foreach ($this->success as $iter257) { - $xfer += $iter266->write($output); + $xfer += $iter257->write($output); } } $output->writeListEnd(); @@ -53295,15 +52925,15 @@ class Airavata_getAllGatewayResourceProfiles_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size267 = 0; - $_etype270 = 0; - $xfer += $input->readListBegin($_etype270, $_size267); - for ($_i271 = 0; $_i271 < $_size267; ++$_i271) + $_size258 = 0; + $_etype261 = 0; + $xfer += $input->readListBegin($_etype261, $_size258); + for ($_i262 = 0; $_i262 < $_size258; ++$_i262) { - $elem272 = null; - $elem272 = new \Airavata\Model\AppCatalog\GatewayProfile\GatewayResourceProfile(); - $xfer += $elem272->read($input); - $this->success []= $elem272; + $elem263 = null; + $elem263 = new \Airavata\Model\AppCatalog\GatewayProfile\GatewayResourceProfile(); + $xfer += $elem263->read($input); + $this->success []= $elem263; } $xfer += $input->readListEnd(); } else { @@ -53363,9 +52993,9 @@ class Airavata_getAllGatewayResourceProfiles_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter273) + foreach ($this->success as $iter264) { - $xfer += $iter273->write($output); + $xfer += $iter264->write($output); } } $output->writeListEnd(); @@ -54860,14 +54490,14 @@ class Airavata_getAllWorkflows_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size274 = 0; - $_etype277 = 0; - $xfer += $input->readListBegin($_etype277, $_size274); - for ($_i278 = 0; $_i278 < $_size274; ++$_i278) + $_size265 = 0; + $_etype268 = 0; + $xfer += $input->readListBegin($_etype268, $_size265); + for ($_i269 = 0; $_i269 < $_size265; ++$_i269) { - $elem279 = null; - $xfer += $input->readString($elem279); - $this->success []= $elem279; + $elem270 = null; + $xfer += $input->readString($elem270); + $this->success []= $elem270; } $xfer += $input->readListEnd(); } else { @@ -54927,9 +54557,9 @@ class Airavata_getAllWorkflows_result { { $output->writeListBegin(TType::STRING, count($this->success)); { - foreach ($this->success as $iter280) + foreach ($this->success as $iter271) { - $xfer += $output->writeString($iter280); + $xfer += $output->writeString($iter271); } } $output->writeListEnd(); @@ -57980,15 +57610,15 @@ class Airavata_getChildDataProducts_result { case 0: if ($ftype == TType::LST) { $this->success = array(); - $_size281 = 0; - $_etype284 = 0; - $xfer += $input->readListBegin($_etype284, $_size281); - for ($_i285 = 0; $_i285 < $_size281; ++$_i285) + $_size272 = 0; + $_etype275 = 0; + $xfer += $input->readListBegin($_etype275, $_size272); + for ($_i276 = 0; $_i276 < $_size272; ++$_i276) { - $elem286 = null; - $elem286 = new \Airavata\Model\Data\Replica\DataProductModel(); - $xfer += $elem286->read($input); - $this->success []= $elem286; + $elem277 = null; + $elem277 = new \Airavata\Model\Data\Replica\DataProductModel(); + $xfer += $elem277->read($input); + $this->success []= $elem277; } $xfer += $input->readListEnd(); } else { @@ -58048,9 +57678,9 @@ class Airavata_getChildDataProducts_result { { $output->writeListBegin(TType::STRUCT, count($this->success)); { - foreach ($this->success as $iter287) + foreach ($this->success as $iter278) { - $xfer += $iter287->write($output); + $xfer += $iter278->write($output); } } $output->writeListEnd(); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/40df106a/app/libraries/Airavata/Model/Security/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/Security/Types.php b/app/libraries/Airavata/Model/Security/Types.php index 7b9c143..901565c 100644 --- a/app/libraries/Airavata/Model/Security/Types.php +++ b/app/libraries/Airavata/Model/Security/Types.php @@ -29,10 +29,6 @@ class AuthzToken { */ public $gatewayId = null; /** - * @var string - */ - public $userName = null; - /** * @var array */ public $claimsMap = null; @@ -49,10 +45,6 @@ class AuthzToken { 'type' => TType::STRING, ), 3 => array( - 'var' => 'userName', - 'type' => TType::STRING, - ), - 4 => array( 'var' => 'claimsMap', 'type' => TType::MAP, 'ktype' => TType::STRING, @@ -73,9 +65,6 @@ class AuthzToken { if (isset($vals['gatewayId'])) { $this->gatewayId = $vals['gatewayId']; } - if (isset($vals['userName'])) { - $this->userName = $vals['userName']; - } if (isset($vals['claimsMap'])) { $this->claimsMap = $vals['claimsMap']; } @@ -116,13 +105,6 @@ class AuthzToken { } break; case 3: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->userName); - } else { - $xfer += $input->skip($ftype); - } - break; - case 4: if ($ftype == TType::MAP) { $this->claimsMap = array(); $_size0 = 0; @@ -165,16 +147,11 @@ class AuthzToken { $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->claimsMap !== null) { if (!is_array($this->claimsMap)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('claimsMap', TType::MAP, 4); + $xfer += $output->writeFieldBegin('claimsMap', TType::MAP, 3); { $output->writeMapBegin(TType::STRING, TType::STRING, count($this->claimsMap)); {
