Merge remote-tracking branch 'origin/develop' into develop
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 @@
* @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 @@
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 @@
$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 @@
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 @@
static $_TSPEC;
/**
+ * @var bool
+ */
+ public $success = null;
+ /**
* @var \Airavata\API\Error\InvalidRequestException
*/
public $ire = null;
@@ -13782,6 +13790,10 @@
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 @@
);
}
if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
if (isset($vals['ire'])) {
$this->ire = $vals['ire'];
}
@@ -13839,6 +13854,13 @@
}
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 @@
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);
