Repository: airavata-php-gateway Updated Branches: refs/heads/master e0ca3d846 -> dd1298322
newly generated php code 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/dd129832 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/dd129832 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/dd129832 Branch: refs/heads/master Commit: dd1298322c877e74f32379b1a1c51799c741bc3a Parents: e0ca3d8 Author: Chathuri Wimalasena <[email protected]> Authored: Thu Aug 27 14:11:45 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Thu Aug 27 14:11:45 2015 -0400 ---------------------------------------------------------------------- app/libraries/Airavata/API/Airavata.php | 33 ++++++++++-- app/libraries/Airavata/API/Types.php | 2 +- .../Model/AppCatalog/ComputeResource/Types.php | 4 ++ .../Airavata/Model/Messaging/Event/Types.php | 25 ++++++++- app/libraries/Airavata/Model/job/Types.php | 55 ++++++++++++++------ 5 files changed, 97 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dd129832/app/libraries/Airavata/API/Airavata.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php index 0928ada..140aa19 100644 --- a/app/libraries/Airavata/API/Airavata.php +++ b/app/libraries/Airavata/API/Airavata.php @@ -115,12 +115,13 @@ interface AiravataIf { /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $airavataCredStoreToken + * @param string $gatewayId * @return string * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException */ - public function getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken); + public function getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId); /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $userName @@ -3032,17 +3033,18 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("generateAndRegisterSSHKeys failed: unknown result"); } - public function getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken) + public function getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId) { - $this->send_getSSHPubKey($authzToken, $airavataCredStoreToken); + $this->send_getSSHPubKey($authzToken, $airavataCredStoreToken, $gatewayId); return $this->recv_getSSHPubKey(); } - public function send_getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken) + public function send_getSSHPubKey(\Airavata\Model\Security\AuthzToken $authzToken, $airavataCredStoreToken, $gatewayId) { $args = new \Airavata\API\Airavata_getSSHPubKey_args(); $args->authzToken = $authzToken; $args->airavataCredStoreToken = $airavataCredStoreToken; + $args->gatewayId = $gatewayId; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { @@ -12335,6 +12337,10 @@ class Airavata_getSSHPubKey_args { * @var string */ public $airavataCredStoreToken = null; + /** + * @var string + */ + public $gatewayId = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -12348,6 +12354,10 @@ class Airavata_getSSHPubKey_args { 'var' => 'airavataCredStoreToken', 'type' => TType::STRING, ), + 3 => array( + 'var' => 'gatewayId', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -12357,6 +12367,9 @@ class Airavata_getSSHPubKey_args { if (isset($vals['airavataCredStoreToken'])) { $this->airavataCredStoreToken = $vals['airavataCredStoreToken']; } + if (isset($vals['gatewayId'])) { + $this->gatewayId = $vals['gatewayId']; + } } } @@ -12394,6 +12407,13 @@ class Airavata_getSSHPubKey_args { $xfer += $input->skip($ftype); } break; + case 3: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->gatewayId); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -12420,6 +12440,11 @@ class Airavata_getSSHPubKey_args { $xfer += $output->writeString($this->airavataCredStoreToken); $xfer += $output->writeFieldEnd(); } + if ($this->gatewayId !== null) { + $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3); + $xfer += $output->writeString($this->gatewayId); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dd129832/app/libraries/Airavata/API/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/API/Types.php b/app/libraries/Airavata/API/Types.php index 7a574d4..55d6b6d 100644 --- a/app/libraries/Airavata/API/Types.php +++ b/app/libraries/Airavata/API/Types.php @@ -35,7 +35,7 @@ final class Constant extends \Thrift\Type\TConstant { * in a change to major/minor version numbers. * */ -"0.15.0"; +"0.16.0"; } } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dd129832/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 6835993..6891a0d 100644 --- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php @@ -174,12 +174,14 @@ final class JobSubmissionProtocol { const GLOBUS = 2; const UNICORE = 3; const CLOUD = 4; + const SSH_FORK = 5; static public $__names = array( 0 => 'LOCAL', 1 => 'SSH', 2 => 'GLOBUS', 3 => 'UNICORE', 4 => 'CLOUD', + 5 => 'SSH_FORK', ); } @@ -198,10 +200,12 @@ final class MonitorMode { const POLL_JOB_MANAGER = 0; const JOB_EMAIL_NOTIFICATION_MONITOR = 1; const XSEDE_AMQP_SUBSCRIBE = 2; + const FORK = 3; static public $__names = array( 0 => 'POLL_JOB_MANAGER', 1 => 'JOB_EMAIL_NOTIFICATION_MONITOR', 2 => 'XSEDE_AMQP_SUBSCRIBE', + 3 => 'FORK', ); } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dd129832/app/libraries/Airavata/Model/Messaging/Event/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/Messaging/Event/Types.php b/app/libraries/Airavata/Model/Messaging/Event/Types.php index c6dce6c..6fa7020 100644 --- a/app/libraries/Airavata/Model/Messaging/Event/Types.php +++ b/app/libraries/Airavata/Model/Messaging/Event/Types.php @@ -1159,6 +1159,10 @@ class ProcessSubmitEvent { /** * @var string */ + public $experimentId = null; + /** + * @var string + */ public $tokenId = null; public function __construct($vals=null) { @@ -1173,6 +1177,10 @@ class ProcessSubmitEvent { 'type' => TType::STRING, ), 3 => array( + 'var' => 'experimentId', + 'type' => TType::STRING, + ), + 4 => array( 'var' => 'tokenId', 'type' => TType::STRING, ), @@ -1185,6 +1193,9 @@ class ProcessSubmitEvent { if (isset($vals['gatewayId'])) { $this->gatewayId = $vals['gatewayId']; } + if (isset($vals['experimentId'])) { + $this->experimentId = $vals['experimentId']; + } if (isset($vals['tokenId'])) { $this->tokenId = $vals['tokenId']; } @@ -1226,6 +1237,13 @@ class ProcessSubmitEvent { break; case 3: if ($ftype == TType::STRING) { + $xfer += $input->readString($this->experimentId); + } else { + $xfer += $input->skip($ftype); + } + break; + case 4: + if ($ftype == TType::STRING) { $xfer += $input->readString($this->tokenId); } else { $xfer += $input->skip($ftype); @@ -1254,8 +1272,13 @@ class ProcessSubmitEvent { $xfer += $output->writeString($this->gatewayId); $xfer += $output->writeFieldEnd(); } + if ($this->experimentId !== null) { + $xfer += $output->writeFieldBegin('experimentId', TType::STRING, 3); + $xfer += $output->writeString($this->experimentId); + $xfer += $output->writeFieldEnd(); + } if ($this->tokenId !== null) { - $xfer += $output->writeFieldBegin('tokenId', TType::STRING, 3); + $xfer += $output->writeFieldBegin('tokenId', TType::STRING, 4); $xfer += $output->writeString($this->tokenId); $xfer += $output->writeFieldEnd(); } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dd129832/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 index 8869cdb..791a4b3 100644 --- a/app/libraries/Airavata/Model/job/Types.php +++ b/app/libraries/Airavata/Model/job/Types.php @@ -31,6 +31,10 @@ class JobModel { /** * @var string */ + public $processId = null; + /** + * @var string + */ public $jobDescription = null; /** * @var int @@ -65,27 +69,31 @@ class JobModel { 'type' => TType::STRING, ), 3 => array( - 'var' => 'jobDescription', + 'var' => 'processId', 'type' => TType::STRING, ), 4 => array( + 'var' => 'jobDescription', + 'type' => TType::STRING, + ), + 5 => array( 'var' => 'creationTime', 'type' => TType::I64, ), - 5 => array( + 6 => array( 'var' => 'jobStatus', 'type' => TType::STRUCT, 'class' => '\Airavata\Model\Status\JobStatus', ), - 6 => array( + 7 => array( 'var' => 'computeResourceConsumed', 'type' => TType::STRING, ), - 7 => array( + 8 => array( 'var' => 'jobName', 'type' => TType::STRING, ), - 8 => array( + 9 => array( 'var' => 'workingDir', 'type' => TType::STRING, ), @@ -98,6 +106,9 @@ class JobModel { if (isset($vals['taskId'])) { $this->taskId = $vals['taskId']; } + if (isset($vals['processId'])) { + $this->processId = $vals['processId']; + } if (isset($vals['jobDescription'])) { $this->jobDescription = $vals['jobDescription']; } @@ -154,19 +165,26 @@ class JobModel { break; case 3: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->jobDescription); + $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 5: + case 6: if ($ftype == TType::STRUCT) { $this->jobStatus = new \Airavata\Model\Status\JobStatus(); $xfer += $this->jobStatus->read($input); @@ -174,21 +192,21 @@ class JobModel { $xfer += $input->skip($ftype); } break; - case 6: + case 7: if ($ftype == TType::STRING) { $xfer += $input->readString($this->computeResourceConsumed); } else { $xfer += $input->skip($ftype); } break; - case 7: + case 8: if ($ftype == TType::STRING) { $xfer += $input->readString($this->jobName); } else { $xfer += $input->skip($ftype); } break; - case 8: + case 9: if ($ftype == TType::STRING) { $xfer += $input->readString($this->workingDir); } else { @@ -218,13 +236,18 @@ class JobModel { $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, 3); + $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, 4); + $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5); $xfer += $output->writeI64($this->creationTime); $xfer += $output->writeFieldEnd(); } @@ -232,22 +255,22 @@ class JobModel { if (!is_object($this->jobStatus)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('jobStatus', TType::STRUCT, 5); + $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, 6); + $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, 7); + $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, 8); + $xfer += $output->writeFieldBegin('workingDir', TType::STRING, 9); $xfer += $output->writeString($this->workingDir); $xfer += $output->writeFieldEnd(); }
