airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [05/11] airavata git commit: data storage preference related changes to app catalog
Date Mon, 28 Sep 2015 17:58:27 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/d84783da/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 6891a0d..e5bff2c 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
@@ -1332,6 +1332,13 @@ class LOCALDataMovement {
  * 
  * sshPort:
  *  If a non-default port needs to used, specify it.
+ * 
+ * batchQueueEmailSenders:
+ *  If a resource always sends the monitoring from a specific address, specify the
+ *   full email address. If a resource sends emails from multiple addresses (
+ *    example: based on the submitted login node) then use the wildchar * to indicate
+ *    the same. Example: *@*.example.com or *@example.com
+ * 
  */
 class SSHJobSubmission {
   static $_TSPEC;
@@ -1360,6 +1367,10 @@ class SSHJobSubmission {
    * @var int
    */
   public $monitorMode = null;
+  /**
+   * @var string[]
+   */
+  public $batchQueueEmailSenders = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -1389,6 +1400,14 @@ class SSHJobSubmission {
           'var' => 'monitorMode',
           'type' => TType::I32,
           ),
+        7 => array(
+          'var' => 'batchQueueEmailSenders',
+          'type' => TType::LST,
+          'etype' => TType::STRING,
+          'elem' => array(
+            'type' => TType::STRING,
+            ),
+          ),
         );
     }
     if (is_array($vals)) {
@@ -1410,6 +1429,9 @@ class SSHJobSubmission {
       if (isset($vals['monitorMode'])) {
         $this->monitorMode = $vals['monitorMode'];
       }
+      if (isset($vals['batchQueueEmailSenders'])) {
+        $this->batchQueueEmailSenders = $vals['batchQueueEmailSenders'];
+      }
     }
   }
 
@@ -1475,6 +1497,23 @@ class SSHJobSubmission {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 7:
+          if ($ftype == TType::LST) {
+            $this->batchQueueEmailSenders = array();
+            $_size16 = 0;
+            $_etype19 = 0;
+            $xfer += $input->readListBegin($_etype19, $_size16);
+            for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
+            {
+              $elem21 = null;
+              $xfer += $input->readString($elem21);
+              $this->batchQueueEmailSenders []= $elem21;
+            }
+            $xfer += $input->readListEnd();
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -1521,6 +1560,23 @@ class SSHJobSubmission {
       $xfer += $output->writeI32($this->monitorMode);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->batchQueueEmailSenders !== null) {
+      if (!is_array($this->batchQueueEmailSenders)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('batchQueueEmailSenders', TType::LST, 7);
+      {
+        $output->writeListBegin(TType::STRING, count($this->batchQueueEmailSenders));
+        {
+          foreach ($this->batchQueueEmailSenders as $iter22)
+          {
+            $xfer += $output->writeString($iter22);
+          }
+        }
+        $output->writeListEnd();
+      }
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -1614,14 +1670,14 @@ class GlobusJobSubmission {
         case 3:
           if ($ftype == TType::LST) {
             $this->globusGateKeeperEndPoint = array();
-            $_size16 = 0;
-            $_etype19 = 0;
-            $xfer += $input->readListBegin($_etype19, $_size16);
-            for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
+            $_size23 = 0;
+            $_etype26 = 0;
+            $xfer += $input->readListBegin($_etype26, $_size23);
+            for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
             {
-              $elem21 = null;
-              $xfer += $input->readString($elem21);
-              $this->globusGateKeeperEndPoint []= $elem21;
+              $elem28 = null;
+              $xfer += $input->readString($elem28);
+              $this->globusGateKeeperEndPoint []= $elem28;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -1659,9 +1715,9 @@ class GlobusJobSubmission {
       {
         $output->writeListBegin(TType::STRING, count($this->globusGateKeeperEndPoint));
         {
-          foreach ($this->globusGateKeeperEndPoint as $iter22)
+          foreach ($this->globusGateKeeperEndPoint as $iter29)
           {
-            $xfer += $output->writeString($iter22);
+            $xfer += $output->writeString($iter29);
           }
         }
         $output->writeListEnd();
@@ -2491,14 +2547,14 @@ class ComputeResourceDescription {
         case 3:
           if ($ftype == TType::LST) {
             $this->hostAliases = array();
-            $_size23 = 0;
-            $_etype26 = 0;
-            $xfer += $input->readListBegin($_etype26, $_size23);
-            for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
+            $_size30 = 0;
+            $_etype33 = 0;
+            $xfer += $input->readListBegin($_etype33, $_size30);
+            for ($_i34 = 0; $_i34 < $_size30; ++$_i34)
             {
-              $elem28 = null;
-              $xfer += $input->readString($elem28);
-              $this->hostAliases []= $elem28;
+              $elem35 = null;
+              $xfer += $input->readString($elem35);
+              $this->hostAliases []= $elem35;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -2508,14 +2564,14 @@ class ComputeResourceDescription {
         case 4:
           if ($ftype == TType::LST) {
             $this->ipAddresses = array();
-            $_size29 = 0;
-            $_etype32 = 0;
-            $xfer += $input->readListBegin($_etype32, $_size29);
-            for ($_i33 = 0; $_i33 < $_size29; ++$_i33)
+            $_size36 = 0;
+            $_etype39 = 0;
+            $xfer += $input->readListBegin($_etype39, $_size36);
+            for ($_i40 = 0; $_i40 < $_size36; ++$_i40)
             {
-              $elem34 = null;
-              $xfer += $input->readString($elem34);
-              $this->ipAddresses []= $elem34;
+              $elem41 = null;
+              $xfer += $input->readString($elem41);
+              $this->ipAddresses []= $elem41;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -2539,15 +2595,15 @@ class ComputeResourceDescription {
         case 7:
           if ($ftype == TType::LST) {
             $this->batchQueues = array();
-            $_size35 = 0;
-            $_etype38 = 0;
-            $xfer += $input->readListBegin($_etype38, $_size35);
-            for ($_i39 = 0; $_i39 < $_size35; ++$_i39)
+            $_size42 = 0;
+            $_etype45 = 0;
+            $xfer += $input->readListBegin($_etype45, $_size42);
+            for ($_i46 = 0; $_i46 < $_size42; ++$_i46)
             {
-              $elem40 = null;
-              $elem40 = new \Airavata\Model\AppCatalog\ComputeResource\BatchQueue();
-              $xfer += $elem40->read($input);
-              $this->batchQueues []= $elem40;
+              $elem47 = null;
+              $elem47 = new \Airavata\Model\AppCatalog\ComputeResource\BatchQueue();
+              $xfer += $elem47->read($input);
+              $this->batchQueues []= $elem47;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -2557,17 +2613,17 @@ class ComputeResourceDescription {
         case 8:
           if ($ftype == TType::MAP) {
             $this->fileSystems = array();
-            $_size41 = 0;
-            $_ktype42 = 0;
-            $_vtype43 = 0;
-            $xfer += $input->readMapBegin($_ktype42, $_vtype43, $_size41);
-            for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
+            $_size48 = 0;
+            $_ktype49 = 0;
+            $_vtype50 = 0;
+            $xfer += $input->readMapBegin($_ktype49, $_vtype50, $_size48);
+            for ($_i52 = 0; $_i52 < $_size48; ++$_i52)
             {
-              $key46 = 0;
-              $val47 = '';
-              $xfer += $input->readI32($key46);
-              $xfer += $input->readString($val47);
-              $this->fileSystems[$key46] = $val47;
+              $key53 = 0;
+              $val54 = '';
+              $xfer += $input->readI32($key53);
+              $xfer += $input->readString($val54);
+              $this->fileSystems[$key53] = $val54;
             }
             $xfer += $input->readMapEnd();
           } else {
@@ -2577,15 +2633,15 @@ class ComputeResourceDescription {
         case 9:
           if ($ftype == TType::LST) {
             $this->jobSubmissionInterfaces = array();
-            $_size48 = 0;
-            $_etype51 = 0;
-            $xfer += $input->readListBegin($_etype51, $_size48);
-            for ($_i52 = 0; $_i52 < $_size48; ++$_i52)
+            $_size55 = 0;
+            $_etype58 = 0;
+            $xfer += $input->readListBegin($_etype58, $_size55);
+            for ($_i59 = 0; $_i59 < $_size55; ++$_i59)
             {
-              $elem53 = null;
-              $elem53 = new \Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface();
-              $xfer += $elem53->read($input);
-              $this->jobSubmissionInterfaces []= $elem53;
+              $elem60 = null;
+              $elem60 = new \Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface();
+              $xfer += $elem60->read($input);
+              $this->jobSubmissionInterfaces []= $elem60;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -2595,15 +2651,15 @@ class ComputeResourceDescription {
         case 10:
           if ($ftype == TType::LST) {
             $this->dataMovementInterfaces = array();
-            $_size54 = 0;
-            $_etype57 = 0;
-            $xfer += $input->readListBegin($_etype57, $_size54);
-            for ($_i58 = 0; $_i58 < $_size54; ++$_i58)
+            $_size61 = 0;
+            $_etype64 = 0;
+            $xfer += $input->readListBegin($_etype64, $_size61);
+            for ($_i65 = 0; $_i65 < $_size61; ++$_i65)
             {
-              $elem59 = null;
-              $elem59 = new \Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface();
-              $xfer += $elem59->read($input);
-              $this->dataMovementInterfaces []= $elem59;
+              $elem66 = null;
+              $elem66 = new \Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface();
+              $xfer += $elem66->read($input);
+              $this->dataMovementInterfaces []= $elem66;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -2648,9 +2704,9 @@ class ComputeResourceDescription {
       {
         $output->writeListBegin(TType::STRING, count($this->hostAliases));
         {
-          foreach ($this->hostAliases as $iter60)
+          foreach ($this->hostAliases as $iter67)
           {
-            $xfer += $output->writeString($iter60);
+            $xfer += $output->writeString($iter67);
           }
         }
         $output->writeListEnd();
@@ -2665,9 +2721,9 @@ class ComputeResourceDescription {
       {
         $output->writeListBegin(TType::STRING, count($this->ipAddresses));
         {
-          foreach ($this->ipAddresses as $iter61)
+          foreach ($this->ipAddresses as $iter68)
           {
-            $xfer += $output->writeString($iter61);
+            $xfer += $output->writeString($iter68);
           }
         }
         $output->writeListEnd();
@@ -2692,9 +2748,9 @@ class ComputeResourceDescription {
       {
         $output->writeListBegin(TType::STRUCT, count($this->batchQueues));
         {
-          foreach ($this->batchQueues as $iter62)
+          foreach ($this->batchQueues as $iter69)
           {
-            $xfer += $iter62->write($output);
+            $xfer += $iter69->write($output);
           }
         }
         $output->writeListEnd();
@@ -2709,10 +2765,10 @@ class ComputeResourceDescription {
       {
         $output->writeMapBegin(TType::I32, TType::STRING, count($this->fileSystems));
         {
-          foreach ($this->fileSystems as $kiter63 => $viter64)
+          foreach ($this->fileSystems as $kiter70 => $viter71)
           {
-            $xfer += $output->writeI32($kiter63);
-            $xfer += $output->writeString($viter64);
+            $xfer += $output->writeI32($kiter70);
+            $xfer += $output->writeString($viter71);
           }
         }
         $output->writeMapEnd();
@@ -2727,9 +2783,9 @@ class ComputeResourceDescription {
       {
         $output->writeListBegin(TType::STRUCT, count($this->jobSubmissionInterfaces));
         {
-          foreach ($this->jobSubmissionInterfaces as $iter65)
+          foreach ($this->jobSubmissionInterfaces as $iter72)
           {
-            $xfer += $iter65->write($output);
+            $xfer += $iter72->write($output);
           }
         }
         $output->writeListEnd();
@@ -2744,9 +2800,9 @@ class ComputeResourceDescription {
       {
         $output->writeListBegin(TType::STRUCT, count($this->dataMovementInterfaces));
         {
-          foreach ($this->dataMovementInterfaces as $iter66)
+          foreach ($this->dataMovementInterfaces as $iter73)
           {
-            $xfer += $iter66->write($output);
+            $xfer += $iter73->write($output);
           }
         }
         $output->writeListEnd();

http://git-wip-us.apache.org/repos/asf/airavata/blob/d84783da/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index a94dd88..f63f2f0 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -46,6 +46,10 @@ use Thrift\Exception\TApplicationException;
  *    allocation is approved, an allocation number is assigned. Before passing this number
with job submittions, the
  *    account to be used has to be added to the allocation.
  * 
+ * resourceSpecificCredentialStoreToken:
+ *  Resource specific credential store token. If this token is specified, then it is superceeded
by the gateway's
+ *   default credential store.
+ * 
  */
 class ComputeResourcePreference {
   static $_TSPEC;
@@ -82,6 +86,10 @@ class ComputeResourcePreference {
    * @var string
    */
   public $allocationProjectNumber = null;
+  /**
+   * @var string
+   */
+  public $resourceSpecificCredentialStoreToken = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -118,6 +126,10 @@ class ComputeResourcePreference {
           'var' => 'allocationProjectNumber',
           'type' => TType::STRING,
           ),
+        9 => array(
+          'var' => 'resourceSpecificCredentialStoreToken',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -145,6 +157,9 @@ class ComputeResourcePreference {
       if (isset($vals['allocationProjectNumber'])) {
         $this->allocationProjectNumber = $vals['allocationProjectNumber'];
       }
+      if (isset($vals['resourceSpecificCredentialStoreToken'])) {
+        $this->resourceSpecificCredentialStoreToken = $vals['resourceSpecificCredentialStoreToken'];
+      }
     }
   }
 
@@ -223,6 +238,13 @@ class ComputeResourcePreference {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 9:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->resourceSpecificCredentialStoreToken);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -276,6 +298,155 @@ class ComputeResourcePreference {
       $xfer += $output->writeString($this->allocationProjectNumber);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->resourceSpecificCredentialStoreToken !== null) {
+      $xfer += $output->writeFieldBegin('resourceSpecificCredentialStoreToken', TType::STRING,
9);
+      $xfer += $output->writeString($this->resourceSpecificCredentialStoreToken);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class DataStoragePreference {
+  static $_TSPEC;
+
+  /**
+   * @var string
+   */
+  public $dataMovememtResourceId = null;
+  /**
+   * @var string
+   */
+  public $loginUserName = null;
+  /**
+   * @var string
+   */
+  public $fileSystemRootLocation = null;
+  /**
+   * @var string
+   */
+  public $resourceSpecificCredentialStoreToken = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'dataMovememtResourceId',
+          'type' => TType::STRING,
+          ),
+        2 => array(
+          'var' => 'loginUserName',
+          'type' => TType::STRING,
+          ),
+        3 => array(
+          'var' => 'fileSystemRootLocation',
+          'type' => TType::STRING,
+          ),
+        4 => array(
+          'var' => 'resourceSpecificCredentialStoreToken',
+          'type' => TType::STRING,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['dataMovememtResourceId'])) {
+        $this->dataMovememtResourceId = $vals['dataMovememtResourceId'];
+      }
+      if (isset($vals['loginUserName'])) {
+        $this->loginUserName = $vals['loginUserName'];
+      }
+      if (isset($vals['fileSystemRootLocation'])) {
+        $this->fileSystemRootLocation = $vals['fileSystemRootLocation'];
+      }
+      if (isset($vals['resourceSpecificCredentialStoreToken'])) {
+        $this->resourceSpecificCredentialStoreToken = $vals['resourceSpecificCredentialStoreToken'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'DataStoragePreference';
+  }
+
+  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->dataMovememtResourceId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->loginUserName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->fileSystemRootLocation);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 4:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->resourceSpecificCredentialStoreToken);
+          } 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('DataStoragePreference');
+    if ($this->dataMovememtResourceId !== null) {
+      $xfer += $output->writeFieldBegin('dataMovememtResourceId', TType::STRING, 1);
+      $xfer += $output->writeString($this->dataMovememtResourceId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->loginUserName !== null) {
+      $xfer += $output->writeFieldBegin('loginUserName', TType::STRING, 2);
+      $xfer += $output->writeString($this->loginUserName);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->fileSystemRootLocation !== null) {
+      $xfer += $output->writeFieldBegin('fileSystemRootLocation', TType::STRING, 3);
+      $xfer += $output->writeString($this->fileSystemRootLocation);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->resourceSpecificCredentialStoreToken !== null) {
+      $xfer += $output->writeFieldBegin('resourceSpecificCredentialStoreToken', TType::STRING,
4);
+      $xfer += $output->writeString($this->resourceSpecificCredentialStoreToken);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -287,12 +458,14 @@ class ComputeResourcePreference {
  * Gateway Resource Profile
  * 
  * gatewayID:
- *   Unique identifier for the gateway assigned by Airavata. Corelate this to Airavata Admin
API Gateway Registration.
+ *  Unique identifier for the gateway assigned by Airavata. Corelate this to Airavata Admin
API Gateway Registration.
+ * 
+ * credentialStoreToken:
+ *  Gateway's defualt credential store token.
  * 
  * computeResourcePreferences:
  *  List of resource preferences for each of the registered compute resources.
  * 
- * 
  */
 class GatewayResourceProfile {
   static $_TSPEC;
@@ -302,9 +475,17 @@ class GatewayResourceProfile {
    */
   public $gatewayID = null;
   /**
+   * @var string
+   */
+  public $credentialStoreToken = null;
+  /**
    * @var \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference[]
    */
   public $computeResourcePreferences = null;
+  /**
+   * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference[]
+   */
+  public $dataStoragePreferences = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -314,6 +495,10 @@ class GatewayResourceProfile {
           'type' => TType::STRING,
           ),
         2 => array(
+          'var' => 'credentialStoreToken',
+          'type' => TType::STRING,
+          ),
+        3 => array(
           'var' => 'computeResourcePreferences',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
@@ -322,15 +507,30 @@ class GatewayResourceProfile {
             'class' => '\Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference',
             ),
           ),
+        4 => array(
+          'var' => 'dataStoragePreferences',
+          'type' => TType::LST,
+          'etype' => TType::STRUCT,
+          'elem' => array(
+            'type' => TType::STRUCT,
+            'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+            ),
+          ),
         );
     }
     if (is_array($vals)) {
       if (isset($vals['gatewayID'])) {
         $this->gatewayID = $vals['gatewayID'];
       }
+      if (isset($vals['credentialStoreToken'])) {
+        $this->credentialStoreToken = $vals['credentialStoreToken'];
+      }
       if (isset($vals['computeResourcePreferences'])) {
         $this->computeResourcePreferences = $vals['computeResourcePreferences'];
       }
+      if (isset($vals['dataStoragePreferences'])) {
+        $this->dataStoragePreferences = $vals['dataStoragePreferences'];
+      }
     }
   }
 
@@ -361,6 +561,13 @@ class GatewayResourceProfile {
           }
           break;
         case 2:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->credentialStoreToken);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
           if ($ftype == TType::LST) {
             $this->computeResourcePreferences = array();
             $_size0 = 0;
@@ -378,6 +585,24 @@ class GatewayResourceProfile {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 4:
+          if ($ftype == TType::LST) {
+            $this->dataStoragePreferences = array();
+            $_size6 = 0;
+            $_etype9 = 0;
+            $xfer += $input->readListBegin($_etype9, $_size6);
+            for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
+            {
+              $elem11 = null;
+              $elem11 = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference();
+              $xfer += $elem11->read($input);
+              $this->dataStoragePreferences []= $elem11;
+            }
+            $xfer += $input->readListEnd();
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -396,17 +621,39 @@ class GatewayResourceProfile {
       $xfer += $output->writeString($this->gatewayID);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->credentialStoreToken !== null) {
+      $xfer += $output->writeFieldBegin('credentialStoreToken', TType::STRING, 2);
+      $xfer += $output->writeString($this->credentialStoreToken);
+      $xfer += $output->writeFieldEnd();
+    }
     if ($this->computeResourcePreferences !== null) {
       if (!is_array($this->computeResourcePreferences)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 2);
+      $xfer += $output->writeFieldBegin('computeResourcePreferences', TType::LST, 3);
       {
         $output->writeListBegin(TType::STRUCT, count($this->computeResourcePreferences));
         {
-          foreach ($this->computeResourcePreferences as $iter6)
+          foreach ($this->computeResourcePreferences as $iter12)
+          {
+            $xfer += $iter12->write($output);
+          }
+        }
+        $output->writeListEnd();
+      }
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->dataStoragePreferences !== null) {
+      if (!is_array($this->dataStoragePreferences)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 4);
+      {
+        $output->writeListBegin(TType::STRUCT, count($this->dataStoragePreferences));
+        {
+          foreach ($this->dataStoragePreferences as $iter13)
           {
-            $xfer += $iter6->write($output);
+            $xfer += $iter13->write($output);
           }
         }
         $output->writeListEnd();

http://git-wip-us.apache.org/repos/asf/airavata/blob/d84783da/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 1cb2251..0acd73a 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
@@ -130,11 +130,16 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
   print('  bool updateGatewayResourceProfile(AuthzToken authzToken, string gatewayID, GatewayResourceProfile
gatewayResourceProfile)')
   print('  bool deleteGatewayResourceProfile(AuthzToken authzToken, string gatewayID)')
   print('  bool addGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID,
string computeResourceId, ComputeResourcePreference computeResourcePreference)')
+  print('  bool addGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID,
string dataMoveId, DataStoragePreference dataStoragePreference)')
   print('  ComputeResourcePreference getGatewayComputeResourcePreference(AuthzToken authzToken,
string gatewayID, string computeResourceId)')
+  print('  DataStoragePreference getGatewayDataStoragePreference(AuthzToken authzToken, string
gatewayID, string dataMoveId)')
   print('   getAllGatewayComputeResourcePreferences(AuthzToken authzToken, string gatewayID)')
+  print('   getAllGatewayDataStoragePreferences(AuthzToken authzToken, string gatewayID)')
   print('   getAllGatewayComputeResources(AuthzToken authzToken)')
   print('  bool updateGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID,
string computeResourceId, ComputeResourcePreference computeResourcePreference)')
+  print('  bool updateGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID,
string dataMoveId, DataStoragePreference dataStoragePreference)')
   print('  bool deleteGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID,
string computeResourceId)')
+  print('  bool deleteGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID,
string dataMoveId)')
   print('   getAllWorkflows(AuthzToken authzToken, string gatewayId)')
   print('  Workflow getWorkflow(AuthzToken authzToken, string workflowTemplateId)')
   print('  void deleteWorkflow(AuthzToken authzToken, string workflowTemplateId)')
@@ -834,18 +839,36 @@ elif cmd == 'addGatewayComputeResourcePreference':
     sys.exit(1)
   pp.pprint(client.addGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
 
+elif cmd == 'addGatewayDataStoragePreference':
+  if len(args) != 4:
+    print('addGatewayDataStoragePreference requires 4 args')
+    sys.exit(1)
+  pp.pprint(client.addGatewayDataStoragePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
+
 elif cmd == 'getGatewayComputeResourcePreference':
   if len(args) != 3:
     print('getGatewayComputeResourcePreference requires 3 args')
     sys.exit(1)
   pp.pprint(client.getGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],))
 
+elif cmd == 'getGatewayDataStoragePreference':
+  if len(args) != 3:
+    print('getGatewayDataStoragePreference requires 3 args')
+    sys.exit(1)
+  pp.pprint(client.getGatewayDataStoragePreference(eval(args[0]),args[1],args[2],))
+
 elif cmd == 'getAllGatewayComputeResourcePreferences':
   if len(args) != 2:
     print('getAllGatewayComputeResourcePreferences requires 2 args')
     sys.exit(1)
   pp.pprint(client.getAllGatewayComputeResourcePreferences(eval(args[0]),args[1],))
 
+elif cmd == 'getAllGatewayDataStoragePreferences':
+  if len(args) != 2:
+    print('getAllGatewayDataStoragePreferences requires 2 args')
+    sys.exit(1)
+  pp.pprint(client.getAllGatewayDataStoragePreferences(eval(args[0]),args[1],))
+
 elif cmd == 'getAllGatewayComputeResources':
   if len(args) != 1:
     print('getAllGatewayComputeResources requires 1 args')
@@ -858,12 +881,24 @@ elif cmd == 'updateGatewayComputeResourcePreference':
     sys.exit(1)
   pp.pprint(client.updateGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
 
+elif cmd == 'updateGatewayDataStoragePreference':
+  if len(args) != 4:
+    print('updateGatewayDataStoragePreference requires 4 args')
+    sys.exit(1)
+  pp.pprint(client.updateGatewayDataStoragePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
+
 elif cmd == 'deleteGatewayComputeResourcePreference':
   if len(args) != 3:
     print('deleteGatewayComputeResourcePreference requires 3 args')
     sys.exit(1)
   pp.pprint(client.deleteGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],))
 
+elif cmd == 'deleteGatewayDataStoragePreference':
+  if len(args) != 3:
+    print('deleteGatewayDataStoragePreference requires 3 args')
+    sys.exit(1)
+  pp.pprint(client.deleteGatewayDataStoragePreference(eval(args[0]),args[1],args[2],))
+
 elif cmd == 'getAllWorkflows':
   if len(args) != 2:
     print('getAllWorkflows requires 2 args')


Mime
View raw message