airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [2/3] airavata-php-gateway git commit: AIRAVATA-2232 Update Thrift stubs
Date Tue, 29 Nov 2016 19:09:36 GMT
AIRAVATA-2232 Update Thrift stubs


Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/31b233cb
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/31b233cb
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/31b233cb

Branch: refs/heads/develop
Commit: 31b233cba6c23f1a4b72fb7db4c25fadf3bcc580
Parents: 76bb9da
Author: Marcus Christie <machrist@iu.edu>
Authored: Tue Nov 29 11:46:47 2016 -0500
Committer: Marcus Christie <machrist@iu.edu>
Committed: Tue Nov 29 11:47:29 2016 -0500

----------------------------------------------------------------------
 app/libraries/Airavata/API/Airavata.php         | 409 ++-----------------
 .../Model/AppCatalog/ComputeResource/Types.php  |   2 +
 .../Airavata/Model/Credential/Store/Types.php   |  32 ++
 app/libraries/Airavata/Model/Group/Types.php    |   2 +
 app/libraries/Airavata/Model/Process/Types.php  |  23 ++
 app/libraries/Airavata/Model/Status/Types.php   | 190 +++++++++
 6 files changed, 286 insertions(+), 372 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/31b233cb/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index fe72dce..f235e48 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -253,34 +253,12 @@ interface AiravataIf {
    *    The User for which the credential should be registered. For community accounts, this
user is the name of the
    *    community user name. For computational resources, this user name need not be the
same user name on resoruces.
    * 
-   * @return airavataCredStoreToken
-   *   An SSH Key pair is generated and stored in the credential store and associated with
users or community account
-   *   belonging to a Gateway.
-   * 
-   * 
-   * 
-   * @param \Airavata\Model\Security\AuthzToken $authzToken
-   * @param string $gatewayId
-   * @param string $userName
-   * @return string
-   * @throws \Airavata\API\Error\InvalidRequestException
-   * @throws \Airavata\API\Error\AiravataClientException
-   * @throws \Airavata\API\Error\AiravataSystemException
-   */
-  public function generateAndRegisterSSHKeys(\Airavata\Model\Security\AuthzToken $authzToken,
$gatewayId, $userName);
-  /**
-   * Generate and Register SSH Key Pair with Airavata Credential Store.
-   * 
-   * @param gatewayId
-   *    The identifier for the requested Gateway.
-   * 
-   * @param userName
-   *    The User for which the credential should be registered. For community accounts, this
user is the name of the
-   *    community user name. For computational resources, this user name need not be the
same user name on resoruces.
-   * 
    * @param description
    *    The description field for a credential type, all type of credential can have a description.
    * 
+   * @param credentialOwnerType
+   *    The type of owner of this credential. Two possible values: GATEWAY (default) and
USER
+   * 
    * @return airavataCredStoreToken
    *   An SSH Key pair is generated and stored in the credential store and associated with
users or community account
    *   belonging to a Gateway.
@@ -291,12 +269,13 @@ interface AiravataIf {
    * @param string $gatewayId
    * @param string $userName
    * @param string $description
+   * @param int $credentialOwnerType
    * @return string
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    */
-  public function generateAndRegisterSSHKeysWithDescription(\Airavata\Model\Security\AuthzToken
$authzToken, $gatewayId, $userName, $description);
+  public function generateAndRegisterSSHKeys(\Airavata\Model\Security\AuthzToken $authzToken,
$gatewayId, $userName, $description, $credentialOwnerType);
   /**
    * Generate and Register Username PWD Pair with Airavata Credential Store.
    * 
@@ -5007,18 +4986,20 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("getAllNotifications failed: unknown result");
   }
 
-  public function generateAndRegisterSSHKeys(\Airavata\Model\Security\AuthzToken $authzToken,
$gatewayId, $userName)
+  public function generateAndRegisterSSHKeys(\Airavata\Model\Security\AuthzToken $authzToken,
$gatewayId, $userName, $description, $credentialOwnerType)
   {
-    $this->send_generateAndRegisterSSHKeys($authzToken, $gatewayId, $userName);
+    $this->send_generateAndRegisterSSHKeys($authzToken, $gatewayId, $userName, $description,
$credentialOwnerType);
     return $this->recv_generateAndRegisterSSHKeys();
   }
 
-  public function send_generateAndRegisterSSHKeys(\Airavata\Model\Security\AuthzToken $authzToken,
$gatewayId, $userName)
+  public function send_generateAndRegisterSSHKeys(\Airavata\Model\Security\AuthzToken $authzToken,
$gatewayId, $userName, $description, $credentialOwnerType)
   {
     $args = new \Airavata\API\Airavata_generateAndRegisterSSHKeys_args();
     $args->authzToken = $authzToken;
     $args->gatewayId = $gatewayId;
     $args->userName = $userName;
+    $args->description = $description;
+    $args->credentialOwnerType = $credentialOwnerType;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
     {
@@ -5069,69 +5050,6 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("generateAndRegisterSSHKeys failed: unknown result");
   }
 
-  public function generateAndRegisterSSHKeysWithDescription(\Airavata\Model\Security\AuthzToken
$authzToken, $gatewayId, $userName, $description)
-  {
-    $this->send_generateAndRegisterSSHKeysWithDescription($authzToken, $gatewayId, $userName,
$description);
-    return $this->recv_generateAndRegisterSSHKeysWithDescription();
-  }
-
-  public function send_generateAndRegisterSSHKeysWithDescription(\Airavata\Model\Security\AuthzToken
$authzToken, $gatewayId, $userName, $description)
-  {
-    $args = new \Airavata\API\Airavata_generateAndRegisterSSHKeysWithDescription_args();
-    $args->authzToken = $authzToken;
-    $args->gatewayId = $gatewayId;
-    $args->userName = $userName;
-    $args->description = $description;
-    $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
-    if ($bin_accel)
-    {
-      thrift_protocol_write_binary($this->output_, 'generateAndRegisterSSHKeysWithDescription',
TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
-    }
-    else
-    {
-      $this->output_->writeMessageBegin('generateAndRegisterSSHKeysWithDescription',
TMessageType::CALL, $this->seqid_);
-      $args->write($this->output_);
-      $this->output_->writeMessageEnd();
-      $this->output_->getTransport()->flush();
-    }
-  }
-
-  public function recv_generateAndRegisterSSHKeysWithDescription()
-  {
-    $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_generateAndRegisterSSHKeysWithDescription_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_generateAndRegisterSSHKeysWithDescription_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;
-    }
-    throw new \Exception("generateAndRegisterSSHKeysWithDescription failed: unknown result");
-  }
-
   public function registerPwdCredential(\Airavata\Model\Security\AuthzToken $authzToken,
$gatewayId, $portalUserName, $loginUserName, $password, $description)
   {
     $this->send_registerPwdCredential($authzToken, $gatewayId, $portalUserName, $loginUserName,
$password, $description);
@@ -19181,286 +19099,14 @@ class Airavata_generateAndRegisterSSHKeys_args {
    * @var string
    */
   public $userName = 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' => 'gatewayId',
-          'type' => TType::STRING,
-          ),
-        3 => array(
-          'var' => 'userName',
-          'type' => TType::STRING,
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['authzToken'])) {
-        $this->authzToken = $vals['authzToken'];
-      }
-      if (isset($vals['gatewayId'])) {
-        $this->gatewayId = $vals['gatewayId'];
-      }
-      if (isset($vals['userName'])) {
-        $this->userName = $vals['userName'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'Airavata_generateAndRegisterSSHKeys_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->gatewayId);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 3:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->userName);
-          } 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_generateAndRegisterSSHKeys_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->gatewayId !== null) {
-      $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
-      $xfer += $output->writeString($this->gatewayId);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->userName !== null) {
-      $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
-      $xfer += $output->writeString($this->userName);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class Airavata_generateAndRegisterSSHKeys_result {
-  static $_TSPEC;
-
   /**
    * @var string
    */
-  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;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        0 => array(
-          'var' => 'success',
-          'type' => TType::STRING,
-          ),
-        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',
-          ),
-        );
-    }
-    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'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'Airavata_generateAndRegisterSSHKeys_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::STRING) {
-            $xfer += $input->readString($this->success);
-          } 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;
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeys_result');
-    if ($this->success !== null) {
-      $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
-      $xfer += $output->writeString($this->success);
-      $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();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class Airavata_generateAndRegisterSSHKeysWithDescription_args {
-  static $_TSPEC;
-
-  /**
-   * @var \Airavata\Model\Security\AuthzToken
-   */
-  public $authzToken = null;
-  /**
-   * @var string
-   */
-  public $gatewayId = null;
-  /**
-   * @var string
-   */
-  public $userName = null;
+  public $description = null;
   /**
-   * @var string
+   * @var int
    */
-  public $description = null;
+  public $credentialOwnerType = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -19482,6 +19128,10 @@ class Airavata_generateAndRegisterSSHKeysWithDescription_args {
           'var' => 'description',
           'type' => TType::STRING,
           ),
+        5 => array(
+          'var' => 'credentialOwnerType',
+          'type' => TType::I32,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -19497,11 +19147,14 @@ class Airavata_generateAndRegisterSSHKeysWithDescription_args {
       if (isset($vals['description'])) {
         $this->description = $vals['description'];
       }
+      if (isset($vals['credentialOwnerType'])) {
+        $this->credentialOwnerType = $vals['credentialOwnerType'];
+      }
     }
   }
 
   public function getName() {
-    return 'Airavata_generateAndRegisterSSHKeysWithDescription_args';
+    return 'Airavata_generateAndRegisterSSHKeys_args';
   }
 
   public function read($input)
@@ -19548,6 +19201,13 @@ class Airavata_generateAndRegisterSSHKeysWithDescription_args {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 5:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->credentialOwnerType);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -19560,7 +19220,7 @@ class Airavata_generateAndRegisterSSHKeysWithDescription_args {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeysWithDescription_args');
+    $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeys_args');
     if ($this->authzToken !== null) {
       if (!is_object($this->authzToken)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -19584,6 +19244,11 @@ class Airavata_generateAndRegisterSSHKeysWithDescription_args {
       $xfer += $output->writeString($this->description);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->credentialOwnerType !== null) {
+      $xfer += $output->writeFieldBegin('credentialOwnerType', TType::I32, 5);
+      $xfer += $output->writeI32($this->credentialOwnerType);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -19591,7 +19256,7 @@ class Airavata_generateAndRegisterSSHKeysWithDescription_args {
 
 }
 
-class Airavata_generateAndRegisterSSHKeysWithDescription_result {
+class Airavata_generateAndRegisterSSHKeys_result {
   static $_TSPEC;
 
   /**
@@ -19652,7 +19317,7 @@ class Airavata_generateAndRegisterSSHKeysWithDescription_result {
   }
 
   public function getName() {
-    return 'Airavata_generateAndRegisterSSHKeysWithDescription_result';
+    return 'Airavata_generateAndRegisterSSHKeys_result';
   }
 
   public function read($input)
@@ -19713,7 +19378,7 @@ class Airavata_generateAndRegisterSSHKeysWithDescription_result {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeysWithDescription_result');
+    $xfer += $output->writeStructBegin('Airavata_generateAndRegisterSSHKeys_result');
     if ($this->success !== null) {
       $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
       $xfer += $output->writeString($this->success);

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/31b233cb/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 39acd3c..696b064 100644
--- a/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/app/libraries/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -42,12 +42,14 @@ final class ResourceJobManagerType {
   const SLURM = 2;
   const LSF = 3;
   const UGE = 4;
+  const CLOUD = 5;
   static public $__names = array(
     0 => 'FORK',
     1 => 'PBS',
     2 => 'SLURM',
     3 => 'LSF',
     4 => 'UGE',
+    5 => 'CLOUD',
   );
 }
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/31b233cb/app/libraries/Airavata/Model/Credential/Store/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Credential/Store/Types.php b/app/libraries/Airavata/Model/Credential/Store/Types.php
index 82139a3..d8e3f13 100644
--- a/app/libraries/Airavata/Model/Credential/Store/Types.php
+++ b/app/libraries/Airavata/Model/Credential/Store/Types.php
@@ -17,6 +17,15 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
 use Thrift\Exception\TApplicationException;
 
 
+final class CredentialOwnerType {
+  const GATEWAY = 0;
+  const USER = 1;
+  static public $__names = array(
+    0 => 'GATEWAY',
+    1 => 'USER',
+  );
+}
+
 class SSHCredential {
   static $_TSPEC;
 
@@ -52,6 +61,10 @@ class SSHCredential {
    * @var string
    */
   public $description = null;
+  /**
+   * @var int
+   */
+  public $credentialOwnerType =   0;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -88,6 +101,10 @@ class SSHCredential {
           'var' => 'description',
           'type' => TType::STRING,
           ),
+        9 => array(
+          'var' => 'credentialOwnerType',
+          'type' => TType::I32,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -115,6 +132,9 @@ class SSHCredential {
       if (isset($vals['description'])) {
         $this->description = $vals['description'];
       }
+      if (isset($vals['credentialOwnerType'])) {
+        $this->credentialOwnerType = $vals['credentialOwnerType'];
+      }
     }
   }
 
@@ -193,6 +213,13 @@ class SSHCredential {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 9:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->credentialOwnerType);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -246,6 +273,11 @@ class SSHCredential {
       $xfer += $output->writeString($this->description);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->credentialOwnerType !== null) {
+      $xfer += $output->writeFieldBegin('credentialOwnerType', TType::I32, 9);
+      $xfer += $output->writeI32($this->credentialOwnerType);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/31b233cb/app/libraries/Airavata/Model/Group/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Group/Types.php b/app/libraries/Airavata/Model/Group/Types.php
index 44f3db0..ec7a68e 100644
--- a/app/libraries/Airavata/Model/Group/Types.php
+++ b/app/libraries/Airavata/Model/Group/Types.php
@@ -33,9 +33,11 @@ final class ResourceType {
 final class ResourcePermissionType {
   const WRITE = 0;
   const READ = 1;
+  const OWNER = 2;
   static public $__names = array(
     0 => 'WRITE',
     1 => 'READ',
+    2 => 'OWNER',
   );
 }
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/31b233cb/app/libraries/Airavata/Model/Process/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Process/Types.php b/app/libraries/Airavata/Model/Process/Types.php
index 9e0b0b2..dc69623 100644
--- a/app/libraries/Airavata/Model/Process/Types.php
+++ b/app/libraries/Airavata/Model/Process/Types.php
@@ -121,6 +121,10 @@ class ProcessModel {
    * @var string
    */
   public $userName = null;
+  /**
+   * @var bool
+   */
+  public $useUserCRPref = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -247,6 +251,10 @@ class ProcessModel {
           'var' => 'userName',
           'type' => TType::STRING,
           ),
+        24 => array(
+          'var' => 'useUserCRPref',
+          'type' => TType::BOOL,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -319,6 +327,9 @@ class ProcessModel {
       if (isset($vals['userName'])) {
         $this->userName = $vals['userName'];
       }
+      if (isset($vals['useUserCRPref'])) {
+        $this->useUserCRPref = $vals['useUserCRPref'];
+      }
     }
   }
 
@@ -568,6 +579,13 @@ class ProcessModel {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 24:
+          if ($ftype == TType::BOOL) {
+            $xfer += $input->readBool($this->useUserCRPref);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -771,6 +789,11 @@ class ProcessModel {
       $xfer += $output->writeString($this->userName);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->useUserCRPref !== null) {
+      $xfer += $output->writeFieldBegin('useUserCRPref', TType::BOOL, 24);
+      $xfer += $output->writeBool($this->useUserCRPref);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/31b233cb/app/libraries/Airavata/Model/Status/Types.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/Model/Status/Types.php b/app/libraries/Airavata/Model/Status/Types.php
index 8457502..0a0a23b 100644
--- a/app/libraries/Airavata/Model/Status/Types.php
+++ b/app/libraries/Airavata/Model/Status/Types.php
@@ -606,4 +606,194 @@ class JobStatus {
 
 }
 
+class QueueStatusModel {
+  static $_TSPEC;
+
+  /**
+   * @var string
+   */
+  public $hostName = null;
+  /**
+   * @var string
+   */
+  public $queueName = null;
+  /**
+   * @var bool
+   */
+  public $queueUp = null;
+  /**
+   * @var int
+   */
+  public $runningJobs = null;
+  /**
+   * @var int
+   */
+  public $queuedJobs = null;
+  /**
+   * @var int
+   */
+  public $time = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'hostName',
+          'type' => TType::STRING,
+          ),
+        2 => array(
+          'var' => 'queueName',
+          'type' => TType::STRING,
+          ),
+        3 => array(
+          'var' => 'queueUp',
+          'type' => TType::BOOL,
+          ),
+        4 => array(
+          'var' => 'runningJobs',
+          'type' => TType::I32,
+          ),
+        5 => array(
+          'var' => 'queuedJobs',
+          'type' => TType::I32,
+          ),
+        6 => array(
+          'var' => 'time',
+          'type' => TType::I64,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['hostName'])) {
+        $this->hostName = $vals['hostName'];
+      }
+      if (isset($vals['queueName'])) {
+        $this->queueName = $vals['queueName'];
+      }
+      if (isset($vals['queueUp'])) {
+        $this->queueUp = $vals['queueUp'];
+      }
+      if (isset($vals['runningJobs'])) {
+        $this->runningJobs = $vals['runningJobs'];
+      }
+      if (isset($vals['queuedJobs'])) {
+        $this->queuedJobs = $vals['queuedJobs'];
+      }
+      if (isset($vals['time'])) {
+        $this->time = $vals['time'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'QueueStatusModel';
+  }
+
+  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->hostName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->queueName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
+          if ($ftype == TType::BOOL) {
+            $xfer += $input->readBool($this->queueUp);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 4:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->runningJobs);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 5:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->queuedJobs);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 6:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->time);
+          } 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('QueueStatusModel');
+    if ($this->hostName !== null) {
+      $xfer += $output->writeFieldBegin('hostName', TType::STRING, 1);
+      $xfer += $output->writeString($this->hostName);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->queueName !== null) {
+      $xfer += $output->writeFieldBegin('queueName', TType::STRING, 2);
+      $xfer += $output->writeString($this->queueName);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->queueUp !== null) {
+      $xfer += $output->writeFieldBegin('queueUp', TType::BOOL, 3);
+      $xfer += $output->writeBool($this->queueUp);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->runningJobs !== null) {
+      $xfer += $output->writeFieldBegin('runningJobs', TType::I32, 4);
+      $xfer += $output->writeI32($this->runningJobs);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->queuedJobs !== null) {
+      $xfer += $output->writeFieldBegin('queuedJobs', TType::I32, 5);
+      $xfer += $output->writeI32($this->queuedJobs);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->time !== null) {
+      $xfer += $output->writeFieldBegin('time', TType::I64, 6);
+      $xfer += $output->writeI64($this->time);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
 


Mime
View raw message