Repository: airavata-php-gateway Updated Branches: refs/heads/master 66438b0df -> 09d8d5bcf
syncing job model name case 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/09d8d5bc Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/09d8d5bc Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/09d8d5bc Branch: refs/heads/master Commit: 09d8d5bcfb82bd9caa1b88bdf1e443b6eae3ff89 Parents: 66438b0 Author: Suresh Marru <[email protected]> Authored: Sat Sep 5 11:37:19 2015 -0400 Committer: Suresh Marru <[email protected]> Committed: Sat Sep 5 11:37:19 2015 -0400 ---------------------------------------------------------------------- app/libraries/Airavata/API/Airavata.php | 50 +++- app/libraries/Airavata/Model/Job/Types.php | 353 ++++++++++++++++++++++++ app/libraries/Airavata/Model/job/Types.php | 284 ------------------- 3 files changed, 394 insertions(+), 293 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/09d8d5bc/app/libraries/Airavata/API/Airavata.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php index c068aa6..6455693 100644 --- a/app/libraries/Airavata/API/Airavata.php +++ b/app/libraries/Airavata/API/Airavata.php @@ -20,13 +20,14 @@ interface AiravataIf { /** * Fetch Apache Airavata API version * + * @param \Airavata\Model\Security\AuthzToken $authzToken * @return string * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException * @throws \Airavata\API\Error\AuthorizationException */ - public function getAPIVersion(); + public function getAPIVersion(\Airavata\Model\Security\AuthzToken $authzToken); /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param \Airavata\Model\Workspace\Gateway $gateway @@ -807,7 +808,7 @@ interface AiravataIf { /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $airavataExperimentId - * @return \Airavata\Model\job\JobModel[] + * @return \Airavata\Model\Job\JobModel[] * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\ExperimentNotFoundException * @throws \Airavata\API\Error\AiravataClientException @@ -2554,15 +2555,16 @@ class AiravataClient implements \Airavata\API\AiravataIf { $this->output_ = $output ? $output : $input; } - public function getAPIVersion() + public function getAPIVersion(\Airavata\Model\Security\AuthzToken $authzToken) { - $this->send_getAPIVersion(); + $this->send_getAPIVersion($authzToken); return $this->recv_getAPIVersion(); } - public function send_getAPIVersion() + public function send_getAPIVersion(\Airavata\Model\Security\AuthzToken $authzToken) { $args = new \Airavata\API\Airavata_getAPIVersion_args(); + $args->authzToken = $authzToken; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { @@ -10202,12 +10204,26 @@ class AiravataClient implements \Airavata\API\AiravataIf { class Airavata_getAPIVersion_args { static $_TSPEC; + /** + * @var \Airavata\Model\Security\AuthzToken + */ + public $authzToken = null; - public function __construct() { + public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( + 1 => array( + 'var' => 'authzToken', + 'type' => TType::STRUCT, + 'class' => '\Airavata\Model\Security\AuthzToken', + ), ); } + if (is_array($vals)) { + if (isset($vals['authzToken'])) { + $this->authzToken = $vals['authzToken']; + } + } } public function getName() { @@ -10229,6 +10245,14 @@ class Airavata_getAPIVersion_args { } switch ($fid) { + case 1: + if ($ftype == TType::STRUCT) { + $this->authzToken = new \Airavata\Model\Security\AuthzToken(); + $xfer += $this->authzToken->read($input); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -10242,6 +10266,14 @@ class Airavata_getAPIVersion_args { public function write($output) { $xfer = 0; $xfer += $output->writeStructBegin('Airavata_getAPIVersion_args'); + if ($this->authzToken !== null) { + if (!is_object($this->authzToken)) { + throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); + } + $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1); + $xfer += $this->authzToken->write($output); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; @@ -22233,7 +22265,7 @@ class Airavata_getJobDetails_result { static $_TSPEC; /** - * @var \Airavata\Model\job\JobModel[] + * @var \Airavata\Model\Job\JobModel[] */ public $success = null; /** @@ -22266,7 +22298,7 @@ class Airavata_getJobDetails_result { 'etype' => TType::STRUCT, 'elem' => array( 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\job\JobModel', + 'class' => '\Airavata\Model\Job\JobModel', ), ), 1 => array( @@ -22346,7 +22378,7 @@ class Airavata_getJobDetails_result { for ($_i129 = 0; $_i129 < $_size125; ++$_i129) { $elem130 = null; - $elem130 = new \Airavata\Model\job\JobModel(); + $elem130 = new \Airavata\Model\Job\JobModel(); $xfer += $elem130->read($input); $this->success []= $elem130; } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/09d8d5bc/app/libraries/Airavata/Model/Job/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/Job/Types.php b/app/libraries/Airavata/Model/Job/Types.php new file mode 100644 index 0000000..c7d3dd8 --- /dev/null +++ b/app/libraries/Airavata/Model/Job/Types.php @@ -0,0 +1,353 @@ +<?php +namespace Airavata\Model\Job; + +/** + * Autogenerated by Thrift Compiler (0.9.2) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +use Thrift\Base\TBase; +use Thrift\Type\TType; +use Thrift\Type\TMessageType; +use Thrift\Exception\TException; +use Thrift\Exception\TProtocolException; +use Thrift\Protocol\TProtocol; +use Thrift\Protocol\TBinaryProtocolAccelerated; +use Thrift\Exception\TApplicationException; + + +class JobModel { + static $_TSPEC; + + /** + * @var string + */ + public $jobId = null; + /** + * @var string + */ + public $taskId = null; + /** + * @var string + */ + public $processId = null; + /** + * @var string + */ + public $jobDescription = null; + /** + * @var int + */ + public $creationTime = null; + /** + * @var \Airavata\Model\Status\JobStatus + */ + public $jobStatus = null; + /** + * @var string + */ + public $computeResourceConsumed = null; + /** + * @var string + */ + public $jobName = null; + /** + * @var string + */ + public $workingDir = null; + /** + * @var string + */ + public $stdOut = null; + /** + * @var string + */ + public $stdErr = null; + /** + * @var int + */ + public $exitCode = null; + + public function __construct($vals=null) { + if (!isset(self::$_TSPEC)) { + self::$_TSPEC = array( + 1 => array( + 'var' => 'jobId', + 'type' => TType::STRING, + ), + 2 => array( + 'var' => 'taskId', + 'type' => TType::STRING, + ), + 3 => array( + 'var' => 'processId', + 'type' => TType::STRING, + ), + 4 => array( + 'var' => 'jobDescription', + 'type' => TType::STRING, + ), + 5 => array( + 'var' => 'creationTime', + 'type' => TType::I64, + ), + 6 => array( + 'var' => 'jobStatus', + 'type' => TType::STRUCT, + 'class' => '\Airavata\Model\Status\JobStatus', + ), + 7 => array( + 'var' => 'computeResourceConsumed', + 'type' => TType::STRING, + ), + 8 => array( + 'var' => 'jobName', + 'type' => TType::STRING, + ), + 9 => array( + 'var' => 'workingDir', + 'type' => TType::STRING, + ), + 10 => array( + 'var' => 'stdOut', + 'type' => TType::STRING, + ), + 11 => array( + 'var' => 'stdErr', + 'type' => TType::STRING, + ), + 12 => array( + 'var' => 'exitCode', + 'type' => TType::I32, + ), + ); + } + if (is_array($vals)) { + if (isset($vals['jobId'])) { + $this->jobId = $vals['jobId']; + } + if (isset($vals['taskId'])) { + $this->taskId = $vals['taskId']; + } + if (isset($vals['processId'])) { + $this->processId = $vals['processId']; + } + if (isset($vals['jobDescription'])) { + $this->jobDescription = $vals['jobDescription']; + } + if (isset($vals['creationTime'])) { + $this->creationTime = $vals['creationTime']; + } + if (isset($vals['jobStatus'])) { + $this->jobStatus = $vals['jobStatus']; + } + if (isset($vals['computeResourceConsumed'])) { + $this->computeResourceConsumed = $vals['computeResourceConsumed']; + } + if (isset($vals['jobName'])) { + $this->jobName = $vals['jobName']; + } + if (isset($vals['workingDir'])) { + $this->workingDir = $vals['workingDir']; + } + if (isset($vals['stdOut'])) { + $this->stdOut = $vals['stdOut']; + } + if (isset($vals['stdErr'])) { + $this->stdErr = $vals['stdErr']; + } + if (isset($vals['exitCode'])) { + $this->exitCode = $vals['exitCode']; + } + } + } + + public function getName() { + return 'JobModel'; + } + + public function read($input) + { + $xfer = 0; + $fname = null; + $ftype = 0; + $fid = 0; + $xfer += $input->readStructBegin($fname); + while (true) + { + $xfer += $input->readFieldBegin($fname, $ftype, $fid); + if ($ftype == TType::STOP) { + break; + } + switch ($fid) + { + case 1: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->jobId); + } else { + $xfer += $input->skip($ftype); + } + break; + case 2: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->taskId); + } else { + $xfer += $input->skip($ftype); + } + break; + case 3: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->processId); + } else { + $xfer += $input->skip($ftype); + } + break; + case 4: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->jobDescription); + } else { + $xfer += $input->skip($ftype); + } + break; + case 5: + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->creationTime); + } else { + $xfer += $input->skip($ftype); + } + break; + case 6: + if ($ftype == TType::STRUCT) { + $this->jobStatus = new \Airavata\Model\Status\JobStatus(); + $xfer += $this->jobStatus->read($input); + } else { + $xfer += $input->skip($ftype); + } + break; + case 7: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->computeResourceConsumed); + } else { + $xfer += $input->skip($ftype); + } + break; + case 8: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->jobName); + } else { + $xfer += $input->skip($ftype); + } + break; + case 9: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->workingDir); + } else { + $xfer += $input->skip($ftype); + } + break; + case 10: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->stdOut); + } else { + $xfer += $input->skip($ftype); + } + break; + case 11: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->stdErr); + } else { + $xfer += $input->skip($ftype); + } + break; + case 12: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->exitCode); + } else { + $xfer += $input->skip($ftype); + } + break; + default: + $xfer += $input->skip($ftype); + break; + } + $xfer += $input->readFieldEnd(); + } + $xfer += $input->readStructEnd(); + return $xfer; + } + + public function write($output) { + $xfer = 0; + $xfer += $output->writeStructBegin('JobModel'); + if ($this->jobId !== null) { + $xfer += $output->writeFieldBegin('jobId', TType::STRING, 1); + $xfer += $output->writeString($this->jobId); + $xfer += $output->writeFieldEnd(); + } + if ($this->taskId !== null) { + $xfer += $output->writeFieldBegin('taskId', TType::STRING, 2); + $xfer += $output->writeString($this->taskId); + $xfer += $output->writeFieldEnd(); + } + if ($this->processId !== null) { + $xfer += $output->writeFieldBegin('processId', TType::STRING, 3); + $xfer += $output->writeString($this->processId); + $xfer += $output->writeFieldEnd(); + } + if ($this->jobDescription !== null) { + $xfer += $output->writeFieldBegin('jobDescription', TType::STRING, 4); + $xfer += $output->writeString($this->jobDescription); + $xfer += $output->writeFieldEnd(); + } + if ($this->creationTime !== null) { + $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5); + $xfer += $output->writeI64($this->creationTime); + $xfer += $output->writeFieldEnd(); + } + if ($this->jobStatus !== null) { + if (!is_object($this->jobStatus)) { + throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); + } + $xfer += $output->writeFieldBegin('jobStatus', TType::STRUCT, 6); + $xfer += $this->jobStatus->write($output); + $xfer += $output->writeFieldEnd(); + } + if ($this->computeResourceConsumed !== null) { + $xfer += $output->writeFieldBegin('computeResourceConsumed', TType::STRING, 7); + $xfer += $output->writeString($this->computeResourceConsumed); + $xfer += $output->writeFieldEnd(); + } + if ($this->jobName !== null) { + $xfer += $output->writeFieldBegin('jobName', TType::STRING, 8); + $xfer += $output->writeString($this->jobName); + $xfer += $output->writeFieldEnd(); + } + if ($this->workingDir !== null) { + $xfer += $output->writeFieldBegin('workingDir', TType::STRING, 9); + $xfer += $output->writeString($this->workingDir); + $xfer += $output->writeFieldEnd(); + } + if ($this->stdOut !== null) { + $xfer += $output->writeFieldBegin('stdOut', TType::STRING, 10); + $xfer += $output->writeString($this->stdOut); + $xfer += $output->writeFieldEnd(); + } + if ($this->stdErr !== null) { + $xfer += $output->writeFieldBegin('stdErr', TType::STRING, 11); + $xfer += $output->writeString($this->stdErr); + $xfer += $output->writeFieldEnd(); + } + if ($this->exitCode !== null) { + $xfer += $output->writeFieldBegin('exitCode', TType::I32, 12); + $xfer += $output->writeI32($this->exitCode); + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } + +} + + http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/09d8d5bc/app/libraries/Airavata/Model/job/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/job/Types.php b/app/libraries/Airavata/Model/job/Types.php deleted file mode 100644 index 791a4b3..0000000 --- a/app/libraries/Airavata/Model/job/Types.php +++ /dev/null @@ -1,284 +0,0 @@ -<?php -namespace Airavata\Model\job; - -/** - * Autogenerated by Thrift Compiler (0.9.2) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -use Thrift\Base\TBase; -use Thrift\Type\TType; -use Thrift\Type\TMessageType; -use Thrift\Exception\TException; -use Thrift\Exception\TProtocolException; -use Thrift\Protocol\TProtocol; -use Thrift\Protocol\TBinaryProtocolAccelerated; -use Thrift\Exception\TApplicationException; - - -class JobModel { - static $_TSPEC; - - /** - * @var string - */ - public $jobId = null; - /** - * @var string - */ - public $taskId = null; - /** - * @var string - */ - public $processId = null; - /** - * @var string - */ - public $jobDescription = null; - /** - * @var int - */ - public $creationTime = null; - /** - * @var \Airavata\Model\Status\JobStatus - */ - public $jobStatus = null; - /** - * @var string - */ - public $computeResourceConsumed = null; - /** - * @var string - */ - public $jobName = null; - /** - * @var string - */ - public $workingDir = null; - - public function __construct($vals=null) { - if (!isset(self::$_TSPEC)) { - self::$_TSPEC = array( - 1 => array( - 'var' => 'jobId', - 'type' => TType::STRING, - ), - 2 => array( - 'var' => 'taskId', - 'type' => TType::STRING, - ), - 3 => array( - 'var' => 'processId', - 'type' => TType::STRING, - ), - 4 => array( - 'var' => 'jobDescription', - 'type' => TType::STRING, - ), - 5 => array( - 'var' => 'creationTime', - 'type' => TType::I64, - ), - 6 => array( - 'var' => 'jobStatus', - 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\Status\JobStatus', - ), - 7 => array( - 'var' => 'computeResourceConsumed', - 'type' => TType::STRING, - ), - 8 => array( - 'var' => 'jobName', - 'type' => TType::STRING, - ), - 9 => array( - 'var' => 'workingDir', - 'type' => TType::STRING, - ), - ); - } - if (is_array($vals)) { - if (isset($vals['jobId'])) { - $this->jobId = $vals['jobId']; - } - if (isset($vals['taskId'])) { - $this->taskId = $vals['taskId']; - } - if (isset($vals['processId'])) { - $this->processId = $vals['processId']; - } - if (isset($vals['jobDescription'])) { - $this->jobDescription = $vals['jobDescription']; - } - if (isset($vals['creationTime'])) { - $this->creationTime = $vals['creationTime']; - } - if (isset($vals['jobStatus'])) { - $this->jobStatus = $vals['jobStatus']; - } - if (isset($vals['computeResourceConsumed'])) { - $this->computeResourceConsumed = $vals['computeResourceConsumed']; - } - if (isset($vals['jobName'])) { - $this->jobName = $vals['jobName']; - } - if (isset($vals['workingDir'])) { - $this->workingDir = $vals['workingDir']; - } - } - } - - public function getName() { - return 'JobModel'; - } - - public function read($input) - { - $xfer = 0; - $fname = null; - $ftype = 0; - $fid = 0; - $xfer += $input->readStructBegin($fname); - while (true) - { - $xfer += $input->readFieldBegin($fname, $ftype, $fid); - if ($ftype == TType::STOP) { - break; - } - switch ($fid) - { - case 1: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->jobId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 2: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->taskId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 3: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->processId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 4: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->jobDescription); - } else { - $xfer += $input->skip($ftype); - } - break; - case 5: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->creationTime); - } else { - $xfer += $input->skip($ftype); - } - break; - case 6: - if ($ftype == TType::STRUCT) { - $this->jobStatus = new \Airavata\Model\Status\JobStatus(); - $xfer += $this->jobStatus->read($input); - } else { - $xfer += $input->skip($ftype); - } - break; - case 7: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->computeResourceConsumed); - } else { - $xfer += $input->skip($ftype); - } - break; - case 8: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->jobName); - } else { - $xfer += $input->skip($ftype); - } - break; - case 9: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->workingDir); - } else { - $xfer += $input->skip($ftype); - } - break; - default: - $xfer += $input->skip($ftype); - break; - } - $xfer += $input->readFieldEnd(); - } - $xfer += $input->readStructEnd(); - return $xfer; - } - - public function write($output) { - $xfer = 0; - $xfer += $output->writeStructBegin('JobModel'); - if ($this->jobId !== null) { - $xfer += $output->writeFieldBegin('jobId', TType::STRING, 1); - $xfer += $output->writeString($this->jobId); - $xfer += $output->writeFieldEnd(); - } - if ($this->taskId !== null) { - $xfer += $output->writeFieldBegin('taskId', TType::STRING, 2); - $xfer += $output->writeString($this->taskId); - $xfer += $output->writeFieldEnd(); - } - if ($this->processId !== null) { - $xfer += $output->writeFieldBegin('processId', TType::STRING, 3); - $xfer += $output->writeString($this->processId); - $xfer += $output->writeFieldEnd(); - } - if ($this->jobDescription !== null) { - $xfer += $output->writeFieldBegin('jobDescription', TType::STRING, 4); - $xfer += $output->writeString($this->jobDescription); - $xfer += $output->writeFieldEnd(); - } - if ($this->creationTime !== null) { - $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5); - $xfer += $output->writeI64($this->creationTime); - $xfer += $output->writeFieldEnd(); - } - if ($this->jobStatus !== null) { - if (!is_object($this->jobStatus)) { - throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); - } - $xfer += $output->writeFieldBegin('jobStatus', TType::STRUCT, 6); - $xfer += $this->jobStatus->write($output); - $xfer += $output->writeFieldEnd(); - } - if ($this->computeResourceConsumed !== null) { - $xfer += $output->writeFieldBegin('computeResourceConsumed', TType::STRING, 7); - $xfer += $output->writeString($this->computeResourceConsumed); - $xfer += $output->writeFieldEnd(); - } - if ($this->jobName !== null) { - $xfer += $output->writeFieldBegin('jobName', TType::STRING, 8); - $xfer += $output->writeString($this->jobName); - $xfer += $output->writeFieldEnd(); - } - if ($this->workingDir !== null) { - $xfer += $output->writeFieldBegin('workingDir', TType::STRING, 9); - $xfer += $output->writeString($this->workingDir); - $xfer += $output->writeFieldEnd(); - } - $xfer += $output->writeFieldStop(); - $xfer += $output->writeStructEnd(); - return $xfer; - } - -} - -
