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/24 21:34:20 UTC
[10/61] [abbrv] airavata git commit: Add Tenant Profile Thrift Model
http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Dbevent/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Dbevent/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Dbevent/Types.php
new file mode 100644
index 0000000..bfbc983
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Dbevent/Types.php
@@ -0,0 +1,573 @@
+<?php
+namespace Airavata\Model\Dbevent;
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+
+final class CrudType {
+ const CREATE = 0;
+ const READ = 1;
+ const UPDATE = 2;
+ const DELETE = 3;
+ static public $__names = array(
+ 0 => 'CREATE',
+ 1 => 'READ',
+ 2 => 'UPDATE',
+ 3 => 'DELETE',
+ );
+}
+
+final class EntityType {
+ const USER_PROFILE = 0;
+ const TENANT = 1;
+ const GROUP = 2;
+ const PROJECT = 3;
+ const EXPERIMENT = 4;
+ const APPLICATION = 5;
+ const SHARING = 6;
+ const REGISTRY = 7;
+ static public $__names = array(
+ 0 => 'USER_PROFILE',
+ 1 => 'TENANT',
+ 2 => 'GROUP',
+ 3 => 'PROJECT',
+ 4 => 'EXPERIMENT',
+ 5 => 'APPLICATION',
+ 6 => 'SHARING',
+ 7 => 'REGISTRY',
+ );
+}
+
+final class DBEventType {
+ const PUBLISHER = 0;
+ const SUBSCRIBER = 1;
+ static public $__names = array(
+ 0 => 'PUBLISHER',
+ 1 => 'SUBSCRIBER',
+ );
+}
+
+class DBEventPublisherContext {
+ static $_TSPEC;
+
+ /**
+ * @var int
+ */
+ public $crudType = null;
+ /**
+ * @var int
+ */
+ public $entityType = null;
+ /**
+ * @var string
+ */
+ public $entityDataModel = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'crudType',
+ 'type' => TType::I32,
+ ),
+ 2 => array(
+ 'var' => 'entityType',
+ 'type' => TType::I32,
+ ),
+ 3 => array(
+ 'var' => 'entityDataModel',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['crudType'])) {
+ $this->crudType = $vals['crudType'];
+ }
+ if (isset($vals['entityType'])) {
+ $this->entityType = $vals['entityType'];
+ }
+ if (isset($vals['entityDataModel'])) {
+ $this->entityDataModel = $vals['entityDataModel'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'DBEventPublisherContext';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->crudType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->entityType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->entityDataModel);
+ } 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('DBEventPublisherContext');
+ if ($this->crudType !== null) {
+ $xfer += $output->writeFieldBegin('crudType', TType::I32, 1);
+ $xfer += $output->writeI32($this->crudType);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->entityType !== null) {
+ $xfer += $output->writeFieldBegin('entityType', TType::I32, 2);
+ $xfer += $output->writeI32($this->entityType);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->entityDataModel !== null) {
+ $xfer += $output->writeFieldBegin('entityDataModel', TType::STRING, 3);
+ $xfer += $output->writeString($this->entityDataModel);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class DBEventPublisher {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Dbevent\DBEventPublisherContext
+ */
+ public $publisherContext = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'publisherContext',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Dbevent\DBEventPublisherContext',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['publisherContext'])) {
+ $this->publisherContext = $vals['publisherContext'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'DBEventPublisher';
+ }
+
+ 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->publisherContext = new \Airavata\Model\Dbevent\DBEventPublisherContext();
+ $xfer += $this->publisherContext->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('DBEventPublisher');
+ if ($this->publisherContext !== null) {
+ if (!is_object($this->publisherContext)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('publisherContext', TType::STRUCT, 1);
+ $xfer += $this->publisherContext->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class DBEventSubscriber {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $subscriberService = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'subscriberService',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['subscriberService'])) {
+ $this->subscriberService = $vals['subscriberService'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'DBEventSubscriber';
+ }
+
+ 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->subscriberService);
+ } 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('DBEventSubscriber');
+ if ($this->subscriberService !== null) {
+ $xfer += $output->writeFieldBegin('subscriberService', TType::STRING, 1);
+ $xfer += $output->writeString($this->subscriberService);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class DBEventMessageContext {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Dbevent\DBEventPublisher
+ */
+ public $publisher = null;
+ /**
+ * @var \Airavata\Model\Dbevent\DBEventSubscriber
+ */
+ public $subscriber = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'publisher',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Dbevent\DBEventPublisher',
+ ),
+ 2 => array(
+ 'var' => 'subscriber',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Dbevent\DBEventSubscriber',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['publisher'])) {
+ $this->publisher = $vals['publisher'];
+ }
+ if (isset($vals['subscriber'])) {
+ $this->subscriber = $vals['subscriber'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'DBEventMessageContext';
+ }
+
+ 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->publisher = new \Airavata\Model\Dbevent\DBEventPublisher();
+ $xfer += $this->publisher->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->subscriber = new \Airavata\Model\Dbevent\DBEventSubscriber();
+ $xfer += $this->subscriber->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('DBEventMessageContext');
+ if ($this->publisher !== null) {
+ if (!is_object($this->publisher)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('publisher', TType::STRUCT, 1);
+ $xfer += $this->publisher->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->subscriber !== null) {
+ if (!is_object($this->subscriber)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('subscriber', TType::STRUCT, 2);
+ $xfer += $this->subscriber->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class DBEventMessage {
+ static $_TSPEC;
+
+ /**
+ * @var int
+ */
+ public $dbEventType = null;
+ /**
+ * @var \Airavata\Model\Dbevent\DBEventMessageContext
+ */
+ public $messageContext = null;
+ /**
+ * @var string
+ */
+ public $publisherService = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'dbEventType',
+ 'type' => TType::I32,
+ ),
+ 2 => array(
+ 'var' => 'messageContext',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Dbevent\DBEventMessageContext',
+ ),
+ 3 => array(
+ 'var' => 'publisherService',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['dbEventType'])) {
+ $this->dbEventType = $vals['dbEventType'];
+ }
+ if (isset($vals['messageContext'])) {
+ $this->messageContext = $vals['messageContext'];
+ }
+ if (isset($vals['publisherService'])) {
+ $this->publisherService = $vals['publisherService'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'DBEventMessage';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->dbEventType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->messageContext = new \Airavata\Model\Dbevent\DBEventMessageContext();
+ $xfer += $this->messageContext->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->publisherService);
+ } 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('DBEventMessage');
+ if ($this->dbEventType !== null) {
+ $xfer += $output->writeFieldBegin('dbEventType', TType::I32, 1);
+ $xfer += $output->writeI32($this->dbEventType);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->messageContext !== null) {
+ if (!is_object($this->messageContext)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('messageContext', TType::STRUCT, 2);
+ $xfer += $this->messageContext->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->publisherService !== null) {
+ $xfer += $output->writeFieldBegin('publisherService', TType::STRING, 3);
+ $xfer += $output->writeString($this->publisherService);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
index 96a015e..fed31a4 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Messaging/Event/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/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/blob/ddb95c12/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
new file mode 100644
index 0000000..74595f8
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
@@ -0,0 +1,528 @@
+<?php
+namespace Airavata\Model\Tenant;
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+
+final class TenantApprovalStatus {
+ const REQUESTED = 0;
+ const APPROVED = 1;
+ const ACTIVE = 2;
+ const DEACTIVATED = 3;
+ const CANCELLED = 4;
+ const DENIED = 5;
+ const CREATED = 6;
+ static public $__names = array(
+ 0 => 'REQUESTED',
+ 1 => 'APPROVED',
+ 2 => 'ACTIVE',
+ 3 => 'DEACTIVATED',
+ 4 => 'CANCELLED',
+ 5 => 'DENIED',
+ 6 => 'CREATED',
+ );
+}
+
+class Tenant {
+ static $_TSPEC;
+
+ /**
+ * @var string
+ */
+ public $tenantId = null;
+ /**
+ * @var int
+ */
+ public $tenantApprovalStatus = null;
+ /**
+ * @var string
+ */
+ public $tenantName = null;
+ /**
+ * @var string
+ */
+ public $domain = null;
+ /**
+ * @var string
+ */
+ public $emailAddress = null;
+ /**
+ * @var string
+ */
+ public $tenantAcronym = null;
+ /**
+ * @var string
+ */
+ public $tenantURL = null;
+ /**
+ * @var string
+ */
+ public $tenantPublicAbstract = null;
+ /**
+ * @var string
+ */
+ public $reviewProposalDescription = null;
+ /**
+ * @var string
+ */
+ public $tenantAdminFirstName = null;
+ /**
+ * @var string
+ */
+ public $tenantAdminLastName = null;
+ /**
+ * @var string
+ */
+ public $tenantAdminEmail = null;
+ /**
+ * @var string
+ */
+ public $identityServerUserName = null;
+ /**
+ * @var string
+ */
+ public $identityServerPasswordToken = null;
+ /**
+ * @var string
+ */
+ public $declinedReason = null;
+ /**
+ * @var string
+ */
+ public $oauthClientId = null;
+ /**
+ * @var string
+ */
+ public $oauthClientSecret = null;
+ /**
+ * @var int
+ */
+ public $requestCreationTime = null;
+ /**
+ * @var string
+ */
+ public $requesterUsername = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'tenantId',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'tenantApprovalStatus',
+ 'type' => TType::I32,
+ ),
+ 3 => array(
+ 'var' => 'tenantName',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'domain',
+ 'type' => TType::STRING,
+ ),
+ 5 => array(
+ 'var' => 'emailAddress',
+ 'type' => TType::STRING,
+ ),
+ 6 => array(
+ 'var' => 'tenantAcronym',
+ 'type' => TType::STRING,
+ ),
+ 7 => array(
+ 'var' => 'tenantURL',
+ 'type' => TType::STRING,
+ ),
+ 8 => array(
+ 'var' => 'tenantPublicAbstract',
+ 'type' => TType::STRING,
+ ),
+ 9 => array(
+ 'var' => 'reviewProposalDescription',
+ 'type' => TType::STRING,
+ ),
+ 10 => array(
+ 'var' => 'tenantAdminFirstName',
+ 'type' => TType::STRING,
+ ),
+ 11 => array(
+ 'var' => 'tenantAdminLastName',
+ 'type' => TType::STRING,
+ ),
+ 12 => array(
+ 'var' => 'tenantAdminEmail',
+ 'type' => TType::STRING,
+ ),
+ 13 => array(
+ 'var' => 'identityServerUserName',
+ 'type' => TType::STRING,
+ ),
+ 14 => array(
+ 'var' => 'identityServerPasswordToken',
+ 'type' => TType::STRING,
+ ),
+ 15 => array(
+ 'var' => 'declinedReason',
+ 'type' => TType::STRING,
+ ),
+ 16 => array(
+ 'var' => 'oauthClientId',
+ 'type' => TType::STRING,
+ ),
+ 17 => array(
+ 'var' => 'oauthClientSecret',
+ 'type' => TType::STRING,
+ ),
+ 18 => array(
+ 'var' => 'requestCreationTime',
+ 'type' => TType::I64,
+ ),
+ 19 => array(
+ 'var' => 'requesterUsername',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['tenantId'])) {
+ $this->tenantId = $vals['tenantId'];
+ }
+ if (isset($vals['tenantApprovalStatus'])) {
+ $this->tenantApprovalStatus = $vals['tenantApprovalStatus'];
+ }
+ if (isset($vals['tenantName'])) {
+ $this->tenantName = $vals['tenantName'];
+ }
+ if (isset($vals['domain'])) {
+ $this->domain = $vals['domain'];
+ }
+ if (isset($vals['emailAddress'])) {
+ $this->emailAddress = $vals['emailAddress'];
+ }
+ if (isset($vals['tenantAcronym'])) {
+ $this->tenantAcronym = $vals['tenantAcronym'];
+ }
+ if (isset($vals['tenantURL'])) {
+ $this->tenantURL = $vals['tenantURL'];
+ }
+ if (isset($vals['tenantPublicAbstract'])) {
+ $this->tenantPublicAbstract = $vals['tenantPublicAbstract'];
+ }
+ if (isset($vals['reviewProposalDescription'])) {
+ $this->reviewProposalDescription = $vals['reviewProposalDescription'];
+ }
+ if (isset($vals['tenantAdminFirstName'])) {
+ $this->tenantAdminFirstName = $vals['tenantAdminFirstName'];
+ }
+ if (isset($vals['tenantAdminLastName'])) {
+ $this->tenantAdminLastName = $vals['tenantAdminLastName'];
+ }
+ if (isset($vals['tenantAdminEmail'])) {
+ $this->tenantAdminEmail = $vals['tenantAdminEmail'];
+ }
+ if (isset($vals['identityServerUserName'])) {
+ $this->identityServerUserName = $vals['identityServerUserName'];
+ }
+ if (isset($vals['identityServerPasswordToken'])) {
+ $this->identityServerPasswordToken = $vals['identityServerPasswordToken'];
+ }
+ if (isset($vals['declinedReason'])) {
+ $this->declinedReason = $vals['declinedReason'];
+ }
+ if (isset($vals['oauthClientId'])) {
+ $this->oauthClientId = $vals['oauthClientId'];
+ }
+ if (isset($vals['oauthClientSecret'])) {
+ $this->oauthClientSecret = $vals['oauthClientSecret'];
+ }
+ if (isset($vals['requestCreationTime'])) {
+ $this->requestCreationTime = $vals['requestCreationTime'];
+ }
+ if (isset($vals['requesterUsername'])) {
+ $this->requesterUsername = $vals['requesterUsername'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Tenant';
+ }
+
+ 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->tenantId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->tenantApprovalStatus);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->domain);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->emailAddress);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantAcronym);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantURL);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantPublicAbstract);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 9:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->reviewProposalDescription);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 10:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantAdminFirstName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 11:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantAdminLastName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantAdminEmail);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 13:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->identityServerUserName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 14:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->identityServerPasswordToken);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 15:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->declinedReason);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 16:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->oauthClientId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 17:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->oauthClientSecret);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 18:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->requestCreationTime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 19:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->requesterUsername);
+ } 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('Tenant');
+ if ($this->tenantId !== null) {
+ $xfer += $output->writeFieldBegin('tenantId', TType::STRING, 1);
+ $xfer += $output->writeString($this->tenantId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantApprovalStatus !== null) {
+ $xfer += $output->writeFieldBegin('tenantApprovalStatus', TType::I32, 2);
+ $xfer += $output->writeI32($this->tenantApprovalStatus);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantName !== null) {
+ $xfer += $output->writeFieldBegin('tenantName', TType::STRING, 3);
+ $xfer += $output->writeString($this->tenantName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->domain !== null) {
+ $xfer += $output->writeFieldBegin('domain', TType::STRING, 4);
+ $xfer += $output->writeString($this->domain);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->emailAddress !== null) {
+ $xfer += $output->writeFieldBegin('emailAddress', TType::STRING, 5);
+ $xfer += $output->writeString($this->emailAddress);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantAcronym !== null) {
+ $xfer += $output->writeFieldBegin('tenantAcronym', TType::STRING, 6);
+ $xfer += $output->writeString($this->tenantAcronym);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantURL !== null) {
+ $xfer += $output->writeFieldBegin('tenantURL', TType::STRING, 7);
+ $xfer += $output->writeString($this->tenantURL);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantPublicAbstract !== null) {
+ $xfer += $output->writeFieldBegin('tenantPublicAbstract', TType::STRING, 8);
+ $xfer += $output->writeString($this->tenantPublicAbstract);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->reviewProposalDescription !== null) {
+ $xfer += $output->writeFieldBegin('reviewProposalDescription', TType::STRING, 9);
+ $xfer += $output->writeString($this->reviewProposalDescription);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantAdminFirstName !== null) {
+ $xfer += $output->writeFieldBegin('tenantAdminFirstName', TType::STRING, 10);
+ $xfer += $output->writeString($this->tenantAdminFirstName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantAdminLastName !== null) {
+ $xfer += $output->writeFieldBegin('tenantAdminLastName', TType::STRING, 11);
+ $xfer += $output->writeString($this->tenantAdminLastName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantAdminEmail !== null) {
+ $xfer += $output->writeFieldBegin('tenantAdminEmail', TType::STRING, 12);
+ $xfer += $output->writeString($this->tenantAdminEmail);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->identityServerUserName !== null) {
+ $xfer += $output->writeFieldBegin('identityServerUserName', TType::STRING, 13);
+ $xfer += $output->writeString($this->identityServerUserName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->identityServerPasswordToken !== null) {
+ $xfer += $output->writeFieldBegin('identityServerPasswordToken', TType::STRING, 14);
+ $xfer += $output->writeString($this->identityServerPasswordToken);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->declinedReason !== null) {
+ $xfer += $output->writeFieldBegin('declinedReason', TType::STRING, 15);
+ $xfer += $output->writeString($this->declinedReason);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->oauthClientId !== null) {
+ $xfer += $output->writeFieldBegin('oauthClientId', TType::STRING, 16);
+ $xfer += $output->writeString($this->oauthClientId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->oauthClientSecret !== null) {
+ $xfer += $output->writeFieldBegin('oauthClientSecret', TType::STRING, 17);
+ $xfer += $output->writeString($this->oauthClientSecret);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->requestCreationTime !== null) {
+ $xfer += $output->writeFieldBegin('requestCreationTime', TType::I64, 18);
+ $xfer += $output->writeI64($this->requestCreationTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->requesterUsername !== null) {
+ $xfer += $output->writeFieldBegin('requesterUsername', TType::STRING, 19);
+ $xfer += $output->writeString($this->requesterUsername);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/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 c9aa616..1ebd5db 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
@@ -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,6 +479,26 @@ class UserProfile {
/**
* @var string
*/
+ 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
+ */
public $userName = null;
/**
* @var string
@@ -476,15 +525,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 +589,34 @@ 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' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 12 => array(
+ 'var' => 'orcidId',
+ 'type' => TType::STRING,
+ ),
+ 13 => array(
'var' => 'phones',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -555,11 +624,11 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 9 => array(
+ 14 => array(
'var' => 'country',
'type' => TType::STRING,
),
- 10 => array(
+ 15 => array(
'var' => 'nationality',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -567,35 +636,35 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 11 => array(
+ 16 => array(
'var' => 'homeOrganization',
'type' => TType::STRING,
),
- 12 => array(
+ 17 => array(
'var' => 'orginationAffiliation',
'type' => TType::STRING,
),
- 13 => array(
+ 18 => array(
'var' => 'creationTime',
- 'type' => TType::STRING,
+ 'type' => TType::I64,
),
- 14 => array(
+ 19 => array(
'var' => 'lastAccessTime',
- 'type' => TType::STRING,
+ 'type' => TType::I64,
),
- 15 => array(
+ 20 => array(
'var' => 'validUntil',
- 'type' => TType::STRING,
+ 'type' => TType::I64,
),
- 16 => array(
+ 21 => array(
'var' => 'State',
'type' => TType::I32,
),
- 17 => array(
+ 22 => array(
'var' => 'comments',
'type' => TType::STRING,
),
- 18 => array(
+ 23 => array(
'var' => 'labeledURI',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -603,15 +672,15 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 19 => array(
+ 24 => array(
'var' => 'gpgKey',
'type' => TType::STRING,
),
- 20 => array(
+ 25 => array(
'var' => 'timeZone',
'type' => TType::STRING,
),
- 21 => array(
+ 26 => array(
'var' => 'nsfDemographics',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\User\NSFDemographics',
@@ -634,6 +703,21 @@ class UserProfile {
if (isset($vals['emails'])) {
$this->emails = $vals['emails'];
}
+ 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['userName'])) {
$this->userName = $vals['userName'];
}
@@ -751,19 +835,54 @@ 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->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:
if ($ftype == TType::LST) {
$this->phones = array();
$_size27 = 0;
@@ -780,14 +899,14 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 14:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->country);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 15:
if ($ftype == TType::LST) {
$this->nationality = array();
$_size33 = 0;
@@ -804,56 +923,56 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 11:
+ case 16:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->homeOrganization);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 12:
+ case 17:
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 18:
+ 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 19:
+ 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 20:
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->validUntil);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 16:
+ case 21:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->State);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 17:
+ case 22:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->comments);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 18:
+ case 23:
if ($ftype == TType::LST) {
$this->labeledURI = array();
$_size39 = 0;
@@ -870,21 +989,21 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 19:
+ case 24:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gpgKey);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 20:
+ case 25:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->timeZone);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 21:
+ case 26:
if ($ftype == TType::STRUCT) {
$this->nsfDemographics = new \Airavata\Model\User\NSFDemographics();
$xfer += $this->nsfDemographics->read($input);
@@ -942,13 +1061,38 @@ class UserProfile {
}
$xfer += $output->writeFieldEnd();
}
+ 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->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 6);
+ $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, 7);
+ $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 12);
$xfer += $output->writeString($this->orcidId);
$xfer += $output->writeFieldEnd();
}
@@ -956,7 +1100,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, 13);
{
$output->writeListBegin(TType::STRING, count($this->phones));
{
@@ -970,7 +1114,7 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->country !== null) {
- $xfer += $output->writeFieldBegin('country', TType::STRING, 9);
+ $xfer += $output->writeFieldBegin('country', TType::STRING, 14);
$xfer += $output->writeString($this->country);
$xfer += $output->writeFieldEnd();
}
@@ -978,7 +1122,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, 15);
{
$output->writeListBegin(TType::STRING, count($this->nationality));
{
@@ -992,37 +1136,37 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->homeOrganization !== null) {
- $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 11);
+ $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 16);
$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, 17);
$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, 18);
+ $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, 19);
+ $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, 20);
+ $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, 21);
$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, 22);
$xfer += $output->writeString($this->comments);
$xfer += $output->writeFieldEnd();
}
@@ -1030,7 +1174,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, 23);
{
$output->writeListBegin(TType::STRING, count($this->labeledURI));
{
@@ -1044,12 +1188,12 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->gpgKey !== null) {
- $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 19);
+ $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 24);
$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, 25);
$xfer += $output->writeString($this->timeZone);
$xfer += $output->writeFieldEnd();
}
@@ -1057,7 +1201,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, 26);
$xfer += $this->nsfDemographics->write($output);
$xfer += $output->writeFieldEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ddb95c12/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 9fbba49..622df08 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
@@ -193,6 +193,13 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' bool deleteGroup(AuthzToken authzToken, string groupId, string ownerId, string gatewayId)')
print(' GroupModel getGroup(AuthzToken authzToken, string groupId)')
print(' getAllGroupsUserBelongs(AuthzToken authzToken, string userName, string gatewayId)')
+ print(' string addUserProfile(AuthzToken authzToken, UserProfile userProfile)')
+ print(' bool updateUserProfile(AuthzToken authzToken, UserProfile userProfile)')
+ 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('')
sys.exit(0)
@@ -1263,6 +1270,48 @@ elif cmd == 'getAllGroupsUserBelongs':
sys.exit(1)
pp.pprint(client.getAllGroupsUserBelongs(eval(args[0]),args[1],args[2],))
+elif cmd == 'addUserProfile':
+ if len(args) != 2:
+ print('addUserProfile requires 2 args')
+ sys.exit(1)
+ pp.pprint(client.addUserProfile(eval(args[0]),eval(args[1]),))
+
+elif cmd == 'updateUserProfile':
+ if len(args) != 2:
+ print('updateUserProfile requires 2 args')
+ sys.exit(1)
+ pp.pprint(client.updateUserProfile(eval(args[0]),eval(args[1]),))
+
+elif cmd == 'getUserProfileById':
+ if len(args) != 3:
+ print('getUserProfileById requires 3 args')
+ sys.exit(1)
+ pp.pprint(client.getUserProfileById(eval(args[0]),args[1],args[2],))
+
+elif cmd == 'deleteUserProfile':
+ if len(args) != 2:
+ print('deleteUserProfile requires 2 args')
+ sys.exit(1)
+ pp.pprint(client.deleteUserProfile(eval(args[0]),args[1],))
+
+elif cmd == 'getAllUserProfilesInGateway':
+ if len(args) != 4:
+ print('getAllUserProfilesInGateway requires 4 args')
+ 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')
+ sys.exit(1)
+ pp.pprint(client.doesUserProfileExist(eval(args[0]),args[1],args[2],))
+
else:
print('Unrecognized method %s' % cmd)
sys.exit(1)