You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/11/18 01:57:58 UTC

[4/8] airavata git commit: adding data storage interfaces

http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
index 6da0cfa..01e1e67 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
@@ -305,33 +305,33 @@ std::ostream& operator<<(std::ostream& out, const ComputeResourcePreference& obj
 }
 
 
-DataStoragePreference::~DataStoragePreference() throw() {
+StoragePreference::~StoragePreference() throw() {
 }
 
 
-void DataStoragePreference::__set_dataMovememtResourceId(const std::string& val) {
-  this->dataMovememtResourceId = val;
+void StoragePreference::__set_storageResourceId(const std::string& val) {
+  this->storageResourceId = val;
 }
 
-void DataStoragePreference::__set_loginUserName(const std::string& val) {
+void StoragePreference::__set_loginUserName(const std::string& val) {
   this->loginUserName = val;
 __isset.loginUserName = true;
 }
 
-void DataStoragePreference::__set_fileSystemRootLocation(const std::string& val) {
+void StoragePreference::__set_fileSystemRootLocation(const std::string& val) {
   this->fileSystemRootLocation = val;
 __isset.fileSystemRootLocation = true;
 }
 
-void DataStoragePreference::__set_resourceSpecificCredentialStoreToken(const std::string& val) {
+void StoragePreference::__set_resourceSpecificCredentialStoreToken(const std::string& val) {
   this->resourceSpecificCredentialStoreToken = val;
 __isset.resourceSpecificCredentialStoreToken = true;
 }
 
-const char* DataStoragePreference::ascii_fingerprint = "6BA700CA2E5FC52A8DA5ADCF811DC8DA";
-const uint8_t DataStoragePreference::binary_fingerprint[16] = {0x6B,0xA7,0x00,0xCA,0x2E,0x5F,0xC5,0x2A,0x8D,0xA5,0xAD,0xCF,0x81,0x1D,0xC8,0xDA};
+const char* StoragePreference::ascii_fingerprint = "6BA700CA2E5FC52A8DA5ADCF811DC8DA";
+const uint8_t StoragePreference::binary_fingerprint[16] = {0x6B,0xA7,0x00,0xCA,0x2E,0x5F,0xC5,0x2A,0x8D,0xA5,0xAD,0xCF,0x81,0x1D,0xC8,0xDA};
 
-uint32_t DataStoragePreference::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t StoragePreference::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
   std::string fname;
@@ -342,7 +342,7 @@ uint32_t DataStoragePreference::read(::apache::thrift::protocol::TProtocol* ipro
 
   using ::apache::thrift::protocol::TProtocolException;
 
-  bool isset_dataMovememtResourceId = false;
+  bool isset_storageResourceId = false;
 
   while (true)
   {
@@ -354,8 +354,8 @@ uint32_t DataStoragePreference::read(::apache::thrift::protocol::TProtocol* ipro
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->dataMovememtResourceId);
-          isset_dataMovememtResourceId = true;
+          xfer += iprot->readString(this->storageResourceId);
+          isset_storageResourceId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -393,18 +393,18 @@ uint32_t DataStoragePreference::read(::apache::thrift::protocol::TProtocol* ipro
 
   xfer += iprot->readStructEnd();
 
-  if (!isset_dataMovememtResourceId)
+  if (!isset_storageResourceId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t DataStoragePreference::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t StoragePreference::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   oprot->incrementRecursionDepth();
-  xfer += oprot->writeStructBegin("DataStoragePreference");
+  xfer += oprot->writeStructBegin("StoragePreference");
 
-  xfer += oprot->writeFieldBegin("dataMovememtResourceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->dataMovememtResourceId);
+  xfer += oprot->writeFieldBegin("storageResourceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->storageResourceId);
   xfer += oprot->writeFieldEnd();
 
   if (this->__isset.loginUserName) {
@@ -428,34 +428,34 @@ uint32_t DataStoragePreference::write(::apache::thrift::protocol::TProtocol* opr
   return xfer;
 }
 
-void swap(DataStoragePreference &a, DataStoragePreference &b) {
+void swap(StoragePreference &a, StoragePreference &b) {
   using ::std::swap;
-  swap(a.dataMovememtResourceId, b.dataMovememtResourceId);
+  swap(a.storageResourceId, b.storageResourceId);
   swap(a.loginUserName, b.loginUserName);
   swap(a.fileSystemRootLocation, b.fileSystemRootLocation);
   swap(a.resourceSpecificCredentialStoreToken, b.resourceSpecificCredentialStoreToken);
   swap(a.__isset, b.__isset);
 }
 
-DataStoragePreference::DataStoragePreference(const DataStoragePreference& other4) {
-  dataMovememtResourceId = other4.dataMovememtResourceId;
+StoragePreference::StoragePreference(const StoragePreference& other4) {
+  storageResourceId = other4.storageResourceId;
   loginUserName = other4.loginUserName;
   fileSystemRootLocation = other4.fileSystemRootLocation;
   resourceSpecificCredentialStoreToken = other4.resourceSpecificCredentialStoreToken;
   __isset = other4.__isset;
 }
-DataStoragePreference& DataStoragePreference::operator=(const DataStoragePreference& other5) {
-  dataMovememtResourceId = other5.dataMovememtResourceId;
+StoragePreference& StoragePreference::operator=(const StoragePreference& other5) {
+  storageResourceId = other5.storageResourceId;
   loginUserName = other5.loginUserName;
   fileSystemRootLocation = other5.fileSystemRootLocation;
   resourceSpecificCredentialStoreToken = other5.resourceSpecificCredentialStoreToken;
   __isset = other5.__isset;
   return *this;
 }
-std::ostream& operator<<(std::ostream& out, const DataStoragePreference& obj) {
+std::ostream& operator<<(std::ostream& out, const StoragePreference& obj) {
   using apache::thrift::to_string;
-  out << "DataStoragePreference(";
-  out << "dataMovememtResourceId=" << to_string(obj.dataMovememtResourceId);
+  out << "StoragePreference(";
+  out << "storageResourceId=" << to_string(obj.storageResourceId);
   out << ", " << "loginUserName="; (obj.__isset.loginUserName ? (out << to_string(obj.loginUserName)) : (out << "<null>"));
   out << ", " << "fileSystemRootLocation="; (obj.__isset.fileSystemRootLocation ? (out << to_string(obj.fileSystemRootLocation)) : (out << "<null>"));
   out << ", " << "resourceSpecificCredentialStoreToken="; (obj.__isset.resourceSpecificCredentialStoreToken ? (out << to_string(obj.resourceSpecificCredentialStoreToken)) : (out << "<null>"));
@@ -482,9 +482,9 @@ void GatewayResourceProfile::__set_computeResourcePreferences(const std::vector<
 __isset.computeResourcePreferences = true;
 }
 
-void GatewayResourceProfile::__set_dataStoragePreferences(const std::vector<DataStoragePreference> & val) {
-  this->dataStoragePreferences = val;
-__isset.dataStoragePreferences = true;
+void GatewayResourceProfile::__set_storagePreferences(const std::vector<StoragePreference> & val) {
+  this->storagePreferences = val;
+__isset.storagePreferences = true;
 }
 
 const char* GatewayResourceProfile::ascii_fingerprint = "A4BF6D60A7DE5979505C0E7F00278F12";
@@ -550,19 +550,19 @@ uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* ipr
       case 4:
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
-            this->dataStoragePreferences.clear();
+            this->storagePreferences.clear();
             uint32_t _size11;
             ::apache::thrift::protocol::TType _etype14;
             xfer += iprot->readListBegin(_etype14, _size11);
-            this->dataStoragePreferences.resize(_size11);
+            this->storagePreferences.resize(_size11);
             uint32_t _i15;
             for (_i15 = 0; _i15 < _size11; ++_i15)
             {
-              xfer += this->dataStoragePreferences[_i15].read(iprot);
+              xfer += this->storagePreferences[_i15].read(iprot);
             }
             xfer += iprot->readListEnd();
           }
-          this->__isset.dataStoragePreferences = true;
+          this->__isset.storagePreferences = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -608,12 +608,12 @@ uint32_t GatewayResourceProfile::write(::apache::thrift::protocol::TProtocol* op
     }
     xfer += oprot->writeFieldEnd();
   }
-  if (this->__isset.dataStoragePreferences) {
-    xfer += oprot->writeFieldBegin("dataStoragePreferences", ::apache::thrift::protocol::T_LIST, 4);
+  if (this->__isset.storagePreferences) {
+    xfer += oprot->writeFieldBegin("storagePreferences", ::apache::thrift::protocol::T_LIST, 4);
     {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataStoragePreferences.size()));
-      std::vector<DataStoragePreference> ::const_iterator _iter17;
-      for (_iter17 = this->dataStoragePreferences.begin(); _iter17 != this->dataStoragePreferences.end(); ++_iter17)
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->storagePreferences.size()));
+      std::vector<StoragePreference> ::const_iterator _iter17;
+      for (_iter17 = this->storagePreferences.begin(); _iter17 != this->storagePreferences.end(); ++_iter17)
       {
         xfer += (*_iter17).write(oprot);
       }
@@ -632,7 +632,7 @@ void swap(GatewayResourceProfile &a, GatewayResourceProfile &b) {
   swap(a.gatewayID, b.gatewayID);
   swap(a.credentialStoreToken, b.credentialStoreToken);
   swap(a.computeResourcePreferences, b.computeResourcePreferences);
-  swap(a.dataStoragePreferences, b.dataStoragePreferences);
+  swap(a.storagePreferences, b.storagePreferences);
   swap(a.__isset, b.__isset);
 }
 
@@ -640,14 +640,14 @@ GatewayResourceProfile::GatewayResourceProfile(const GatewayResourceProfile& oth
   gatewayID = other18.gatewayID;
   credentialStoreToken = other18.credentialStoreToken;
   computeResourcePreferences = other18.computeResourcePreferences;
-  dataStoragePreferences = other18.dataStoragePreferences;
+  storagePreferences = other18.storagePreferences;
   __isset = other18.__isset;
 }
 GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceProfile& other19) {
   gatewayID = other19.gatewayID;
   credentialStoreToken = other19.credentialStoreToken;
   computeResourcePreferences = other19.computeResourcePreferences;
-  dataStoragePreferences = other19.dataStoragePreferences;
+  storagePreferences = other19.storagePreferences;
   __isset = other19.__isset;
   return *this;
 }
@@ -657,7 +657,7 @@ std::ostream& operator<<(std::ostream& out, const GatewayResourceProfile& obj) {
   out << "gatewayID=" << to_string(obj.gatewayID);
   out << ", " << "credentialStoreToken="; (obj.__isset.credentialStoreToken ? (out << to_string(obj.credentialStoreToken)) : (out << "<null>"));
   out << ", " << "computeResourcePreferences="; (obj.__isset.computeResourcePreferences ? (out << to_string(obj.computeResourcePreferences)) : (out << "<null>"));
-  out << ", " << "dataStoragePreferences="; (obj.__isset.dataStoragePreferences ? (out << to_string(obj.dataStoragePreferences)) : (out << "<null>"));
+  out << ", " << "storagePreferences="; (obj.__isset.storagePreferences ? (out << to_string(obj.storagePreferences)) : (out << "<null>"));
   out << ")";
   return out;
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
index 59fbbef..db23b4e 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
@@ -39,7 +39,7 @@ namespace apache { namespace airavata { namespace model { namespace appcatalog {
 
 class ComputeResourcePreference;
 
-class DataStoragePreference;
+class StoragePreference;
 
 class GatewayResourceProfile;
 
@@ -146,33 +146,33 @@ class ComputeResourcePreference {
 
 void swap(ComputeResourcePreference &a, ComputeResourcePreference &b);
 
-typedef struct _DataStoragePreference__isset {
-  _DataStoragePreference__isset() : loginUserName(false), fileSystemRootLocation(false), resourceSpecificCredentialStoreToken(false) {}
+typedef struct _StoragePreference__isset {
+  _StoragePreference__isset() : loginUserName(false), fileSystemRootLocation(false), resourceSpecificCredentialStoreToken(false) {}
   bool loginUserName :1;
   bool fileSystemRootLocation :1;
   bool resourceSpecificCredentialStoreToken :1;
-} _DataStoragePreference__isset;
+} _StoragePreference__isset;
 
-class DataStoragePreference {
+class StoragePreference {
  public:
 
   static const char* ascii_fingerprint; // = "6BA700CA2E5FC52A8DA5ADCF811DC8DA";
   static const uint8_t binary_fingerprint[16]; // = {0x6B,0xA7,0x00,0xCA,0x2E,0x5F,0xC5,0x2A,0x8D,0xA5,0xAD,0xCF,0x81,0x1D,0xC8,0xDA};
 
-  DataStoragePreference(const DataStoragePreference&);
-  DataStoragePreference& operator=(const DataStoragePreference&);
-  DataStoragePreference() : dataMovememtResourceId(), loginUserName(), fileSystemRootLocation(), resourceSpecificCredentialStoreToken() {
+  StoragePreference(const StoragePreference&);
+  StoragePreference& operator=(const StoragePreference&);
+  StoragePreference() : storageResourceId(), loginUserName(), fileSystemRootLocation(), resourceSpecificCredentialStoreToken() {
   }
 
-  virtual ~DataStoragePreference() throw();
-  std::string dataMovememtResourceId;
+  virtual ~StoragePreference() throw();
+  std::string storageResourceId;
   std::string loginUserName;
   std::string fileSystemRootLocation;
   std::string resourceSpecificCredentialStoreToken;
 
-  _DataStoragePreference__isset __isset;
+  _StoragePreference__isset __isset;
 
-  void __set_dataMovememtResourceId(const std::string& val);
+  void __set_storageResourceId(const std::string& val);
 
   void __set_loginUserName(const std::string& val);
 
@@ -180,9 +180,9 @@ class DataStoragePreference {
 
   void __set_resourceSpecificCredentialStoreToken(const std::string& val);
 
-  bool operator == (const DataStoragePreference & rhs) const
+  bool operator == (const StoragePreference & rhs) const
   {
-    if (!(dataMovememtResourceId == rhs.dataMovememtResourceId))
+    if (!(storageResourceId == rhs.storageResourceId))
       return false;
     if (__isset.loginUserName != rhs.__isset.loginUserName)
       return false;
@@ -198,25 +198,25 @@ class DataStoragePreference {
       return false;
     return true;
   }
-  bool operator != (const DataStoragePreference &rhs) const {
+  bool operator != (const StoragePreference &rhs) const {
     return !(*this == rhs);
   }
 
-  bool operator < (const DataStoragePreference & ) const;
+  bool operator < (const StoragePreference & ) const;
 
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  friend std::ostream& operator<<(std::ostream& out, const DataStoragePreference& obj);
+  friend std::ostream& operator<<(std::ostream& out, const StoragePreference& obj);
 };
 
-void swap(DataStoragePreference &a, DataStoragePreference &b);
+void swap(StoragePreference &a, StoragePreference &b);
 
 typedef struct _GatewayResourceProfile__isset {
-  _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), dataStoragePreferences(false) {}
+  _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), storagePreferences(false) {}
   bool credentialStoreToken :1;
   bool computeResourcePreferences :1;
-  bool dataStoragePreferences :1;
+  bool storagePreferences :1;
 } _GatewayResourceProfile__isset;
 
 class GatewayResourceProfile {
@@ -234,7 +234,7 @@ class GatewayResourceProfile {
   std::string gatewayID;
   std::string credentialStoreToken;
   std::vector<ComputeResourcePreference>  computeResourcePreferences;
-  std::vector<DataStoragePreference>  dataStoragePreferences;
+  std::vector<StoragePreference>  storagePreferences;
 
   _GatewayResourceProfile__isset __isset;
 
@@ -244,7 +244,7 @@ class GatewayResourceProfile {
 
   void __set_computeResourcePreferences(const std::vector<ComputeResourcePreference> & val);
 
-  void __set_dataStoragePreferences(const std::vector<DataStoragePreference> & val);
+  void __set_storagePreferences(const std::vector<StoragePreference> & val);
 
   bool operator == (const GatewayResourceProfile & rhs) const
   {
@@ -258,9 +258,9 @@ class GatewayResourceProfile {
       return false;
     else if (__isset.computeResourcePreferences && !(computeResourcePreferences == rhs.computeResourcePreferences))
       return false;
-    if (__isset.dataStoragePreferences != rhs.__isset.dataStoragePreferences)
+    if (__isset.storagePreferences != rhs.__isset.storagePreferences)
       return false;
-    else if (__isset.dataStoragePreferences && !(dataStoragePreferences == rhs.dataStoragePreferences))
+    else if (__isset.storagePreferences && !(storagePreferences == rhs.storagePreferences))
       return false;
     return true;
   }

http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index 0b73e12..3f55ee1 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -2530,14 +2530,14 @@ interface AiravataIf {
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
    * @param string $dataMoveId
-   * @param \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference
+   * @param \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference
    * @return bool
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function addGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference);
+  public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference);
   /**
    * Fetch a Compute Resource Preference of a registered gateway profile.
    * 
@@ -2597,13 +2597,13 @@ interface AiravataIf {
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
    * @param string $dataMoveId
-   * @return \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference
+   * @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 getGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId);
+  public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId);
   /**
    * Fetch all Compute Resource Preferences of a registered gateway profile.
    * 
@@ -2626,13 +2626,13 @@ interface AiravataIf {
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
-   * @return \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference[]
+   * @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 getAllGatewayDataStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID);
+  public function getAllGatewayStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID);
   /**
    * Fetch all gateway profiles registered
    * 
@@ -2675,15 +2675,15 @@ interface AiravataIf {
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
-   * @param string $dataMoveId
-   * @param \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference
+   * @param string $storageId
+   * @param \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference
    * @return bool
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function updateGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference);
+  public function updateGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference);
   /**
    * Delete the Compute Resource Preference of a registered gateway profile.
    * 
@@ -2710,14 +2710,14 @@ interface AiravataIf {
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayID
-   * @param string $dataMoveId
+   * @param string $storageId
    * @return bool
    * @throws \Airavata\API\Error\InvalidRequestException
    * @throws \Airavata\API\Error\AiravataClientException
    * @throws \Airavata\API\Error\AiravataSystemException
    * @throws \Airavata\API\Error\AuthorizationException
    */
-  public function deleteGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId);
+  public function deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId);
   /**
    * @param \Airavata\Model\Security\AuthzToken $authzToken
    * @param string $gatewayId
@@ -10127,37 +10127,37 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("addGatewayComputeResourcePreference failed: unknown result");
   }
 
-  public function addGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference)
+  public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
   {
-    $this->send_addGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId, $dataStoragePreference);
-    return $this->recv_addGatewayDataStoragePreference();
+    $this->send_addGatewayStoragePreference($authzToken, $gatewayID, $dataMoveId, $storagePreference);
+    return $this->recv_addGatewayStoragePreference();
   }
 
-  public function send_addGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference)
+  public function send_addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
   {
-    $args = new \Airavata\API\Airavata_addGatewayDataStoragePreference_args();
+    $args = new \Airavata\API\Airavata_addGatewayStoragePreference_args();
     $args->authzToken = $authzToken;
     $args->gatewayID = $gatewayID;
     $args->dataMoveId = $dataMoveId;
-    $args->dataStoragePreference = $dataStoragePreference;
+    $args->storagePreference = $storagePreference;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
     {
-      thrift_protocol_write_binary($this->output_, 'addGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+      thrift_protocol_write_binary($this->output_, 'addGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
     }
     else
     {
-      $this->output_->writeMessageBegin('addGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_);
+      $this->output_->writeMessageBegin('addGatewayStoragePreference', TMessageType::CALL, $this->seqid_);
       $args->write($this->output_);
       $this->output_->writeMessageEnd();
       $this->output_->getTransport()->flush();
     }
   }
 
-  public function recv_addGatewayDataStoragePreference()
+  public function recv_addGatewayStoragePreference()
   {
     $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
-    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_addGatewayDataStoragePreference_result', $this->input_->isStrictRead());
+    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_addGatewayStoragePreference_result', $this->input_->isStrictRead());
     else
     {
       $rseqid = 0;
@@ -10171,7 +10171,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
         $this->input_->readMessageEnd();
         throw $x;
       }
-      $result = new \Airavata\API\Airavata_addGatewayDataStoragePreference_result();
+      $result = new \Airavata\API\Airavata_addGatewayStoragePreference_result();
       $result->read($this->input_);
       $this->input_->readMessageEnd();
     }
@@ -10190,7 +10190,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     if ($result->ae !== null) {
       throw $result->ae;
     }
-    throw new \Exception("addGatewayDataStoragePreference failed: unknown result");
+    throw new \Exception("addGatewayStoragePreference failed: unknown result");
   }
 
   public function getGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId)
@@ -10258,36 +10258,36 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("getGatewayComputeResourcePreference failed: unknown result");
   }
 
-  public function getGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+  public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
   {
-    $this->send_getGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId);
-    return $this->recv_getGatewayDataStoragePreference();
+    $this->send_getGatewayStoragePreference($authzToken, $gatewayID, $dataMoveId);
+    return $this->recv_getGatewayStoragePreference();
   }
 
-  public function send_getGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+  public function send_getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
   {
-    $args = new \Airavata\API\Airavata_getGatewayDataStoragePreference_args();
+    $args = new \Airavata\API\Airavata_getGatewayStoragePreference_args();
     $args->authzToken = $authzToken;
     $args->gatewayID = $gatewayID;
     $args->dataMoveId = $dataMoveId;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
     {
-      thrift_protocol_write_binary($this->output_, 'getGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+      thrift_protocol_write_binary($this->output_, 'getGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
     }
     else
     {
-      $this->output_->writeMessageBegin('getGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_);
+      $this->output_->writeMessageBegin('getGatewayStoragePreference', TMessageType::CALL, $this->seqid_);
       $args->write($this->output_);
       $this->output_->writeMessageEnd();
       $this->output_->getTransport()->flush();
     }
   }
 
-  public function recv_getGatewayDataStoragePreference()
+  public function recv_getGatewayStoragePreference()
   {
     $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
-    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getGatewayDataStoragePreference_result', $this->input_->isStrictRead());
+    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getGatewayStoragePreference_result', $this->input_->isStrictRead());
     else
     {
       $rseqid = 0;
@@ -10301,7 +10301,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
         $this->input_->readMessageEnd();
         throw $x;
       }
-      $result = new \Airavata\API\Airavata_getGatewayDataStoragePreference_result();
+      $result = new \Airavata\API\Airavata_getGatewayStoragePreference_result();
       $result->read($this->input_);
       $this->input_->readMessageEnd();
     }
@@ -10320,7 +10320,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     if ($result->ae !== null) {
       throw $result->ae;
     }
-    throw new \Exception("getGatewayDataStoragePreference failed: unknown result");
+    throw new \Exception("getGatewayStoragePreference failed: unknown result");
   }
 
   public function getAllGatewayComputeResourcePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID)
@@ -10387,35 +10387,35 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("getAllGatewayComputeResourcePreferences failed: unknown result");
   }
 
-  public function getAllGatewayDataStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID)
+  public function getAllGatewayStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID)
   {
-    $this->send_getAllGatewayDataStoragePreferences($authzToken, $gatewayID);
-    return $this->recv_getAllGatewayDataStoragePreferences();
+    $this->send_getAllGatewayStoragePreferences($authzToken, $gatewayID);
+    return $this->recv_getAllGatewayStoragePreferences();
   }
 
-  public function send_getAllGatewayDataStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID)
+  public function send_getAllGatewayStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID)
   {
-    $args = new \Airavata\API\Airavata_getAllGatewayDataStoragePreferences_args();
+    $args = new \Airavata\API\Airavata_getAllGatewayStoragePreferences_args();
     $args->authzToken = $authzToken;
     $args->gatewayID = $gatewayID;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
     {
-      thrift_protocol_write_binary($this->output_, 'getAllGatewayDataStoragePreferences', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+      thrift_protocol_write_binary($this->output_, 'getAllGatewayStoragePreferences', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
     }
     else
     {
-      $this->output_->writeMessageBegin('getAllGatewayDataStoragePreferences', TMessageType::CALL, $this->seqid_);
+      $this->output_->writeMessageBegin('getAllGatewayStoragePreferences', TMessageType::CALL, $this->seqid_);
       $args->write($this->output_);
       $this->output_->writeMessageEnd();
       $this->output_->getTransport()->flush();
     }
   }
 
-  public function recv_getAllGatewayDataStoragePreferences()
+  public function recv_getAllGatewayStoragePreferences()
   {
     $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
-    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getAllGatewayDataStoragePreferences_result', $this->input_->isStrictRead());
+    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getAllGatewayStoragePreferences_result', $this->input_->isStrictRead());
     else
     {
       $rseqid = 0;
@@ -10429,7 +10429,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
         $this->input_->readMessageEnd();
         throw $x;
       }
-      $result = new \Airavata\API\Airavata_getAllGatewayDataStoragePreferences_result();
+      $result = new \Airavata\API\Airavata_getAllGatewayStoragePreferences_result();
       $result->read($this->input_);
       $this->input_->readMessageEnd();
     }
@@ -10448,7 +10448,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     if ($result->ae !== null) {
       throw $result->ae;
     }
-    throw new \Exception("getAllGatewayDataStoragePreferences failed: unknown result");
+    throw new \Exception("getAllGatewayStoragePreferences failed: unknown result");
   }
 
   public function getAllGatewayResourceProfiles(\Airavata\Model\Security\AuthzToken $authzToken)
@@ -10580,37 +10580,37 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("updateGatewayComputeResourcePreference failed: unknown result");
   }
 
-  public function updateGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference)
+  public function updateGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
   {
-    $this->send_updateGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId, $dataStoragePreference);
-    return $this->recv_updateGatewayDataStoragePreference();
+    $this->send_updateGatewayStoragePreference($authzToken, $gatewayID, $storageId, $storagePreference);
+    return $this->recv_updateGatewayStoragePreference();
   }
 
-  public function send_updateGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference)
+  public function send_updateGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
   {
-    $args = new \Airavata\API\Airavata_updateGatewayDataStoragePreference_args();
+    $args = new \Airavata\API\Airavata_updateGatewayStoragePreference_args();
     $args->authzToken = $authzToken;
     $args->gatewayID = $gatewayID;
-    $args->dataMoveId = $dataMoveId;
-    $args->dataStoragePreference = $dataStoragePreference;
+    $args->storageId = $storageId;
+    $args->storagePreference = $storagePreference;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
     {
-      thrift_protocol_write_binary($this->output_, 'updateGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+      thrift_protocol_write_binary($this->output_, 'updateGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
     }
     else
     {
-      $this->output_->writeMessageBegin('updateGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_);
+      $this->output_->writeMessageBegin('updateGatewayStoragePreference', TMessageType::CALL, $this->seqid_);
       $args->write($this->output_);
       $this->output_->writeMessageEnd();
       $this->output_->getTransport()->flush();
     }
   }
 
-  public function recv_updateGatewayDataStoragePreference()
+  public function recv_updateGatewayStoragePreference()
   {
     $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
-    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateGatewayDataStoragePreference_result', $this->input_->isStrictRead());
+    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateGatewayStoragePreference_result', $this->input_->isStrictRead());
     else
     {
       $rseqid = 0;
@@ -10624,7 +10624,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
         $this->input_->readMessageEnd();
         throw $x;
       }
-      $result = new \Airavata\API\Airavata_updateGatewayDataStoragePreference_result();
+      $result = new \Airavata\API\Airavata_updateGatewayStoragePreference_result();
       $result->read($this->input_);
       $this->input_->readMessageEnd();
     }
@@ -10643,7 +10643,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     if ($result->ae !== null) {
       throw $result->ae;
     }
-    throw new \Exception("updateGatewayDataStoragePreference failed: unknown result");
+    throw new \Exception("updateGatewayStoragePreference failed: unknown result");
   }
 
   public function deleteGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId)
@@ -10711,36 +10711,36 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("deleteGatewayComputeResourcePreference failed: unknown result");
   }
 
-  public function deleteGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+  public function deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId)
   {
-    $this->send_deleteGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId);
-    return $this->recv_deleteGatewayDataStoragePreference();
+    $this->send_deleteGatewayStoragePreference($authzToken, $gatewayID, $storageId);
+    return $this->recv_deleteGatewayStoragePreference();
   }
 
-  public function send_deleteGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+  public function send_deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId)
   {
-    $args = new \Airavata\API\Airavata_deleteGatewayDataStoragePreference_args();
+    $args = new \Airavata\API\Airavata_deleteGatewayStoragePreference_args();
     $args->authzToken = $authzToken;
     $args->gatewayID = $gatewayID;
-    $args->dataMoveId = $dataMoveId;
+    $args->storageId = $storageId;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
     {
-      thrift_protocol_write_binary($this->output_, 'deleteGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+      thrift_protocol_write_binary($this->output_, 'deleteGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
     }
     else
     {
-      $this->output_->writeMessageBegin('deleteGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_);
+      $this->output_->writeMessageBegin('deleteGatewayStoragePreference', TMessageType::CALL, $this->seqid_);
       $args->write($this->output_);
       $this->output_->writeMessageEnd();
       $this->output_->getTransport()->flush();
     }
   }
 
-  public function recv_deleteGatewayDataStoragePreference()
+  public function recv_deleteGatewayStoragePreference()
   {
     $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
-    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_deleteGatewayDataStoragePreference_result', $this->input_->isStrictRead());
+    if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_deleteGatewayStoragePreference_result', $this->input_->isStrictRead());
     else
     {
       $rseqid = 0;
@@ -10754,7 +10754,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
         $this->input_->readMessageEnd();
         throw $x;
       }
-      $result = new \Airavata\API\Airavata_deleteGatewayDataStoragePreference_result();
+      $result = new \Airavata\API\Airavata_deleteGatewayStoragePreference_result();
       $result->read($this->input_);
       $this->input_->readMessageEnd();
     }
@@ -10773,7 +10773,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     if ($result->ae !== null) {
       throw $result->ae;
     }
-    throw new \Exception("deleteGatewayDataStoragePreference failed: unknown result");
+    throw new \Exception("deleteGatewayStoragePreference failed: unknown result");
   }
 
   public function getAllWorkflows(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId)
@@ -46013,7 +46013,7 @@ class Airavata_addGatewayComputeResourcePreference_result {
 
 }
 
-class Airavata_addGatewayDataStoragePreference_args {
+class Airavata_addGatewayStoragePreference_args {
   static $_TSPEC;
 
   /**
@@ -46029,9 +46029,9 @@ class Airavata_addGatewayDataStoragePreference_args {
    */
   public $dataMoveId = null;
   /**
-   * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference
+   * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
    */
-  public $dataStoragePreference = null;
+  public $storagePreference = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -46050,9 +46050,9 @@ class Airavata_addGatewayDataStoragePreference_args {
           'type' => TType::STRING,
           ),
         4 => array(
-          'var' => 'dataStoragePreference',
+          'var' => 'storagePreference',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+          'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
           ),
         );
     }
@@ -46066,14 +46066,14 @@ class Airavata_addGatewayDataStoragePreference_args {
       if (isset($vals['dataMoveId'])) {
         $this->dataMoveId = $vals['dataMoveId'];
       }
-      if (isset($vals['dataStoragePreference'])) {
-        $this->dataStoragePreference = $vals['dataStoragePreference'];
+      if (isset($vals['storagePreference'])) {
+        $this->storagePreference = $vals['storagePreference'];
       }
     }
   }
 
   public function getName() {
-    return 'Airavata_addGatewayDataStoragePreference_args';
+    return 'Airavata_addGatewayStoragePreference_args';
   }
 
   public function read($input)
@@ -46115,8 +46115,8 @@ class Airavata_addGatewayDataStoragePreference_args {
           break;
         case 4:
           if ($ftype == TType::STRUCT) {
-            $this->dataStoragePreference = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference();
-            $xfer += $this->dataStoragePreference->read($input);
+            $this->storagePreference = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
+            $xfer += $this->storagePreference->read($input);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -46133,7 +46133,7 @@ class Airavata_addGatewayDataStoragePreference_args {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_addGatewayDataStoragePreference_args');
+    $xfer += $output->writeStructBegin('Airavata_addGatewayStoragePreference_args');
     if ($this->authzToken !== null) {
       if (!is_object($this->authzToken)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -46152,12 +46152,12 @@ class Airavata_addGatewayDataStoragePreference_args {
       $xfer += $output->writeString($this->dataMoveId);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->dataStoragePreference !== null) {
-      if (!is_object($this->dataStoragePreference)) {
+    if ($this->storagePreference !== null) {
+      if (!is_object($this->storagePreference)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('dataStoragePreference', TType::STRUCT, 4);
-      $xfer += $this->dataStoragePreference->write($output);
+      $xfer += $output->writeFieldBegin('storagePreference', TType::STRUCT, 4);
+      $xfer += $this->storagePreference->write($output);
       $xfer += $output->writeFieldEnd();
     }
     $xfer += $output->writeFieldStop();
@@ -46167,7 +46167,7 @@ class Airavata_addGatewayDataStoragePreference_args {
 
 }
 
-class Airavata_addGatewayDataStoragePreference_result {
+class Airavata_addGatewayStoragePreference_result {
   static $_TSPEC;
 
   /**
@@ -46240,7 +46240,7 @@ class Airavata_addGatewayDataStoragePreference_result {
   }
 
   public function getName() {
-    return 'Airavata_addGatewayDataStoragePreference_result';
+    return 'Airavata_addGatewayStoragePreference_result';
   }
 
   public function read($input)
@@ -46309,7 +46309,7 @@ class Airavata_addGatewayDataStoragePreference_result {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_addGatewayDataStoragePreference_result');
+    $xfer += $output->writeStructBegin('Airavata_addGatewayStoragePreference_result');
     if ($this->success !== null) {
       $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
       $xfer += $output->writeBool($this->success);
@@ -46648,7 +46648,7 @@ class Airavata_getGatewayComputeResourcePreference_result {
 
 }
 
-class Airavata_getGatewayDataStoragePreference_args {
+class Airavata_getGatewayStoragePreference_args {
   static $_TSPEC;
 
   /**
@@ -46696,7 +46696,7 @@ class Airavata_getGatewayDataStoragePreference_args {
   }
 
   public function getName() {
-    return 'Airavata_getGatewayDataStoragePreference_args';
+    return 'Airavata_getGatewayStoragePreference_args';
   }
 
   public function read($input)
@@ -46748,7 +46748,7 @@ class Airavata_getGatewayDataStoragePreference_args {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_getGatewayDataStoragePreference_args');
+    $xfer += $output->writeStructBegin('Airavata_getGatewayStoragePreference_args');
     if ($this->authzToken !== null) {
       if (!is_object($this->authzToken)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -46774,11 +46774,11 @@ class Airavata_getGatewayDataStoragePreference_args {
 
 }
 
-class Airavata_getGatewayDataStoragePreference_result {
+class Airavata_getGatewayStoragePreference_result {
   static $_TSPEC;
 
   /**
-   * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference
+   * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
    */
   public $success = null;
   /**
@@ -46804,7 +46804,7 @@ class Airavata_getGatewayDataStoragePreference_result {
         0 => array(
           'var' => 'success',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+          'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
           ),
         1 => array(
           'var' => 'ire',
@@ -46848,7 +46848,7 @@ class Airavata_getGatewayDataStoragePreference_result {
   }
 
   public function getName() {
-    return 'Airavata_getGatewayDataStoragePreference_result';
+    return 'Airavata_getGatewayStoragePreference_result';
   }
 
   public function read($input)
@@ -46868,7 +46868,7 @@ class Airavata_getGatewayDataStoragePreference_result {
       {
         case 0:
           if ($ftype == TType::STRUCT) {
-            $this->success = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference();
+            $this->success = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
             $xfer += $this->success->read($input);
           } else {
             $xfer += $input->skip($ftype);
@@ -46918,7 +46918,7 @@ class Airavata_getGatewayDataStoragePreference_result {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_getGatewayDataStoragePreference_result');
+    $xfer += $output->writeStructBegin('Airavata_getGatewayStoragePreference_result');
     if ($this->success !== null) {
       if (!is_object($this->success)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -47260,7 +47260,7 @@ class Airavata_getAllGatewayComputeResourcePreferences_result {
 
 }
 
-class Airavata_getAllGatewayDataStoragePreferences_args {
+class Airavata_getAllGatewayStoragePreferences_args {
   static $_TSPEC;
 
   /**
@@ -47297,7 +47297,7 @@ class Airavata_getAllGatewayDataStoragePreferences_args {
   }
 
   public function getName() {
-    return 'Airavata_getAllGatewayDataStoragePreferences_args';
+    return 'Airavata_getAllGatewayStoragePreferences_args';
   }
 
   public function read($input)
@@ -47342,7 +47342,7 @@ class Airavata_getAllGatewayDataStoragePreferences_args {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_getAllGatewayDataStoragePreferences_args');
+    $xfer += $output->writeStructBegin('Airavata_getAllGatewayStoragePreferences_args');
     if ($this->authzToken !== null) {
       if (!is_object($this->authzToken)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -47363,11 +47363,11 @@ class Airavata_getAllGatewayDataStoragePreferences_args {
 
 }
 
-class Airavata_getAllGatewayDataStoragePreferences_result {
+class Airavata_getAllGatewayStoragePreferences_result {
   static $_TSPEC;
 
   /**
-   * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference[]
+   * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
    */
   public $success = null;
   /**
@@ -47396,7 +47396,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+            'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
             ),
           ),
         1 => array(
@@ -47441,7 +47441,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
   }
 
   public function getName() {
-    return 'Airavata_getAllGatewayDataStoragePreferences_result';
+    return 'Airavata_getAllGatewayStoragePreferences_result';
   }
 
   public function read($input)
@@ -47468,7 +47468,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
             for ($_i239 = 0; $_i239 < $_size235; ++$_i239)
             {
               $elem240 = null;
-              $elem240 = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference();
+              $elem240 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
               $xfer += $elem240->read($input);
               $this->success []= $elem240;
             }
@@ -47521,7 +47521,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_getAllGatewayDataStoragePreferences_result');
+    $xfer += $output->writeStructBegin('Airavata_getAllGatewayStoragePreferences_result');
     if ($this->success !== null) {
       if (!is_array($this->success)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -48178,7 +48178,7 @@ class Airavata_updateGatewayComputeResourcePreference_result {
 
 }
 
-class Airavata_updateGatewayDataStoragePreference_args {
+class Airavata_updateGatewayStoragePreference_args {
   static $_TSPEC;
 
   /**
@@ -48192,11 +48192,11 @@ class Airavata_updateGatewayDataStoragePreference_args {
   /**
    * @var string
    */
-  public $dataMoveId = null;
+  public $storageId = null;
   /**
-   * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference
+   * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
    */
-  public $dataStoragePreference = null;
+  public $storagePreference = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -48211,13 +48211,13 @@ class Airavata_updateGatewayDataStoragePreference_args {
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'dataMoveId',
+          'var' => 'storageId',
           'type' => TType::STRING,
           ),
         4 => array(
-          'var' => 'dataStoragePreference',
+          'var' => 'storagePreference',
           'type' => TType::STRUCT,
-          'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+          'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
           ),
         );
     }
@@ -48228,17 +48228,17 @@ class Airavata_updateGatewayDataStoragePreference_args {
       if (isset($vals['gatewayID'])) {
         $this->gatewayID = $vals['gatewayID'];
       }
-      if (isset($vals['dataMoveId'])) {
-        $this->dataMoveId = $vals['dataMoveId'];
+      if (isset($vals['storageId'])) {
+        $this->storageId = $vals['storageId'];
       }
-      if (isset($vals['dataStoragePreference'])) {
-        $this->dataStoragePreference = $vals['dataStoragePreference'];
+      if (isset($vals['storagePreference'])) {
+        $this->storagePreference = $vals['storagePreference'];
       }
     }
   }
 
   public function getName() {
-    return 'Airavata_updateGatewayDataStoragePreference_args';
+    return 'Airavata_updateGatewayStoragePreference_args';
   }
 
   public function read($input)
@@ -48273,15 +48273,15 @@ class Airavata_updateGatewayDataStoragePreference_args {
           break;
         case 3:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->dataMoveId);
+            $xfer += $input->readString($this->storageId);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 4:
           if ($ftype == TType::STRUCT) {
-            $this->dataStoragePreference = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference();
-            $xfer += $this->dataStoragePreference->read($input);
+            $this->storagePreference = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
+            $xfer += $this->storagePreference->read($input);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -48298,7 +48298,7 @@ class Airavata_updateGatewayDataStoragePreference_args {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_updateGatewayDataStoragePreference_args');
+    $xfer += $output->writeStructBegin('Airavata_updateGatewayStoragePreference_args');
     if ($this->authzToken !== null) {
       if (!is_object($this->authzToken)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -48312,17 +48312,17 @@ class Airavata_updateGatewayDataStoragePreference_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->storageId !== null) {
+      $xfer += $output->writeFieldBegin('storageId', TType::STRING, 3);
+      $xfer += $output->writeString($this->storageId);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->dataStoragePreference !== null) {
-      if (!is_object($this->dataStoragePreference)) {
+    if ($this->storagePreference !== null) {
+      if (!is_object($this->storagePreference)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('dataStoragePreference', TType::STRUCT, 4);
-      $xfer += $this->dataStoragePreference->write($output);
+      $xfer += $output->writeFieldBegin('storagePreference', TType::STRUCT, 4);
+      $xfer += $this->storagePreference->write($output);
       $xfer += $output->writeFieldEnd();
     }
     $xfer += $output->writeFieldStop();
@@ -48332,7 +48332,7 @@ class Airavata_updateGatewayDataStoragePreference_args {
 
 }
 
-class Airavata_updateGatewayDataStoragePreference_result {
+class Airavata_updateGatewayStoragePreference_result {
   static $_TSPEC;
 
   /**
@@ -48405,7 +48405,7 @@ class Airavata_updateGatewayDataStoragePreference_result {
   }
 
   public function getName() {
-    return 'Airavata_updateGatewayDataStoragePreference_result';
+    return 'Airavata_updateGatewayStoragePreference_result';
   }
 
   public function read($input)
@@ -48474,7 +48474,7 @@ class Airavata_updateGatewayDataStoragePreference_result {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_updateGatewayDataStoragePreference_result');
+    $xfer += $output->writeStructBegin('Airavata_updateGatewayStoragePreference_result');
     if ($this->success !== null) {
       $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
       $xfer += $output->writeBool($this->success);
@@ -48808,7 +48808,7 @@ class Airavata_deleteGatewayComputeResourcePreference_result {
 
 }
 
-class Airavata_deleteGatewayDataStoragePreference_args {
+class Airavata_deleteGatewayStoragePreference_args {
   static $_TSPEC;
 
   /**
@@ -48822,7 +48822,7 @@ class Airavata_deleteGatewayDataStoragePreference_args {
   /**
    * @var string
    */
-  public $dataMoveId = null;
+  public $storageId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -48837,7 +48837,7 @@ class Airavata_deleteGatewayDataStoragePreference_args {
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'dataMoveId',
+          'var' => 'storageId',
           'type' => TType::STRING,
           ),
         );
@@ -48849,14 +48849,14 @@ class Airavata_deleteGatewayDataStoragePreference_args {
       if (isset($vals['gatewayID'])) {
         $this->gatewayID = $vals['gatewayID'];
       }
-      if (isset($vals['dataMoveId'])) {
-        $this->dataMoveId = $vals['dataMoveId'];
+      if (isset($vals['storageId'])) {
+        $this->storageId = $vals['storageId'];
       }
     }
   }
 
   public function getName() {
-    return 'Airavata_deleteGatewayDataStoragePreference_args';
+    return 'Airavata_deleteGatewayStoragePreference_args';
   }
 
   public function read($input)
@@ -48891,7 +48891,7 @@ class Airavata_deleteGatewayDataStoragePreference_args {
           break;
         case 3:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->dataMoveId);
+            $xfer += $input->readString($this->storageId);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -48908,7 +48908,7 @@ class Airavata_deleteGatewayDataStoragePreference_args {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_deleteGatewayDataStoragePreference_args');
+    $xfer += $output->writeStructBegin('Airavata_deleteGatewayStoragePreference_args');
     if ($this->authzToken !== null) {
       if (!is_object($this->authzToken)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -48922,9 +48922,9 @@ class Airavata_deleteGatewayDataStoragePreference_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->storageId !== null) {
+      $xfer += $output->writeFieldBegin('storageId', TType::STRING, 3);
+      $xfer += $output->writeString($this->storageId);
       $xfer += $output->writeFieldEnd();
     }
     $xfer += $output->writeFieldStop();
@@ -48934,7 +48934,7 @@ class Airavata_deleteGatewayDataStoragePreference_args {
 
 }
 
-class Airavata_deleteGatewayDataStoragePreference_result {
+class Airavata_deleteGatewayStoragePreference_result {
   static $_TSPEC;
 
   /**
@@ -49007,7 +49007,7 @@ class Airavata_deleteGatewayDataStoragePreference_result {
   }
 
   public function getName() {
-    return 'Airavata_deleteGatewayDataStoragePreference_result';
+    return 'Airavata_deleteGatewayStoragePreference_result';
   }
 
   public function read($input)
@@ -49076,7 +49076,7 @@ class Airavata_deleteGatewayDataStoragePreference_result {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('Airavata_deleteGatewayDataStoragePreference_result');
+    $xfer += $output->writeStructBegin('Airavata_deleteGatewayStoragePreference_result');
     if ($this->success !== null) {
       $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
       $xfer += $output->writeBool($this->success);

http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/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 f63f2f0..9152391 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
@@ -310,13 +310,13 @@ class ComputeResourcePreference {
 
 }
 
-class DataStoragePreference {
+class StoragePreference {
   static $_TSPEC;
 
   /**
    * @var string
    */
-  public $dataMovememtResourceId = null;
+  public $storageResourceId = null;
   /**
    * @var string
    */
@@ -334,7 +334,7 @@ class DataStoragePreference {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'dataMovememtResourceId',
+          'var' => 'storageResourceId',
           'type' => TType::STRING,
           ),
         2 => array(
@@ -352,8 +352,8 @@ class DataStoragePreference {
         );
     }
     if (is_array($vals)) {
-      if (isset($vals['dataMovememtResourceId'])) {
-        $this->dataMovememtResourceId = $vals['dataMovememtResourceId'];
+      if (isset($vals['storageResourceId'])) {
+        $this->storageResourceId = $vals['storageResourceId'];
       }
       if (isset($vals['loginUserName'])) {
         $this->loginUserName = $vals['loginUserName'];
@@ -368,7 +368,7 @@ class DataStoragePreference {
   }
 
   public function getName() {
-    return 'DataStoragePreference';
+    return 'StoragePreference';
   }
 
   public function read($input)
@@ -388,7 +388,7 @@ class DataStoragePreference {
       {
         case 1:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->dataMovememtResourceId);
+            $xfer += $input->readString($this->storageResourceId);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -426,10 +426,10 @@ class DataStoragePreference {
 
   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->writeStructBegin('StoragePreference');
+    if ($this->storageResourceId !== null) {
+      $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 1);
+      $xfer += $output->writeString($this->storageResourceId);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->loginUserName !== null) {
@@ -483,9 +483,9 @@ class GatewayResourceProfile {
    */
   public $computeResourcePreferences = null;
   /**
-   * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference[]
+   * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
    */
-  public $dataStoragePreferences = null;
+  public $storagePreferences = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -508,12 +508,12 @@ class GatewayResourceProfile {
             ),
           ),
         4 => array(
-          'var' => 'dataStoragePreferences',
+          'var' => 'storagePreferences',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+            'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
             ),
           ),
         );
@@ -528,8 +528,8 @@ class GatewayResourceProfile {
       if (isset($vals['computeResourcePreferences'])) {
         $this->computeResourcePreferences = $vals['computeResourcePreferences'];
       }
-      if (isset($vals['dataStoragePreferences'])) {
-        $this->dataStoragePreferences = $vals['dataStoragePreferences'];
+      if (isset($vals['storagePreferences'])) {
+        $this->storagePreferences = $vals['storagePreferences'];
       }
     }
   }
@@ -587,16 +587,16 @@ class GatewayResourceProfile {
           break;
         case 4:
           if ($ftype == TType::LST) {
-            $this->dataStoragePreferences = array();
+            $this->storagePreferences = 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();
+              $elem11 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
               $xfer += $elem11->read($input);
-              $this->dataStoragePreferences []= $elem11;
+              $this->storagePreferences []= $elem11;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -643,15 +643,15 @@ class GatewayResourceProfile {
       }
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->dataStoragePreferences !== null) {
-      if (!is_array($this->dataStoragePreferences)) {
+    if ($this->storagePreferences !== null) {
+      if (!is_array($this->storagePreferences)) {
         throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
       }
-      $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 4);
+      $xfer += $output->writeFieldBegin('storagePreferences', TType::LST, 4);
       {
-        $output->writeListBegin(TType::STRUCT, count($this->dataStoragePreferences));
+        $output->writeListBegin(TType::STRUCT, count($this->storagePreferences));
         {
-          foreach ($this->dataStoragePreferences as $iter13)
+          foreach ($this->storagePreferences as $iter13)
           {
             $xfer += $iter13->write($output);
           }

http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/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 96cf8bd..42dbfd2 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
@@ -137,16 +137,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('  bool addGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId, StoragePreference storagePreference)')
   print('  ComputeResourcePreference getGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID, string computeResourceId)')
-  print('  DataStoragePreference getGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId)')
+  print('  StoragePreference getGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId)')
   print('   getAllGatewayComputeResourcePreferences(AuthzToken authzToken, string gatewayID)')
-  print('   getAllGatewayDataStoragePreferences(AuthzToken authzToken, string gatewayID)')
+  print('   getAllGatewayStoragePreferences(AuthzToken authzToken, string gatewayID)')
   print('   getAllGatewayResourceProfiles(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 updateGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string storageId, StoragePreference storagePreference)')
   print('  bool deleteGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID, string computeResourceId)')
-  print('  bool deleteGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId)')
+  print('  bool deleteGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string storageId)')
   print('   getAllWorkflows(AuthzToken authzToken, string gatewayId)')
   print('  Workflow getWorkflow(AuthzToken authzToken, string workflowTemplateId)')
   print('  void deleteWorkflow(AuthzToken authzToken, string workflowTemplateId)')
@@ -888,11 +888,11 @@ elif cmd == 'addGatewayComputeResourcePreference':
     sys.exit(1)
   pp.pprint(client.addGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
 
-elif cmd == 'addGatewayDataStoragePreference':
+elif cmd == 'addGatewayStoragePreference':
   if len(args) != 4:
-    print('addGatewayDataStoragePreference requires 4 args')
+    print('addGatewayStoragePreference requires 4 args')
     sys.exit(1)
-  pp.pprint(client.addGatewayDataStoragePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
+  pp.pprint(client.addGatewayStoragePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
 
 elif cmd == 'getGatewayComputeResourcePreference':
   if len(args) != 3:
@@ -900,11 +900,11 @@ elif cmd == 'getGatewayComputeResourcePreference':
     sys.exit(1)
   pp.pprint(client.getGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],))
 
-elif cmd == 'getGatewayDataStoragePreference':
+elif cmd == 'getGatewayStoragePreference':
   if len(args) != 3:
-    print('getGatewayDataStoragePreference requires 3 args')
+    print('getGatewayStoragePreference requires 3 args')
     sys.exit(1)
-  pp.pprint(client.getGatewayDataStoragePreference(eval(args[0]),args[1],args[2],))
+  pp.pprint(client.getGatewayStoragePreference(eval(args[0]),args[1],args[2],))
 
 elif cmd == 'getAllGatewayComputeResourcePreferences':
   if len(args) != 2:
@@ -912,11 +912,11 @@ elif cmd == 'getAllGatewayComputeResourcePreferences':
     sys.exit(1)
   pp.pprint(client.getAllGatewayComputeResourcePreferences(eval(args[0]),args[1],))
 
-elif cmd == 'getAllGatewayDataStoragePreferences':
+elif cmd == 'getAllGatewayStoragePreferences':
   if len(args) != 2:
-    print('getAllGatewayDataStoragePreferences requires 2 args')
+    print('getAllGatewayStoragePreferences requires 2 args')
     sys.exit(1)
-  pp.pprint(client.getAllGatewayDataStoragePreferences(eval(args[0]),args[1],))
+  pp.pprint(client.getAllGatewayStoragePreferences(eval(args[0]),args[1],))
 
 elif cmd == 'getAllGatewayResourceProfiles':
   if len(args) != 1:
@@ -930,11 +930,11 @@ elif cmd == 'updateGatewayComputeResourcePreference':
     sys.exit(1)
   pp.pprint(client.updateGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
 
-elif cmd == 'updateGatewayDataStoragePreference':
+elif cmd == 'updateGatewayStoragePreference':
   if len(args) != 4:
-    print('updateGatewayDataStoragePreference requires 4 args')
+    print('updateGatewayStoragePreference requires 4 args')
     sys.exit(1)
-  pp.pprint(client.updateGatewayDataStoragePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
+  pp.pprint(client.updateGatewayStoragePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
 
 elif cmd == 'deleteGatewayComputeResourcePreference':
   if len(args) != 3:
@@ -942,11 +942,11 @@ elif cmd == 'deleteGatewayComputeResourcePreference':
     sys.exit(1)
   pp.pprint(client.deleteGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],))
 
-elif cmd == 'deleteGatewayDataStoragePreference':
+elif cmd == 'deleteGatewayStoragePreference':
   if len(args) != 3:
-    print('deleteGatewayDataStoragePreference requires 3 args')
+    print('deleteGatewayStoragePreference requires 3 args')
     sys.exit(1)
-  pp.pprint(client.deleteGatewayDataStoragePreference(eval(args[0]),args[1],args[2],))
+  pp.pprint(client.deleteGatewayStoragePreference(eval(args[0]),args[1],args[2],))
 
 elif cmd == 'getAllWorkflows':
   if len(args) != 2: