Repository: airavata-php-gateway Updated Branches: refs/heads/develop 7dcf7f98a -> 26c67fca6
updating thrift 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/8e2594a5 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/8e2594a5 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/8e2594a5 Branch: refs/heads/develop Commit: 8e2594a585cae48bfd3193069448f2dc94245787 Parents: 81cceeb Author: scnakandala <[email protected]> Authored: Tue Nov 17 15:20:28 2015 -0500 Committer: scnakandala <[email protected]> Committed: Tue Nov 17 15:20:28 2015 -0500 ---------------------------------------------------------------------- .../Airavata/Model/Experiment/Types.php | 187 ++++++++++++------- app/libraries/Airavata/Model/Task/Types.php | 51 +++++ 2 files changed, 170 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/8e2594a5/app/libraries/Airavata/Model/Experiment/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/Experiment/Types.php b/app/libraries/Airavata/Model/Experiment/Types.php index fd56220..d01c0d0 100644 --- a/app/libraries/Airavata/Model/Experiment/Types.php +++ b/app/libraries/Airavata/Model/Experiment/Types.php @@ -355,6 +355,10 @@ class ExperimentModel { * @var \Airavata\Model\Commons\ErrorModel[] */ public $errors = null; + /** + * @var \Airavata\Model\Process\ProcessModel[] + */ + public $processes = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -448,6 +452,15 @@ class ExperimentModel { 'class' => '\Airavata\Model\Commons\ErrorModel', ), ), + 18 => array( + 'var' => 'processes', + 'type' => TType::LST, + 'etype' => TType::STRUCT, + 'elem' => array( + 'type' => TType::STRUCT, + 'class' => '\Airavata\Model\Process\ProcessModel', + ), + ), ); } if (is_array($vals)) { @@ -502,6 +515,9 @@ class ExperimentModel { if (isset($vals['errors'])) { $this->errors = $vals['errors']; } + if (isset($vals['processes'])) { + $this->processes = $vals['processes']; + } } } @@ -688,6 +704,24 @@ class ExperimentModel { $xfer += $input->skip($ftype); } break; + case 18: + if ($ftype == TType::LST) { + $this->processes = array(); + $_size24 = 0; + $_etype27 = 0; + $xfer += $input->readListBegin($_etype27, $_size24); + for ($_i28 = 0; $_i28 < $_size24; ++$_i28) + { + $elem29 = null; + $elem29 = new \Airavata\Model\Process\ProcessModel(); + $xfer += $elem29->read($input); + $this->processes []= $elem29; + } + $xfer += $input->readListEnd(); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -764,9 +798,9 @@ class ExperimentModel { { $output->writeListBegin(TType::STRING, count($this->emailAddresses)); { - foreach ($this->emailAddresses as $iter24) + foreach ($this->emailAddresses as $iter30) { - $xfer += $output->writeString($iter24); + $xfer += $output->writeString($iter30); } } $output->writeListEnd(); @@ -789,9 +823,9 @@ class ExperimentModel { { $output->writeListBegin(TType::STRUCT, count($this->experimentInputs)); { - foreach ($this->experimentInputs as $iter25) + foreach ($this->experimentInputs as $iter31) { - $xfer += $iter25->write($output); + $xfer += $iter31->write($output); } } $output->writeListEnd(); @@ -806,9 +840,9 @@ class ExperimentModel { { $output->writeListBegin(TType::STRUCT, count($this->experimentOutputs)); { - foreach ($this->experimentOutputs as $iter26) + foreach ($this->experimentOutputs as $iter32) { - $xfer += $iter26->write($output); + $xfer += $iter32->write($output); } } $output->writeListEnd(); @@ -831,9 +865,26 @@ class ExperimentModel { { $output->writeListBegin(TType::STRUCT, count($this->errors)); { - foreach ($this->errors as $iter27) + foreach ($this->errors as $iter33) + { + $xfer += $iter33->write($output); + } + } + $output->writeListEnd(); + } + $xfer += $output->writeFieldEnd(); + } + if ($this->processes !== null) { + if (!is_array($this->processes)) { + throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); + } + $xfer += $output->writeFieldBegin('processes', TType::LST, 18); + { + $output->writeListBegin(TType::STRUCT, count($this->processes)); + { + foreach ($this->processes as $iter34) { - $xfer += $iter27->write($output); + $xfer += $iter34->write($output); } } $output->writeListEnd(); @@ -1391,15 +1442,15 @@ class ExperimentStatistics { case 7: if ($ftype == TType::LST) { $this->allExperiments = array(); - $_size28 = 0; - $_etype31 = 0; - $xfer += $input->readListBegin($_etype31, $_size28); - for ($_i32 = 0; $_i32 < $_size28; ++$_i32) + $_size35 = 0; + $_etype38 = 0; + $xfer += $input->readListBegin($_etype38, $_size35); + for ($_i39 = 0; $_i39 < $_size35; ++$_i39) { - $elem33 = null; - $elem33 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem33->read($input); - $this->allExperiments []= $elem33; + $elem40 = null; + $elem40 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem40->read($input); + $this->allExperiments []= $elem40; } $xfer += $input->readListEnd(); } else { @@ -1409,15 +1460,15 @@ class ExperimentStatistics { case 8: if ($ftype == TType::LST) { $this->completedExperiments = array(); - $_size34 = 0; - $_etype37 = 0; - $xfer += $input->readListBegin($_etype37, $_size34); - for ($_i38 = 0; $_i38 < $_size34; ++$_i38) + $_size41 = 0; + $_etype44 = 0; + $xfer += $input->readListBegin($_etype44, $_size41); + for ($_i45 = 0; $_i45 < $_size41; ++$_i45) { - $elem39 = null; - $elem39 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem39->read($input); - $this->completedExperiments []= $elem39; + $elem46 = null; + $elem46 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem46->read($input); + $this->completedExperiments []= $elem46; } $xfer += $input->readListEnd(); } else { @@ -1427,15 +1478,15 @@ class ExperimentStatistics { case 9: if ($ftype == TType::LST) { $this->failedExperiments = array(); - $_size40 = 0; - $_etype43 = 0; - $xfer += $input->readListBegin($_etype43, $_size40); - for ($_i44 = 0; $_i44 < $_size40; ++$_i44) + $_size47 = 0; + $_etype50 = 0; + $xfer += $input->readListBegin($_etype50, $_size47); + for ($_i51 = 0; $_i51 < $_size47; ++$_i51) { - $elem45 = null; - $elem45 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem45->read($input); - $this->failedExperiments []= $elem45; + $elem52 = null; + $elem52 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem52->read($input); + $this->failedExperiments []= $elem52; } $xfer += $input->readListEnd(); } else { @@ -1445,15 +1496,15 @@ class ExperimentStatistics { case 10: if ($ftype == TType::LST) { $this->cancelledExperiments = array(); - $_size46 = 0; - $_etype49 = 0; - $xfer += $input->readListBegin($_etype49, $_size46); - for ($_i50 = 0; $_i50 < $_size46; ++$_i50) + $_size53 = 0; + $_etype56 = 0; + $xfer += $input->readListBegin($_etype56, $_size53); + for ($_i57 = 0; $_i57 < $_size53; ++$_i57) { - $elem51 = null; - $elem51 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem51->read($input); - $this->cancelledExperiments []= $elem51; + $elem58 = null; + $elem58 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem58->read($input); + $this->cancelledExperiments []= $elem58; } $xfer += $input->readListEnd(); } else { @@ -1463,15 +1514,15 @@ class ExperimentStatistics { case 11: if ($ftype == TType::LST) { $this->createdExperiments = array(); - $_size52 = 0; - $_etype55 = 0; - $xfer += $input->readListBegin($_etype55, $_size52); - for ($_i56 = 0; $_i56 < $_size52; ++$_i56) + $_size59 = 0; + $_etype62 = 0; + $xfer += $input->readListBegin($_etype62, $_size59); + for ($_i63 = 0; $_i63 < $_size59; ++$_i63) { - $elem57 = null; - $elem57 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem57->read($input); - $this->createdExperiments []= $elem57; + $elem64 = null; + $elem64 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem64->read($input); + $this->createdExperiments []= $elem64; } $xfer += $input->readListEnd(); } else { @@ -1481,15 +1532,15 @@ class ExperimentStatistics { case 12: if ($ftype == TType::LST) { $this->runningExperiments = array(); - $_size58 = 0; - $_etype61 = 0; - $xfer += $input->readListBegin($_etype61, $_size58); - for ($_i62 = 0; $_i62 < $_size58; ++$_i62) + $_size65 = 0; + $_etype68 = 0; + $xfer += $input->readListBegin($_etype68, $_size65); + for ($_i69 = 0; $_i69 < $_size65; ++$_i69) { - $elem63 = null; - $elem63 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); - $xfer += $elem63->read($input); - $this->runningExperiments []= $elem63; + $elem70 = null; + $elem70 = new \Airavata\Model\Experiment\ExperimentSummaryModel(); + $xfer += $elem70->read($input); + $this->runningExperiments []= $elem70; } $xfer += $input->readListEnd(); } else { @@ -1547,9 +1598,9 @@ class ExperimentStatistics { { $output->writeListBegin(TType::STRUCT, count($this->allExperiments)); { - foreach ($this->allExperiments as $iter64) + foreach ($this->allExperiments as $iter71) { - $xfer += $iter64->write($output); + $xfer += $iter71->write($output); } } $output->writeListEnd(); @@ -1564,9 +1615,9 @@ class ExperimentStatistics { { $output->writeListBegin(TType::STRUCT, count($this->completedExperiments)); { - foreach ($this->completedExperiments as $iter65) + foreach ($this->completedExperiments as $iter72) { - $xfer += $iter65->write($output); + $xfer += $iter72->write($output); } } $output->writeListEnd(); @@ -1581,9 +1632,9 @@ class ExperimentStatistics { { $output->writeListBegin(TType::STRUCT, count($this->failedExperiments)); { - foreach ($this->failedExperiments as $iter66) + foreach ($this->failedExperiments as $iter73) { - $xfer += $iter66->write($output); + $xfer += $iter73->write($output); } } $output->writeListEnd(); @@ -1598,9 +1649,9 @@ class ExperimentStatistics { { $output->writeListBegin(TType::STRUCT, count($this->cancelledExperiments)); { - foreach ($this->cancelledExperiments as $iter67) + foreach ($this->cancelledExperiments as $iter74) { - $xfer += $iter67->write($output); + $xfer += $iter74->write($output); } } $output->writeListEnd(); @@ -1615,9 +1666,9 @@ class ExperimentStatistics { { $output->writeListBegin(TType::STRUCT, count($this->createdExperiments)); { - foreach ($this->createdExperiments as $iter68) + foreach ($this->createdExperiments as $iter75) { - $xfer += $iter68->write($output); + $xfer += $iter75->write($output); } } $output->writeListEnd(); @@ -1632,9 +1683,9 @@ class ExperimentStatistics { { $output->writeListBegin(TType::STRUCT, count($this->runningExperiments)); { - foreach ($this->runningExperiments as $iter69) + foreach ($this->runningExperiments as $iter76) { - $xfer += $iter69->write($output); + $xfer += $iter76->write($output); } } $output->writeListEnd(); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/8e2594a5/app/libraries/Airavata/Model/Task/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/Task/Types.php b/app/libraries/Airavata/Model/Task/Types.php index df9e68d..deae011 100644 --- a/app/libraries/Airavata/Model/Task/Types.php +++ b/app/libraries/Airavata/Model/Task/Types.php @@ -102,6 +102,10 @@ class TaskModel { * @var \Airavata\Model\Commons\ErrorModel */ public $taskError = null; + /** + * @var \Airavata\Model\Job\JobModel[] + */ + public $jobs = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -144,6 +148,15 @@ class TaskModel { 'type' => TType::STRUCT, 'class' => '\Airavata\Model\Commons\ErrorModel', ), + 10 => array( + 'var' => 'jobs', + 'type' => TType::LST, + 'etype' => TType::STRUCT, + 'elem' => array( + 'type' => TType::STRUCT, + 'class' => '\Airavata\Model\Job\JobModel', + ), + ), ); } if (is_array($vals)) { @@ -174,6 +187,9 @@ class TaskModel { if (isset($vals['taskError'])) { $this->taskError = $vals['taskError']; } + if (isset($vals['jobs'])) { + $this->jobs = $vals['jobs']; + } } } @@ -261,6 +277,24 @@ class TaskModel { $xfer += $input->skip($ftype); } break; + case 10: + if ($ftype == TType::LST) { + $this->jobs = array(); + $_size0 = 0; + $_etype3 = 0; + $xfer += $input->readListBegin($_etype3, $_size0); + for ($_i4 = 0; $_i4 < $_size0; ++$_i4) + { + $elem5 = null; + $elem5 = new \Airavata\Model\Job\JobModel(); + $xfer += $elem5->read($input); + $this->jobs []= $elem5; + } + $xfer += $input->readListEnd(); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -325,6 +359,23 @@ class TaskModel { $xfer += $this->taskError->write($output); $xfer += $output->writeFieldEnd(); } + if ($this->jobs !== null) { + if (!is_array($this->jobs)) { + throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); + } + $xfer += $output->writeFieldBegin('jobs', TType::LST, 10); + { + $output->writeListBegin(TType::STRUCT, count($this->jobs)); + { + foreach ($this->jobs as $iter6) + { + $xfer += $iter6->write($output); + } + } + $output->writeListEnd(); + } + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer;
