Repository: airavata-php-gateway Updated Branches: refs/heads/develop 21748deb1 -> 84b048257
updating thrift generated files 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/84b04825 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/84b04825 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/84b04825 Branch: refs/heads/develop Commit: 84b048257e1db3ac65c6f28925f33f23203f30e0 Parents: 21748de Author: scnakandala <[email protected]> Authored: Thu Aug 18 12:05:34 2016 -0400 Committer: scnakandala <[email protected]> Committed: Thu Aug 18 12:05:34 2016 -0400 ---------------------------------------------------------------------- .../Airavata/Model/Messaging/Event/Types.php | 124 +++++++++++++++++-- .../Airavata/Model/Workspace/Types.php | 25 ++++ .../Wsis/Stubs/AuthenticationAdminStub.php | 3 + 3 files changed, 140 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/84b04825/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 9c6a1e8..96a015e 100644 --- a/app/libraries/Airavata/Model/Messaging/Event/Types.php +++ b/app/libraries/Airavata/Model/Messaging/Event/Types.php @@ -32,20 +32,22 @@ final class MessageLevel { final class MessageType { const EXPERIMENT = 0; - const TASK = 1; - const PROCESS = 2; - const JOB = 3; - const LAUNCHPROCESS = 4; - const TERMINATEPROCESS = 5; - const PROCESSOUTPUT = 6; + const EXPERIMENT_CANCEL = 1; + const TASK = 2; + const PROCESS = 3; + const JOB = 4; + const LAUNCHPROCESS = 5; + const TERMINATEPROCESS = 6; + const PROCESSOUTPUT = 7; static public $__names = array( 0 => 'EXPERIMENT', - 1 => 'TASK', - 2 => 'PROCESS', - 3 => 'JOB', - 4 => 'LAUNCHPROCESS', - 5 => 'TERMINATEPROCESS', - 6 => 'PROCESSOUTPUT', + 1 => 'EXPERIMENT_CANCEL', + 2 => 'TASK', + 3 => 'PROCESS', + 4 => 'JOB', + 5 => 'LAUNCHPROCESS', + 6 => 'TERMINATEPROCESS', + 7 => 'PROCESSOUTPUT', ); } @@ -1145,6 +1147,104 @@ class JobIdentifier { } +class ExperimentSubmitEvent { + static $_TSPEC; + + /** + * @var string + */ + public $experimentId = null; + /** + * @var string + */ + public $gatewayId = null; + + public function __construct($vals=null) { + if (!isset(self::$_TSPEC)) { + self::$_TSPEC = array( + 1 => array( + 'var' => 'experimentId', + 'type' => TType::STRING, + ), + 2 => array( + 'var' => 'gatewayId', + 'type' => TType::STRING, + ), + ); + } + if (is_array($vals)) { + if (isset($vals['experimentId'])) { + $this->experimentId = $vals['experimentId']; + } + if (isset($vals['gatewayId'])) { + $this->gatewayId = $vals['gatewayId']; + } + } + } + + public function getName() { + return 'ExperimentSubmitEvent'; + } + + 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->experimentId); + } else { + $xfer += $input->skip($ftype); + } + break; + case 2: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->gatewayId); + } 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('ExperimentSubmitEvent'); + if ($this->experimentId !== null) { + $xfer += $output->writeFieldBegin('experimentId', TType::STRING, 1); + $xfer += $output->writeString($this->experimentId); + $xfer += $output->writeFieldEnd(); + } + if ($this->gatewayId !== null) { + $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2); + $xfer += $output->writeString($this->gatewayId); + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } + +} + class ProcessSubmitEvent { static $_TSPEC; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/84b04825/app/libraries/Airavata/Model/Workspace/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/Workspace/Types.php b/app/libraries/Airavata/Model/Workspace/Types.php index 71a2eca..098511f 100644 --- a/app/libraries/Airavata/Model/Workspace/Types.php +++ b/app/libraries/Airavata/Model/Workspace/Types.php @@ -24,6 +24,7 @@ final class GatewayApprovalStatus { const DEACTIVATED = 3; const CANCELLED = 4; const DENIED = 5; + const CREATED = 6; static public $__names = array( 0 => 'REQUESTED', 1 => 'APPROVED', @@ -31,6 +32,7 @@ final class GatewayApprovalStatus { 3 => 'DEACTIVATED', 4 => 'CANCELLED', 5 => 'DENIED', + 6 => 'CREATED', ); } @@ -696,6 +698,10 @@ class Gateway { * @var int */ public $requestCreationTime = null; + /** + * @var string + */ + public $requesterUsername = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -772,6 +778,10 @@ class Gateway { 'var' => 'requestCreationTime', 'type' => TType::I64, ), + 19 => array( + 'var' => 'requesterUsername', + 'type' => TType::STRING, + ), ); } if (is_array($vals)) { @@ -829,6 +839,9 @@ class Gateway { if (isset($vals['requestCreationTime'])) { $this->requestCreationTime = $vals['requestCreationTime']; } + if (isset($vals['requesterUsername'])) { + $this->requesterUsername = $vals['requesterUsername']; + } } } @@ -977,6 +990,13 @@ class Gateway { $xfer += $input->skip($ftype); } break; + case 19: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->requesterUsername); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -1080,6 +1100,11 @@ class Gateway { $xfer += $output->writeI64($this->requestCreationTime); $xfer += $output->writeFieldEnd(); } + if ($this->requesterUsername !== null) { + $xfer += $output->writeFieldBegin('requesterUsername', TType::STRING, 19); + $xfer += $output->writeString($this->requesterUsername); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/84b04825/app/libraries/Wsis/Stubs/AuthenticationAdminStub.php ---------------------------------------------------------------------- diff --git a/app/libraries/Wsis/Stubs/AuthenticationAdminStub.php b/app/libraries/Wsis/Stubs/AuthenticationAdminStub.php index 00a1f02..7725f4c 100644 --- a/app/libraries/Wsis/Stubs/AuthenticationAdminStub.php +++ b/app/libraries/Wsis/Stubs/AuthenticationAdminStub.php @@ -788,6 +788,9 @@ class TypeTable { * @copyright {copyright} * @package {package} */ + +67377932bbc662c02ae7e30210680aa82d38fcf5 + class AuthenticationAdminStub extends SoapClient { private static $classmap = array(
