Repository: airavata-php-gateway Updated Branches: refs/heads/develop 753a34018 -> 8693429f8
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/libraries/Airavata/API/Error/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/API/Error/Types.php b/app/libraries/Airavata/API/Error/Types.php index edaa6de..0b5258d 100644 --- a/app/libraries/Airavata/API/Error/Types.php +++ b/app/libraries/Airavata/API/Error/Types.php @@ -514,6 +514,88 @@ class AuthorizationException extends TException { } /** + * This exception is thrown when you try to save a duplicate entity that already exists + * in the database. + * + * message: contains the associated error message + * + */ +class DuplicateEntryException extends TException { + static $_TSPEC; + + /** + * @var string + */ + public $message = null; + + public function __construct($vals=null) { + if (!isset(self::$_TSPEC)) { + self::$_TSPEC = array( + 1 => array( + 'var' => 'message', + 'type' => TType::STRING, + ), + ); + } + if (is_array($vals)) { + if (isset($vals['message'])) { + $this->message = $vals['message']; + } + } + } + + public function getName() { + return 'DuplicateEntryException'; + } + + 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->message); + } 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('DuplicateEntryException'); + if ($this->message !== null) { + $xfer += $output->writeFieldBegin('message', TType::STRING, 1); + $xfer += $output->writeString($this->message); + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } + +} + +/** * This exception is thrown by Airavata Services when a call fails as a result of * a problem that a client may be able to resolve. For example, if the user * attempts to execute an application on a resource gateway does not have access to. http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/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 03d1121..abcb322 100644 --- a/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/AppDeployment/Types.php @@ -506,6 +506,10 @@ class ApplicationDeploymentDescription { */ public $defaultCPUCount = null; /** + * @var int + */ + public $defaultWalltime = null; + /** * @var bool */ public $editableByUser = null; @@ -604,6 +608,10 @@ class ApplicationDeploymentDescription { 'type' => TType::I32, ), 16 => array( + 'var' => 'defaultWalltime', + 'type' => TType::I32, + ), + 17 => array( 'var' => 'editableByUser', 'type' => TType::BOOL, ), @@ -655,6 +663,9 @@ class ApplicationDeploymentDescription { if (isset($vals['defaultCPUCount'])) { $this->defaultCPUCount = $vals['defaultCPUCount']; } + if (isset($vals['defaultWalltime'])) { + $this->defaultWalltime = $vals['defaultWalltime']; + } if (isset($vals['editableByUser'])) { $this->editableByUser = $vals['editableByUser']; } @@ -852,6 +863,13 @@ class ApplicationDeploymentDescription { } break; case 16: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->defaultWalltime); + } else { + $xfer += $input->skip($ftype); + } + break; + case 17: if ($ftype == TType::BOOL) { $xfer += $input->readBool($this->editableByUser); } else { @@ -1018,8 +1036,13 @@ class ApplicationDeploymentDescription { $xfer += $output->writeI32($this->defaultCPUCount); $xfer += $output->writeFieldEnd(); } + if ($this->defaultWalltime !== null) { + $xfer += $output->writeFieldBegin('defaultWalltime', TType::I32, 16); + $xfer += $output->writeI32($this->defaultWalltime); + $xfer += $output->writeFieldEnd(); + } if ($this->editableByUser !== null) { - $xfer += $output->writeFieldBegin('editableByUser', TType::BOOL, 16); + $xfer += $output->writeFieldBegin('editableByUser', TType::BOOL, 17); $xfer += $output->writeBool($this->editableByUser); $xfer += $output->writeFieldEnd(); } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/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 696b064..00b72de 100644 --- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php @@ -43,6 +43,7 @@ final class ResourceJobManagerType { const LSF = 3; const UGE = 4; const CLOUD = 5; + const AIRAVATA_CUSTOM = 6; static public $__names = array( 0 => 'FORK', 1 => 'PBS', @@ -50,6 +51,7 @@ final class ResourceJobManagerType { 3 => 'LSF', 4 => 'UGE', 5 => 'CLOUD', + 6 => 'AIRAVATA_CUSTOM', ); } @@ -1883,6 +1885,22 @@ class ComputeResourceDescription { * @var string */ public $gatewayUsageExecutable = null; + /** + * @var int + */ + public $cpusPerNode = null; + /** + * @var int + */ + public $defaultNodeCount = null; + /** + * @var int + */ + public $defaultCPUCount = null; + /** + * @var int + */ + public $defaultWalltime = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -1974,6 +1992,22 @@ class ComputeResourceDescription { 'var' => 'gatewayUsageExecutable', 'type' => TType::STRING, ), + 15 => array( + 'var' => 'cpusPerNode', + 'type' => TType::I32, + ), + 16 => array( + 'var' => 'defaultNodeCount', + 'type' => TType::I32, + ), + 17 => array( + 'var' => 'defaultCPUCount', + 'type' => TType::I32, + ), + 18 => array( + 'var' => 'defaultWalltime', + 'type' => TType::I32, + ), ); } if (is_array($vals)) { @@ -2019,6 +2053,18 @@ class ComputeResourceDescription { if (isset($vals['gatewayUsageExecutable'])) { $this->gatewayUsageExecutable = $vals['gatewayUsageExecutable']; } + if (isset($vals['cpusPerNode'])) { + $this->cpusPerNode = $vals['cpusPerNode']; + } + if (isset($vals['defaultNodeCount'])) { + $this->defaultNodeCount = $vals['defaultNodeCount']; + } + if (isset($vals['defaultCPUCount'])) { + $this->defaultCPUCount = $vals['defaultCPUCount']; + } + if (isset($vals['defaultWalltime'])) { + $this->defaultWalltime = $vals['defaultWalltime']; + } } } @@ -2205,6 +2251,34 @@ class ComputeResourceDescription { $xfer += $input->skip($ftype); } break; + case 15: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->cpusPerNode); + } else { + $xfer += $input->skip($ftype); + } + break; + case 16: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->defaultNodeCount); + } else { + $xfer += $input->skip($ftype); + } + break; + case 17: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->defaultCPUCount); + } else { + $xfer += $input->skip($ftype); + } + break; + case 18: + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->defaultWalltime); + } else { + $xfer += $input->skip($ftype); + } + break; default: $xfer += $input->skip($ftype); break; @@ -2361,6 +2435,26 @@ class ComputeResourceDescription { $xfer += $output->writeString($this->gatewayUsageExecutable); $xfer += $output->writeFieldEnd(); } + if ($this->cpusPerNode !== null) { + $xfer += $output->writeFieldBegin('cpusPerNode', TType::I32, 15); + $xfer += $output->writeI32($this->cpusPerNode); + $xfer += $output->writeFieldEnd(); + } + if ($this->defaultNodeCount !== null) { + $xfer += $output->writeFieldBegin('defaultNodeCount', TType::I32, 16); + $xfer += $output->writeI32($this->defaultNodeCount); + $xfer += $output->writeFieldEnd(); + } + if ($this->defaultCPUCount !== null) { + $xfer += $output->writeFieldBegin('defaultCPUCount', TType::I32, 17); + $xfer += $output->writeI32($this->defaultCPUCount); + $xfer += $output->writeFieldEnd(); + } + if ($this->defaultWalltime !== null) { + $xfer += $output->writeFieldBegin('defaultWalltime', TType::I32, 18); + $xfer += $output->writeI32($this->defaultWalltime); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/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 fd97025..b8bdf76 100644 --- a/app/libraries/Airavata/Model/Application/Io/Types.php +++ b/app/libraries/Airavata/Model/Application/Io/Types.php @@ -173,9 +173,9 @@ class InputDataObjectType { 'var' => 'storageResourceId', 'type' => TType::STRING, ), - 13 => array( - 'var' => 'isReadOnly', - 'type' => TType::BOOL, + 13 => array( + 'var' => 'isReadOnly', + 'type' => TType::BOOL, ), ); } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/libraries/Airavata/Model/Data/Replica/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/Data/Replica/Types.php b/app/libraries/Airavata/Model/Data/Replica/Types.php index 7fba287..d6e208e 100644 --- a/app/libraries/Airavata/Model/Data/Replica/Types.php +++ b/app/libraries/Airavata/Model/Data/Replica/Types.php @@ -48,103 +48,107 @@ final class DataProductType { ); } -class DataProductModel { +class DataReplicaLocationModel { static $_TSPEC; /** * @var string */ - public $productUri = null; + public $replicaId = null; /** * @var string */ - public $gatewayId = null; + public $productUri = null; /** * @var string */ - public $parentProductUri = null; + public $replicaName = null; /** * @var string */ - public $productName = null; + public $replicaDescription = null; /** - * @var string + * @var int */ - public $productDescription = null; + public $creationTime = null; /** - * @var string + * @var int */ - public $ownerName = null; + public $lastModifiedTime = null; /** * @var int */ - public $dataProductType = null; + public $validUntilTime = null; /** * @var int */ - public $productSize = null; + public $replicaLocationCategory = null; /** * @var int */ - public $creationTime = null; + public $replicaPersistentType = null; /** - * @var int + * @var string */ - public $lastModifiedTime = null; + public $storageResourceId = null; /** - * @var array + * @var string */ - public $productMetadata = null; + public $filePath = null; /** - * @var \Airavata\Model\Data\Replica\DataReplicaLocationModel[] + * @var array */ - public $replicaLocations = null; + public $replicaMetadata = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( 1 => array( - 'var' => 'productUri', + 'var' => 'replicaId', 'type' => TType::STRING, ), 2 => array( - 'var' => 'gatewayId', + 'var' => 'productUri', 'type' => TType::STRING, ), 3 => array( - 'var' => 'parentProductUri', + 'var' => 'replicaName', 'type' => TType::STRING, ), 4 => array( - 'var' => 'productName', + 'var' => 'replicaDescription', 'type' => TType::STRING, ), 5 => array( - 'var' => 'productDescription', - 'type' => TType::STRING, + 'var' => 'creationTime', + 'type' => TType::I64, ), 6 => array( - 'var' => 'ownerName', - 'type' => TType::STRING, + 'var' => 'lastModifiedTime', + 'type' => TType::I64, ), 7 => array( - 'var' => 'dataProductType', - 'type' => TType::I32, + 'var' => 'validUntilTime', + 'type' => TType::I64, ), 8 => array( - 'var' => 'productSize', + 'var' => 'replicaLocationCategory', 'type' => TType::I32, ), 9 => array( - 'var' => 'creationTime', - 'type' => TType::I64, + 'var' => 'replicaPersistentType', + 'type' => TType::I32, ), 10 => array( - 'var' => 'lastModifiedTime', - 'type' => TType::I64, + 'var' => 'storageResourceId', + 'type' => TType::STRING, ), 11 => array( - 'var' => 'productMetadata', + 'var' => 'filePath', + 'type' => TType::STRING, + ), + 12 => array( + 'var' => 'replicaMetadata', 'type' => TType::MAP, 'ktype' => TType::STRING, 'vtype' => TType::STRING, @@ -155,41 +159,20 @@ class DataProductModel { 'type' => TType::STRING, ), ), - 12 => array( - 'var' => 'replicaLocations', - 'type' => TType::LST, - 'etype' => TType::STRUCT, - 'elem' => array( - 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\Data\Replica\DataReplicaLocationModel', - ), - ), ); } if (is_array($vals)) { + if (isset($vals['replicaId'])) { + $this->replicaId = $vals['replicaId']; + } if (isset($vals['productUri'])) { $this->productUri = $vals['productUri']; } - if (isset($vals['gatewayId'])) { - $this->gatewayId = $vals['gatewayId']; - } - if (isset($vals['parentProductUri'])) { - $this->parentProductUri = $vals['parentProductUri']; - } - if (isset($vals['productName'])) { - $this->productName = $vals['productName']; - } - if (isset($vals['productDescription'])) { - $this->productDescription = $vals['productDescription']; - } - if (isset($vals['ownerName'])) { - $this->ownerName = $vals['ownerName']; - } - if (isset($vals['dataProductType'])) { - $this->dataProductType = $vals['dataProductType']; + if (isset($vals['replicaName'])) { + $this->replicaName = $vals['replicaName']; } - if (isset($vals['productSize'])) { - $this->productSize = $vals['productSize']; + if (isset($vals['replicaDescription'])) { + $this->replicaDescription = $vals['replicaDescription']; } if (isset($vals['creationTime'])) { $this->creationTime = $vals['creationTime']; @@ -197,17 +180,29 @@ class DataProductModel { if (isset($vals['lastModifiedTime'])) { $this->lastModifiedTime = $vals['lastModifiedTime']; } - if (isset($vals['productMetadata'])) { - $this->productMetadata = $vals['productMetadata']; + if (isset($vals['validUntilTime'])) { + $this->validUntilTime = $vals['validUntilTime']; } - if (isset($vals['replicaLocations'])) { - $this->replicaLocations = $vals['replicaLocations']; + if (isset($vals['replicaLocationCategory'])) { + $this->replicaLocationCategory = $vals['replicaLocationCategory']; + } + if (isset($vals['replicaPersistentType'])) { + $this->replicaPersistentType = $vals['replicaPersistentType']; + } + if (isset($vals['storageResourceId'])) { + $this->storageResourceId = $vals['storageResourceId']; + } + if (isset($vals['filePath'])) { + $this->filePath = $vals['filePath']; + } + if (isset($vals['replicaMetadata'])) { + $this->replicaMetadata = $vals['replicaMetadata']; } } } public function getName() { - return 'DataProductModel'; + return 'DataReplicaLocationModel'; } public function read($input) @@ -227,77 +222,84 @@ class DataProductModel { { case 1: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->productUri); + $xfer += $input->readString($this->replicaId); } else { $xfer += $input->skip($ftype); } break; case 2: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->gatewayId); + $xfer += $input->readString($this->productUri); } else { $xfer += $input->skip($ftype); } break; case 3: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->parentProductUri); + $xfer += $input->readString($this->replicaName); } else { $xfer += $input->skip($ftype); } break; case 4: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->productName); + $xfer += $input->readString($this->replicaDescription); } else { $xfer += $input->skip($ftype); } break; case 5: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->productDescription); + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->creationTime); } else { $xfer += $input->skip($ftype); } break; case 6: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->ownerName); + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->lastModifiedTime); } else { $xfer += $input->skip($ftype); } break; case 7: - if ($ftype == TType::I32) { - $xfer += $input->readI32($this->dataProductType); + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->validUntilTime); } else { $xfer += $input->skip($ftype); } break; case 8: if ($ftype == TType::I32) { - $xfer += $input->readI32($this->productSize); + $xfer += $input->readI32($this->replicaLocationCategory); } else { $xfer += $input->skip($ftype); } break; case 9: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->creationTime); + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->replicaPersistentType); } else { $xfer += $input->skip($ftype); } break; case 10: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->lastModifiedTime); + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->storageResourceId); } else { $xfer += $input->skip($ftype); } break; case 11: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->filePath); + } else { + $xfer += $input->skip($ftype); + } + break; + case 12: if ($ftype == TType::MAP) { - $this->productMetadata = array(); + $this->replicaMetadata = array(); $_size0 = 0; $_ktype1 = 0; $_vtype2 = 0; @@ -308,31 +310,13 @@ class DataProductModel { $val6 = ''; $xfer += $input->readString($key5); $xfer += $input->readString($val6); - $this->productMetadata[$key5] = $val6; + $this->replicaMetadata[$key5] = $val6; } $xfer += $input->readMapEnd(); } else { $xfer += $input->skip($ftype); } break; - case 12: - if ($ftype == TType::LST) { - $this->replicaLocations = array(); - $_size7 = 0; - $_etype10 = 0; - $xfer += $input->readListBegin($_etype10, $_size7); - for ($_i11 = 0; $_i11 < $_size7; ++$_i11) - { - $elem12 = null; - $elem12 = new \Airavata\Model\Data\Replica\DataReplicaLocationModel(); - $xfer += $elem12->read($input); - $this->replicaLocations []= $elem12; - } - $xfer += $input->readListEnd(); - } else { - $xfer += $input->skip($ftype); - } - break; default: $xfer += $input->skip($ftype); break; @@ -345,92 +329,80 @@ class DataProductModel { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('DataProductModel'); + $xfer += $output->writeStructBegin('DataReplicaLocationModel'); + if ($this->replicaId !== null) { + $xfer += $output->writeFieldBegin('replicaId', TType::STRING, 1); + $xfer += $output->writeString($this->replicaId); + $xfer += $output->writeFieldEnd(); + } if ($this->productUri !== null) { - $xfer += $output->writeFieldBegin('productUri', TType::STRING, 1); + $xfer += $output->writeFieldBegin('productUri', TType::STRING, 2); $xfer += $output->writeString($this->productUri); $xfer += $output->writeFieldEnd(); } - if ($this->gatewayId !== null) { - $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2); - $xfer += $output->writeString($this->gatewayId); + if ($this->replicaName !== null) { + $xfer += $output->writeFieldBegin('replicaName', TType::STRING, 3); + $xfer += $output->writeString($this->replicaName); $xfer += $output->writeFieldEnd(); } - if ($this->parentProductUri !== null) { - $xfer += $output->writeFieldBegin('parentProductUri', TType::STRING, 3); - $xfer += $output->writeString($this->parentProductUri); + if ($this->replicaDescription !== null) { + $xfer += $output->writeFieldBegin('replicaDescription', TType::STRING, 4); + $xfer += $output->writeString($this->replicaDescription); $xfer += $output->writeFieldEnd(); } - if ($this->productName !== null) { - $xfer += $output->writeFieldBegin('productName', TType::STRING, 4); - $xfer += $output->writeString($this->productName); + if ($this->creationTime !== null) { + $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5); + $xfer += $output->writeI64($this->creationTime); $xfer += $output->writeFieldEnd(); } - if ($this->productDescription !== null) { - $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 5); - $xfer += $output->writeString($this->productDescription); + if ($this->lastModifiedTime !== null) { + $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 6); + $xfer += $output->writeI64($this->lastModifiedTime); $xfer += $output->writeFieldEnd(); } - if ($this->ownerName !== null) { - $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 6); - $xfer += $output->writeString($this->ownerName); + if ($this->validUntilTime !== null) { + $xfer += $output->writeFieldBegin('validUntilTime', TType::I64, 7); + $xfer += $output->writeI64($this->validUntilTime); $xfer += $output->writeFieldEnd(); } - if ($this->dataProductType !== null) { - $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 7); - $xfer += $output->writeI32($this->dataProductType); + if ($this->replicaLocationCategory !== null) { + $xfer += $output->writeFieldBegin('replicaLocationCategory', TType::I32, 8); + $xfer += $output->writeI32($this->replicaLocationCategory); $xfer += $output->writeFieldEnd(); } - if ($this->productSize !== null) { - $xfer += $output->writeFieldBegin('productSize', TType::I32, 8); - $xfer += $output->writeI32($this->productSize); + if ($this->replicaPersistentType !== null) { + $xfer += $output->writeFieldBegin('replicaPersistentType', TType::I32, 9); + $xfer += $output->writeI32($this->replicaPersistentType); $xfer += $output->writeFieldEnd(); } - if ($this->creationTime !== null) { - $xfer += $output->writeFieldBegin('creationTime', TType::I64, 9); - $xfer += $output->writeI64($this->creationTime); + if ($this->storageResourceId !== null) { + $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 10); + $xfer += $output->writeString($this->storageResourceId); $xfer += $output->writeFieldEnd(); } - if ($this->lastModifiedTime !== null) { - $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 10); - $xfer += $output->writeI64($this->lastModifiedTime); + if ($this->filePath !== null) { + $xfer += $output->writeFieldBegin('filePath', TType::STRING, 11); + $xfer += $output->writeString($this->filePath); $xfer += $output->writeFieldEnd(); } - if ($this->productMetadata !== null) { - if (!is_array($this->productMetadata)) { + if ($this->replicaMetadata !== null) { + if (!is_array($this->replicaMetadata)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 11); + $xfer += $output->writeFieldBegin('replicaMetadata', TType::MAP, 12); { - $output->writeMapBegin(TType::STRING, TType::STRING, count($this->productMetadata)); + $output->writeMapBegin(TType::STRING, TType::STRING, count($this->replicaMetadata)); { - foreach ($this->productMetadata as $kiter13 => $viter14) + foreach ($this->replicaMetadata as $kiter7 => $viter8) { - $xfer += $output->writeString($kiter13); - $xfer += $output->writeString($viter14); + $xfer += $output->writeString($kiter7); + $xfer += $output->writeString($viter8); } } $output->writeMapEnd(); } $xfer += $output->writeFieldEnd(); } - if ($this->replicaLocations !== null) { - if (!is_array($this->replicaLocations)) { - throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); - } - $xfer += $output->writeFieldBegin('replicaLocations', TType::LST, 12); - { - $output->writeListBegin(TType::STRUCT, count($this->replicaLocations)); - { - foreach ($this->replicaLocations as $iter15) - { - $xfer += $iter15->write($output); - } - } - $output->writeListEnd(); - } - $xfer += $output->writeFieldEnd(); - } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; @@ -438,107 +410,103 @@ class DataProductModel { } -class DataReplicaLocationModel { +class DataProductModel { static $_TSPEC; /** * @var string */ - public $replicaId = null; + public $productUri = null; /** * @var string */ - public $productUri = null; + public $gatewayId = null; /** * @var string */ - public $replicaName = null; + public $parentProductUri = null; /** * @var string */ - public $replicaDescription = null; + public $productName = null; /** - * @var int + * @var string */ - public $creationTime = null; + public $productDescription = null; /** - * @var int + * @var string */ - public $lastModifiedTime = null; + public $ownerName = null; /** * @var int */ - public $validUntilTime = null; + public $dataProductType = null; /** * @var int */ - public $replicaLocationCategory = null; + public $productSize = null; /** * @var int */ - public $replicaPersistentType = null; + public $creationTime = null; /** - * @var string + * @var int */ - public $storageResourceId = null; + public $lastModifiedTime = null; /** - * @var string + * @var array */ - public $filePath = null; + public $productMetadata = null; /** - * @var array + * @var \Airavata\Model\Data\Replica\DataReplicaLocationModel[] */ - public $replicaMetadata = null; + public $replicaLocations = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( 1 => array( - 'var' => 'replicaId', + 'var' => 'productUri', 'type' => TType::STRING, ), 2 => array( - 'var' => 'productUri', + 'var' => 'gatewayId', 'type' => TType::STRING, ), 3 => array( - 'var' => 'replicaName', + 'var' => 'parentProductUri', 'type' => TType::STRING, ), 4 => array( - 'var' => 'replicaDescription', + 'var' => 'productName', 'type' => TType::STRING, ), 5 => array( - 'var' => 'creationTime', - 'type' => TType::I64, + 'var' => 'productDescription', + 'type' => TType::STRING, ), 6 => array( - 'var' => 'lastModifiedTime', - 'type' => TType::I64, + 'var' => 'ownerName', + 'type' => TType::STRING, ), 7 => array( - 'var' => 'validUntilTime', - 'type' => TType::I64, + 'var' => 'dataProductType', + 'type' => TType::I32, ), 8 => array( - 'var' => 'replicaLocationCategory', + 'var' => 'productSize', 'type' => TType::I32, ), 9 => array( - 'var' => 'replicaPersistentType', - 'type' => TType::I32, + 'var' => 'creationTime', + 'type' => TType::I64, ), 10 => array( - 'var' => 'storageResourceId', - 'type' => TType::STRING, + 'var' => 'lastModifiedTime', + 'type' => TType::I64, ), 11 => array( - 'var' => 'filePath', - 'type' => TType::STRING, - ), - 12 => array( - 'var' => 'replicaMetadata', + 'var' => 'productMetadata', 'type' => TType::MAP, 'ktype' => TType::STRING, 'vtype' => TType::STRING, @@ -549,50 +517,59 @@ class DataReplicaLocationModel { 'type' => TType::STRING, ), ), + 12 => array( + 'var' => 'replicaLocations', + 'type' => TType::LST, + 'etype' => TType::STRUCT, + 'elem' => array( + 'type' => TType::STRUCT, + 'class' => '\Airavata\Model\Data\Replica\DataReplicaLocationModel', + ), + ), ); } if (is_array($vals)) { - if (isset($vals['replicaId'])) { - $this->replicaId = $vals['replicaId']; - } if (isset($vals['productUri'])) { $this->productUri = $vals['productUri']; } - if (isset($vals['replicaName'])) { - $this->replicaName = $vals['replicaName']; + if (isset($vals['gatewayId'])) { + $this->gatewayId = $vals['gatewayId']; } - if (isset($vals['replicaDescription'])) { - $this->replicaDescription = $vals['replicaDescription']; + if (isset($vals['parentProductUri'])) { + $this->parentProductUri = $vals['parentProductUri']; } - if (isset($vals['creationTime'])) { - $this->creationTime = $vals['creationTime']; + if (isset($vals['productName'])) { + $this->productName = $vals['productName']; } - if (isset($vals['lastModifiedTime'])) { - $this->lastModifiedTime = $vals['lastModifiedTime']; + if (isset($vals['productDescription'])) { + $this->productDescription = $vals['productDescription']; } - if (isset($vals['validUntilTime'])) { - $this->validUntilTime = $vals['validUntilTime']; + if (isset($vals['ownerName'])) { + $this->ownerName = $vals['ownerName']; } - if (isset($vals['replicaLocationCategory'])) { - $this->replicaLocationCategory = $vals['replicaLocationCategory']; + if (isset($vals['dataProductType'])) { + $this->dataProductType = $vals['dataProductType']; } - if (isset($vals['replicaPersistentType'])) { - $this->replicaPersistentType = $vals['replicaPersistentType']; + if (isset($vals['productSize'])) { + $this->productSize = $vals['productSize']; } - if (isset($vals['storageResourceId'])) { - $this->storageResourceId = $vals['storageResourceId']; + if (isset($vals['creationTime'])) { + $this->creationTime = $vals['creationTime']; } - if (isset($vals['filePath'])) { - $this->filePath = $vals['filePath']; + if (isset($vals['lastModifiedTime'])) { + $this->lastModifiedTime = $vals['lastModifiedTime']; } - if (isset($vals['replicaMetadata'])) { - $this->replicaMetadata = $vals['replicaMetadata']; + if (isset($vals['productMetadata'])) { + $this->productMetadata = $vals['productMetadata']; + } + if (isset($vals['replicaLocations'])) { + $this->replicaLocations = $vals['replicaLocations']; } } } public function getName() { - return 'DataReplicaLocationModel'; + return 'DataProductModel'; } public function read($input) @@ -612,97 +589,108 @@ class DataReplicaLocationModel { { case 1: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->replicaId); + $xfer += $input->readString($this->productUri); } else { $xfer += $input->skip($ftype); } break; case 2: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->productUri); + $xfer += $input->readString($this->gatewayId); } else { $xfer += $input->skip($ftype); } break; case 3: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->replicaName); + $xfer += $input->readString($this->parentProductUri); } else { $xfer += $input->skip($ftype); } break; case 4: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->replicaDescription); + $xfer += $input->readString($this->productName); } else { $xfer += $input->skip($ftype); } break; case 5: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->creationTime); + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->productDescription); } else { $xfer += $input->skip($ftype); } break; case 6: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->lastModifiedTime); + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->ownerName); } else { $xfer += $input->skip($ftype); } break; case 7: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->validUntilTime); + if ($ftype == TType::I32) { + $xfer += $input->readI32($this->dataProductType); } else { $xfer += $input->skip($ftype); } break; case 8: if ($ftype == TType::I32) { - $xfer += $input->readI32($this->replicaLocationCategory); + $xfer += $input->readI32($this->productSize); } else { $xfer += $input->skip($ftype); } break; case 9: - if ($ftype == TType::I32) { - $xfer += $input->readI32($this->replicaPersistentType); + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->creationTime); } else { $xfer += $input->skip($ftype); } break; case 10: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->storageResourceId); + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->lastModifiedTime); } else { $xfer += $input->skip($ftype); } break; case 11: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->filePath); + if ($ftype == TType::MAP) { + $this->productMetadata = array(); + $_size9 = 0; + $_ktype10 = 0; + $_vtype11 = 0; + $xfer += $input->readMapBegin($_ktype10, $_vtype11, $_size9); + for ($_i13 = 0; $_i13 < $_size9; ++$_i13) + { + $key14 = ''; + $val15 = ''; + $xfer += $input->readString($key14); + $xfer += $input->readString($val15); + $this->productMetadata[$key14] = $val15; + } + $xfer += $input->readMapEnd(); } else { $xfer += $input->skip($ftype); } break; case 12: - if ($ftype == TType::MAP) { - $this->replicaMetadata = array(); + if ($ftype == TType::LST) { + $this->replicaLocations = array(); $_size16 = 0; - $_ktype17 = 0; - $_vtype18 = 0; - $xfer += $input->readMapBegin($_ktype17, $_vtype18, $_size16); + $_etype19 = 0; + $xfer += $input->readListBegin($_etype19, $_size16); for ($_i20 = 0; $_i20 < $_size16; ++$_i20) { - $key21 = ''; - $val22 = ''; - $xfer += $input->readString($key21); - $xfer += $input->readString($val22); - $this->replicaMetadata[$key21] = $val22; + $elem21 = null; + $elem21 = new \Airavata\Model\Data\Replica\DataReplicaLocationModel(); + $xfer += $elem21->read($input); + $this->replicaLocations []= $elem21; } - $xfer += $input->readMapEnd(); + $xfer += $input->readListEnd(); } else { $xfer += $input->skip($ftype); } @@ -719,80 +707,92 @@ class DataReplicaLocationModel { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('DataReplicaLocationModel'); - if ($this->replicaId !== null) { - $xfer += $output->writeFieldBegin('replicaId', TType::STRING, 1); - $xfer += $output->writeString($this->replicaId); - $xfer += $output->writeFieldEnd(); - } + $xfer += $output->writeStructBegin('DataProductModel'); if ($this->productUri !== null) { - $xfer += $output->writeFieldBegin('productUri', TType::STRING, 2); + $xfer += $output->writeFieldBegin('productUri', TType::STRING, 1); $xfer += $output->writeString($this->productUri); $xfer += $output->writeFieldEnd(); } - if ($this->replicaName !== null) { - $xfer += $output->writeFieldBegin('replicaName', TType::STRING, 3); - $xfer += $output->writeString($this->replicaName); + if ($this->gatewayId !== null) { + $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2); + $xfer += $output->writeString($this->gatewayId); $xfer += $output->writeFieldEnd(); } - if ($this->replicaDescription !== null) { - $xfer += $output->writeFieldBegin('replicaDescription', TType::STRING, 4); - $xfer += $output->writeString($this->replicaDescription); + if ($this->parentProductUri !== null) { + $xfer += $output->writeFieldBegin('parentProductUri', TType::STRING, 3); + $xfer += $output->writeString($this->parentProductUri); $xfer += $output->writeFieldEnd(); } - if ($this->creationTime !== null) { - $xfer += $output->writeFieldBegin('creationTime', TType::I64, 5); - $xfer += $output->writeI64($this->creationTime); + if ($this->productName !== null) { + $xfer += $output->writeFieldBegin('productName', TType::STRING, 4); + $xfer += $output->writeString($this->productName); $xfer += $output->writeFieldEnd(); } - if ($this->lastModifiedTime !== null) { - $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 6); - $xfer += $output->writeI64($this->lastModifiedTime); + if ($this->productDescription !== null) { + $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 5); + $xfer += $output->writeString($this->productDescription); $xfer += $output->writeFieldEnd(); } - if ($this->validUntilTime !== null) { - $xfer += $output->writeFieldBegin('validUntilTime', TType::I64, 7); - $xfer += $output->writeI64($this->validUntilTime); + if ($this->ownerName !== null) { + $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 6); + $xfer += $output->writeString($this->ownerName); $xfer += $output->writeFieldEnd(); } - if ($this->replicaLocationCategory !== null) { - $xfer += $output->writeFieldBegin('replicaLocationCategory', TType::I32, 8); - $xfer += $output->writeI32($this->replicaLocationCategory); + if ($this->dataProductType !== null) { + $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 7); + $xfer += $output->writeI32($this->dataProductType); $xfer += $output->writeFieldEnd(); } - if ($this->replicaPersistentType !== null) { - $xfer += $output->writeFieldBegin('replicaPersistentType', TType::I32, 9); - $xfer += $output->writeI32($this->replicaPersistentType); + if ($this->productSize !== null) { + $xfer += $output->writeFieldBegin('productSize', TType::I32, 8); + $xfer += $output->writeI32($this->productSize); $xfer += $output->writeFieldEnd(); } - if ($this->storageResourceId !== null) { - $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 10); - $xfer += $output->writeString($this->storageResourceId); + if ($this->creationTime !== null) { + $xfer += $output->writeFieldBegin('creationTime', TType::I64, 9); + $xfer += $output->writeI64($this->creationTime); $xfer += $output->writeFieldEnd(); } - if ($this->filePath !== null) { - $xfer += $output->writeFieldBegin('filePath', TType::STRING, 11); - $xfer += $output->writeString($this->filePath); + if ($this->lastModifiedTime !== null) { + $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 10); + $xfer += $output->writeI64($this->lastModifiedTime); $xfer += $output->writeFieldEnd(); } - if ($this->replicaMetadata !== null) { - if (!is_array($this->replicaMetadata)) { + if ($this->productMetadata !== null) { + if (!is_array($this->productMetadata)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('replicaMetadata', TType::MAP, 12); + $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 11); { - $output->writeMapBegin(TType::STRING, TType::STRING, count($this->replicaMetadata)); + $output->writeMapBegin(TType::STRING, TType::STRING, count($this->productMetadata)); { - foreach ($this->replicaMetadata as $kiter23 => $viter24) + foreach ($this->productMetadata as $kiter22 => $viter23) { - $xfer += $output->writeString($kiter23); - $xfer += $output->writeString($viter24); + $xfer += $output->writeString($kiter22); + $xfer += $output->writeString($viter23); } } $output->writeMapEnd(); } $xfer += $output->writeFieldEnd(); } + if ($this->replicaLocations !== null) { + if (!is_array($this->replicaLocations)) { + throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); + } + $xfer += $output->writeFieldBegin('replicaLocations', TType::LST, 12); + { + $output->writeListBegin(TType::STRUCT, count($this->replicaLocations)); + { + foreach ($this->replicaLocations as $iter24) + { + $xfer += $iter24->write($output); + } + } + $output->writeListEnd(); + } + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/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 96a015e..fed31a4 100644 --- a/app/libraries/Airavata/Model/Messaging/Event/Types.php +++ b/app/libraries/Airavata/Model/Messaging/Event/Types.php @@ -39,6 +39,7 @@ final class MessageType { const LAUNCHPROCESS = 5; const TERMINATEPROCESS = 6; const PROCESSOUTPUT = 7; + const DB_EVENT = 8; static public $__names = array( 0 => 'EXPERIMENT', 1 => 'EXPERIMENT_CANCEL', @@ -48,6 +49,7 @@ final class MessageType { 5 => 'LAUNCHPROCESS', 6 => 'TERMINATEPROCESS', 7 => 'PROCESSOUTPUT', + 8 => 'DB_EVENT', ); } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/libraries/Airavata/Model/User/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/User/Types.php b/app/libraries/Airavata/Model/User/Types.php index c9aa616..493b615 100644 --- a/app/libraries/Airavata/Model/User/Types.php +++ b/app/libraries/Airavata/Model/User/Types.php @@ -133,6 +133,10 @@ class NSFDemographics { /** * @var string */ + public $airavataInternalUserId = "DO_NOT_SET_AT_CLIENTS"; + /** + * @var string + */ public $gender = null; /** * @var int @@ -155,14 +159,18 @@ class NSFDemographics { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( 1 => array( - 'var' => 'gender', + 'var' => 'airavataInternalUserId', 'type' => TType::STRING, ), 2 => array( + 'var' => 'gender', + 'type' => TType::STRING, + ), + 3 => array( 'var' => 'usCitizenship', 'type' => TType::I32, ), - 3 => array( + 4 => array( 'var' => 'ethnicities', 'type' => TType::LST, 'etype' => TType::I32, @@ -170,7 +178,7 @@ class NSFDemographics { 'type' => TType::I32, ), ), - 4 => array( + 5 => array( 'var' => 'races', 'type' => TType::LST, 'etype' => TType::I32, @@ -178,7 +186,7 @@ class NSFDemographics { 'type' => TType::I32, ), ), - 5 => array( + 6 => array( 'var' => 'disabilities', 'type' => TType::LST, 'etype' => TType::I32, @@ -189,6 +197,9 @@ class NSFDemographics { ); } if (is_array($vals)) { + if (isset($vals['airavataInternalUserId'])) { + $this->airavataInternalUserId = $vals['airavataInternalUserId']; + } if (isset($vals['gender'])) { $this->gender = $vals['gender']; } @@ -228,19 +239,26 @@ class NSFDemographics { { case 1: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->gender); + $xfer += $input->readString($this->airavataInternalUserId); } else { $xfer += $input->skip($ftype); } break; case 2: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->gender); + } else { + $xfer += $input->skip($ftype); + } + break; + case 3: if ($ftype == TType::I32) { $xfer += $input->readI32($this->usCitizenship); } else { $xfer += $input->skip($ftype); } break; - case 3: + case 4: if ($ftype == TType::LST) { $this->ethnicities = array(); $_size0 = 0; @@ -257,7 +275,7 @@ class NSFDemographics { $xfer += $input->skip($ftype); } break; - case 4: + case 5: if ($ftype == TType::LST) { $this->races = array(); $_size6 = 0; @@ -274,7 +292,7 @@ class NSFDemographics { $xfer += $input->skip($ftype); } break; - case 5: + case 6: if ($ftype == TType::LST) { $this->disabilities = array(); $_size12 = 0; @@ -304,13 +322,18 @@ class NSFDemographics { public function write($output) { $xfer = 0; $xfer += $output->writeStructBegin('NSFDemographics'); + if ($this->airavataInternalUserId !== null) { + $xfer += $output->writeFieldBegin('airavataInternalUserId', TType::STRING, 1); + $xfer += $output->writeString($this->airavataInternalUserId); + $xfer += $output->writeFieldEnd(); + } if ($this->gender !== null) { - $xfer += $output->writeFieldBegin('gender', TType::STRING, 1); + $xfer += $output->writeFieldBegin('gender', TType::STRING, 2); $xfer += $output->writeString($this->gender); $xfer += $output->writeFieldEnd(); } if ($this->usCitizenship !== null) { - $xfer += $output->writeFieldBegin('usCitizenship', TType::I32, 2); + $xfer += $output->writeFieldBegin('usCitizenship', TType::I32, 3); $xfer += $output->writeI32($this->usCitizenship); $xfer += $output->writeFieldEnd(); } @@ -318,7 +341,7 @@ class NSFDemographics { if (!is_array($this->ethnicities)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('ethnicities', TType::LST, 3); + $xfer += $output->writeFieldBegin('ethnicities', TType::LST, 4); { $output->writeListBegin(TType::I32, count($this->ethnicities)); { @@ -335,7 +358,7 @@ class NSFDemographics { if (!is_array($this->races)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('races', TType::LST, 4); + $xfer += $output->writeFieldBegin('races', TType::LST, 5); { $output->writeListBegin(TType::I32, count($this->races)); { @@ -352,7 +375,7 @@ class NSFDemographics { if (!is_array($this->disabilities)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('disabilities', TType::LST, 5); + $xfer += $output->writeFieldBegin('disabilities', TType::LST, 6); { $output->writeListBegin(TType::I32, count($this->disabilities)); { @@ -393,6 +416,12 @@ class NSFDemographics { * * Externally assertable unique identifier. SAML (primarly in higher education, academic) tends to keep * * user name less opaque. OpenID Connect maintains them to be opaque. * * + * * firstName, middleName, lastName: + * * First and Last names as assertede by the user + * * + * * namePrefix, nameSuffix: + * * prefix and suffix to the users name as asserted by the user + * * * * emails: * * Email identifier are Verified, REQUIRED and MULTIVALUED * * @@ -450,7 +479,23 @@ class UserProfile { /** * @var string */ - public $userName = null; + public $firstName = null; + /** + * @var string + */ + public $lastName = null; + /** + * @var string + */ + public $middleName = null; + /** + * @var string + */ + public $namePrefix = null; + /** + * @var string + */ + public $nameSuffix = null; /** * @var string */ @@ -476,15 +521,15 @@ class UserProfile { */ public $orginationAffiliation = null; /** - * @var string + * @var int */ public $creationTime = null; /** - * @var string + * @var int */ public $lastAccessTime = null; /** - * @var string + * @var int */ public $validUntil = null; /** @@ -540,14 +585,30 @@ class UserProfile { ), ), 6 => array( - 'var' => 'userName', + 'var' => 'firstName', 'type' => TType::STRING, ), 7 => array( - 'var' => 'orcidId', + 'var' => 'lastName', 'type' => TType::STRING, ), 8 => array( + 'var' => 'middleName', + 'type' => TType::STRING, + ), + 9 => array( + 'var' => 'namePrefix', + 'type' => TType::STRING, + ), + 10 => array( + 'var' => 'nameSuffix', + 'type' => TType::STRING, + ), + 11 => array( + 'var' => 'orcidId', + 'type' => TType::STRING, + ), + 12 => array( 'var' => 'phones', 'type' => TType::LST, 'etype' => TType::STRING, @@ -555,11 +616,11 @@ class UserProfile { 'type' => TType::STRING, ), ), - 9 => array( + 13 => array( 'var' => 'country', 'type' => TType::STRING, ), - 10 => array( + 14 => array( 'var' => 'nationality', 'type' => TType::LST, 'etype' => TType::STRING, @@ -567,35 +628,35 @@ class UserProfile { 'type' => TType::STRING, ), ), - 11 => array( + 15 => array( 'var' => 'homeOrganization', 'type' => TType::STRING, ), - 12 => array( + 16 => array( 'var' => 'orginationAffiliation', 'type' => TType::STRING, ), - 13 => array( + 17 => array( 'var' => 'creationTime', - 'type' => TType::STRING, + 'type' => TType::I64, ), - 14 => array( + 18 => array( 'var' => 'lastAccessTime', - 'type' => TType::STRING, + 'type' => TType::I64, ), - 15 => array( + 19 => array( 'var' => 'validUntil', - 'type' => TType::STRING, + 'type' => TType::I64, ), - 16 => array( + 20 => array( 'var' => 'State', 'type' => TType::I32, ), - 17 => array( + 21 => array( 'var' => 'comments', 'type' => TType::STRING, ), - 18 => array( + 22 => array( 'var' => 'labeledURI', 'type' => TType::LST, 'etype' => TType::STRING, @@ -603,15 +664,15 @@ class UserProfile { 'type' => TType::STRING, ), ), - 19 => array( + 23 => array( 'var' => 'gpgKey', 'type' => TType::STRING, ), - 20 => array( + 24 => array( 'var' => 'timeZone', 'type' => TType::STRING, ), - 21 => array( + 25 => array( 'var' => 'nsfDemographics', 'type' => TType::STRUCT, 'class' => '\Airavata\Model\User\NSFDemographics', @@ -634,8 +695,20 @@ class UserProfile { if (isset($vals['emails'])) { $this->emails = $vals['emails']; } - if (isset($vals['userName'])) { - $this->userName = $vals['userName']; + if (isset($vals['firstName'])) { + $this->firstName = $vals['firstName']; + } + if (isset($vals['lastName'])) { + $this->lastName = $vals['lastName']; + } + if (isset($vals['middleName'])) { + $this->middleName = $vals['middleName']; + } + if (isset($vals['namePrefix'])) { + $this->namePrefix = $vals['namePrefix']; + } + if (isset($vals['nameSuffix'])) { + $this->nameSuffix = $vals['nameSuffix']; } if (isset($vals['orcidId'])) { $this->orcidId = $vals['orcidId']; @@ -751,19 +824,47 @@ class UserProfile { break; case 6: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->userName); + $xfer += $input->readString($this->firstName); } else { $xfer += $input->skip($ftype); } break; case 7: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->orcidId); + $xfer += $input->readString($this->lastName); } else { $xfer += $input->skip($ftype); } break; case 8: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->middleName); + } else { + $xfer += $input->skip($ftype); + } + break; + case 9: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->namePrefix); + } else { + $xfer += $input->skip($ftype); + } + break; + case 10: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->nameSuffix); + } else { + $xfer += $input->skip($ftype); + } + break; + case 11: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->orcidId); + } else { + $xfer += $input->skip($ftype); + } + break; + case 12: if ($ftype == TType::LST) { $this->phones = array(); $_size27 = 0; @@ -780,14 +881,14 @@ class UserProfile { $xfer += $input->skip($ftype); } break; - case 9: + case 13: if ($ftype == TType::STRING) { $xfer += $input->readString($this->country); } else { $xfer += $input->skip($ftype); } break; - case 10: + case 14: if ($ftype == TType::LST) { $this->nationality = array(); $_size33 = 0; @@ -804,56 +905,56 @@ class UserProfile { $xfer += $input->skip($ftype); } break; - case 11: + case 15: if ($ftype == TType::STRING) { $xfer += $input->readString($this->homeOrganization); } else { $xfer += $input->skip($ftype); } break; - case 12: + case 16: if ($ftype == TType::STRING) { $xfer += $input->readString($this->orginationAffiliation); } else { $xfer += $input->skip($ftype); } break; - case 13: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->creationTime); + case 17: + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->creationTime); } else { $xfer += $input->skip($ftype); } break; - case 14: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->lastAccessTime); + case 18: + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->lastAccessTime); } else { $xfer += $input->skip($ftype); } break; - case 15: - if ($ftype == TType::STRING) { - $xfer += $input->readString($this->validUntil); + case 19: + if ($ftype == TType::I64) { + $xfer += $input->readI64($this->validUntil); } else { $xfer += $input->skip($ftype); } break; - case 16: + case 20: if ($ftype == TType::I32) { $xfer += $input->readI32($this->State); } else { $xfer += $input->skip($ftype); } break; - case 17: + case 21: if ($ftype == TType::STRING) { $xfer += $input->readString($this->comments); } else { $xfer += $input->skip($ftype); } break; - case 18: + case 22: if ($ftype == TType::LST) { $this->labeledURI = array(); $_size39 = 0; @@ -870,21 +971,21 @@ class UserProfile { $xfer += $input->skip($ftype); } break; - case 19: + case 23: if ($ftype == TType::STRING) { $xfer += $input->readString($this->gpgKey); } else { $xfer += $input->skip($ftype); } break; - case 20: + case 24: if ($ftype == TType::STRING) { $xfer += $input->readString($this->timeZone); } else { $xfer += $input->skip($ftype); } break; - case 21: + case 25: if ($ftype == TType::STRUCT) { $this->nsfDemographics = new \Airavata\Model\User\NSFDemographics(); $xfer += $this->nsfDemographics->read($input); @@ -942,13 +1043,33 @@ class UserProfile { } $xfer += $output->writeFieldEnd(); } - if ($this->userName !== null) { - $xfer += $output->writeFieldBegin('userName', TType::STRING, 6); - $xfer += $output->writeString($this->userName); + if ($this->firstName !== null) { + $xfer += $output->writeFieldBegin('firstName', TType::STRING, 6); + $xfer += $output->writeString($this->firstName); + $xfer += $output->writeFieldEnd(); + } + if ($this->lastName !== null) { + $xfer += $output->writeFieldBegin('lastName', TType::STRING, 7); + $xfer += $output->writeString($this->lastName); + $xfer += $output->writeFieldEnd(); + } + if ($this->middleName !== null) { + $xfer += $output->writeFieldBegin('middleName', TType::STRING, 8); + $xfer += $output->writeString($this->middleName); + $xfer += $output->writeFieldEnd(); + } + if ($this->namePrefix !== null) { + $xfer += $output->writeFieldBegin('namePrefix', TType::STRING, 9); + $xfer += $output->writeString($this->namePrefix); + $xfer += $output->writeFieldEnd(); + } + if ($this->nameSuffix !== null) { + $xfer += $output->writeFieldBegin('nameSuffix', TType::STRING, 10); + $xfer += $output->writeString($this->nameSuffix); $xfer += $output->writeFieldEnd(); } if ($this->orcidId !== null) { - $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 7); + $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 11); $xfer += $output->writeString($this->orcidId); $xfer += $output->writeFieldEnd(); } @@ -956,7 +1077,7 @@ class UserProfile { if (!is_array($this->phones)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('phones', TType::LST, 8); + $xfer += $output->writeFieldBegin('phones', TType::LST, 12); { $output->writeListBegin(TType::STRING, count($this->phones)); { @@ -970,7 +1091,7 @@ class UserProfile { $xfer += $output->writeFieldEnd(); } if ($this->country !== null) { - $xfer += $output->writeFieldBegin('country', TType::STRING, 9); + $xfer += $output->writeFieldBegin('country', TType::STRING, 13); $xfer += $output->writeString($this->country); $xfer += $output->writeFieldEnd(); } @@ -978,7 +1099,7 @@ class UserProfile { if (!is_array($this->nationality)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('nationality', TType::LST, 10); + $xfer += $output->writeFieldBegin('nationality', TType::LST, 14); { $output->writeListBegin(TType::STRING, count($this->nationality)); { @@ -992,37 +1113,37 @@ class UserProfile { $xfer += $output->writeFieldEnd(); } if ($this->homeOrganization !== null) { - $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 11); + $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 15); $xfer += $output->writeString($this->homeOrganization); $xfer += $output->writeFieldEnd(); } if ($this->orginationAffiliation !== null) { - $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 12); + $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 16); $xfer += $output->writeString($this->orginationAffiliation); $xfer += $output->writeFieldEnd(); } if ($this->creationTime !== null) { - $xfer += $output->writeFieldBegin('creationTime', TType::STRING, 13); - $xfer += $output->writeString($this->creationTime); + $xfer += $output->writeFieldBegin('creationTime', TType::I64, 17); + $xfer += $output->writeI64($this->creationTime); $xfer += $output->writeFieldEnd(); } if ($this->lastAccessTime !== null) { - $xfer += $output->writeFieldBegin('lastAccessTime', TType::STRING, 14); - $xfer += $output->writeString($this->lastAccessTime); + $xfer += $output->writeFieldBegin('lastAccessTime', TType::I64, 18); + $xfer += $output->writeI64($this->lastAccessTime); $xfer += $output->writeFieldEnd(); } if ($this->validUntil !== null) { - $xfer += $output->writeFieldBegin('validUntil', TType::STRING, 15); - $xfer += $output->writeString($this->validUntil); + $xfer += $output->writeFieldBegin('validUntil', TType::I64, 19); + $xfer += $output->writeI64($this->validUntil); $xfer += $output->writeFieldEnd(); } if ($this->State !== null) { - $xfer += $output->writeFieldBegin('State', TType::I32, 16); + $xfer += $output->writeFieldBegin('State', TType::I32, 20); $xfer += $output->writeI32($this->State); $xfer += $output->writeFieldEnd(); } if ($this->comments !== null) { - $xfer += $output->writeFieldBegin('comments', TType::STRING, 17); + $xfer += $output->writeFieldBegin('comments', TType::STRING, 21); $xfer += $output->writeString($this->comments); $xfer += $output->writeFieldEnd(); } @@ -1030,7 +1151,7 @@ class UserProfile { if (!is_array($this->labeledURI)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 18); + $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 22); { $output->writeListBegin(TType::STRING, count($this->labeledURI)); { @@ -1044,12 +1165,12 @@ class UserProfile { $xfer += $output->writeFieldEnd(); } if ($this->gpgKey !== null) { - $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 19); + $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 23); $xfer += $output->writeString($this->gpgKey); $xfer += $output->writeFieldEnd(); } if ($this->timeZone !== null) { - $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 20); + $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 24); $xfer += $output->writeString($this->timeZone); $xfer += $output->writeFieldEnd(); } @@ -1057,7 +1178,7 @@ class UserProfile { if (!is_object($this->nsfDemographics)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 21); + $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 25); $xfer += $this->nsfDemographics->write($output); $xfer += $output->writeFieldEnd(); } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/storage/.gitignore ---------------------------------------------------------------------- diff --git a/app/storage/.gitignore b/app/storage/.gitignore old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/storage/cache/.gitignore ---------------------------------------------------------------------- diff --git a/app/storage/cache/.gitignore b/app/storage/cache/.gitignore old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/storage/logs/.gitignore ---------------------------------------------------------------------- diff --git a/app/storage/logs/.gitignore b/app/storage/logs/.gitignore old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/storage/meta/.gitignore ---------------------------------------------------------------------- diff --git a/app/storage/meta/.gitignore b/app/storage/meta/.gitignore old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/storage/sessions/.gitignore ---------------------------------------------------------------------- diff --git a/app/storage/sessions/.gitignore b/app/storage/sessions/.gitignore old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/storage/views/.gitignore ---------------------------------------------------------------------- diff --git a/app/storage/views/.gitignore b/app/storage/views/.gitignore old mode 100644 new mode 100755 http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/views/partials/deployment-block.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/deployment-block.blade.php b/app/views/partials/deployment-block.blade.php index 5dcf5ff..58b3aa5 100644 --- a/app/views/partials/deployment-block.blade.php +++ b/app/views/partials/deployment-block.blade.php @@ -142,4 +142,19 @@ @endif </div> <button type="button" class="btn btn-default control-label add-postJobCommand hide">Add Post Job Command</button> +</div> +<div class="form-group"> + <label class="control-label">Default Node Count</label> + <input type="number" min="0" class="form-control" value="@if( isset( $deploymentObject)){{$deploymentObject->defaultNodeCount}}@endif" + required readonly maxlength="30" name="defaultNodeCount"/> +</div> +<div class="form-group"> + <label class="control-label">Default CPU Count</label> + <input type="number" min="0" class="form-control" value="@if( isset( $deploymentObject)){{$deploymentObject->defaultCPUCount}}@endif" + required readonly maxlength="30" name="defaultCPUCount"/> +</div> +<div class="form-group"> + <label class="control-label">Default Walltime</label> + <input type="number" min="0" class="form-control" value="@if( isset( $deploymentObject)){{$deploymentObject->defaultWalltime}}@endif" + required readonly maxlength="30" name="defaultWalltime"/> </div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/views/resource/edit.blade.php ---------------------------------------------------------------------- diff --git a/app/views/resource/edit.blade.php b/app/views/resource/edit.blade.php index e2d3e75..ff0cf7b 100644 --- a/app/views/resource/edit.blade.php +++ b/app/views/resource/edit.blade.php @@ -84,6 +84,26 @@ maxlength="30" name="maxMemoryPerNode"/> </div> <div class="form-group"> + <label class="control-label">CPUs Per Node</label> + <input type="number" min="0" class="form-control" value="{{ $computeResource->cpusPerNode }}" + maxlength="30" name="cpusPerNode"/> + </div> + <div class="form-group"> + <label class="control-label">Default Node Count</label> + <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultNodeCount }}" + maxlength="30" name="defaultNodeCount"/> + </div> + <div class="form-group"> + <label class="control-label">Default CPU Count</label> + <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultCPUCount }}" + maxlength="30" name="defaultCPUCount"/> + </div> + <div class="form-group"> + <label class="control-label">Default Walltime</label> + <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultWalltime }}" + maxlength="30" name="defaultWalltime"/> + </div> + <div class="form-group"> <input type="submit" class="btn btn-primary" name="step1" value="Save changes"/> </div> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/badb6a85/app/views/resource/view.blade.php ---------------------------------------------------------------------- diff --git a/app/views/resource/view.blade.php b/app/views/resource/view.blade.php index 4f91ac9..6e34d23 100644 --- a/app/views/resource/view.blade.php +++ b/app/views/resource/view.blade.php @@ -82,6 +82,26 @@ <input readonly type="number" min="0" class="form-control" value="{{ $computeResource->maxMemoryPerNode }}" maxlength="30" name="maxMemoryPerNode"/> </div> + <div class="form-group"> + <label class="control-label">CPUs Per Node</label> + <input type="number" min="0" class="form-control" value="{{ $computeResource->cpusPerNode }}" + maxlength="30" name="cpusPerNode"/> + </div> + <div class="form-group"> + <label class="control-label">Default Node Count</label> + <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultNodeCount }}" + maxlength="30" name="defaultNodeCount"/> + </div> + <div class="form-group"> + <label class="control-label">Default CPU Count</label> + <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultCPUCount }}" + maxlength="30" name="defaultCPUCount"/> + </div> + <div class="form-group"> + <label class="control-label">Default Walltime</label> + <input type="number" min="0" class="form-control" value="{{ $computeResource->defaultWalltime }}" + maxlength="30" name="defaultWalltime"/> + </div> </form> </div>
