AIRAVATA-2190 Updating Thrift stubs
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/0d58af52 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/0d58af52 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/0d58af52 Branch: refs/heads/develop Commit: 0d58af524d86fefb9566008aab7ab0e39bc571bd Parents: 071a027 Author: Marcus Christie <[email protected]> Authored: Fri Nov 4 12:11:37 2016 -0400 Committer: Marcus Christie <[email protected]> Committed: Fri Nov 4 12:11:37 2016 -0400 ---------------------------------------------------------------------- app/libraries/Airavata/API/Airavata.php | 65 +++++++++++++- .../Model/AppCatalog/AppDeployment/Types.php | 92 ++++++++++++++++++++ .../Model/AppCatalog/ComputeResource/Types.php | 92 ++++++++++++++++++++ 3 files changed, 245 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0d58af52/app/libraries/Airavata/API/Airavata.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php index 7d5325a..5739ce5 100644 --- a/app/libraries/Airavata/API/Airavata.php +++ b/app/libraries/Airavata/API/Airavata.php @@ -1225,6 +1225,9 @@ interface AiravataIf { * Once an experiment is cloned, to disambiguate, the users are suggested to provide new metadata. This will again require * the basic experiment metadata like the name and description, intended user, the gateway identifier and if the experiment * should be shared public by default. + * @param newExperimentProjectId + * The project in which to create the cloned experiment. This is optional and if null the experiment will be created + * in the same project as the existing experiment. * * @return * The server-side generated.airavata.registry.core.experiment.globally unique identifier (Experiment ID) for the newly cloned experiment. @@ -1256,14 +1259,16 @@ interface AiravataIf { * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $existingExperimentID * @param string $newExperimentName + * @param string $newExperimentProjectId * @return string * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\ExperimentNotFoundException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException * @throws \Airavata\API\Error\AuthorizationException + * @throws \Airavata\API\Error\ProjectNotFoundException */ - public function cloneExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $existingExperimentID, $newExperimentName); + public function cloneExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $existingExperimentID, $newExperimentName, $newExperimentProjectId); /** * * Terminate a running Experiment. @@ -7066,18 +7071,19 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("getJobDetails failed: unknown result"); } - public function cloneExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $existingExperimentID, $newExperimentName) + public function cloneExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $existingExperimentID, $newExperimentName, $newExperimentProjectId) { - $this->send_cloneExperiment($authzToken, $existingExperimentID, $newExperimentName); + $this->send_cloneExperiment($authzToken, $existingExperimentID, $newExperimentName, $newExperimentProjectId); return $this->recv_cloneExperiment(); } - public function send_cloneExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $existingExperimentID, $newExperimentName) + public function send_cloneExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $existingExperimentID, $newExperimentName, $newExperimentProjectId) { $args = new \Airavata\API\Airavata_cloneExperiment_args(); $args->authzToken = $authzToken; $args->existingExperimentID = $existingExperimentID; $args->newExperimentName = $newExperimentName; + $args->newExperimentProjectId = $newExperimentProjectId; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { @@ -7131,6 +7137,9 @@ class AiravataClient implements \Airavata\API\AiravataIf { if ($result->ae !== null) { throw $result->ae; } + if ($result->pnfe !== null) { + throw $result->pnfe; + } throw new \Exception("cloneExperiment failed: unknown result"); } @@ -29465,6 +29474,10 @@ class Airavata_cloneExperiment_args { * @var string */ public $newExperimentName = null; + /** + * @var string + */ + public $newExperimentProjectId = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -29482,6 +29495,10 @@ class Airavata_cloneExperiment_args { 'var' => 'newExperimentName', 'type' => TType::STRING, ), + 4 => array( + 'var' => 'newExperimentProjectId', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -29494,6 +29511,9 @@ class Airavata_cloneExperiment_args { if (isset($vals['newExperimentName'])) { $this->newExperimentName = $vals['newExperimentName']; } + if (isset($vals['newExperimentProjectId'])) { + $this->newExperimentProjectId = $vals['newExperimentProjectId']; + } } } @@ -29538,6 +29558,13 @@ class Airavata_cloneExperiment_args { $xfer += $input->skip($ftype); } break; + case 4: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->newExperimentProjectId); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -29569,6 +29596,11 @@ class Airavata_cloneExperiment_args { $xfer += $output->writeString($this->newExperimentName); $xfer += $output->writeFieldEnd(); } + if ($this->newExperimentProjectId !== null) { + $xfer += $output->writeFieldBegin('newExperimentProjectId', TType::STRING, 4); + $xfer += $output->writeString($this->newExperimentProjectId); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; @@ -29603,6 +29635,10 @@ class Airavata_cloneExperiment_result { * @var \Airavata\API\Error\AuthorizationException */ public $ae = null; + /** + * @var \Airavata\API\Error\ProjectNotFoundException + */ + public $pnfe = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -29636,6 +29672,11 @@ class Airavata_cloneExperiment_result { 'type' => TType::STRUCT, 'class' => '\Airavata\API\Error\AuthorizationException', ), + 6 => array( + 'var' => 'pnfe', + 'type' => TType::STRUCT, + 'class' => '\Airavata\API\Error\ProjectNotFoundException', + ), ); } if (is_array($vals)) { @@ -29657,6 +29698,9 @@ class Airavata_cloneExperiment_result { if (isset($vals['ae'])) { $this->ae = $vals['ae']; } + if (isset($vals['pnfe'])) { + $this->pnfe = $vals['pnfe']; + } } } @@ -29726,6 +29770,14 @@ class Airavata_cloneExperiment_result { $xfer += $input->skip($ftype); } break; + case 6: + if ($ftype == TType::STRUCT) { + $this->pnfe = new \Airavata\API\Error\ProjectNotFoundException(); + $xfer += $this->pnfe->read($input); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -29769,6 +29821,11 @@ class Airavata_cloneExperiment_result { $xfer += $this->ae->write($output); $xfer += $output->writeFieldEnd(); } + if ($this->pnfe !== null) { + $xfer += $output->writeFieldBegin('pnfe', TType::STRUCT, 6); + $xfer += $this->pnfe->write($output); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0d58af52/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php index 29965e7..03d1121 100644 --- a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php @@ -493,6 +493,22 @@ class ApplicationDeploymentDescription { * @var \Airavata\Model\AppCatalog\AppDeployment\CommandObject[] */ public $postJobCommands = null; + /** + * @var string + */ + public $defaultQueueName = null; + /** + * @var int + */ + public $defaultNodeCount = null; + /** + * @var int + */ + public $defaultCPUCount = null; + /** + * @var bool + */ + public $editableByUser = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -575,6 +591,22 @@ class ApplicationDeploymentDescription { 'class' => '\Airavata\Model\AppCatalog\AppDeployment\CommandObject', ), ), + 13 => array( + 'var' => 'defaultQueueName', + 'type' => TType::STRING, + ), + 14 => array( + 'var' => 'defaultNodeCount', + 'type' => TType::I32, + ), + 15 => array( + 'var' => 'defaultCPUCount', + 'type' => TType::I32, + ), + 16 => array( + 'var' => 'editableByUser', + 'type' => TType::BOOL, + ), ); } if (is_array($vals)) { @@ -614,6 +646,18 @@ class ApplicationDeploymentDescription { if (isset($vals['postJobCommands'])) { $this->postJobCommands = $vals['postJobCommands']; } + if (isset($vals['defaultQueueName'])) { + $this->defaultQueueName = $vals['defaultQueueName']; + } + if (isset($vals['defaultNodeCount'])) { + $this->defaultNodeCount = $vals['defaultNodeCount']; + } + if (isset($vals['defaultCPUCount'])) { + $this->defaultCPUCount = $vals['defaultCPUCount']; + } + if (isset($vals['editableByUser'])) { + $this->editableByUser = $vals['editableByUser']; + } } } @@ -786,6 +830,34 @@ class ApplicationDeploymentDescription { $xfer += $input->skip($ftype); } break; + case 13: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->defaultQueueName); + } else { + $xfer += $input->skip($ftype); + } + break; + case 14: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->defaultNodeCount); + } else { + $xfer += $input->skip($ftype); + } + break; + case 15: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->defaultCPUCount); + } else { + $xfer += $input->skip($ftype); + } + break; + case 16: + if ($ftype == TType::BOOL) { + $xfer += $input->readBool($this->editableByUser); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -931,6 +1003,26 @@ class ApplicationDeploymentDescription { } $xfer += $output->writeFieldEnd(); } + if ($this->defaultQueueName !== null) { + $xfer += $output->writeFieldBegin('defaultQueueName', TType::STRING, 13); + $xfer += $output->writeString($this->defaultQueueName); + $xfer += $output->writeFieldEnd(); + } + if ($this->defaultNodeCount !== null) { + $xfer += $output->writeFieldBegin('defaultNodeCount', TType::I32, 14); + $xfer += $output->writeI32($this->defaultNodeCount); + $xfer += $output->writeFieldEnd(); + } + if ($this->defaultCPUCount !== null) { + $xfer += $output->writeFieldBegin('defaultCPUCount', TType::I32, 15); + $xfer += $output->writeI32($this->defaultCPUCount); + $xfer += $output->writeFieldEnd(); + } + if ($this->editableByUser !== null) { + $xfer += $output->writeFieldBegin('editableByUser', TType::BOOL, 16); + $xfer += $output->writeBool($this->editableByUser); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/0d58af52/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 71b4fd7..39acd3c 100644 --- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php @@ -522,6 +522,22 @@ class BatchQueue { * @var int */ public $maxMemory = null; + /** + * @var int + */ + public $cpuPerNode = null; + /** + * @var int + */ + public $defaultNodeCount = null; + /** + * @var int + */ + public $defaultCPUCount = null; + /** + * @var bool + */ + public $isDefaultQueue = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -554,6 +570,22 @@ class BatchQueue { 'var' => 'maxMemory', 'type' => TType::I32, ), + 8 => array( + 'var' => 'cpuPerNode', + 'type' => TType::I32, + ), + 9 => array( + 'var' => 'defaultNodeCount', + 'type' => TType::I32, + ), + 10 => array( + 'var' => 'defaultCPUCount', + 'type' => TType::I32, + ), + 11 => array( + 'var' => 'isDefaultQueue', + 'type' => TType::BOOL, + ), ); } if (is_array($vals)) { @@ -578,6 +610,18 @@ class BatchQueue { if (isset($vals['maxMemory'])) { $this->maxMemory = $vals['maxMemory']; } + if (isset($vals['cpuPerNode'])) { + $this->cpuPerNode = $vals['cpuPerNode']; + } + if (isset($vals['defaultNodeCount'])) { + $this->defaultNodeCount = $vals['defaultNodeCount']; + } + if (isset($vals['defaultCPUCount'])) { + $this->defaultCPUCount = $vals['defaultCPUCount']; + } + if (isset($vals['isDefaultQueue'])) { + $this->isDefaultQueue = $vals['isDefaultQueue']; + } } } @@ -649,6 +693,34 @@ class BatchQueue { $xfer += $input->skip($ftype); } break; + case 8: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->cpuPerNode); + } else { + $xfer += $input->skip($ftype); + } + break; + case 9: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->defaultNodeCount); + } else { + $xfer += $input->skip($ftype); + } + break; + case 10: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->defaultCPUCount); + } else { + $xfer += $input->skip($ftype); + } + break; + case 11: + if ($ftype == TType::BOOL) { + $xfer += $input->readBool($this->isDefaultQueue); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -697,6 +769,26 @@ class BatchQueue { $xfer += $output->writeI32($this->maxMemory); $xfer += $output->writeFieldEnd(); } + if ($this->cpuPerNode !== null) { + $xfer += $output->writeFieldBegin('cpuPerNode', TType::I32, 8); + $xfer += $output->writeI32($this->cpuPerNode); + $xfer += $output->writeFieldEnd(); + } + if ($this->defaultNodeCount !== null) { + $xfer += $output->writeFieldBegin('defaultNodeCount', TType::I32, 9); + $xfer += $output->writeI32($this->defaultNodeCount); + $xfer += $output->writeFieldEnd(); + } + if ($this->defaultCPUCount !== null) { + $xfer += $output->writeFieldBegin('defaultCPUCount', TType::I32, 10); + $xfer += $output->writeI32($this->defaultCPUCount); + $xfer += $output->writeFieldEnd(); + } + if ($this->isDefaultQueue !== null) { + $xfer += $output->writeFieldBegin('isDefaultQueue', TType::BOOL, 11); + $xfer += $output->writeBool($this->isDefaultQueue); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer;
