Repository: airavata-php-gateway Updated Branches: refs/heads/develop 09a65f9c9 -> ffe3b4e53
adding gateway usage reporting flags 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/1e839a71 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1e839a71 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1e839a71 Branch: refs/heads/develop Commit: 1e839a718eaa0000857a8e9fb03f9818e7e45adf Parents: c047e65 Author: smarru <[email protected]> Authored: Tue Feb 23 15:34:09 2016 -0500 Committer: smarru <[email protected]> Committed: Tue Feb 23 15:34:09 2016 -0500 ---------------------------------------------------------------------- .../Model/AppCatalog/ComputeResource/Types.php | 69 ++++++++++++++++++++ .../Model/AppCatalog/GatewayProfile/Types.php | 23 +++++++ 2 files changed, 92 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1e839a71/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 00f7e6c..5b79870 100644 --- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php @@ -1716,6 +1716,18 @@ class ComputeResourceDescription { * @var int */ public $maxMemoryPerNode = null; + /** + * @var bool + */ + public $gatewayUsageReporting = null; + /** + * @var string + */ + public $gatewayUsageModuleLoadCommand = null; + /** + * @var string + */ + public $gatewayUsageExecutable = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -1795,6 +1807,18 @@ class ComputeResourceDescription { 'var' => 'maxMemoryPerNode', 'type' => TType::I32, ), + 12 => array( + 'var' => 'gatewayUsageReporting', + 'type' => TType::BOOL, + ), + 13 => array( + 'var' => 'gatewayUsageModuleLoadCommand', + 'type' => TType::STRING, + ), + 14 => array( + 'var' => 'gatewayUsageExecutable', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -1831,6 +1855,15 @@ class ComputeResourceDescription { if (isset($vals['maxMemoryPerNode'])) { $this->maxMemoryPerNode = $vals['maxMemoryPerNode']; } + if (isset($vals['gatewayUsageReporting'])) { + $this->gatewayUsageReporting = $vals['gatewayUsageReporting']; + } + if (isset($vals['gatewayUsageModuleLoadCommand'])) { + $this->gatewayUsageModuleLoadCommand = $vals['gatewayUsageModuleLoadCommand']; + } + if (isset($vals['gatewayUsageExecutable'])) { + $this->gatewayUsageExecutable = $vals['gatewayUsageExecutable']; + } } } @@ -1996,6 +2029,27 @@ class ComputeResourceDescription { $xfer += $input->skip($ftype); } break; + case 12: + if ($ftype == TType::BOOL) { + $xfer += $input->readBool($this->gatewayUsageReporting); + } else { + $xfer += $input->skip($ftype); + } + break; + case 13: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->gatewayUsageModuleLoadCommand); + } else { + $xfer += $input->skip($ftype); + } + break; + case 14: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->gatewayUsageExecutable); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -2137,6 +2191,21 @@ class ComputeResourceDescription { $xfer += $output->writeI32($this->maxMemoryPerNode); $xfer += $output->writeFieldEnd(); } + if ($this->gatewayUsageReporting !== null) { + $xfer += $output->writeFieldBegin('gatewayUsageReporting', TType::BOOL, 12); + $xfer += $output->writeBool($this->gatewayUsageReporting); + $xfer += $output->writeFieldEnd(); + } + if ($this->gatewayUsageModuleLoadCommand !== null) { + $xfer += $output->writeFieldBegin('gatewayUsageModuleLoadCommand', TType::STRING, 13); + $xfer += $output->writeString($this->gatewayUsageModuleLoadCommand); + $xfer += $output->writeFieldEnd(); + } + if ($this->gatewayUsageExecutable !== null) { + $xfer += $output->writeFieldBegin('gatewayUsageExecutable', TType::STRING, 14); + $xfer += $output->writeString($this->gatewayUsageExecutable); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1e839a71/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 46f89a0..37e7837 100644 --- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php @@ -486,6 +486,10 @@ 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)) { @@ -516,6 +520,10 @@ class GatewayResourceProfile { 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference', ), ), + 5 => array( + 'var' => 'usageReportingGatewayId', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -531,6 +539,9 @@ class GatewayResourceProfile { if (isset($vals['storagePreferences'])) { $this->storagePreferences = $vals['storagePreferences']; } + if (isset($vals['usageReportingGatewayId'])) { + $this->usageReportingGatewayId = $vals['usageReportingGatewayId']; + } } } @@ -603,6 +614,13 @@ 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; @@ -660,6 +678,11 @@ 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;
