updating thrift files
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/9f4024b8 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/9f4024b8 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/9f4024b8 Branch: refs/heads/dreg-gateway Commit: 9f4024b89ffc9ad660dde7a23315b433a1fdc2df Parents: 54de692 Author: scnakandala <[email protected]> Authored: Wed Nov 2 10:05:33 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Nov 2 10:05:33 2016 -0400 ---------------------------------------------------------------------- app/libraries/Airavata/API/Airavata.php | 31 ++++- .../Model/AppCatalog/GatewayProfile/Types.php | 92 +++++++++++++++ .../Airavata/Model/Workspace/Types.php | 115 +++++++++++++++++++ 3 files changed, 236 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9f4024b8/app/libraries/Airavata/API/Airavata.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php index cebfb90..df385a9 100644 --- a/app/libraries/Airavata/API/Airavata.php +++ b/app/libraries/Airavata/API/Airavata.php @@ -106,6 +106,7 @@ interface AiravataIf { * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $gatewayId * @param \Airavata\Model\Workspace\Gateway $updatedGateway + * @return bool * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException @@ -3638,7 +3639,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { public function updateGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Workspace\Gateway $updatedGateway) { $this->send_updateGateway($authzToken, $gatewayId, $updatedGateway); - $this->recv_updateGateway(); + return $this->recv_updateGateway(); } public function send_updateGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, \Airavata\Model\Workspace\Gateway $updatedGateway) @@ -3682,6 +3683,9 @@ class AiravataClient implements \Airavata\API\AiravataIf { $result->read($this->input_); $this->input_->readMessageEnd(); } + if ($result->success !== null) { + return $result->success; + } if ($result->ire !== null) { throw $result->ire; } @@ -3694,7 +3698,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { if ($result->ae !== null) { throw $result->ae; } - return; + throw new \Exception("updateGateway failed: unknown result"); } public function getGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId) @@ -13763,6 +13767,10 @@ class Airavata_updateGateway_result { static $_TSPEC; /** + * @var bool + */ + public $success = null; + /** * @var \Airavata\API\Error\InvalidRequestException */ public $ire = null; @@ -13782,6 +13790,10 @@ class Airavata_updateGateway_result { 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, @@ -13805,6 +13817,9 @@ class Airavata_updateGateway_result { ); } if (is_array($vals)) { + if (isset($vals['success'])) { + $this->success = $vals['success']; + } if (isset($vals['ire'])) { $this->ire = $vals['ire']; } @@ -13839,6 +13854,13 @@ class Airavata_updateGateway_result { } 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(); @@ -13884,6 +13906,11 @@ class Airavata_updateGateway_result { public function write($output) { $xfer = 0; $xfer += $output->writeStructBegin('Airavata_updateGateway_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); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9f4024b8/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 8a56327..f0b329d 100644 --- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php @@ -94,6 +94,22 @@ class ComputeResourcePreference { * @var string */ public $usageReportingGatewayId = null; + /** + * @var string + */ + public $qualityOfService = null; + /** + * @var string + */ + public $reservation = null; + /** + * @var int + */ + public $reservationStartTime = null; + /** + * @var int + */ + public $reservationEndTime = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -138,6 +154,22 @@ class ComputeResourcePreference { 'var' => 'usageReportingGatewayId', 'type' => TType::STRING, ), + 11 => array( + 'var' => 'qualityOfService', + 'type' => TType::STRING, + ), + 12 => array( + 'var' => 'reservation', + 'type' => TType::STRING, + ), + 13 => array( + 'var' => 'reservationStartTime', + 'type' => TType::I64, + ), + 14 => array( + 'var' => 'reservationEndTime', + 'type' => TType::I64, + ), ); } if (is_array($vals)) { @@ -171,6 +203,18 @@ class ComputeResourcePreference { if (isset($vals['usageReportingGatewayId'])) { $this->usageReportingGatewayId = $vals['usageReportingGatewayId']; } + if (isset($vals['qualityOfService'])) { + $this->qualityOfService = $vals['qualityOfService']; + } + if (isset($vals['reservation'])) { + $this->reservation = $vals['reservation']; + } + if (isset($vals['reservationStartTime'])) { + $this->reservationStartTime = $vals['reservationStartTime']; + } + if (isset($vals['reservationEndTime'])) { + $this->reservationEndTime = $vals['reservationEndTime']; + } } } @@ -263,6 +307,34 @@ class ComputeResourcePreference { $xfer += $input->skip($ftype); } break; + case 11: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->qualityOfService); + } else { + $xfer += $input->skip($ftype); + } + break; + case 12: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->reservation); + } else { + $xfer += $input->skip($ftype); + } + break; + case 13: + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->reservationStartTime); + } else { + $xfer += $input->skip($ftype); + } + break; + case 14: + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->reservationEndTime); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -326,6 +398,26 @@ class ComputeResourcePreference { $xfer += $output->writeString($this->usageReportingGatewayId); $xfer += $output->writeFieldEnd(); } + if ($this->qualityOfService !== null) { + $xfer += $output->writeFieldBegin('qualityOfService', TType::STRING, 11); + $xfer += $output->writeString($this->qualityOfService); + $xfer += $output->writeFieldEnd(); + } + if ($this->reservation !== null) { + $xfer += $output->writeFieldBegin('reservation', TType::STRING, 12); + $xfer += $output->writeString($this->reservation); + $xfer += $output->writeFieldEnd(); + } + if ($this->reservationStartTime !== null) { + $xfer += $output->writeFieldBegin('reservationStartTime', TType::I64, 13); + $xfer += $output->writeI64($this->reservationStartTime); + $xfer += $output->writeFieldEnd(); + } + if ($this->reservationEndTime !== null) { + $xfer += $output->writeFieldBegin('reservationEndTime', TType::I64, 14); + $xfer += $output->writeI64($this->reservationEndTime); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/9f4024b8/app/libraries/Airavata/Model/Workspace/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/Workspace/Types.php b/app/libraries/Airavata/Model/Workspace/Types.php index b16d03c..1b516d8 100644 --- a/app/libraries/Airavata/Model/Workspace/Types.php +++ b/app/libraries/Airavata/Model/Workspace/Types.php @@ -569,6 +569,26 @@ class Gateway { * @var string */ public $reviewProposalDescription = null; + /** + * @var string + */ + public $gatewayAdminFirstName = null; + /** + * @var string + */ + public $gatewayAdminLastName = null; + /** + * @var string + */ + public $gatewayAdminEmail = null; + /** + * @var string + */ + public $identityServerUserName = null; + /** + * @var string + */ + public $identityServerPasswordToken = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -609,6 +629,26 @@ class Gateway { 'var' => 'reviewProposalDescription', 'type' => TType::STRING, ), + 10 => array( + 'var' => 'gatewayAdminFirstName', + 'type' => TType::STRING, + ), + 11 => array( + 'var' => 'gatewayAdminLastName', + 'type' => TType::STRING, + ), + 12 => array( + 'var' => 'gatewayAdminEmail', + 'type' => TType::STRING, + ), + 13 => array( + 'var' => 'identityServerUserName', + 'type' => TType::STRING, + ), + 14 => array( + 'var' => 'identityServerPasswordToken', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -639,6 +679,21 @@ class Gateway { if (isset($vals['reviewProposalDescription'])) { $this->reviewProposalDescription = $vals['reviewProposalDescription']; } + if (isset($vals['gatewayAdminFirstName'])) { + $this->gatewayAdminFirstName = $vals['gatewayAdminFirstName']; + } + if (isset($vals['gatewayAdminLastName'])) { + $this->gatewayAdminLastName = $vals['gatewayAdminLastName']; + } + if (isset($vals['gatewayAdminEmail'])) { + $this->gatewayAdminEmail = $vals['gatewayAdminEmail']; + } + if (isset($vals['identityServerUserName'])) { + $this->identityServerUserName = $vals['identityServerUserName']; + } + if (isset($vals['identityServerPasswordToken'])) { + $this->identityServerPasswordToken = $vals['identityServerPasswordToken']; + } } } @@ -724,6 +779,41 @@ class Gateway { $xfer += $input->skip($ftype); } break; + case 10: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->gatewayAdminFirstName); + } else { + $xfer += $input->skip($ftype); + } + break; + case 11: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->gatewayAdminLastName); + } else { + $xfer += $input->skip($ftype); + } + break; + case 12: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->gatewayAdminEmail); + } else { + $xfer += $input->skip($ftype); + } + break; + case 13: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->identityServerUserName); + } else { + $xfer += $input->skip($ftype); + } + break; + case 14: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->identityServerPasswordToken); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -782,6 +872,31 @@ class Gateway { $xfer += $output->writeString($this->reviewProposalDescription); $xfer += $output->writeFieldEnd(); } + if ($this->gatewayAdminFirstName !== null) { + $xfer += $output->writeFieldBegin('gatewayAdminFirstName', TType::STRING, 10); + $xfer += $output->writeString($this->gatewayAdminFirstName); + $xfer += $output->writeFieldEnd(); + } + if ($this->gatewayAdminLastName !== null) { + $xfer += $output->writeFieldBegin('gatewayAdminLastName', TType::STRING, 11); + $xfer += $output->writeString($this->gatewayAdminLastName); + $xfer += $output->writeFieldEnd(); + } + if ($this->gatewayAdminEmail !== null) { + $xfer += $output->writeFieldBegin('gatewayAdminEmail', TType::STRING, 12); + $xfer += $output->writeString($this->gatewayAdminEmail); + $xfer += $output->writeFieldEnd(); + } + if ($this->identityServerUserName !== null) { + $xfer += $output->writeFieldBegin('identityServerUserName', TType::STRING, 13); + $xfer += $output->writeString($this->identityServerUserName); + $xfer += $output->writeFieldEnd(); + } + if ($this->identityServerPasswordToken !== null) { + $xfer += $output->writeFieldBegin('identityServerPasswordToken', TType::STRING, 14); + $xfer += $output->writeString($this->identityServerPasswordToken); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer;
