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 2017/05/15 05:31:53 UTC
[2/3] airavata git commit: making database level changes for
supporting custom node/cpu/walltime configurations
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index 23df7a4..9c20f39 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -4206,74 +4206,7 @@ interface AiravataIf {
public function getAllUserProfilesInGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $offset, $limit);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $userName
- * @param string $gatewayId
- * @return \Airavata\Model\User\UserProfile * A structure holding the user profile and its child models.
- * *
- * * Notes:
- * * The model does not include passwords as it is assumed an external identity provider is used to authenticate user.
- * * References:
- * * NSF Demographic Information - http://www.nsf.gov/pubs/2000/00form1225/00form1225.doc
- * * LDAP Schema - https://tools.ietf.org/html/rfc4519
- * * SCIM 2.0 - https://tools.ietf.org/html/rfc7643
- * *
- * * userModelVersion:
- * * Version number of profile
- * *
- * * airavataInternalUserId:
- * * internal to Airavata, not intended to be used outside of the Airavata platform or possibly by gateways
- * * (that is, never shown to users), never reassigned, REQUIRED
- * *
- * * userId:
- * * 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
- * *
- * * userName:
- * * Name-based identifiers can be multivalues. To keep it simple, Airavata will make it a string.
- * * In the future these can be enumerated as:
- * * Official name (as asserted possibly by some external identity provider)
- * * Prefered name (as asserted or suggested by user directly)
- * * Components:
- * * givenName
- * * surname (familyName)
- * * displayName (often asserted by user to handle things like middle names, suffix, prefix, and the like)
- * *
- * * orcidId: ORCID ID - http://orcid.org/about/what-is-orcid)
- * *
- * * phones: Telephone MULTIVALUED
- * *
- * * country: Country of Residance
- * *
- * * nationality Countries of citizenship
- * *
- * * comments:
- * * Free-form information (treated as opaque by Airavata and simply passed to resource).
- * *
- * * labeledURI:
- * * Google Scholar, Web of Science, ACS, e.t.c
- * *
- * * timeZone:
- * * User’s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
- * *
- *
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function getUserProfileByName(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId);
- /**
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $userName
+ * @param string $userId
* @param string $gatewayId
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
@@ -4281,7 +4214,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId);
+ public function doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userId, $gatewayId);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -15565,82 +15498,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getAllUserProfilesInGateway failed: unknown result");
}
- public function getUserProfileByName(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
- {
- $this->send_getUserProfileByName($authzToken, $userName, $gatewayId);
- return $this->recv_getUserProfileByName();
- }
-
- public function send_getUserProfileByName(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
- {
- $args = new \Airavata\API\Airavata_getUserProfileByName_args();
- $args->authzToken = $authzToken;
- $args->userName = $userName;
- $args->gatewayId = $gatewayId;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getUserProfileByName', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getUserProfileByName', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getUserProfileByName()
- {
- $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
- if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getUserProfileByName_result', $this->input_->isStrictRead());
- else
- {
- $rseqid = 0;
- $fname = null;
- $mtype = 0;
-
- $this->input_->readMessageBegin($fname, $mtype, $rseqid);
- if ($mtype == TMessageType::EXCEPTION) {
- $x = new TApplicationException();
- $x->read($this->input_);
- $this->input_->readMessageEnd();
- throw $x;
- }
- $result = new \Airavata\API\Airavata_getUserProfileByName_result();
- $result->read($this->input_);
- $this->input_->readMessageEnd();
- }
- if ($result->success !== null) {
- return $result->success;
- }
- if ($result->ire !== null) {
- throw $result->ire;
- }
- if ($result->ace !== null) {
- throw $result->ace;
- }
- if ($result->ase !== null) {
- throw $result->ase;
- }
- if ($result->ae !== null) {
- throw $result->ae;
- }
- throw new \Exception("getUserProfileByName failed: unknown result");
- }
-
- public function doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
+ public function doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userId, $gatewayId)
{
- $this->send_doesUserProfileExist($authzToken, $userName, $gatewayId);
+ $this->send_doesUserProfileExist($authzToken, $userId, $gatewayId);
return $this->recv_doesUserProfileExist();
}
- public function send_doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
+ public function send_doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userId, $gatewayId)
{
$args = new \Airavata\API\Airavata_doesUserProfileExist_args();
$args->authzToken = $authzToken;
- $args->userName = $userName;
+ $args->userId = $userId;
$args->gatewayId = $gatewayId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
@@ -69065,312 +68933,6 @@ class Airavata_getAllUserProfilesInGateway_result {
}
-class Airavata_getUserProfileByName_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $userName = null;
- /**
- * @var string
- */
- public $gatewayId = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'authzToken',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Security\AuthzToken',
- ),
- 2 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
- }
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
- }
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_getUserProfileByName_args';
- }
-
- 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::STRUCT) {
- $this->authzToken = new \Airavata\Model\Security\AuthzToken();
- $xfer += $this->authzToken->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getUserProfileByName_args');
- if ($this->authzToken !== null) {
- if (!is_object($this->authzToken)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1);
- $xfer += $this->authzToken->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 2);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_getUserProfileByName_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\User\UserProfile
- */
- public $success = null;
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\AiravataClientException
- */
- public $ace = null;
- /**
- * @var \Airavata\API\Error\AiravataSystemException
- */
- public $ase = null;
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\User\UserProfile',
- ),
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 3 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 4 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
- if (isset($vals['ire'])) {
- $this->ire = $vals['ire'];
- }
- if (isset($vals['ace'])) {
- $this->ace = $vals['ace'];
- }
- if (isset($vals['ase'])) {
- $this->ase = $vals['ase'];
- }
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_getUserProfileByName_result';
- }
-
- 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 0:
- if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\User\UserProfile();
- $xfer += $this->success->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->ire = new \Airavata\API\Error\InvalidRequestException();
- $xfer += $this->ire->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ae = new \Airavata\API\Error\AuthorizationException();
- $xfer += $this->ae->read($input);
- } 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('Airavata_getUserProfileByName_result');
- if ($this->success !== null) {
- if (!is_object($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
- $xfer += $this->success->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
- $xfer += $this->ase->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
class Airavata_doesUserProfileExist_args {
static $_TSPEC;
@@ -69381,7 +68943,7 @@ class Airavata_doesUserProfileExist_args {
/**
* @var string
*/
- public $userName = null;
+ public $userId = null;
/**
* @var string
*/
@@ -69396,7 +68958,7 @@ class Airavata_doesUserProfileExist_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'userName',
+ 'var' => 'userId',
'type' => TType::STRING,
),
3 => array(
@@ -69409,8 +68971,8 @@ class Airavata_doesUserProfileExist_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
+ if (isset($vals['userId'])) {
+ $this->userId = $vals['userId'];
}
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
@@ -69447,7 +69009,7 @@ class Airavata_doesUserProfileExist_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
+ $xfer += $input->readString($this->userId);
} else {
$xfer += $input->skip($ftype);
}
@@ -69480,9 +69042,9 @@ class Airavata_doesUserProfileExist_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 2);
- $xfer += $output->writeString($this->userName);
+ if ($this->userId !== null) {
+ $xfer += $output->writeFieldBegin('userId', TType::STRING, 2);
+ $xfer += $output->writeString($this->userId);
$xfer += $output->writeFieldEnd();
}
if ($this->gatewayId !== null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
index 03d1121..abcb322 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/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/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 86e6c5d..e250c65 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -1885,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 $defaultWallltime = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -1976,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' => 'defaultWallltime',
+ 'type' => TType::I32,
+ ),
);
}
if (is_array($vals)) {
@@ -2021,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['defaultWallltime'])) {
+ $this->defaultWallltime = $vals['defaultWallltime'];
+ }
}
}
@@ -2207,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->defaultWallltime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -2363,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->defaultWallltime !== null) {
+ $xfer += $output->writeFieldBegin('defaultWallltime', TType::I32, 18);
+ $xfer += $output->writeI32($this->defaultWallltime);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
index 1ebd5db..493b615 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
@@ -499,10 +499,6 @@ class UserProfile {
/**
* @var string
*/
- public $userName = null;
- /**
- * @var string
- */
public $orcidId = null;
/**
* @var string[]
@@ -609,14 +605,10 @@ class UserProfile {
'type' => TType::STRING,
),
11 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 12 => array(
'var' => 'orcidId',
'type' => TType::STRING,
),
- 13 => array(
+ 12 => array(
'var' => 'phones',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -624,11 +616,11 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 14 => array(
+ 13 => array(
'var' => 'country',
'type' => TType::STRING,
),
- 15 => array(
+ 14 => array(
'var' => 'nationality',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -636,35 +628,35 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 16 => array(
+ 15 => array(
'var' => 'homeOrganization',
'type' => TType::STRING,
),
- 17 => array(
+ 16 => array(
'var' => 'orginationAffiliation',
'type' => TType::STRING,
),
- 18 => array(
+ 17 => array(
'var' => 'creationTime',
'type' => TType::I64,
),
- 19 => array(
+ 18 => array(
'var' => 'lastAccessTime',
'type' => TType::I64,
),
- 20 => array(
+ 19 => array(
'var' => 'validUntil',
'type' => TType::I64,
),
- 21 => array(
+ 20 => array(
'var' => 'State',
'type' => TType::I32,
),
- 22 => array(
+ 21 => array(
'var' => 'comments',
'type' => TType::STRING,
),
- 23 => array(
+ 22 => array(
'var' => 'labeledURI',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -672,15 +664,15 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 24 => array(
+ 23 => array(
'var' => 'gpgKey',
'type' => TType::STRING,
),
- 25 => array(
+ 24 => array(
'var' => 'timeZone',
'type' => TType::STRING,
),
- 26 => array(
+ 25 => array(
'var' => 'nsfDemographics',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\User\NSFDemographics',
@@ -718,9 +710,6 @@ class UserProfile {
if (isset($vals['nameSuffix'])) {
$this->nameSuffix = $vals['nameSuffix'];
}
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
- }
if (isset($vals['orcidId'])) {
$this->orcidId = $vals['orcidId'];
}
@@ -870,19 +859,12 @@ class UserProfile {
break;
case 11:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 12:
- if ($ftype == TType::STRING) {
$xfer += $input->readString($this->orcidId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 13:
+ case 12:
if ($ftype == TType::LST) {
$this->phones = array();
$_size27 = 0;
@@ -899,14 +881,14 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 14:
+ case 13:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->country);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 15:
+ case 14:
if ($ftype == TType::LST) {
$this->nationality = array();
$_size33 = 0;
@@ -923,56 +905,56 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 16:
+ case 15:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->homeOrganization);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 17:
+ case 16:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->orginationAffiliation);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 18:
+ case 17:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 19:
+ case 18:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->lastAccessTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 20:
+ case 19:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->validUntil);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 21:
+ case 20:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->State);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 22:
+ case 21:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->comments);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 23:
+ case 22:
if ($ftype == TType::LST) {
$this->labeledURI = array();
$_size39 = 0;
@@ -989,21 +971,21 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 24:
+ case 23:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gpgKey);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 25:
+ case 24:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->timeZone);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 26:
+ case 25:
if ($ftype == TType::STRUCT) {
$this->nsfDemographics = new \Airavata\Model\User\NSFDemographics();
$xfer += $this->nsfDemographics->read($input);
@@ -1086,13 +1068,8 @@ class UserProfile {
$xfer += $output->writeString($this->nameSuffix);
$xfer += $output->writeFieldEnd();
}
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 11);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
if ($this->orcidId !== null) {
- $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 12);
+ $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 11);
$xfer += $output->writeString($this->orcidId);
$xfer += $output->writeFieldEnd();
}
@@ -1100,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, 13);
+ $xfer += $output->writeFieldBegin('phones', TType::LST, 12);
{
$output->writeListBegin(TType::STRING, count($this->phones));
{
@@ -1114,7 +1091,7 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->country !== null) {
- $xfer += $output->writeFieldBegin('country', TType::STRING, 14);
+ $xfer += $output->writeFieldBegin('country', TType::STRING, 13);
$xfer += $output->writeString($this->country);
$xfer += $output->writeFieldEnd();
}
@@ -1122,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, 15);
+ $xfer += $output->writeFieldBegin('nationality', TType::LST, 14);
{
$output->writeListBegin(TType::STRING, count($this->nationality));
{
@@ -1136,37 +1113,37 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->homeOrganization !== null) {
- $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 16);
+ $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, 17);
+ $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 16);
$xfer += $output->writeString($this->orginationAffiliation);
$xfer += $output->writeFieldEnd();
}
if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 18);
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 17);
$xfer += $output->writeI64($this->creationTime);
$xfer += $output->writeFieldEnd();
}
if ($this->lastAccessTime !== null) {
- $xfer += $output->writeFieldBegin('lastAccessTime', TType::I64, 19);
+ $xfer += $output->writeFieldBegin('lastAccessTime', TType::I64, 18);
$xfer += $output->writeI64($this->lastAccessTime);
$xfer += $output->writeFieldEnd();
}
if ($this->validUntil !== null) {
- $xfer += $output->writeFieldBegin('validUntil', TType::I64, 20);
+ $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, 21);
+ $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, 22);
+ $xfer += $output->writeFieldBegin('comments', TType::STRING, 21);
$xfer += $output->writeString($this->comments);
$xfer += $output->writeFieldEnd();
}
@@ -1174,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, 23);
+ $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 22);
{
$output->writeListBegin(TType::STRING, count($this->labeledURI));
{
@@ -1188,12 +1165,12 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->gpgKey !== null) {
- $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 24);
+ $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, 25);
+ $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 24);
$xfer += $output->writeString($this->timeZone);
$xfer += $output->writeFieldEnd();
}
@@ -1201,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, 26);
+ $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 25);
$xfer += $this->nsfDemographics->write($output);
$xfer += $output->writeFieldEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
index 0e8e23c..19d9d61 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
@@ -15,4 +15,17 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
use Thrift\Exception\TApplicationException;
+final class Constant extends \Thrift\Type\TConstant {
+ static protected $TENANT_PROFILE_CPI_VERSION;
+ static protected $TENANT_PROFILE_CPI_NAME;
+
+ static protected function init_TENANT_PROFILE_CPI_VERSION() {
+ return "0.17";
+ }
+
+ static protected function init_TENANT_PROFILE_CPI_NAME() {
+ return "TenantProfileService";
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index 622df08..96f0e6f 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -198,8 +198,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' UserProfile getUserProfileById(AuthzToken authzToken, string userId, string gatewayId)')
print(' bool deleteUserProfile(AuthzToken authzToken, string userId)')
print(' getAllUserProfilesInGateway(AuthzToken authzToken, string gatewayId, i32 offset, i32 limit)')
- print(' UserProfile getUserProfileByName(AuthzToken authzToken, string userName, string gatewayId)')
- print(' bool doesUserProfileExist(AuthzToken authzToken, string userName, string gatewayId)')
+ print(' bool doesUserProfileExist(AuthzToken authzToken, string userId, string gatewayId)')
print('')
sys.exit(0)
@@ -1300,12 +1299,6 @@ elif cmd == 'getAllUserProfilesInGateway':
sys.exit(1)
pp.pprint(client.getAllUserProfilesInGateway(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
-elif cmd == 'getUserProfileByName':
- if len(args) != 3:
- print('getUserProfileByName requires 3 args')
- sys.exit(1)
- pp.pprint(client.getUserProfileByName(eval(args[0]),args[1],args[2],))
-
elif cmd == 'doesUserProfileExist':
if len(args) != 3:
print('doesUserProfileExist requires 3 args')
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
index 6712bf7..e195f71 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
@@ -3499,20 +3499,11 @@ class Iface:
"""
pass
- def getUserProfileByName(self, authzToken, userName, gatewayId):
+ def doesUserProfileExist(self, authzToken, userId, gatewayId):
"""
Parameters:
- authzToken
- - userName
- - gatewayId
- """
- pass
-
- def doesUserProfileExist(self, authzToken, userName, gatewayId):
- """
- Parameters:
- - authzToken
- - userName
+ - userId
- gatewayId
"""
pass
@@ -12884,64 +12875,21 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserProfilesInGateway failed: unknown result")
- def getUserProfileByName(self, authzToken, userName, gatewayId):
- """
- Parameters:
- - authzToken
- - userName
- - gatewayId
- """
- self.send_getUserProfileByName(authzToken, userName, gatewayId)
- return self.recv_getUserProfileByName()
-
- def send_getUserProfileByName(self, authzToken, userName, gatewayId):
- self._oprot.writeMessageBegin('getUserProfileByName', TMessageType.CALL, self._seqid)
- args = getUserProfileByName_args()
- args.authzToken = authzToken
- args.userName = userName
- args.gatewayId = gatewayId
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getUserProfileByName(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getUserProfileByName_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserProfileByName failed: unknown result")
-
- def doesUserProfileExist(self, authzToken, userName, gatewayId):
+ def doesUserProfileExist(self, authzToken, userId, gatewayId):
"""
Parameters:
- authzToken
- - userName
+ - userId
- gatewayId
"""
- self.send_doesUserProfileExist(authzToken, userName, gatewayId)
+ self.send_doesUserProfileExist(authzToken, userId, gatewayId)
return self.recv_doesUserProfileExist()
- def send_doesUserProfileExist(self, authzToken, userName, gatewayId):
+ def send_doesUserProfileExist(self, authzToken, userId, gatewayId):
self._oprot.writeMessageBegin('doesUserProfileExist', TMessageType.CALL, self._seqid)
args = doesUserProfileExist_args()
args.authzToken = authzToken
- args.userName = userName
+ args.userId = userId
args.gatewayId = gatewayId
args.write(self._oprot)
self._oprot.writeMessageEnd()
@@ -13149,7 +13097,6 @@ class Processor(Iface, TProcessor):
self._processMap["getUserProfileById"] = Processor.process_getUserProfileById
self._processMap["deleteUserProfile"] = Processor.process_deleteUserProfile
self._processMap["getAllUserProfilesInGateway"] = Processor.process_getAllUserProfilesInGateway
- self._processMap["getUserProfileByName"] = Processor.process_getUserProfileByName
self._processMap["doesUserProfileExist"] = Processor.process_doesUserProfileExist
def process(self, iprot, oprot):
@@ -18576,44 +18523,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getUserProfileByName(self, seqid, iprot, oprot):
- args = getUserProfileByName_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getUserProfileByName_result()
- try:
- result.success = self._handler.getUserProfileByName(args.authzToken, args.userName, args.gatewayId)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("getUserProfileByName", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
def process_doesUserProfileExist(self, seqid, iprot, oprot):
args = doesUserProfileExist_args()
args.read(iprot)
iprot.readMessageEnd()
result = doesUserProfileExist_result()
try:
- result.success = self._handler.doesUserProfileExist(args.authzToken, args.userName, args.gatewayId)
+ result.success = self._handler.doesUserProfileExist(args.authzToken, args.userId, args.gatewayId)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -56540,243 +56456,24 @@ class getAllUserProfilesInGateway_result:
def __ne__(self, other):
return not (self == other)
-class getUserProfileByName_args:
- """
- Attributes:
- - authzToken
- - userName
- - gatewayId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'userName', None, None, ), # 2
- (3, TType.STRING, 'gatewayId', None, None, ), # 3
- )
-
- def __init__(self, authzToken=None, userName=None, gatewayId=None,):
- self.authzToken = authzToken
- self.userName = userName
- self.gatewayId = gatewayId
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.userName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('getUserProfileByName_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 2)
- oprot.writeString(self.userName)
- oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.userName is None:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.gatewayId is None:
- raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.gatewayId)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class getUserProfileByName_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.STRUCT, 'success', (apache.airavata.model.user.ttypes.UserProfile, apache.airavata.model.user.ttypes.UserProfile.thrift_spec), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.STRUCT:
- self.success = apache.airavata.model.user.ttypes.UserProfile()
- self.success.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('getUserProfileByName_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRUCT, 0)
- self.success.write(oprot)
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.success)
- value = (value * 31) ^ hash(self.ire)
- value = (value * 31) ^ hash(self.ace)
- value = (value * 31) ^ hash(self.ase)
- value = (value * 31) ^ hash(self.ae)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
class doesUserProfileExist_args:
"""
Attributes:
- authzToken
- - userName
+ - userId
- gatewayId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'userName', None, None, ), # 2
+ (2, TType.STRING, 'userId', None, None, ), # 2
(3, TType.STRING, 'gatewayId', None, None, ), # 3
)
- def __init__(self, authzToken=None, userName=None, gatewayId=None,):
+ def __init__(self, authzToken=None, userId=None, gatewayId=None,):
self.authzToken = authzToken
- self.userName = userName
+ self.userId = userId
self.gatewayId = gatewayId
def read(self, iprot):
@@ -56796,7 +56493,7 @@ class doesUserProfileExist_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.userName = iprot.readString()
+ self.userId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
@@ -56818,9 +56515,9 @@ class doesUserProfileExist_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 2)
- oprot.writeString(self.userName)
+ if self.userId is not None:
+ oprot.writeFieldBegin('userId', TType.STRING, 2)
+ oprot.writeString(self.userId)
oprot.writeFieldEnd()
if self.gatewayId is not None:
oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
@@ -56832,8 +56529,8 @@ class doesUserProfileExist_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.userName is None:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
+ if self.userId is None:
+ raise TProtocol.TProtocolException(message='Required field userId is unset!')
if self.gatewayId is None:
raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
return
@@ -56842,7 +56539,7 @@ class doesUserProfileExist_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.userName)
+ value = (value * 31) ^ hash(self.userId)
value = (value * 31) ^ hash(self.gatewayId)
return value
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
index 12dfca0..fd2e305 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
@@ -379,6 +379,7 @@ class ApplicationDeploymentDescription:
- defaultQueueName
- defaultNodeCount
- defaultCPUCount
+ - defaultWalltime
- editableByUser
"""
@@ -399,10 +400,11 @@ class ApplicationDeploymentDescription:
(13, TType.STRING, 'defaultQueueName', None, None, ), # 13
(14, TType.I32, 'defaultNodeCount', None, None, ), # 14
(15, TType.I32, 'defaultCPUCount', None, None, ), # 15
- (16, TType.BOOL, 'editableByUser', None, None, ), # 16
+ (16, TType.I32, 'defaultWalltime', None, None, ), # 16
+ (17, TType.BOOL, 'editableByUser', None, None, ), # 17
)
- def __init__(self, appDeploymentId=thrift_spec[1][4], appModuleId=None, computeHostId=None, executablePath=None, parallelism=thrift_spec[5][4], appDeploymentDescription=None, moduleLoadCmds=None, libPrependPaths=None, libAppendPaths=None, setEnvironment=None, preJobCommands=None, postJobCommands=None, defaultQueueName=None, defaultNodeCount=None, defaultCPUCount=None, editableByUser=None,):
+ def __init__(self, appDeploymentId=thrift_spec[1][4], appModuleId=None, computeHostId=None, executablePath=None, parallelism=thrift_spec[5][4], appDeploymentDescription=None, moduleLoadCmds=None, libPrependPaths=None, libAppendPaths=None, setEnvironment=None, preJobCommands=None, postJobCommands=None, defaultQueueName=None, defaultNodeCount=None, defaultCPUCount=None, defaultWalltime=None, editableByUser=None,):
self.appDeploymentId = appDeploymentId
self.appModuleId = appModuleId
self.computeHostId = computeHostId
@@ -418,6 +420,7 @@ class ApplicationDeploymentDescription:
self.defaultQueueName = defaultQueueName
self.defaultNodeCount = defaultNodeCount
self.defaultCPUCount = defaultCPUCount
+ self.defaultWalltime = defaultWalltime
self.editableByUser = editableByUser
def read(self, iprot):
@@ -541,6 +544,11 @@ class ApplicationDeploymentDescription:
else:
iprot.skip(ftype)
elif fid == 16:
+ if ftype == TType.I32:
+ self.defaultWalltime = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 17:
if ftype == TType.BOOL:
self.editableByUser = iprot.readBool()
else:
@@ -633,8 +641,12 @@ class ApplicationDeploymentDescription:
oprot.writeFieldBegin('defaultCPUCount', TType.I32, 15)
oprot.writeI32(self.defaultCPUCount)
oprot.writeFieldEnd()
+ if self.defaultWalltime is not None:
+ oprot.writeFieldBegin('defaultWalltime', TType.I32, 16)
+ oprot.writeI32(self.defaultWalltime)
+ oprot.writeFieldEnd()
if self.editableByUser is not None:
- oprot.writeFieldBegin('editableByUser', TType.BOOL, 16)
+ oprot.writeFieldBegin('editableByUser', TType.BOOL, 17)
oprot.writeBool(self.editableByUser)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -671,6 +683,7 @@ class ApplicationDeploymentDescription:
value = (value * 31) ^ hash(self.defaultQueueName)
value = (value * 31) ^ hash(self.defaultNodeCount)
value = (value * 31) ^ hash(self.defaultCPUCount)
+ value = (value * 31) ^ hash(self.defaultWalltime)
value = (value * 31) ^ hash(self.editableByUser)
return value
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
index dfc0cca..b2fcc2e 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
@@ -1431,6 +1431,10 @@ class ComputeResourceDescription:
- gatewayUsageReporting
- gatewayUsageModuleLoadCommand
- gatewayUsageExecutable
+ - cpusPerNode
+ - defaultNodeCount
+ - defaultCPUCount
+ - defaultWallltime
"""
thrift_spec = (
@@ -1449,9 +1453,13 @@ class ComputeResourceDescription:
(12, TType.BOOL, 'gatewayUsageReporting', None, None, ), # 12
(13, TType.STRING, 'gatewayUsageModuleLoadCommand', None, None, ), # 13
(14, TType.STRING, 'gatewayUsageExecutable', None, None, ), # 14
+ (15, TType.I32, 'cpusPerNode', None, None, ), # 15
+ (16, TType.I32, 'defaultNodeCount', None, None, ), # 16
+ (17, TType.I32, 'defaultCPUCount', None, None, ), # 17
+ (18, TType.I32, 'defaultWallltime', None, None, ), # 18
)
- def __init__(self, computeResourceId=thrift_spec[1][4], hostName=None, hostAliases=None, ipAddresses=None, resourceDescription=None, enabled=None, batchQueues=None, fileSystems=None, jobSubmissionInterfaces=None, dataMovementInterfaces=None, maxMemoryPerNode=None, gatewayUsageReporting=None, gatewayUsageModuleLoadCommand=None, gatewayUsageExecutable=None,):
+ def __init__(self, computeResourceId=thrift_spec[1][4], hostName=None, hostAliases=None, ipAddresses=None, resourceDescription=None, enabled=None, batchQueues=None, fileSystems=None, jobSubmissionInterfaces=None, dataMovementInterfaces=None, maxMemoryPerNode=None, gatewayUsageReporting=None, gatewayUsageModuleLoadCommand=None, gatewayUsageExecutable=None, cpusPerNode=None, defaultNodeCount=None, defaultCPUCount=None, defaultWallltime=None,):
self.computeResourceId = computeResourceId
self.hostName = hostName
self.hostAliases = hostAliases
@@ -1466,6 +1474,10 @@ class ComputeResourceDescription:
self.gatewayUsageReporting = gatewayUsageReporting
self.gatewayUsageModuleLoadCommand = gatewayUsageModuleLoadCommand
self.gatewayUsageExecutable = gatewayUsageExecutable
+ self.cpusPerNode = cpusPerNode
+ self.defaultNodeCount = defaultNodeCount
+ self.defaultCPUCount = defaultCPUCount
+ self.defaultWallltime = defaultWallltime
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -1580,6 +1592,26 @@ class ComputeResourceDescription:
self.gatewayUsageExecutable = iprot.readString()
else:
iprot.skip(ftype)
+ elif fid == 15:
+ if ftype == TType.I32:
+ self.cpusPerNode = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 16:
+ if ftype == TType.I32:
+ self.defaultNodeCount = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 17:
+ if ftype == TType.I32:
+ self.defaultCPUCount = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 18:
+ if ftype == TType.I32:
+ self.defaultWallltime = iprot.readI32()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -1665,6 +1697,22 @@ class ComputeResourceDescription:
oprot.writeFieldBegin('gatewayUsageExecutable', TType.STRING, 14)
oprot.writeString(self.gatewayUsageExecutable)
oprot.writeFieldEnd()
+ if self.cpusPerNode is not None:
+ oprot.writeFieldBegin('cpusPerNode', TType.I32, 15)
+ oprot.writeI32(self.cpusPerNode)
+ oprot.writeFieldEnd()
+ if self.defaultNodeCount is not None:
+ oprot.writeFieldBegin('defaultNodeCount', TType.I32, 16)
+ oprot.writeI32(self.defaultNodeCount)
+ oprot.writeFieldEnd()
+ if self.defaultCPUCount is not None:
+ oprot.writeFieldBegin('defaultCPUCount', TType.I32, 17)
+ oprot.writeI32(self.defaultCPUCount)
+ oprot.writeFieldEnd()
+ if self.defaultWallltime is not None:
+ oprot.writeFieldBegin('defaultWallltime', TType.I32, 18)
+ oprot.writeI32(self.defaultWallltime)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -1692,6 +1740,10 @@ class ComputeResourceDescription:
value = (value * 31) ^ hash(self.gatewayUsageReporting)
value = (value * 31) ^ hash(self.gatewayUsageModuleLoadCommand)
value = (value * 31) ^ hash(self.gatewayUsageExecutable)
+ value = (value * 31) ^ hash(self.cpusPerNode)
+ value = (value * 31) ^ hash(self.defaultNodeCount)
+ value = (value * 31) ^ hash(self.defaultCPUCount)
+ value = (value * 31) ^ hash(self.defaultWallltime)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
index 4dc61ae..14b8baa 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
@@ -397,7 +397,6 @@ class UserProfile:
- middleName
- namePrefix
- nameSuffix
- - userName
- orcidId
- phones
- country
@@ -427,25 +426,24 @@ class UserProfile:
(8, TType.STRING, 'middleName', None, None, ), # 8
(9, TType.STRING, 'namePrefix', None, None, ), # 9
(10, TType.STRING, 'nameSuffix', None, None, ), # 10
- (11, TType.STRING, 'userName', None, None, ), # 11
- (12, TType.STRING, 'orcidId', None, None, ), # 12
- (13, TType.LIST, 'phones', (TType.STRING,None), None, ), # 13
- (14, TType.STRING, 'country', None, None, ), # 14
- (15, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 15
- (16, TType.STRING, 'homeOrganization', None, None, ), # 16
- (17, TType.STRING, 'orginationAffiliation', None, None, ), # 17
- (18, TType.I64, 'creationTime', None, None, ), # 18
- (19, TType.I64, 'lastAccessTime', None, None, ), # 19
- (20, TType.I64, 'validUntil', None, None, ), # 20
- (21, TType.I32, 'State', None, None, ), # 21
- (22, TType.STRING, 'comments', None, None, ), # 22
- (23, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 23
- (24, TType.STRING, 'gpgKey', None, None, ), # 24
- (25, TType.STRING, 'timeZone', None, None, ), # 25
- (26, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 26
+ (11, TType.STRING, 'orcidId', None, None, ), # 11
+ (12, TType.LIST, 'phones', (TType.STRING,None), None, ), # 12
+ (13, TType.STRING, 'country', None, None, ), # 13
+ (14, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 14
+ (15, TType.STRING, 'homeOrganization', None, None, ), # 15
+ (16, TType.STRING, 'orginationAffiliation', None, None, ), # 16
+ (17, TType.I64, 'creationTime', None, None, ), # 17
+ (18, TType.I64, 'lastAccessTime', None, None, ), # 18
+ (19, TType.I64, 'validUntil', None, None, ), # 19
+ (20, TType.I32, 'State', None, None, ), # 20
+ (21, TType.STRING, 'comments', None, None, ), # 21
+ (22, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 22
+ (23, TType.STRING, 'gpgKey', None, None, ), # 23
+ (24, TType.STRING, 'timeZone', None, None, ), # 24
+ (25, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 25
)
- def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, gatewayId=None, emails=None, firstName=None, lastName=None, middleName=None, namePrefix=None, nameSuffix=None, userName=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
+ def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, gatewayId=None, emails=None, firstName=None, lastName=None, middleName=None, namePrefix=None, nameSuffix=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
self.userModelVersion = userModelVersion
self.airavataInternalUserId = airavataInternalUserId
self.userId = userId
@@ -456,7 +454,6 @@ class UserProfile:
self.middleName = middleName
self.namePrefix = namePrefix
self.nameSuffix = nameSuffix
- self.userName = userName
self.orcidId = orcidId
self.phones = phones
self.country = country
@@ -539,15 +536,10 @@ class UserProfile:
iprot.skip(ftype)
elif fid == 11:
if ftype == TType.STRING:
- self.userName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 12:
- if ftype == TType.STRING:
self.orcidId = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 13:
+ elif fid == 12:
if ftype == TType.LIST:
self.phones = []
(_etype30, _size27) = iprot.readListBegin()
@@ -557,12 +549,12 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 14:
+ elif fid == 13:
if ftype == TType.STRING:
self.country = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 15:
+ elif fid == 14:
if ftype == TType.LIST:
self.nationality = []
(_etype36, _size33) = iprot.readListBegin()
@@ -572,42 +564,42 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 16:
+ elif fid == 15:
if ftype == TType.STRING:
self.homeOrganization = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 17:
+ elif fid == 16:
if ftype == TType.STRING:
self.orginationAffiliation = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 18:
+ elif fid == 17:
if ftype == TType.I64:
self.creationTime = iprot.readI64()
else:
iprot.skip(ftype)
- elif fid == 19:
+ elif fid == 18:
if ftype == TType.I64:
self.lastAccessTime = iprot.readI64()
else:
iprot.skip(ftype)
- elif fid == 20:
+ elif fid == 19:
if ftype == TType.I64:
self.validUntil = iprot.readI64()
else:
iprot.skip(ftype)
- elif fid == 21:
+ elif fid == 20:
if ftype == TType.I32:
self.State = iprot.readI32()
else:
iprot.skip(ftype)
- elif fid == 22:
+ elif fid == 21:
if ftype == TType.STRING:
self.comments = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 23:
+ elif fid == 22:
if ftype == TType.LIST:
self.labeledURI = []
(_etype42, _size39) = iprot.readListBegin()
@@ -617,17 +609,17 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 24:
+ elif fid == 23:
if ftype == TType.STRING:
self.gpgKey = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 25:
+ elif fid == 24:
if ftype == TType.STRING:
self.timeZone = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 26:
+ elif fid == 25:
if ftype == TType.STRUCT:
self.nsfDemographics = NSFDemographics()
self.nsfDemographics.read(iprot)
@@ -686,77 +678,73 @@ class UserProfile:
oprot.writeFieldBegin('nameSuffix', TType.STRING, 10)
oprot.writeString(self.nameSuffix)
oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 11)
- oprot.writeString(self.userName)
- oprot.writeFieldEnd()
if self.orcidId is not None:
- oprot.writeFieldBegin('orcidId', TType.STRING, 12)
+ oprot.writeFieldBegin('orcidId', TType.STRING, 11)
oprot.writeString(self.orcidId)
oprot.writeFieldEnd()
if self.phones is not None:
- oprot.writeFieldBegin('phones', TType.LIST, 13)
+ oprot.writeFieldBegin('phones', TType.LIST, 12)
oprot.writeListBegin(TType.STRING, len(self.phones))
for iter46 in self.phones:
oprot.writeString(iter46)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.country is not None:
- oprot.writeFieldBegin('country', TType.STRING, 14)
+ oprot.writeFieldBegin('country', TType.STRING, 13)
oprot.writeString(self.country)
oprot.writeFieldEnd()
if self.nationality is not None:
- oprot.writeFieldBegin('nationality', TType.LIST, 15)
+ oprot.writeFieldBegin('nationality', TType.LIST, 14)
oprot.writeListBegin(TType.STRING, len(self.nationality))
for iter47 in self.nationality:
oprot.writeString(iter47)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.homeOrganization is not None:
- oprot.writeFieldBegin('homeOrganization', TType.STRING, 16)
+ oprot.writeFieldBegin('homeOrganization', TType.STRING, 15)
oprot.writeString(self.homeOrganization)
oprot.writeFieldEnd()
if self.orginationAffiliation is not None:
- oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 17)
+ oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 16)
oprot.writeString(self.orginationAffiliation)
oprot.writeFieldEnd()
if self.creationTime is not None:
- oprot.writeFieldBegin('creationTime', TType.I64, 18)
+ oprot.writeFieldBegin('creationTime', TType.I64, 17)
oprot.writeI64(self.creationTime)
oprot.writeFieldEnd()
if self.lastAccessTime is not None:
- oprot.writeFieldBegin('lastAccessTime', TType.I64, 19)
+ oprot.writeFieldBegin('lastAccessTime', TType.I64, 18)
oprot.writeI64(self.lastAccessTime)
oprot.writeFieldEnd()
if self.validUntil is not None:
- oprot.writeFieldBegin('validUntil', TType.I64, 20)
+ oprot.writeFieldBegin('validUntil', TType.I64, 19)
oprot.writeI64(self.validUntil)
oprot.writeFieldEnd()
if self.State is not None:
- oprot.writeFieldBegin('State', TType.I32, 21)
+ oprot.writeFieldBegin('State', TType.I32, 20)
oprot.writeI32(self.State)
oprot.writeFieldEnd()
if self.comments is not None:
- oprot.writeFieldBegin('comments', TType.STRING, 22)
+ oprot.writeFieldBegin('comments', TType.STRING, 21)
oprot.writeString(self.comments)
oprot.writeFieldEnd()
if self.labeledURI is not None:
- oprot.writeFieldBegin('labeledURI', TType.LIST, 23)
+ oprot.writeFieldBegin('labeledURI', TType.LIST, 22)
oprot.writeListBegin(TType.STRING, len(self.labeledURI))
for iter48 in self.labeledURI:
oprot.writeString(iter48)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.gpgKey is not None:
- oprot.writeFieldBegin('gpgKey', TType.STRING, 24)
+ oprot.writeFieldBegin('gpgKey', TType.STRING, 23)
oprot.writeString(self.gpgKey)
oprot.writeFieldEnd()
if self.timeZone is not None:
- oprot.writeFieldBegin('timeZone', TType.STRING, 25)
+ oprot.writeFieldBegin('timeZone', TType.STRING, 24)
oprot.writeString(self.timeZone)
oprot.writeFieldEnd()
if self.nsfDemographics is not None:
- oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 26)
+ oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 25)
self.nsfDemographics.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -800,7 +788,6 @@ class UserProfile:
value = (value * 31) ^ hash(self.middleName)
value = (value * 31) ^ hash(self.namePrefix)
value = (value * 31) ^ hash(self.nameSuffix)
- value = (value * 31) ^ hash(self.userName)
value = (value * 31) ^ hash(self.orcidId)
value = (value * 31) ^ hash(self.phones)
value = (value * 31) ^ hash(self.country)