moving usage gateway id into resuorces
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/282e5b2c Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/282e5b2c Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/282e5b2c Branch: refs/heads/master Commit: 282e5b2c427a3e55a85a06e60888a9475181f535 Parents: ac38843 Author: smarru <[email protected]> Authored: Wed Feb 24 11:48:34 2016 -0500 Committer: smarru <[email protected]> Committed: Wed Feb 24 11:48:34 2016 -0500 ---------------------------------------------------------------------- .../Model/AppCatalog/GatewayProfile/Types.php | 46 ++++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/282e5b2c/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 37e7837..7f0d412 100644 --- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php @@ -90,6 +90,10 @@ class ComputeResourcePreference { * @var string */ public $resourceSpecificCredentialStoreToken = null; + /** + * @var string + */ + public $usageReportingGatewayId = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -130,6 +134,10 @@ class ComputeResourcePreference { 'var' => 'resourceSpecificCredentialStoreToken', 'type' => TType::STRING, ), + 10 => array( + 'var' => 'usageReportingGatewayId', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -160,6 +168,9 @@ class ComputeResourcePreference { if (isset($vals['resourceSpecificCredentialStoreToken'])) { $this->resourceSpecificCredentialStoreToken = $vals['resourceSpecificCredentialStoreToken']; } + if (isset($vals['usageReportingGatewayId'])) { + $this->usageReportingGatewayId = $vals['usageReportingGatewayId']; + } } } @@ -245,6 +256,13 @@ class ComputeResourcePreference { $xfer += $input->skip($ftype); } break; + case 10: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->usageReportingGatewayId); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -303,6 +321,11 @@ class ComputeResourcePreference { $xfer += $output->writeString($this->resourceSpecificCredentialStoreToken); $xfer += $output->writeFieldEnd(); } + if ($this->usageReportingGatewayId !== null) { + $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 10); + $xfer += $output->writeString($this->usageReportingGatewayId); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; @@ -486,10 +509,6 @@ class GatewayResourceProfile { * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[] */ public $storagePreferences = null; - /** - * @var string - */ - public $usageReportingGatewayId = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -520,10 +539,6 @@ class GatewayResourceProfile { 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference', ), ), - 5 => array( - 'var' => 'usageReportingGatewayId', - 'type' => TType::STRING, - ), ); } if (is_array($vals)) { @@ -539,9 +554,6 @@ class GatewayResourceProfile { if (isset($vals['storagePreferences'])) { $this->storagePreferences = $vals['storagePreferences']; } - if (isset($vals['usageReportingGatewayId'])) { - $this->usageReportingGatewayId = $vals['usageReportingGatewayId']; - } } } @@ -614,13 +626,6 @@ class GatewayResourceProfile { $xfer += $input->skip($ftype); } break; - case 5: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->usageReportingGatewayId); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -678,11 +683,6 @@ class GatewayResourceProfile { } $xfer += $output->writeFieldEnd(); } - if ($this->usageReportingGatewayId !== null) { - $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 5); - $xfer += $output->writeString($this->usageReportingGatewayId); - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer;
