You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/11/09 17:55:06 UTC
[1/2] airavata-php-gateway git commit: updating thrift models
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master 6aae243f3 -> 4fa2e7fb8
updating thrift models
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/47fed00e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/47fed00e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/47fed00e
Branch: refs/heads/master
Commit: 47fed00e77ee05a8aec1bf8234df70ef1ce9672c
Parents: ff17e7a
Author: scnakandala <su...@gmail.com>
Authored: Mon Nov 9 11:54:48 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Nov 9 11:54:48 2015 -0500
----------------------------------------------------------------------
.../Model/AppCatalog/AppDeployment/Types.php | 2 +-
.../Model/AppCatalog/ComputeResource/Types.php | 27 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 37 +-
.../Airavata/Model/Application/Io/Types.php | 23 ++
.../Airavata/Model/Experiment/Types.php | 2 +
app/libraries/Airavata/Model/Task/Types.php | 414 ++++++++++++++++++-
6 files changed, 482 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/47fed00e/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 a9cc409..e35f999 100644
--- a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php
@@ -59,7 +59,7 @@ final class ApplicationParallelismType {
* value:
* Value of the environment variable to set
*
- * envOrder:
+ * envPathOrder:
* The order of the setting of the env variables when there are multiple env variables
*/
class SetEnvPaths {
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/47fed00e/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 e5bff2c..ce752e3 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -146,12 +146,14 @@ final class SecurityProtocol {
const GSI = 2;
const KERBEROS = 3;
const OAUTH = 4;
+ const LOCAL = 5;
static public $__names = array(
0 => 'USERNAME_PASSWORD',
1 => 'SSH_KEYS',
2 => 'GSI',
3 => 'KERBEROS',
4 => 'OAUTH',
+ 5 => 'LOCAL',
);
}
@@ -1145,6 +1147,10 @@ class LOCALSubmission {
*/
public $jobSubmissionInterfaceId = "DO_NOT_SET_AT_CLIENTS";
/**
+ * @var int
+ */
+ public $securityProtocol = null;
+ /**
* @var \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager
*/
public $resourceJobManager = null;
@@ -1157,6 +1163,10 @@ class LOCALSubmission {
'type' => TType::STRING,
),
2 => array(
+ 'var' => 'securityProtocol',
+ 'type' => TType::I32,
+ ),
+ 3 => array(
'var' => 'resourceJobManager',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager',
@@ -1167,6 +1177,9 @@ class LOCALSubmission {
if (isset($vals['jobSubmissionInterfaceId'])) {
$this->jobSubmissionInterfaceId = $vals['jobSubmissionInterfaceId'];
}
+ if (isset($vals['securityProtocol'])) {
+ $this->securityProtocol = $vals['securityProtocol'];
+ }
if (isset($vals['resourceJobManager'])) {
$this->resourceJobManager = $vals['resourceJobManager'];
}
@@ -1200,6 +1213,13 @@ class LOCALSubmission {
}
break;
case 2:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->securityProtocol);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
if ($ftype == TType::STRUCT) {
$this->resourceJobManager = new \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager();
$xfer += $this->resourceJobManager->read($input);
@@ -1225,11 +1245,16 @@ class LOCALSubmission {
$xfer += $output->writeString($this->jobSubmissionInterfaceId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->securityProtocol !== null) {
+ $xfer += $output->writeFieldBegin('securityProtocol', TType::I32, 2);
+ $xfer += $output->writeI32($this->securityProtocol);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->resourceJobManager !== null) {
if (!is_object($this->resourceJobManager)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('resourceJobManager', TType::STRUCT, 2);
+ $xfer += $output->writeFieldBegin('resourceJobManager', TType::STRUCT, 3);
$xfer += $this->resourceJobManager->write($output);
$xfer += $output->writeFieldEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/47fed00e/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index f63f2f0..098ec1e 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -477,6 +477,10 @@ class GatewayResourceProfile {
/**
* @var string
*/
+ public $dataStorageHostName = null;
+ /**
+ * @var string
+ */
public $credentialStoreToken = null;
/**
* @var \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference[]
@@ -495,10 +499,14 @@ class GatewayResourceProfile {
'type' => TType::STRING,
),
2 => array(
- 'var' => 'credentialStoreToken',
+ 'var' => 'dataStorageHostName',
'type' => TType::STRING,
),
3 => array(
+ 'var' => 'credentialStoreToken',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
'var' => 'computeResourcePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -507,7 +515,7 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference',
),
),
- 4 => array(
+ 5 => array(
'var' => 'dataStoragePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -522,6 +530,9 @@ class GatewayResourceProfile {
if (isset($vals['gatewayID'])) {
$this->gatewayID = $vals['gatewayID'];
}
+ if (isset($vals['dataStorageHostName'])) {
+ $this->dataStorageHostName = $vals['dataStorageHostName'];
+ }
if (isset($vals['credentialStoreToken'])) {
$this->credentialStoreToken = $vals['credentialStoreToken'];
}
@@ -562,12 +573,19 @@ class GatewayResourceProfile {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->credentialStoreToken);
+ $xfer += $input->readString($this->dataStorageHostName);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->credentialStoreToken);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
if ($ftype == TType::LST) {
$this->computeResourcePreferences = array();
$_size0 = 0;
@@ -585,7 +603,7 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 5:
if ($ftype == TType::LST) {
$this->dataStoragePreferences = array();
$_size6 = 0;
@@ -621,8 +639,13 @@ class GatewayResourceProfile {
$xfer += $output->writeString($this->gatewayID);
$xfer += $output->writeFieldEnd();
}
+ if ($this->dataStorageHostName !== null) {
+ $xfer += $output->writeFieldBegin('dataStorageHostName', TType::STRING, 2);
+ $xfer += $output->writeString($this->dataStorageHostName);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->credentialStoreToken !== null) {
- $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 2);
+ $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 3);
$xfer += $output->writeString($this->credentialStoreToken);
$xfer += $output->writeFieldEnd();
}
@@ -630,7 +653,7 @@ class GatewayResourceProfile {
if (!is_array($this->computeResourcePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 3);
+ $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 4);
{
$output->writeListBegin(TType::STRUCT, count($this->computeResourcePreferences));
{
@@ -647,7 +670,7 @@ class GatewayResourceProfile {
if (!is_array($this->dataStoragePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 4);
+ $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 5);
{
$output->writeListBegin(TType::STRUCT, count($this->dataStoragePreferences));
{
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/47fed00e/app/libraries/Airavata/Model/Application/Io/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Application/Io/Types.php b/app/libraries/Airavata/Model/Application/Io/Types.php
index a74e0f9..e04650d 100644
--- a/app/libraries/Airavata/Model/Application/Io/Types.php
+++ b/app/libraries/Airavata/Model/Application/Io/Types.php
@@ -434,6 +434,10 @@ class OutputDataObjectType {
* @var string
*/
public $searchQuery = null;
+ /**
+ * @var bool
+ */
+ public $outputStreaming = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -474,6 +478,10 @@ class OutputDataObjectType {
'var' => 'searchQuery',
'type' => TType::STRING,
),
+ 10 => array(
+ 'var' => 'outputStreaming',
+ 'type' => TType::BOOL,
+ ),
);
}
if (is_array($vals)) {
@@ -504,6 +512,9 @@ class OutputDataObjectType {
if (isset($vals['searchQuery'])) {
$this->searchQuery = $vals['searchQuery'];
}
+ if (isset($vals['outputStreaming'])) {
+ $this->outputStreaming = $vals['outputStreaming'];
+ }
}
}
@@ -589,6 +600,13 @@ class OutputDataObjectType {
$xfer += $input->skip($ftype);
}
break;
+ case 10:
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->outputStreaming);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -647,6 +665,11 @@ class OutputDataObjectType {
$xfer += $output->writeString($this->searchQuery);
$xfer += $output->writeFieldEnd();
}
+ if ($this->outputStreaming !== null) {
+ $xfer += $output->writeFieldBegin('outputStreaming', TType::BOOL, 10);
+ $xfer += $output->writeBool($this->outputStreaming);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/47fed00e/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 8d5ea8e..fd56220 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -33,6 +33,7 @@ final class ExperimentSearchFields {
const FROM_DATE = 3;
const TO_DATE = 4;
const STATUS = 5;
+ const PROJECT_ID = 6;
static public $__names = array(
0 => 'EXPERIMENT_NAME',
1 => 'EXPERIMENT_DESC',
@@ -40,6 +41,7 @@ final class ExperimentSearchFields {
3 => 'FROM_DATE',
4 => 'TO_DATE',
5 => 'STATUS',
+ 6 => 'PROJECT_ID',
);
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/47fed00e/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 66b5cfa..2e3f678 100644
--- a/app/libraries/Airavata/Model/Task/Types.php
+++ b/app/libraries/Airavata/Model/Task/Types.php
@@ -37,6 +37,22 @@ final class TaskTypes {
}
/**
+ * DataStagingTaskModel: A structure holding the data staging task details.
+ *
+ * Source and Destination locations includes standard representation of protocol, host, port and path
+ * A friendly description of the task, usally used to communicate information to users.
+ *
+ */
+final class DataStageType {
+ const INPUT = 0;
+ const OUPUT = 1;
+ static public $__names = array(
+ 0 => 'INPUT',
+ 1 => 'OUPUT',
+ );
+}
+
+/**
* TaskModel: A structure holding the generic task details.
*
* taskDetail:
@@ -314,13 +330,6 @@ class TaskModel {
}
-/**
- * DataStagingTaskModel: A structure holding the data staging task details.
- *
- * Source and Destination locations includes standard representation of protocol, host, port and path
- * A friendly description of the task, usally used to communicate information to users.
- *
- */
class DataStagingTaskModel {
static $_TSPEC;
@@ -335,6 +344,10 @@ class DataStagingTaskModel {
/**
* @var int
*/
+ public $type = null;
+ /**
+ * @var int
+ */
public $transferStartTime = null;
/**
* @var int
@@ -344,6 +357,14 @@ class DataStagingTaskModel {
* @var string
*/
public $transferRate = null;
+ /**
+ * @var \Airavata\Model\Application\Io\InputDataObjectType
+ */
+ public $processInput = null;
+ /**
+ * @var \Airavata\Model\Application\Io\OutputDataObjectType
+ */
+ public $processOutput = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -357,17 +378,31 @@ class DataStagingTaskModel {
'type' => TType::STRING,
),
3 => array(
+ 'var' => 'type',
+ 'type' => TType::I32,
+ ),
+ 4 => array(
'var' => 'transferStartTime',
'type' => TType::I64,
),
- 4 => array(
+ 5 => array(
'var' => 'transferEndTime',
'type' => TType::I64,
),
- 5 => array(
+ 6 => array(
'var' => 'transferRate',
'type' => TType::STRING,
),
+ 7 => array(
+ 'var' => 'processInput',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Application\Io\InputDataObjectType',
+ ),
+ 8 => array(
+ 'var' => 'processOutput',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
+ ),
);
}
if (is_array($vals)) {
@@ -377,6 +412,9 @@ class DataStagingTaskModel {
if (isset($vals['destination'])) {
$this->destination = $vals['destination'];
}
+ if (isset($vals['type'])) {
+ $this->type = $vals['type'];
+ }
if (isset($vals['transferStartTime'])) {
$this->transferStartTime = $vals['transferStartTime'];
}
@@ -386,6 +424,12 @@ class DataStagingTaskModel {
if (isset($vals['transferRate'])) {
$this->transferRate = $vals['transferRate'];
}
+ if (isset($vals['processInput'])) {
+ $this->processInput = $vals['processInput'];
+ }
+ if (isset($vals['processOutput'])) {
+ $this->processOutput = $vals['processOutput'];
+ }
}
}
@@ -423,26 +467,49 @@ class DataStagingTaskModel {
}
break;
case 3:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->type);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->transferStartTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 4:
+ case 5:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->transferEndTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 5:
+ case 6:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->transferRate);
} else {
$xfer += $input->skip($ftype);
}
break;
+ case 7:
+ if ($ftype == TType::STRUCT) {
+ $this->processInput = new \Airavata\Model\Application\Io\InputDataObjectType();
+ $xfer += $this->processInput->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
+ if ($ftype == TType::STRUCT) {
+ $this->processOutput = new \Airavata\Model\Application\Io\OutputDataObjectType();
+ $xfer += $this->processOutput->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -466,21 +533,340 @@ class DataStagingTaskModel {
$xfer += $output->writeString($this->destination);
$xfer += $output->writeFieldEnd();
}
+ if ($this->type !== null) {
+ $xfer += $output->writeFieldBegin('type', TType::I32, 3);
+ $xfer += $output->writeI32($this->type);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->transferStartTime !== null) {
- $xfer += $output->writeFieldBegin('transferStartTime', TType::I64, 3);
+ $xfer += $output->writeFieldBegin('transferStartTime', TType::I64, 4);
$xfer += $output->writeI64($this->transferStartTime);
$xfer += $output->writeFieldEnd();
}
if ($this->transferEndTime !== null) {
- $xfer += $output->writeFieldBegin('transferEndTime', TType::I64, 4);
+ $xfer += $output->writeFieldBegin('transferEndTime', TType::I64, 5);
$xfer += $output->writeI64($this->transferEndTime);
$xfer += $output->writeFieldEnd();
}
if ($this->transferRate !== null) {
- $xfer += $output->writeFieldBegin('transferRate', TType::STRING, 5);
+ $xfer += $output->writeFieldBegin('transferRate', TType::STRING, 6);
$xfer += $output->writeString($this->transferRate);
$xfer += $output->writeFieldEnd();
}
+ if ($this->processInput !== null) {
+ if (!is_object($this->processInput)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('processInput', TType::STRUCT, 7);
+ $xfer += $this->processInput->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->processOutput !== null) {
+ if (!is_object($this->processOutput)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('processOutput', TType::STRUCT, 8);
+ $xfer += $this->processOutput->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+/**
+ * EnvironmentSetupTaskModel: A structure holding the environment creation task details
+ *
+ */
+class EnvironmentSetupTaskModel {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $location = null;
+ /**
+ * @var int
+ */
+ public $protocol = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'location',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'protocol',
+ 'type' => TType::I32,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['location'])) {
+ $this->location = $vals['location'];
+ }
+ if (isset($vals['protocol'])) {
+ $this->protocol = $vals['protocol'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'EnvironmentSetupTaskModel';
+ }
+
+ 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->location);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->protocol);
+ } 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('EnvironmentSetupTaskModel');
+ if ($this->location !== null) {
+ $xfer += $output->writeFieldBegin('location', TType::STRING, 1);
+ $xfer += $output->writeString($this->location);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->protocol !== null) {
+ $xfer += $output->writeFieldBegin('protocol', TType::I32, 2);
+ $xfer += $output->writeI32($this->protocol);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class JobSubmissionTaskModel {
+ static $_TSPEC;
+
+ /**
+ * @var int
+ */
+ public $jobSubmissionProtocol = null;
+ /**
+ * @var int
+ */
+ public $monitorMode = null;
+ /**
+ * @var int
+ */
+ public $wallTime = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'jobSubmissionProtocol',
+ 'type' => TType::I32,
+ ),
+ 2 => array(
+ 'var' => 'monitorMode',
+ 'type' => TType::I32,
+ ),
+ 3 => array(
+ 'var' => 'wallTime',
+ 'type' => TType::I32,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['jobSubmissionProtocol'])) {
+ $this->jobSubmissionProtocol = $vals['jobSubmissionProtocol'];
+ }
+ if (isset($vals['monitorMode'])) {
+ $this->monitorMode = $vals['monitorMode'];
+ }
+ if (isset($vals['wallTime'])) {
+ $this->wallTime = $vals['wallTime'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'JobSubmissionTaskModel';
+ }
+
+ 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::I32) {
+ $xfer += $input->readI32($this->jobSubmissionProtocol);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->monitorMode);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->wallTime);
+ } 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('JobSubmissionTaskModel');
+ if ($this->jobSubmissionProtocol !== null) {
+ $xfer += $output->writeFieldBegin('jobSubmissionProtocol', TType::I32, 1);
+ $xfer += $output->writeI32($this->jobSubmissionProtocol);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->monitorMode !== null) {
+ $xfer += $output->writeFieldBegin('monitorMode', TType::I32, 2);
+ $xfer += $output->writeI32($this->monitorMode);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->wallTime !== null) {
+ $xfer += $output->writeFieldBegin('wallTime', TType::I32, 3);
+ $xfer += $output->writeI32($this->wallTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class MonitorTaskModel {
+ static $_TSPEC;
+
+ /**
+ * @var int
+ */
+ public $monitorMode = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'monitorMode',
+ 'type' => TType::I32,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['monitorMode'])) {
+ $this->monitorMode = $vals['monitorMode'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'MonitorTaskModel';
+ }
+
+ 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::I32) {
+ $xfer += $input->readI32($this->monitorMode);
+ } 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('MonitorTaskModel');
+ if ($this->monitorMode !== null) {
+ $xfer += $output->writeFieldBegin('monitorMode', TType::I32, 1);
+ $xfer += $output->writeI32($this->monitorMode);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
[2/2] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/master'
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/master'
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/4fa2e7fb
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/4fa2e7fb
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/4fa2e7fb
Branch: refs/heads/master
Commit: 4fa2e7fb8a1ad6eae7adcdd4cf1f0684330ef384
Parents: 47fed00 6aae243
Author: scnakandala <su...@gmail.com>
Authored: Mon Nov 9 11:55:03 2015 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Mon Nov 9 11:55:03 2015 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 36 ++++++++++++++++++++++++++-
app/libraries/CommonUtilities.php | 24 +++++++++++++-----
app/views/layout/basic.blade.php | 20 +++++++++++++++
app/views/layout/fixed-scripts.blade.php | 15 +++++++----
4 files changed, 83 insertions(+), 12 deletions(-)
----------------------------------------------------------------------