airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [2/2] airavata-php-gateway git commit: updating libraries
Date Tue, 24 Nov 2015 21:00:56 GMT
updating libraries


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/e4e613f9
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e4e613f9
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e4e613f9

Branch: refs/heads/develop
Commit: e4e613f97a787588faaafd9644f8a17191d79f0b
Parents: a3a066f
Author: Chathuri Wimalasena <chathuri@apache.org>
Authored: Tue Nov 24 16:00:51 2015 -0500
Committer: Chathuri Wimalasena <chathuri@apache.org>
Committed: Tue Nov 24 16:00:51 2015 -0500

----------------------------------------------------------------------
 app/libraries/Airavata/API/Airavata.php         | 420 +++++----
 .../Model/AppCatalog/ComputeResource/Types.php  | 943 +++----------------
 .../Model/AppCatalog/StorageResource/Types.php  |   6 +-
 .../Airavata/Model/Experiment/Types.php         |  23 +
 app/libraries/Airavata/Model/Process/Types.php  |  23 +
 5 files changed, 424 insertions(+), 991 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e4e613f9/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php
index 3f55ee1..746c686 100644
--- a/app/libraries/Airavata/API/Airavata.php
+++ b/app/libraries/Airavata/API/Airavata.php
@@ -1971,16 +1971,17 @@ interface AiravataIf {
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
-   * @param string $computeResourceId
+   * @param string $resourceId
+   * @param int $dataMoveType
    * @param int $priorityOrder
-   * @param \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement
+   * @param \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement
    * @return string
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement);
+  public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
   /**
    * Update the given Local data movement details
    * 
@@ -1996,14 +1997,14 @@ interface AiravataIf {
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $dataMovementInterfaceId
-   * @param \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement
+   * @param \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement
    * @return bool
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement);
+  public function updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
   /**
    *         * This method returns local datamovement object
    *         * @param dataMovementId
@@ -2013,7 +2014,7 @@ interface AiravataIf {
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $dataMovementId
-   * @return \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement LOCAL
+   * @return \Airavata\Model\Data\Movement\LOCALDataMovement LOCAL
    * 
    * alternativeSCPHostName:
    *  If the login to scp is different than the hostname itself, specify it here
@@ -2045,16 +2046,17 @@ interface AiravataIf {
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
-   * @param string $computeResourceId
+   * @param string $resourceId
+   * @param int $dataMoveType
    * @param int $priorityOrder
-   * @param \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement
+   * @param \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement
    * @return string
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement);
+  public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement);
   /**
    * Update the given scp data movement details
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -2071,14 +2073,14 @@ interface AiravataIf {
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $dataMovementInterfaceId
-   * @param \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement
+   * @param \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement
    * @return bool
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement);
+  public function updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement);
   /**
    *   * This method returns SCP datamovement object
    *   * @param dataMovementId
@@ -2088,7 +2090,7 @@ interface AiravataIf {
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $dataMovementId
-   * @return \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement Data Movement through Secured Copy
+   * @return \Airavata\Model\Data\Movement\SCPDataMovement Data Movement through Secured Copy
    * 
    * alternativeSCPHostName:
    *  If the login to scp is different than the hostname itself, specify it here
@@ -2104,31 +2106,32 @@ interface AiravataIf {
   public function getSCPDataMovement(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementId);
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
-   * @param string $computeResourceId
+   * @param string $resourceId
+   * @param int $dataMoveType
    * @param int $priorityOrder
-   * @param \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement
+   * @param \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement
    * @return string
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement);
+  public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $dataMovementInterfaceId
-   * @param \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement
+   * @param \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement
    * @return bool
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement);
+  public function updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $dataMovementId
-   * @return \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement Data Movement through UnicoreStorage
+   * @return \Airavata\Model\Data\Movement\UnicoreDataMovement Data Movement through UnicoreStorage
    * 
    * unicoreEndPointURL:
    *  unicoreGateway End Point. The provider will query this service to fetch required service end points.
@@ -2157,16 +2160,17 @@ interface AiravataIf {
    * 
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
-   * @param string $computeResourceId
+   * @param string $resourceId
+   * @param int $dataMoveType
    * @param int $priorityOrder
-   * @param \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement
+   * @param \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement
    * @return string
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement);
+  public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement);
   /**
    * Update the given GridFTP data movement details to a compute resource
    *  App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -2183,14 +2187,14 @@ interface AiravataIf {
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $dataMovementInterfaceId
-   * @param \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement
+   * @param \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement
    * @return bool
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement);
+  public function updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement);
   /**
    *   * This method returns GridFTP datamovement object
    *   * @param dataMovementId
@@ -2200,7 +2204,7 @@ interface AiravataIf {
    * 
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $dataMovementId
-   * @return \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement Data Movement through GridFTP
+   * @return \Airavata\Model\Data\Movement\GridFTPDataMovement Data Movement through GridFTP
    * 
    * alternativeSCPHostName:
    *  If the login to scp is different than the hostname itself, specify it here
@@ -2529,7 +2533,7 @@ interface AiravataIf {
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
-   * @param string $dataMoveId
+   * @param string $storageResourceId
    * @param \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference
    * @return bool
    * @throws \Airavata\API\Error\InvalidRequestException
@@ -2537,7 +2541,7 @@ interface AiravataIf {
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference);
+  public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference);
   /**
    * Fetch a Compute Resource Preference of a registered gateway profile.
    * 
@@ -2596,14 +2600,14 @@ interface AiravataIf {
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
-   * @param string $dataMoveId
+   * @param string $storageResourceId
    * @return \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId);
+  public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId);
   /**
    * Fetch all Compute Resource Preferences of a registered gateway profile.
    * 
@@ -8314,17 +8318,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("updateUnicoreJobSubmissionDetails failed: unknown result");
   }
 
-  public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+  public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
   {
-    $this->send_addLocalDataMovementDetails($authzToken, $computeResourceId, $priorityOrder, $localDataMovement);
+    $this->send_addLocalDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $localDataMovement);
     return $this->recv_addLocalDataMovementDetails();
   }
 
-  public function send_addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+  public function send_addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
   {
     $args = new \Airavata\API\Airavata_addLocalDataMovementDetails_args();
     $args->authzToken = $authzToken;
-    $args->computeResourceId = $computeResourceId;
+    $args->resourceId = $resourceId;
+    $args->dataMoveType = $dataMoveType;
     $args->priorityOrder = $priorityOrder;
     $args->localDataMovement = $localDataMovement;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -8380,13 +8385,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("addLocalDataMovementDetails failed: unknown result");
   }
 
-  public function updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+  public function updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
   {
     $this->send_updateLocalDataMovementDetails($authzToken, $dataMovementInterfaceId, $localDataMovement);
     return $this->recv_updateLocalDataMovementDetails();
   }
 
-  public function send_updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+  public function send_updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
   {
     $args = new \Airavata\API\Airavata_updateLocalDataMovementDetails_args();
     $args->authzToken = $authzToken;
@@ -8509,17 +8514,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("getLocalDataMovement failed: unknown result");
   }
 
-  public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+  public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
   {
-    $this->send_addSCPDataMovementDetails($authzToken, $computeResourceId, $priorityOrder, $scpDataMovement);
+    $this->send_addSCPDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $scpDataMovement);
     return $this->recv_addSCPDataMovementDetails();
   }
 
-  public function send_addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+  public function send_addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
   {
     $args = new \Airavata\API\Airavata_addSCPDataMovementDetails_args();
     $args->authzToken = $authzToken;
-    $args->computeResourceId = $computeResourceId;
+    $args->resourceId = $resourceId;
+    $args->dataMoveType = $dataMoveType;
     $args->priorityOrder = $priorityOrder;
     $args->scpDataMovement = $scpDataMovement;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -8575,13 +8581,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("addSCPDataMovementDetails failed: unknown result");
   }
 
-  public function updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+  public function updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
   {
     $this->send_updateSCPDataMovementDetails($authzToken, $dataMovementInterfaceId, $scpDataMovement);
     return $this->recv_updateSCPDataMovementDetails();
   }
 
-  public function send_updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+  public function send_updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
   {
     $args = new \Airavata\API\Airavata_updateSCPDataMovementDetails_args();
     $args->authzToken = $authzToken;
@@ -8704,17 +8710,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("getSCPDataMovement failed: unknown result");
   }
 
-  public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+  public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
   {
-    $this->send_addUnicoreDataMovementDetails($authzToken, $computeResourceId, $priorityOrder, $unicoreDataMovement);
+    $this->send_addUnicoreDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $unicoreDataMovement);
     return $this->recv_addUnicoreDataMovementDetails();
   }
 
-  public function send_addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+  public function send_addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
   {
     $args = new \Airavata\API\Airavata_addUnicoreDataMovementDetails_args();
     $args->authzToken = $authzToken;
-    $args->computeResourceId = $computeResourceId;
+    $args->resourceId = $resourceId;
+    $args->dataMoveType = $dataMoveType;
     $args->priorityOrder = $priorityOrder;
     $args->unicoreDataMovement = $unicoreDataMovement;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -8770,13 +8777,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("addUnicoreDataMovementDetails failed: unknown result");
   }
 
-  public function updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+  public function updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
   {
     $this->send_updateUnicoreDataMovementDetails($authzToken, $dataMovementInterfaceId, $unicoreDataMovement);
     return $this->recv_updateUnicoreDataMovementDetails();
   }
 
-  public function send_updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+  public function send_updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
   {
     $args = new \Airavata\API\Airavata_updateUnicoreDataMovementDetails_args();
     $args->authzToken = $authzToken;
@@ -8899,17 +8906,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("getUnicoreDataMovement failed: unknown result");
   }
 
-  public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+  public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
   {
-    $this->send_addGridFTPDataMovementDetails($authzToken, $computeResourceId, $priorityOrder, $gridFTPDataMovement);
+    $this->send_addGridFTPDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $gridFTPDataMovement);
     return $this->recv_addGridFTPDataMovementDetails();
   }
 
-  public function send_addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+  public function send_addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
   {
     $args = new \Airavata\API\Airavata_addGridFTPDataMovementDetails_args();
     $args->authzToken = $authzToken;
-    $args->computeResourceId = $computeResourceId;
+    $args->resourceId = $resourceId;
+    $args->dataMoveType = $dataMoveType;
     $args->priorityOrder = $priorityOrder;
     $args->gridFTPDataMovement = $gridFTPDataMovement;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -8965,13 +8973,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("addGridFTPDataMovementDetails failed: unknown result");
   }
 
-  public function updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+  public function updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
   {
     $this->send_updateGridFTPDataMovementDetails($authzToken, $dataMovementInterfaceId, $gridFTPDataMovement);
     return $this->recv_updateGridFTPDataMovementDetails();
   }
 
-  public function send_updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+  public function send_updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
   {
     $args = new \Airavata\API\Airavata_updateGridFTPDataMovementDetails_args();
     $args->authzToken = $authzToken;
@@ -10127,18 +10135,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("addGatewayComputeResourcePreference failed: unknown result");
   }
 
-  public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
+  public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
   {
-    $this->send_addGatewayStoragePreference($authzToken, $gatewayID, $dataMoveId, $storagePreference);
+    $this->send_addGatewayStoragePreference($authzToken, $gatewayID, $storageResourceId, $storagePreference);
     return $this->recv_addGatewayStoragePreference();
   }
 
-  public function send_addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
+  public function send_addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
   {
     $args = new \Airavata\API\Airavata_addGatewayStoragePreference_args();
     $args->authzToken = $authzToken;
     $args->gatewayID = $gatewayID;
-    $args->dataMoveId = $dataMoveId;
+    $args->storageResourceId = $storageResourceId;
     $args->storagePreference = $storagePreference;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
@@ -10258,18 +10266,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("getGatewayComputeResourcePreference failed: unknown result");
   }
 
-  public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+  public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId)
   {
-    $this->send_getGatewayStoragePreference($authzToken, $gatewayID, $dataMoveId);
+    $this->send_getGatewayStoragePreference($authzToken, $gatewayID, $storageResourceId);
     return $this->recv_getGatewayStoragePreference();
   }
 
-  public function send_getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+  public function send_getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId)
   {
     $args = new \Airavata\API\Airavata_getGatewayStoragePreference_args();
     $args->authzToken = $authzToken;
     $args->gatewayID = $gatewayID;
-    $args->dataMoveId = $dataMoveId;
+    $args->storageResourceId = $storageResourceId;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
     {
@@ -37593,13 +37601,17 @@ class Airavata_addLocalDataMovementDetails_args {
   /**
    * @var string
    */
-  public $computeResourceId = null;
+  public $resourceId = null;
+  /**
+   * @var int
+   */
+  public $dataMoveType = null;
   /**
    * @var int
    */
   public $priorityOrder = null;
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement
+   * @var \Airavata\Model\Data\Movement\LOCALDataMovement
    */
   public $localDataMovement = null;
 
@@ -37612,17 +37624,21 @@ class Airavata_addLocalDataMovementDetails_args {
           'class' => '\Airavata\Model\Security\AuthzToken',
           ),
         2 => array(
-          'var' => 'computeResourceId',
+          'var' => 'resourceId',
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'priorityOrder',
+          'var' => 'dataMoveType',
           'type' => TType::I32,
           ),
         4 => array(
+          'var' => 'priorityOrder',
+          'type' => TType::I32,
+          ),
+        5 => array(
           'var' => 'localDataMovement',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\LOCALDataMovement',
           ),
         );
     }
@@ -37630,8 +37646,11 @@ class Airavata_addLocalDataMovementDetails_args {
       if (isset($vals['authzToken'])) {
         $this->authzToken = $vals['authzToken'];
       }
-      if (isset($vals['computeResourceId'])) {
-        $this->computeResourceId = $vals['computeResourceId'];
+      if (isset($vals['resourceId'])) {
+        $this->resourceId = $vals['resourceId'];
+      }
+      if (isset($vals['dataMoveType'])) {
+        $this->dataMoveType = $vals['dataMoveType'];
       }
       if (isset($vals['priorityOrder'])) {
         $this->priorityOrder = $vals['priorityOrder'];
@@ -37671,21 +37690,28 @@ class Airavata_addLocalDataMovementDetails_args {
           break;
         case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->computeResourceId);
+            $xfer += $input->readString($this->resourceId);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 3:
           if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->priorityOrder);
+            $xfer += $input->readI32($this->dataMoveType);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 4:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->priorityOrder);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 5:
           if ($ftype == TType::STRUCT) {
-            $this->localDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement();
+            $this->localDataMovement = new \Airavata\Model\Data\Movement\LOCALDataMovement();
             $xfer += $this->localDataMovement->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -37712,13 +37738,18 @@ class Airavata_addLocalDataMovementDetails_args {
       $xfer += $this->authzToken->write($output);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->computeResourceId !== null) {
-      $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2);
-      $xfer += $output->writeString($this->computeResourceId);
+    if ($this->resourceId !== null) {
+      $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+      $xfer += $output->writeString($this->resourceId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->dataMoveType !== null) {
+      $xfer += $output->writeFieldBegin('dataMoveType', TType::I32, 3);
+      $xfer += $output->writeI32($this->dataMoveType);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->priorityOrder !== null) {
-      $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 3);
+      $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 4);
       $xfer += $output->writeI32($this->priorityOrder);
       $xfer += $output->writeFieldEnd();
     }
@@ -37726,7 +37757,7 @@ class Airavata_addLocalDataMovementDetails_args {
       if (!is_object($this->localDataMovement)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('localDataMovement', TType::STRUCT, 4);
+      $xfer += $output->writeFieldBegin('localDataMovement', TType::STRUCT, 5);
       $xfer += $this->localDataMovement->write($output);
       $xfer += $output->writeFieldEnd();
     }
@@ -37924,7 +37955,7 @@ class Airavata_updateLocalDataMovementDetails_args {
    */
   public $dataMovementInterfaceId = null;
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement
+   * @var \Airavata\Model\Data\Movement\LOCALDataMovement
    */
   public $localDataMovement = null;
 
@@ -37943,7 +37974,7 @@ class Airavata_updateLocalDataMovementDetails_args {
         3 => array(
           'var' => 'localDataMovement',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\LOCALDataMovement',
           ),
         );
     }
@@ -37996,7 +38027,7 @@ class Airavata_updateLocalDataMovementDetails_args {
           break;
         case 3:
           if ($ftype == TType::STRUCT) {
-            $this->localDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement();
+            $this->localDataMovement = new \Airavata\Model\Data\Movement\LOCALDataMovement();
             $xfer += $this->localDataMovement->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -38325,7 +38356,7 @@ class Airavata_getLocalDataMovement_result {
   static $_TSPEC;
 
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement
+   * @var \Airavata\Model\Data\Movement\LOCALDataMovement
    */
   public $success = null;
   /**
@@ -38351,7 +38382,7 @@ class Airavata_getLocalDataMovement_result {
         0 => array(
           'var' => 'success',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\LOCALDataMovement',
           ),
         1 => array(
           'var' => 'ire',
@@ -38415,7 +38446,7 @@ class Airavata_getLocalDataMovement_result {
       {
         case 0:
           if ($ftype == TType::STRUCT) {
-            $this->success = new \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement();
+            $this->success = new \Airavata\Model\Data\Movement\LOCALDataMovement();
             $xfer += $this->success->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -38511,13 +38542,17 @@ class Airavata_addSCPDataMovementDetails_args {
   /**
    * @var string
    */
-  public $computeResourceId = null;
+  public $resourceId = null;
+  /**
+   * @var int
+   */
+  public $dataMoveType = null;
   /**
    * @var int
    */
   public $priorityOrder = null;
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement
+   * @var \Airavata\Model\Data\Movement\SCPDataMovement
    */
   public $scpDataMovement = null;
 
@@ -38530,17 +38565,21 @@ class Airavata_addSCPDataMovementDetails_args {
           'class' => '\Airavata\Model\Security\AuthzToken',
           ),
         2 => array(
-          'var' => 'computeResourceId',
+          'var' => 'resourceId',
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'priorityOrder',
+          'var' => 'dataMoveType',
           'type' => TType::I32,
           ),
         4 => array(
+          'var' => 'priorityOrder',
+          'type' => TType::I32,
+          ),
+        5 => array(
           'var' => 'scpDataMovement',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\SCPDataMovement',
           ),
         );
     }
@@ -38548,8 +38587,11 @@ class Airavata_addSCPDataMovementDetails_args {
       if (isset($vals['authzToken'])) {
         $this->authzToken = $vals['authzToken'];
       }
-      if (isset($vals['computeResourceId'])) {
-        $this->computeResourceId = $vals['computeResourceId'];
+      if (isset($vals['resourceId'])) {
+        $this->resourceId = $vals['resourceId'];
+      }
+      if (isset($vals['dataMoveType'])) {
+        $this->dataMoveType = $vals['dataMoveType'];
       }
       if (isset($vals['priorityOrder'])) {
         $this->priorityOrder = $vals['priorityOrder'];
@@ -38589,21 +38631,28 @@ class Airavata_addSCPDataMovementDetails_args {
           break;
         case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->computeResourceId);
+            $xfer += $input->readString($this->resourceId);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 3:
           if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->priorityOrder);
+            $xfer += $input->readI32($this->dataMoveType);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 4:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->priorityOrder);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 5:
           if ($ftype == TType::STRUCT) {
-            $this->scpDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement();
+            $this->scpDataMovement = new \Airavata\Model\Data\Movement\SCPDataMovement();
             $xfer += $this->scpDataMovement->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -38630,13 +38679,18 @@ class Airavata_addSCPDataMovementDetails_args {
       $xfer += $this->authzToken->write($output);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->computeResourceId !== null) {
-      $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2);
-      $xfer += $output->writeString($this->computeResourceId);
+    if ($this->resourceId !== null) {
+      $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+      $xfer += $output->writeString($this->resourceId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->dataMoveType !== null) {
+      $xfer += $output->writeFieldBegin('dataMoveType', TType::I32, 3);
+      $xfer += $output->writeI32($this->dataMoveType);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->priorityOrder !== null) {
-      $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 3);
+      $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 4);
       $xfer += $output->writeI32($this->priorityOrder);
       $xfer += $output->writeFieldEnd();
     }
@@ -38644,7 +38698,7 @@ class Airavata_addSCPDataMovementDetails_args {
       if (!is_object($this->scpDataMovement)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('scpDataMovement', TType::STRUCT, 4);
+      $xfer += $output->writeFieldBegin('scpDataMovement', TType::STRUCT, 5);
       $xfer += $this->scpDataMovement->write($output);
       $xfer += $output->writeFieldEnd();
     }
@@ -38842,7 +38896,7 @@ class Airavata_updateSCPDataMovementDetails_args {
    */
   public $dataMovementInterfaceId = null;
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement
+   * @var \Airavata\Model\Data\Movement\SCPDataMovement
    */
   public $scpDataMovement = null;
 
@@ -38861,7 +38915,7 @@ class Airavata_updateSCPDataMovementDetails_args {
         3 => array(
           'var' => 'scpDataMovement',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\SCPDataMovement',
           ),
         );
     }
@@ -38914,7 +38968,7 @@ class Airavata_updateSCPDataMovementDetails_args {
           break;
         case 3:
           if ($ftype == TType::STRUCT) {
-            $this->scpDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement();
+            $this->scpDataMovement = new \Airavata\Model\Data\Movement\SCPDataMovement();
             $xfer += $this->scpDataMovement->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -39243,7 +39297,7 @@ class Airavata_getSCPDataMovement_result {
   static $_TSPEC;
 
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement
+   * @var \Airavata\Model\Data\Movement\SCPDataMovement
    */
   public $success = null;
   /**
@@ -39269,7 +39323,7 @@ class Airavata_getSCPDataMovement_result {
         0 => array(
           'var' => 'success',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\SCPDataMovement',
           ),
         1 => array(
           'var' => 'ire',
@@ -39333,7 +39387,7 @@ class Airavata_getSCPDataMovement_result {
       {
         case 0:
           if ($ftype == TType::STRUCT) {
-            $this->success = new \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement();
+            $this->success = new \Airavata\Model\Data\Movement\SCPDataMovement();
             $xfer += $this->success->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -39429,13 +39483,17 @@ class Airavata_addUnicoreDataMovementDetails_args {
   /**
    * @var string
    */
-  public $computeResourceId = null;
+  public $resourceId = null;
+  /**
+   * @var int
+   */
+  public $dataMoveType = null;
   /**
    * @var int
    */
   public $priorityOrder = null;
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement
+   * @var \Airavata\Model\Data\Movement\UnicoreDataMovement
    */
   public $unicoreDataMovement = null;
 
@@ -39448,17 +39506,21 @@ class Airavata_addUnicoreDataMovementDetails_args {
           'class' => '\Airavata\Model\Security\AuthzToken',
           ),
         2 => array(
-          'var' => 'computeResourceId',
+          'var' => 'resourceId',
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'priorityOrder',
+          'var' => 'dataMoveType',
           'type' => TType::I32,
           ),
         4 => array(
+          'var' => 'priorityOrder',
+          'type' => TType::I32,
+          ),
+        5 => array(
           'var' => 'unicoreDataMovement',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\UnicoreDataMovement',
           ),
         );
     }
@@ -39466,8 +39528,11 @@ class Airavata_addUnicoreDataMovementDetails_args {
       if (isset($vals['authzToken'])) {
         $this->authzToken = $vals['authzToken'];
       }
-      if (isset($vals['computeResourceId'])) {
-        $this->computeResourceId = $vals['computeResourceId'];
+      if (isset($vals['resourceId'])) {
+        $this->resourceId = $vals['resourceId'];
+      }
+      if (isset($vals['dataMoveType'])) {
+        $this->dataMoveType = $vals['dataMoveType'];
       }
       if (isset($vals['priorityOrder'])) {
         $this->priorityOrder = $vals['priorityOrder'];
@@ -39507,21 +39572,28 @@ class Airavata_addUnicoreDataMovementDetails_args {
           break;
         case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->computeResourceId);
+            $xfer += $input->readString($this->resourceId);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 3:
           if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->priorityOrder);
+            $xfer += $input->readI32($this->dataMoveType);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 4:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->priorityOrder);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 5:
           if ($ftype == TType::STRUCT) {
-            $this->unicoreDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement();
+            $this->unicoreDataMovement = new \Airavata\Model\Data\Movement\UnicoreDataMovement();
             $xfer += $this->unicoreDataMovement->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -39548,13 +39620,18 @@ class Airavata_addUnicoreDataMovementDetails_args {
       $xfer += $this->authzToken->write($output);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->computeResourceId !== null) {
-      $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2);
-      $xfer += $output->writeString($this->computeResourceId);
+    if ($this->resourceId !== null) {
+      $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+      $xfer += $output->writeString($this->resourceId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->dataMoveType !== null) {
+      $xfer += $output->writeFieldBegin('dataMoveType', TType::I32, 3);
+      $xfer += $output->writeI32($this->dataMoveType);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->priorityOrder !== null) {
-      $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 3);
+      $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 4);
       $xfer += $output->writeI32($this->priorityOrder);
       $xfer += $output->writeFieldEnd();
     }
@@ -39562,7 +39639,7 @@ class Airavata_addUnicoreDataMovementDetails_args {
       if (!is_object($this->unicoreDataMovement)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('unicoreDataMovement', TType::STRUCT, 4);
+      $xfer += $output->writeFieldBegin('unicoreDataMovement', TType::STRUCT, 5);
       $xfer += $this->unicoreDataMovement->write($output);
       $xfer += $output->writeFieldEnd();
     }
@@ -39760,7 +39837,7 @@ class Airavata_updateUnicoreDataMovementDetails_args {
    */
   public $dataMovementInterfaceId = null;
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement
+   * @var \Airavata\Model\Data\Movement\UnicoreDataMovement
    */
   public $unicoreDataMovement = null;
 
@@ -39779,7 +39856,7 @@ class Airavata_updateUnicoreDataMovementDetails_args {
         3 => array(
           'var' => 'unicoreDataMovement',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\UnicoreDataMovement',
           ),
         );
     }
@@ -39832,7 +39909,7 @@ class Airavata_updateUnicoreDataMovementDetails_args {
           break;
         case 3:
           if ($ftype == TType::STRUCT) {
-            $this->unicoreDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement();
+            $this->unicoreDataMovement = new \Airavata\Model\Data\Movement\UnicoreDataMovement();
             $xfer += $this->unicoreDataMovement->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -40161,7 +40238,7 @@ class Airavata_getUnicoreDataMovement_result {
   static $_TSPEC;
 
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement
+   * @var \Airavata\Model\Data\Movement\UnicoreDataMovement
    */
   public $success = null;
   /**
@@ -40187,7 +40264,7 @@ class Airavata_getUnicoreDataMovement_result {
         0 => array(
           'var' => 'success',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\UnicoreDataMovement',
           ),
         1 => array(
           'var' => 'ire',
@@ -40251,7 +40328,7 @@ class Airavata_getUnicoreDataMovement_result {
       {
         case 0:
           if ($ftype == TType::STRUCT) {
-            $this->success = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement();
+            $this->success = new \Airavata\Model\Data\Movement\UnicoreDataMovement();
             $xfer += $this->success->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -40347,13 +40424,17 @@ class Airavata_addGridFTPDataMovementDetails_args {
   /**
    * @var string
    */
-  public $computeResourceId = null;
+  public $resourceId = null;
+  /**
+   * @var int
+   */
+  public $dataMoveType = null;
   /**
    * @var int
    */
   public $priorityOrder = null;
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement
+   * @var \Airavata\Model\Data\Movement\GridFTPDataMovement
    */
   public $gridFTPDataMovement = null;
 
@@ -40366,17 +40447,21 @@ class Airavata_addGridFTPDataMovementDetails_args {
           'class' => '\Airavata\Model\Security\AuthzToken',
           ),
         2 => array(
-          'var' => 'computeResourceId',
+          'var' => 'resourceId',
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'priorityOrder',
+          'var' => 'dataMoveType',
           'type' => TType::I32,
           ),
         4 => array(
+          'var' => 'priorityOrder',
+          'type' => TType::I32,
+          ),
+        5 => array(
           'var' => 'gridFTPDataMovement',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\GridFTPDataMovement',
           ),
         );
     }
@@ -40384,8 +40469,11 @@ class Airavata_addGridFTPDataMovementDetails_args {
       if (isset($vals['authzToken'])) {
         $this->authzToken = $vals['authzToken'];
       }
-      if (isset($vals['computeResourceId'])) {
-        $this->computeResourceId = $vals['computeResourceId'];
+      if (isset($vals['resourceId'])) {
+        $this->resourceId = $vals['resourceId'];
+      }
+      if (isset($vals['dataMoveType'])) {
+        $this->dataMoveType = $vals['dataMoveType'];
       }
       if (isset($vals['priorityOrder'])) {
         $this->priorityOrder = $vals['priorityOrder'];
@@ -40425,21 +40513,28 @@ class Airavata_addGridFTPDataMovementDetails_args {
           break;
         case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->computeResourceId);
+            $xfer += $input->readString($this->resourceId);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 3:
           if ($ftype == TType::I32) {
-            $xfer += $input->readI32($this->priorityOrder);
+            $xfer += $input->readI32($this->dataMoveType);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 4:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->priorityOrder);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 5:
           if ($ftype == TType::STRUCT) {
-            $this->gridFTPDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement();
+            $this->gridFTPDataMovement = new \Airavata\Model\Data\Movement\GridFTPDataMovement();
             $xfer += $this->gridFTPDataMovement->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -40466,13 +40561,18 @@ class Airavata_addGridFTPDataMovementDetails_args {
       $xfer += $this->authzToken->write($output);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->computeResourceId !== null) {
-      $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2);
-      $xfer += $output->writeString($this->computeResourceId);
+    if ($this->resourceId !== null) {
+      $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+      $xfer += $output->writeString($this->resourceId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->dataMoveType !== null) {
+      $xfer += $output->writeFieldBegin('dataMoveType', TType::I32, 3);
+      $xfer += $output->writeI32($this->dataMoveType);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->priorityOrder !== null) {
-      $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 3);
+      $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 4);
       $xfer += $output->writeI32($this->priorityOrder);
       $xfer += $output->writeFieldEnd();
     }
@@ -40480,7 +40580,7 @@ class Airavata_addGridFTPDataMovementDetails_args {
       if (!is_object($this->gridFTPDataMovement)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('gridFTPDataMovement', TType::STRUCT, 4);
+      $xfer += $output->writeFieldBegin('gridFTPDataMovement', TType::STRUCT, 5);
       $xfer += $this->gridFTPDataMovement->write($output);
       $xfer += $output->writeFieldEnd();
     }
@@ -40678,7 +40778,7 @@ class Airavata_updateGridFTPDataMovementDetails_args {
    */
   public $dataMovementInterfaceId = null;
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement
+   * @var \Airavata\Model\Data\Movement\GridFTPDataMovement
    */
   public $gridFTPDataMovement = null;
 
@@ -40697,7 +40797,7 @@ class Airavata_updateGridFTPDataMovementDetails_args {
         3 => array(
           'var' => 'gridFTPDataMovement',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\GridFTPDataMovement',
           ),
         );
     }
@@ -40750,7 +40850,7 @@ class Airavata_updateGridFTPDataMovementDetails_args {
           break;
         case 3:
           if ($ftype == TType::STRUCT) {
-            $this->gridFTPDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement();
+            $this->gridFTPDataMovement = new \Airavata\Model\Data\Movement\GridFTPDataMovement();
             $xfer += $this->gridFTPDataMovement->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -41079,7 +41179,7 @@ class Airavata_getGridFTPDataMovement_result {
   static $_TSPEC;
 
   /**
-   * @var \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement
+   * @var \Airavata\Model\Data\Movement\GridFTPDataMovement
    */
   public $success = null;
   /**
@@ -41105,7 +41205,7 @@ class Airavata_getGridFTPDataMovement_result {
         0 => array(
           'var' => 'success',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement',
+          'class' => '\Airavata\Model\Data\Movement\GridFTPDataMovement',
           ),
         1 => array(
           'var' => 'ire',
@@ -41169,7 +41269,7 @@ class Airavata_getGridFTPDataMovement_result {
       {
         case 0:
           if ($ftype == TType::STRUCT) {
-            $this->success = new \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement();
+            $this->success = new \Airavata\Model\Data\Movement\GridFTPDataMovement();
             $xfer += $this->success->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -46027,7 +46127,7 @@ class Airavata_addGatewayStoragePreference_args {
   /**
    * @var string
    */
-  public $dataMoveId = null;
+  public $storageResourceId = null;
   /**
    * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
    */
@@ -46046,7 +46146,7 @@ class Airavata_addGatewayStoragePreference_args {
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'dataMoveId',
+          'var' => 'storageResourceId',
           'type' => TType::STRING,
           ),
         4 => array(
@@ -46063,8 +46163,8 @@ class Airavata_addGatewayStoragePreference_args {
       if (isset($vals['gatewayID'])) {
         $this->gatewayID = $vals['gatewayID'];
       }
-      if (isset($vals['dataMoveId'])) {
-        $this->dataMoveId = $vals['dataMoveId'];
+      if (isset($vals['storageResourceId'])) {
+        $this->storageResourceId = $vals['storageResourceId'];
       }
       if (isset($vals['storagePreference'])) {
         $this->storagePreference = $vals['storagePreference'];
@@ -46108,7 +46208,7 @@ class Airavata_addGatewayStoragePreference_args {
           break;
         case 3:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->dataMoveId);
+            $xfer += $input->readString($this->storageResourceId);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -46147,9 +46247,9 @@ class Airavata_addGatewayStoragePreference_args {
       $xfer += $output->writeString($this->gatewayID);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->dataMoveId !== null) {
-      $xfer += $output->writeFieldBegin('dataMoveId', TType::STRING, 3);
-      $xfer += $output->writeString($this->dataMoveId);
+    if ($this->storageResourceId !== null) {
+      $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 3);
+      $xfer += $output->writeString($this->storageResourceId);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->storagePreference !== null) {
@@ -46662,7 +46762,7 @@ class Airavata_getGatewayStoragePreference_args {
   /**
    * @var string
    */
-  public $dataMoveId = null;
+  public $storageResourceId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -46677,7 +46777,7 @@ class Airavata_getGatewayStoragePreference_args {
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'dataMoveId',
+          'var' => 'storageResourceId',
           'type' => TType::STRING,
           ),
         );
@@ -46689,8 +46789,8 @@ class Airavata_getGatewayStoragePreference_args {
       if (isset($vals['gatewayID'])) {
         $this->gatewayID = $vals['gatewayID'];
       }
-      if (isset($vals['dataMoveId'])) {
-        $this->dataMoveId = $vals['dataMoveId'];
+      if (isset($vals['storageResourceId'])) {
+        $this->storageResourceId = $vals['storageResourceId'];
       }
     }
   }
@@ -46731,7 +46831,7 @@ class Airavata_getGatewayStoragePreference_args {
           break;
         case 3:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->dataMoveId);
+            $xfer += $input->readString($this->storageResourceId);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -46762,9 +46862,9 @@ class Airavata_getGatewayStoragePreference_args {
       $xfer += $output->writeString($this->gatewayID);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->dataMoveId !== null) {
-      $xfer += $output->writeFieldBegin('dataMoveId', TType::STRING, 3);
-      $xfer += $output->writeString($this->dataMoveId);
+    if ($this->storageResourceId !== null) {
+      $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 3);
+      $xfer += $output->writeString($this->storageResourceId);
       $xfer += $output->writeFieldEnd();
     }
     $xfer += $output->writeFieldStop();


Mime
View raw message