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 2016/03/25 21:48:48 UTC
[03/40] airavata-php-gateway git commit: updating thrift generated
classes
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89b8258c/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 64a406c..49fdf5a 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -717,13 +717,13 @@ class LOCALSubmission {
*/
public $jobSubmissionInterfaceId = "DO_NOT_SET_AT_CLIENTS";
/**
- * @var int
- */
- public $securityProtocol = null;
- /**
* @var \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager
*/
public $resourceJobManager = null;
+ /**
+ * @var int
+ */
+ public $securityProtocol = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -733,26 +733,26 @@ 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',
),
+ 3 => array(
+ 'var' => 'securityProtocol',
+ 'type' => TType::I32,
+ ),
);
}
if (is_array($vals)) {
if (isset($vals['jobSubmissionInterfaceId'])) {
$this->jobSubmissionInterfaceId = $vals['jobSubmissionInterfaceId'];
}
- if (isset($vals['securityProtocol'])) {
- $this->securityProtocol = $vals['securityProtocol'];
- }
if (isset($vals['resourceJobManager'])) {
$this->resourceJobManager = $vals['resourceJobManager'];
}
+ if (isset($vals['securityProtocol'])) {
+ $this->securityProtocol = $vals['securityProtocol'];
+ }
}
}
@@ -783,16 +783,16 @@ class LOCALSubmission {
}
break;
case 2:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->securityProtocol);
+ if ($ftype == TType::STRUCT) {
+ $this->resourceJobManager = new \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager();
+ $xfer += $this->resourceJobManager->read($input);
} 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);
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->securityProtocol);
} else {
$xfer += $input->skip($ftype);
}
@@ -815,19 +815,19 @@ 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, 3);
+ $xfer += $output->writeFieldBegin('resourceJobManager', TType::STRUCT, 2);
$xfer += $this->resourceJobManager->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->securityProtocol !== null) {
+ $xfer += $output->writeFieldBegin('securityProtocol', TType::I32, 3);
+ $xfer += $output->writeI32($this->securityProtocol);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89b8258c/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 52a5a43..7f0d412 100644
--- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -509,10 +509,6 @@ class GatewayResourceProfile {
* @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
*/
public $storagePreferences = null;
- /**
- * @var string
- */
- public $usageReportingGatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -543,10 +539,6 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
),
- 5 => array(
- 'var' => 'usageReportingGatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -562,9 +554,6 @@ class GatewayResourceProfile {
if (isset($vals['storagePreferences'])) {
$this->storagePreferences = $vals['storagePreferences'];
}
- if (isset($vals['usageReportingGatewayId'])) {
- $this->usageReportingGatewayId = $vals['usageReportingGatewayId'];
- }
}
}
@@ -637,13 +626,6 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 5:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->usageReportingGatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -701,11 +683,6 @@ class GatewayResourceProfile {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->usageReportingGatewayId !== null) {
- $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 5);
- $xfer += $output->writeString($this->usageReportingGatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89b8258c/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 0335092..20587b6 100644
--- a/app/libraries/Airavata/Model/Experiment/Types.php
+++ b/app/libraries/Airavata/Model/Experiment/Types.php
@@ -409,10 +409,6 @@ class ExperimentModel {
* @var \Airavata\Model\Process\ProcessModel[]
*/
public $processes = null;
- /**
- * @var bool
- */
- public $archive = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -519,10 +515,6 @@ class ExperimentModel {
'class' => '\Airavata\Model\Process\ProcessModel',
),
),
- 20 => array(
- 'var' => 'archive',
- 'type' => TType::BOOL,
- ),
);
}
if (is_array($vals)) {
@@ -583,9 +575,6 @@ class ExperimentModel {
if (isset($vals['processes'])) {
$this->processes = $vals['processes'];
}
- if (isset($vals['archive'])) {
- $this->archive = $vals['archive'];
- }
}
}
@@ -797,13 +786,6 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 20:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->archive);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -978,11 +960,6 @@ class ExperimentModel {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->archive !== null) {
- $xfer += $output->writeFieldBegin('archive', TType::BOOL, 20);
- $xfer += $output->writeBool($this->archive);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/89b8258c/app/libraries/Airavata/Model/Process/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Process/Types.php b/app/libraries/Airavata/Model/Process/Types.php
index 41187c5..c0000d0 100644
--- a/app/libraries/Airavata/Model/Process/Types.php
+++ b/app/libraries/Airavata/Model/Process/Types.php
@@ -117,10 +117,6 @@ class ProcessModel {
* @var string
*/
public $experimentDataDir = null;
- /**
- * @var bool
- */
- public $archive = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -235,10 +231,6 @@ class ProcessModel {
'var' => 'experimentDataDir',
'type' => TType::STRING,
),
- 23 => array(
- 'var' => 'archive',
- 'type' => TType::BOOL,
- ),
);
}
if (is_array($vals)) {
@@ -308,9 +300,6 @@ class ProcessModel {
if (isset($vals['experimentDataDir'])) {
$this->experimentDataDir = $vals['experimentDataDir'];
}
- if (isset($vals['archive'])) {
- $this->archive = $vals['archive'];
- }
}
}
@@ -533,13 +522,6 @@ class ProcessModel {
$xfer += $input->skip($ftype);
}
break;
- case 23:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->archive);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -720,11 +702,6 @@ class ProcessModel {
$xfer += $output->writeString($this->experimentDataDir);
$xfer += $output->writeFieldEnd();
}
- if ($this->archive !== null) {
- $xfer += $output->writeFieldBegin('archive', TType::BOOL, 23);
- $xfer += $output->writeBool($this->archive);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;