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

[ch...@apache.org]

http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index a910c4a..e7d3ec6 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -1790,7 +1790,7 @@ public class Airavata {
      */
     public boolean addGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public boolean addGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public boolean addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
      * Fetch a Compute Resource Preference of a registered gateway profile.
@@ -1811,7 +1811,7 @@ public class Airavata {
      */
     public org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference getGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference getGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
      * Fetch all Compute Resource Preferences of a registered gateway profile.
@@ -1828,7 +1828,7 @@ public class Airavata {
      */
     public List<org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference> getAllGatewayComputeResourcePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
      * Fetch all gateway profiles registered
@@ -1861,7 +1861,7 @@ public class Airavata {
      */
     public boolean updateGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public boolean updateGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public boolean updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
      * Delete the Compute Resource Preference of a registered gateway profile.
@@ -1882,7 +1882,7 @@ public class Airavata {
      */
     public boolean deleteGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public boolean deleteGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public boolean deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     public List<String> getAllWorkflows(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
@@ -2128,25 +2128,25 @@ public class Airavata {
 
     public void addGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void addGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void getGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void getGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void getAllGatewayComputeResourcePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void getAllGatewayResourceProfiles(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void updateGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void updateGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void deleteGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void deleteGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void getAllWorkflows(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
@@ -6346,26 +6346,26 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGatewayComputeResourcePreference failed: unknown result");
     }
 
-    public boolean addGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public boolean addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_addGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference);
-      return recv_addGatewayDataStoragePreference();
+      send_addGatewayStoragePreference(authzToken, gatewayID, dataMoveId, storagePreference);
+      return recv_addGatewayStoragePreference();
     }
 
-    public void send_addGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.thrift.TException
+    public void send_addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.thrift.TException
     {
-      addGatewayDataStoragePreference_args args = new addGatewayDataStoragePreference_args();
+      addGatewayStoragePreference_args args = new addGatewayStoragePreference_args();
       args.setAuthzToken(authzToken);
       args.setGatewayID(gatewayID);
       args.setDataMoveId(dataMoveId);
-      args.setDataStoragePreference(dataStoragePreference);
-      sendBase("addGatewayDataStoragePreference", args);
+      args.setStoragePreference(storagePreference);
+      sendBase("addGatewayStoragePreference", args);
     }
 
-    public boolean recv_addGatewayDataStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public boolean recv_addGatewayStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      addGatewayDataStoragePreference_result result = new addGatewayDataStoragePreference_result();
-      receiveBase(result, "addGatewayDataStoragePreference");
+      addGatewayStoragePreference_result result = new addGatewayStoragePreference_result();
+      receiveBase(result, "addGatewayStoragePreference");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -6381,7 +6381,7 @@ public class Airavata {
       if (result.ae != null) {
         throw result.ae;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGatewayDataStoragePreference failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGatewayStoragePreference failed: unknown result");
     }
 
     public org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference getGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -6421,25 +6421,25 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGatewayComputeResourcePreference failed: unknown result");
     }
 
-    public org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference getGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_getGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId);
-      return recv_getGatewayDataStoragePreference();
+      send_getGatewayStoragePreference(authzToken, gatewayID, dataMoveId);
+      return recv_getGatewayStoragePreference();
     }
 
-    public void send_getGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.thrift.TException
+    public void send_getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.thrift.TException
     {
-      getGatewayDataStoragePreference_args args = new getGatewayDataStoragePreference_args();
+      getGatewayStoragePreference_args args = new getGatewayStoragePreference_args();
       args.setAuthzToken(authzToken);
       args.setGatewayID(gatewayID);
       args.setDataMoveId(dataMoveId);
-      sendBase("getGatewayDataStoragePreference", args);
+      sendBase("getGatewayStoragePreference", args);
     }
 
-    public org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference recv_getGatewayDataStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference recv_getGatewayStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      getGatewayDataStoragePreference_result result = new getGatewayDataStoragePreference_result();
-      receiveBase(result, "getGatewayDataStoragePreference");
+      getGatewayStoragePreference_result result = new getGatewayStoragePreference_result();
+      receiveBase(result, "getGatewayStoragePreference");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -6455,7 +6455,7 @@ public class Airavata {
       if (result.ae != null) {
         throw result.ae;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGatewayDataStoragePreference failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGatewayStoragePreference failed: unknown result");
     }
 
     public List<org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference> getAllGatewayComputeResourcePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -6494,24 +6494,24 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllGatewayComputeResourcePreferences failed: unknown result");
     }
 
-    public List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_getAllGatewayDataStoragePreferences(authzToken, gatewayID);
-      return recv_getAllGatewayDataStoragePreferences();
+      send_getAllGatewayStoragePreferences(authzToken, gatewayID);
+      return recv_getAllGatewayStoragePreferences();
     }
 
-    public void send_getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.thrift.TException
+    public void send_getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.thrift.TException
     {
-      getAllGatewayDataStoragePreferences_args args = new getAllGatewayDataStoragePreferences_args();
+      getAllGatewayStoragePreferences_args args = new getAllGatewayStoragePreferences_args();
       args.setAuthzToken(authzToken);
       args.setGatewayID(gatewayID);
-      sendBase("getAllGatewayDataStoragePreferences", args);
+      sendBase("getAllGatewayStoragePreferences", args);
     }
 
-    public List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> recv_getAllGatewayDataStoragePreferences() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> recv_getAllGatewayStoragePreferences() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      getAllGatewayDataStoragePreferences_result result = new getAllGatewayDataStoragePreferences_result();
-      receiveBase(result, "getAllGatewayDataStoragePreferences");
+      getAllGatewayStoragePreferences_result result = new getAllGatewayStoragePreferences_result();
+      receiveBase(result, "getAllGatewayStoragePreferences");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -6527,7 +6527,7 @@ public class Airavata {
       if (result.ae != null) {
         throw result.ae;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllGatewayDataStoragePreferences failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllGatewayStoragePreferences failed: unknown result");
     }
 
     public List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> getAllGatewayResourceProfiles(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -6603,26 +6603,26 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateGatewayComputeResourcePreference failed: unknown result");
     }
 
-    public boolean updateGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public boolean updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_updateGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference);
-      return recv_updateGatewayDataStoragePreference();
+      send_updateGatewayStoragePreference(authzToken, gatewayID, storageId, storagePreference);
+      return recv_updateGatewayStoragePreference();
     }
 
-    public void send_updateGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.thrift.TException
+    public void send_updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.thrift.TException
     {
-      updateGatewayDataStoragePreference_args args = new updateGatewayDataStoragePreference_args();
+      updateGatewayStoragePreference_args args = new updateGatewayStoragePreference_args();
       args.setAuthzToken(authzToken);
       args.setGatewayID(gatewayID);
-      args.setDataMoveId(dataMoveId);
-      args.setDataStoragePreference(dataStoragePreference);
-      sendBase("updateGatewayDataStoragePreference", args);
+      args.setStorageId(storageId);
+      args.setStoragePreference(storagePreference);
+      sendBase("updateGatewayStoragePreference", args);
     }
 
-    public boolean recv_updateGatewayDataStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public boolean recv_updateGatewayStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      updateGatewayDataStoragePreference_result result = new updateGatewayDataStoragePreference_result();
-      receiveBase(result, "updateGatewayDataStoragePreference");
+      updateGatewayStoragePreference_result result = new updateGatewayStoragePreference_result();
+      receiveBase(result, "updateGatewayStoragePreference");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -6638,7 +6638,7 @@ public class Airavata {
       if (result.ae != null) {
         throw result.ae;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateGatewayDataStoragePreference failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateGatewayStoragePreference failed: unknown result");
     }
 
     public boolean deleteGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -6678,25 +6678,25 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteGatewayComputeResourcePreference failed: unknown result");
     }
 
-    public boolean deleteGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public boolean deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_deleteGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId);
-      return recv_deleteGatewayDataStoragePreference();
+      send_deleteGatewayStoragePreference(authzToken, gatewayID, storageId);
+      return recv_deleteGatewayStoragePreference();
     }
 
-    public void send_deleteGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.thrift.TException
+    public void send_deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId) throws org.apache.thrift.TException
     {
-      deleteGatewayDataStoragePreference_args args = new deleteGatewayDataStoragePreference_args();
+      deleteGatewayStoragePreference_args args = new deleteGatewayStoragePreference_args();
       args.setAuthzToken(authzToken);
       args.setGatewayID(gatewayID);
-      args.setDataMoveId(dataMoveId);
-      sendBase("deleteGatewayDataStoragePreference", args);
+      args.setStorageId(storageId);
+      sendBase("deleteGatewayStoragePreference", args);
     }
 
-    public boolean recv_deleteGatewayDataStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public boolean recv_deleteGatewayStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      deleteGatewayDataStoragePreference_result result = new deleteGatewayDataStoragePreference_result();
-      receiveBase(result, "deleteGatewayDataStoragePreference");
+      deleteGatewayStoragePreference_result result = new deleteGatewayStoragePreference_result();
+      receiveBase(result, "deleteGatewayStoragePreference");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -6712,7 +6712,7 @@ public class Airavata {
       if (result.ae != null) {
         throw result.ae;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteGatewayDataStoragePreference failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteGatewayStoragePreference failed: unknown result");
     }
 
     public List<String> getAllWorkflows(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -11218,33 +11218,33 @@ public class Airavata {
       }
     }
 
-    public void addGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      addGatewayDataStoragePreference_call method_call = new addGatewayDataStoragePreference_call(authzToken, gatewayID, dataMoveId, dataStoragePreference, resultHandler, this, ___protocolFactory, ___transport);
+      addGatewayStoragePreference_call method_call = new addGatewayStoragePreference_call(authzToken, gatewayID, dataMoveId, storagePreference, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class addGatewayDataStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class addGatewayStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String gatewayID;
       private String dataMoveId;
-      private org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference;
-      public addGatewayDataStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference;
+      public addGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.gatewayID = gatewayID;
         this.dataMoveId = dataMoveId;
-        this.dataStoragePreference = dataStoragePreference;
+        this.storagePreference = storagePreference;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addGatewayDataStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        addGatewayDataStoragePreference_args args = new addGatewayDataStoragePreference_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addGatewayStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        addGatewayStoragePreference_args args = new addGatewayStoragePreference_args();
         args.setAuthzToken(authzToken);
         args.setGatewayID(gatewayID);
         args.setDataMoveId(dataMoveId);
-        args.setDataStoragePreference(dataStoragePreference);
+        args.setStoragePreference(storagePreference);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -11255,7 +11255,7 @@ public class Airavata {
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_addGatewayDataStoragePreference();
+        return (new Client(prot)).recv_addGatewayStoragePreference();
       }
     }
 
@@ -11297,18 +11297,18 @@ public class Airavata {
       }
     }
 
-    public void getGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getGatewayDataStoragePreference_call method_call = new getGatewayDataStoragePreference_call(authzToken, gatewayID, dataMoveId, resultHandler, this, ___protocolFactory, ___transport);
+      getGatewayStoragePreference_call method_call = new getGatewayStoragePreference_call(authzToken, gatewayID, dataMoveId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getGatewayDataStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class getGatewayStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String gatewayID;
       private String dataMoveId;
-      public getGatewayDataStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.gatewayID = gatewayID;
@@ -11316,8 +11316,8 @@ public class Airavata {
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getGatewayDataStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getGatewayDataStoragePreference_args args = new getGatewayDataStoragePreference_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getGatewayStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getGatewayStoragePreference_args args = new getGatewayStoragePreference_args();
         args.setAuthzToken(authzToken);
         args.setGatewayID(gatewayID);
         args.setDataMoveId(dataMoveId);
@@ -11325,13 +11325,13 @@ public class Airavata {
         prot.writeMessageEnd();
       }
 
-      public org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
+      public org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_getGatewayDataStoragePreference();
+        return (new Client(prot)).recv_getGatewayStoragePreference();
       }
     }
 
@@ -11370,38 +11370,38 @@ public class Airavata {
       }
     }
 
-    public void getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getAllGatewayDataStoragePreferences_call method_call = new getAllGatewayDataStoragePreferences_call(authzToken, gatewayID, resultHandler, this, ___protocolFactory, ___transport);
+      getAllGatewayStoragePreferences_call method_call = new getAllGatewayStoragePreferences_call(authzToken, gatewayID, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getAllGatewayDataStoragePreferences_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class getAllGatewayStoragePreferences_call extends org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String gatewayID;
-      public getAllGatewayDataStoragePreferences_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getAllGatewayStoragePreferences_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.gatewayID = gatewayID;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllGatewayDataStoragePreferences", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getAllGatewayDataStoragePreferences_args args = new getAllGatewayDataStoragePreferences_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllGatewayStoragePreferences", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getAllGatewayStoragePreferences_args args = new getAllGatewayStoragePreferences_args();
         args.setAuthzToken(authzToken);
         args.setGatewayID(gatewayID);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
+      public List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_getAllGatewayDataStoragePreferences();
+        return (new Client(prot)).recv_getAllGatewayStoragePreferences();
       }
     }
 
@@ -11478,33 +11478,33 @@ public class Airavata {
       }
     }
 
-    public void updateGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      updateGatewayDataStoragePreference_call method_call = new updateGatewayDataStoragePreference_call(authzToken, gatewayID, dataMoveId, dataStoragePreference, resultHandler, this, ___protocolFactory, ___transport);
+      updateGatewayStoragePreference_call method_call = new updateGatewayStoragePreference_call(authzToken, gatewayID, storageId, storagePreference, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class updateGatewayDataStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class updateGatewayStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String gatewayID;
-      private String dataMoveId;
-      private org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference;
-      public updateGatewayDataStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private String storageId;
+      private org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference;
+      public updateGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.gatewayID = gatewayID;
-        this.dataMoveId = dataMoveId;
-        this.dataStoragePreference = dataStoragePreference;
+        this.storageId = storageId;
+        this.storagePreference = storagePreference;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("updateGatewayDataStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        updateGatewayDataStoragePreference_args args = new updateGatewayDataStoragePreference_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("updateGatewayStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        updateGatewayStoragePreference_args args = new updateGatewayStoragePreference_args();
         args.setAuthzToken(authzToken);
         args.setGatewayID(gatewayID);
-        args.setDataMoveId(dataMoveId);
-        args.setDataStoragePreference(dataStoragePreference);
+        args.setStorageId(storageId);
+        args.setStoragePreference(storagePreference);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -11515,7 +11515,7 @@ public class Airavata {
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_updateGatewayDataStoragePreference();
+        return (new Client(prot)).recv_updateGatewayStoragePreference();
       }
     }
 
@@ -11557,30 +11557,30 @@ public class Airavata {
       }
     }
 
-    public void deleteGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      deleteGatewayDataStoragePreference_call method_call = new deleteGatewayDataStoragePreference_call(authzToken, gatewayID, dataMoveId, resultHandler, this, ___protocolFactory, ___transport);
+      deleteGatewayStoragePreference_call method_call = new deleteGatewayStoragePreference_call(authzToken, gatewayID, storageId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class deleteGatewayDataStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class deleteGatewayStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String gatewayID;
-      private String dataMoveId;
-      public deleteGatewayDataStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private String storageId;
+      public deleteGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.gatewayID = gatewayID;
-        this.dataMoveId = dataMoveId;
+        this.storageId = storageId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteGatewayDataStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        deleteGatewayDataStoragePreference_args args = new deleteGatewayDataStoragePreference_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteGatewayStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        deleteGatewayStoragePreference_args args = new deleteGatewayStoragePreference_args();
         args.setAuthzToken(authzToken);
         args.setGatewayID(gatewayID);
-        args.setDataMoveId(dataMoveId);
+        args.setStorageId(storageId);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -11591,7 +11591,7 @@ public class Airavata {
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_deleteGatewayDataStoragePreference();
+        return (new Client(prot)).recv_deleteGatewayStoragePreference();
       }
     }
 
@@ -11972,16 +11972,16 @@ public class Airavata {
       processMap.put("updateGatewayResourceProfile", new updateGatewayResourceProfile());
       processMap.put("deleteGatewayResourceProfile", new deleteGatewayResourceProfile());
       processMap.put("addGatewayComputeResourcePreference", new addGatewayComputeResourcePreference());
-      processMap.put("addGatewayDataStoragePreference", new addGatewayDataStoragePreference());
+      processMap.put("addGatewayStoragePreference", new addGatewayStoragePreference());
       processMap.put("getGatewayComputeResourcePreference", new getGatewayComputeResourcePreference());
-      processMap.put("getGatewayDataStoragePreference", new getGatewayDataStoragePreference());
+      processMap.put("getGatewayStoragePreference", new getGatewayStoragePreference());
       processMap.put("getAllGatewayComputeResourcePreferences", new getAllGatewayComputeResourcePreferences());
-      processMap.put("getAllGatewayDataStoragePreferences", new getAllGatewayDataStoragePreferences());
+      processMap.put("getAllGatewayStoragePreferences", new getAllGatewayStoragePreferences());
       processMap.put("getAllGatewayResourceProfiles", new getAllGatewayResourceProfiles());
       processMap.put("updateGatewayComputeResourcePreference", new updateGatewayComputeResourcePreference());
-      processMap.put("updateGatewayDataStoragePreference", new updateGatewayDataStoragePreference());
+      processMap.put("updateGatewayStoragePreference", new updateGatewayStoragePreference());
       processMap.put("deleteGatewayComputeResourcePreference", new deleteGatewayComputeResourcePreference());
-      processMap.put("deleteGatewayDataStoragePreference", new deleteGatewayDataStoragePreference());
+      processMap.put("deleteGatewayStoragePreference", new deleteGatewayStoragePreference());
       processMap.put("getAllWorkflows", new getAllWorkflows());
       processMap.put("getWorkflow", new getWorkflow());
       processMap.put("deleteWorkflow", new deleteWorkflow());
@@ -15431,23 +15431,23 @@ public class Airavata {
       }
     }
 
-    public static class addGatewayDataStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGatewayDataStoragePreference_args> {
-      public addGatewayDataStoragePreference() {
-        super("addGatewayDataStoragePreference");
+    public static class addGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGatewayStoragePreference_args> {
+      public addGatewayStoragePreference() {
+        super("addGatewayStoragePreference");
       }
 
-      public addGatewayDataStoragePreference_args getEmptyArgsInstance() {
-        return new addGatewayDataStoragePreference_args();
+      public addGatewayStoragePreference_args getEmptyArgsInstance() {
+        return new addGatewayStoragePreference_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public addGatewayDataStoragePreference_result getResult(I iface, addGatewayDataStoragePreference_args args) throws org.apache.thrift.TException {
-        addGatewayDataStoragePreference_result result = new addGatewayDataStoragePreference_result();
+      public addGatewayStoragePreference_result getResult(I iface, addGatewayStoragePreference_args args) throws org.apache.thrift.TException {
+        addGatewayStoragePreference_result result = new addGatewayStoragePreference_result();
         try {
-          result.success = iface.addGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference);
+          result.success = iface.addGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.storagePreference);
           result.setSuccessIsSet(true);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
@@ -15492,23 +15492,23 @@ public class Airavata {
       }
     }
 
-    public static class getGatewayDataStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayDataStoragePreference_args> {
-      public getGatewayDataStoragePreference() {
-        super("getGatewayDataStoragePreference");
+    public static class getGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayStoragePreference_args> {
+      public getGatewayStoragePreference() {
+        super("getGatewayStoragePreference");
       }
 
-      public getGatewayDataStoragePreference_args getEmptyArgsInstance() {
-        return new getGatewayDataStoragePreference_args();
+      public getGatewayStoragePreference_args getEmptyArgsInstance() {
+        return new getGatewayStoragePreference_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public getGatewayDataStoragePreference_result getResult(I iface, getGatewayDataStoragePreference_args args) throws org.apache.thrift.TException {
-        getGatewayDataStoragePreference_result result = new getGatewayDataStoragePreference_result();
+      public getGatewayStoragePreference_result getResult(I iface, getGatewayStoragePreference_args args) throws org.apache.thrift.TException {
+        getGatewayStoragePreference_result result = new getGatewayStoragePreference_result();
         try {
-          result.success = iface.getGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId);
+          result.success = iface.getGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -15552,23 +15552,23 @@ public class Airavata {
       }
     }
 
-    public static class getAllGatewayDataStoragePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayDataStoragePreferences_args> {
-      public getAllGatewayDataStoragePreferences() {
-        super("getAllGatewayDataStoragePreferences");
+    public static class getAllGatewayStoragePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayStoragePreferences_args> {
+      public getAllGatewayStoragePreferences() {
+        super("getAllGatewayStoragePreferences");
       }
 
-      public getAllGatewayDataStoragePreferences_args getEmptyArgsInstance() {
-        return new getAllGatewayDataStoragePreferences_args();
+      public getAllGatewayStoragePreferences_args getEmptyArgsInstance() {
+        return new getAllGatewayStoragePreferences_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public getAllGatewayDataStoragePreferences_result getResult(I iface, getAllGatewayDataStoragePreferences_args args) throws org.apache.thrift.TException {
-        getAllGatewayDataStoragePreferences_result result = new getAllGatewayDataStoragePreferences_result();
+      public getAllGatewayStoragePreferences_result getResult(I iface, getAllGatewayStoragePreferences_args args) throws org.apache.thrift.TException {
+        getAllGatewayStoragePreferences_result result = new getAllGatewayStoragePreferences_result();
         try {
-          result.success = iface.getAllGatewayDataStoragePreferences(args.authzToken, args.gatewayID);
+          result.success = iface.getAllGatewayStoragePreferences(args.authzToken, args.gatewayID);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -15643,23 +15643,23 @@ public class Airavata {
       }
     }
 
-    public static class updateGatewayDataStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGatewayDataStoragePreference_args> {
-      public updateGatewayDataStoragePreference() {
-        super("updateGatewayDataStoragePreference");
+    public static class updateGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGatewayStoragePreference_args> {
+      public updateGatewayStoragePreference() {
+        super("updateGatewayStoragePreference");
       }
 
-      public updateGatewayDataStoragePreference_args getEmptyArgsInstance() {
-        return new updateGatewayDataStoragePreference_args();
+      public updateGatewayStoragePreference_args getEmptyArgsInstance() {
+        return new updateGatewayStoragePreference_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public updateGatewayDataStoragePreference_result getResult(I iface, updateGatewayDataStoragePreference_args args) throws org.apache.thrift.TException {
-        updateGatewayDataStoragePreference_result result = new updateGatewayDataStoragePreference_result();
+      public updateGatewayStoragePreference_result getResult(I iface, updateGatewayStoragePreference_args args) throws org.apache.thrift.TException {
+        updateGatewayStoragePreference_result result = new updateGatewayStoragePreference_result();
         try {
-          result.success = iface.updateGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference);
+          result.success = iface.updateGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId, args.storagePreference);
           result.setSuccessIsSet(true);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
@@ -15705,23 +15705,23 @@ public class Airavata {
       }
     }
 
-    public static class deleteGatewayDataStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGatewayDataStoragePreference_args> {
-      public deleteGatewayDataStoragePreference() {
-        super("deleteGatewayDataStoragePreference");
+    public static class deleteGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGatewayStoragePreference_args> {
+      public deleteGatewayStoragePreference() {
+        super("deleteGatewayStoragePreference");
       }
 
-      public deleteGatewayDataStoragePreference_args getEmptyArgsInstance() {
-        return new deleteGatewayDataStoragePreference_args();
+      public deleteGatewayStoragePreference_args getEmptyArgsInstance() {
+        return new deleteGatewayStoragePreference_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public deleteGatewayDataStoragePreference_result getResult(I iface, deleteGatewayDataStoragePreference_args args) throws org.apache.thrift.TException {
-        deleteGatewayDataStoragePreference_result result = new deleteGatewayDataStoragePreference_result();
+      public deleteGatewayStoragePreference_result getResult(I iface, deleteGatewayStoragePreference_args args) throws org.apache.thrift.TException {
+        deleteGatewayStoragePreference_result result = new deleteGatewayStoragePreference_result();
         try {
-          result.success = iface.deleteGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId);
+          result.success = iface.deleteGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId);
           result.setSuccessIsSet(true);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
@@ -16073,16 +16073,16 @@ public class Airavata {
       processMap.put("updateGatewayResourceProfile", new updateGatewayResourceProfile());
       processMap.put("deleteGatewayResourceProfile", new deleteGatewayResourceProfile());
       processMap.put("addGatewayComputeResourcePreference", new addGatewayComputeResourcePreference());
-      processMap.put("addGatewayDataStoragePreference", new addGatewayDataStoragePreference());
+      processMap.put("addGatewayStoragePreference", new addGatewayStoragePreference());
       processMap.put("getGatewayComputeResourcePreference", new getGatewayComputeResourcePreference());
-      processMap.put("getGatewayDataStoragePreference", new getGatewayDataStoragePreference());
+      processMap.put("getGatewayStoragePreference", new getGatewayStoragePreference());
       processMap.put("getAllGatewayComputeResourcePreferences", new getAllGatewayComputeResourcePreferences());
-      processMap.put("getAllGatewayDataStoragePreferences", new getAllGatewayDataStoragePreferences());
+      processMap.put("getAllGatewayStoragePreferences", new getAllGatewayStoragePreferences());
       processMap.put("getAllGatewayResourceProfiles", new getAllGatewayResourceProfiles());
       processMap.put("updateGatewayComputeResourcePreference", new updateGatewayComputeResourcePreference());
-      processMap.put("updateGatewayDataStoragePreference", new updateGatewayDataStoragePreference());
+      processMap.put("updateGatewayStoragePreference", new updateGatewayStoragePreference());
       processMap.put("deleteGatewayComputeResourcePreference", new deleteGatewayComputeResourcePreference());
-      processMap.put("deleteGatewayDataStoragePreference", new deleteGatewayDataStoragePreference());
+      processMap.put("deleteGatewayStoragePreference", new deleteGatewayStoragePreference());
       processMap.put("getAllWorkflows", new getAllWorkflows());
       processMap.put("getWorkflow", new getWorkflow());
       processMap.put("deleteWorkflow", new deleteWorkflow());
@@ -24292,20 +24292,20 @@ public class Airavata {
       }
     }
 
-    public static class addGatewayDataStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addGatewayDataStoragePreference_args, Boolean> {
-      public addGatewayDataStoragePreference() {
-        super("addGatewayDataStoragePreference");
+    public static class addGatewayStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addGatewayStoragePreference_args, Boolean> {
+      public addGatewayStoragePreference() {
+        super("addGatewayStoragePreference");
       }
 
-      public addGatewayDataStoragePreference_args getEmptyArgsInstance() {
-        return new addGatewayDataStoragePreference_args();
+      public addGatewayStoragePreference_args getEmptyArgsInstance() {
+        return new addGatewayStoragePreference_args();
       }
 
       public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
         return new AsyncMethodCallback<Boolean>() { 
           public void onComplete(Boolean o) {
-            addGatewayDataStoragePreference_result result = new addGatewayDataStoragePreference_result();
+            addGatewayStoragePreference_result result = new addGatewayStoragePreference_result();
             result.success = o;
             result.setSuccessIsSet(true);
             try {
@@ -24319,7 +24319,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            addGatewayDataStoragePreference_result result = new addGatewayDataStoragePreference_result();
+            addGatewayStoragePreference_result result = new addGatewayStoragePreference_result();
             if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -24360,8 +24360,8 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, addGatewayDataStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
-        iface.addGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference,resultHandler);
+      public void start(I iface, addGatewayStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.addGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.storagePreference,resultHandler);
       }
     }
 
@@ -24437,20 +24437,20 @@ public class Airavata {
       }
     }
 
-    public static class getGatewayDataStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getGatewayDataStoragePreference_args, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> {
-      public getGatewayDataStoragePreference() {
-        super("getGatewayDataStoragePreference");
+    public static class getGatewayStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getGatewayStoragePreference_args, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> {
+      public getGatewayStoragePreference() {
+        super("getGatewayStoragePreference");
       }
 
-      public getGatewayDataStoragePreference_args getEmptyArgsInstance() {
-        return new getGatewayDataStoragePreference_args();
+      public getGatewayStoragePreference_args getEmptyArgsInstance() {
+        return new getGatewayStoragePreference_args();
       }
 
-      public AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference>() { 
-          public void onComplete(org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference o) {
-            getGatewayDataStoragePreference_result result = new getGatewayDataStoragePreference_result();
+        return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference>() { 
+          public void onComplete(org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference o) {
+            getGatewayStoragePreference_result result = new getGatewayStoragePreference_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -24463,7 +24463,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getGatewayDataStoragePreference_result result = new getGatewayDataStoragePreference_result();
+            getGatewayStoragePreference_result result = new getGatewayStoragePreference_result();
             if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -24504,8 +24504,8 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getGatewayDataStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> resultHandler) throws TException {
-        iface.getGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId,resultHandler);
+      public void start(I iface, getGatewayStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> resultHandler) throws TException {
+        iface.getGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId,resultHandler);
       }
     }
 
@@ -24581,20 +24581,20 @@ public class Airavata {
       }
     }
 
-    public static class getAllGatewayDataStoragePreferences<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllGatewayDataStoragePreferences_args, List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference>> {
-      public getAllGatewayDataStoragePreferences() {
-        super("getAllGatewayDataStoragePreferences");
+    public static class getAllGatewayStoragePreferences<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllGatewayStoragePreferences_args, List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference>> {
+      public getAllGatewayStoragePreferences() {
+        super("getAllGatewayStoragePreferences");
       }
 
-      public getAllGatewayDataStoragePreferences_args getEmptyArgsInstance() {
-        return new getAllGatewayDataStoragePreferences_args();
+      public getAllGatewayStoragePreferences_args getEmptyArgsInstance() {
+        return new getAllGatewayStoragePreferences_args();
       }
 
-      public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference>>() { 
-          public void onComplete(List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> o) {
-            getAllGatewayDataStoragePreferences_result result = new getAllGatewayDataStoragePreferences_result();
+        return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference>>() { 
+          public void onComplete(List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> o) {
+            getAllGatewayStoragePreferences_result result = new getAllGatewayStoragePreferences_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -24607,7 +24607,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getAllGatewayDataStoragePreferences_result result = new getAllGatewayDataStoragePreferences_result();
+            getAllGatewayStoragePreferences_result result = new getAllGatewayStoragePreferences_result();
             if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -24648,8 +24648,8 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getAllGatewayDataStoragePreferences_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference>> resultHandler) throws TException {
-        iface.getAllGatewayDataStoragePreferences(args.authzToken, args.gatewayID,resultHandler);
+      public void start(I iface, getAllGatewayStoragePreferences_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference>> resultHandler) throws TException {
+        iface.getAllGatewayStoragePreferences(args.authzToken, args.gatewayID,resultHandler);
       }
     }
 
@@ -24798,20 +24798,20 @@ public class Airavata {
       }
     }
 
-    public static class updateGatewayDataStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateGatewayDataStoragePreference_args, Boolean> {
-      public updateGatewayDataStoragePreference() {
-        super("updateGatewayDataStoragePreference");
+    public static class updateGatewayStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateGatewayStoragePreference_args, Boolean> {
+      public updateGatewayStoragePreference() {
+        super("updateGatewayStoragePreference");
       }
 
-      public updateGatewayDataStoragePreference_args getEmptyArgsInstance() {
-        return new updateGatewayDataStoragePreference_args();
+      public updateGatewayStoragePreference_args getEmptyArgsInstance() {
+        return new updateGatewayStoragePreference_args();
       }
 
       public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
         return new AsyncMethodCallback<Boolean>() { 
           public void onComplete(Boolean o) {
-            updateGatewayDataStoragePreference_result result = new updateGatewayDataStoragePreference_result();
+            updateGatewayStoragePreference_result result = new updateGatewayStoragePreference_result();
             result.success = o;
             result.setSuccessIsSet(true);
             try {
@@ -24825,7 +24825,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            updateGatewayDataStoragePreference_result result = new updateGatewayDataStoragePreference_result();
+            updateGatewayStoragePreference_result result = new updateGatewayStoragePreference_result();
             if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -24866,8 +24866,8 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, updateGatewayDataStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
-        iface.updateGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference,resultHandler);
+      public void start(I iface, updateGatewayStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.updateGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId, args.storagePreference,resultHandler);
       }
     }
 
@@ -24944,20 +24944,20 @@ public class Airavata {
       }
     }
 
-    public static class deleteGatewayDataStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteGatewayDataStoragePreference_args, Boolean> {
-      public deleteGatewayDataStoragePreference() {
-        super("deleteGatewayDataStoragePreference");
+    public static class deleteGatewayStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteGatewayStoragePreference_args, Boolean> {
+      public deleteGatewayStoragePreference() {
+        super("deleteGatewayStoragePreference");
       }
 
-      public deleteGatewayDataStoragePreference_args getEmptyArgsInstance() {
-        return new deleteGatewayDataStoragePreference_args();
+      public deleteGatewayStoragePreference_args getEmptyArgsInstance() {
+        return new deleteGatewayStoragePreference_args();
       }
 
       public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
         return new AsyncMethodCallback<Boolean>() { 
           public void onComplete(Boolean o) {
-            deleteGatewayDataStoragePreference_result result = new deleteGatewayDataStoragePreference_result();
+            deleteGatewayStoragePreference_result result = new deleteGatewayStoragePreference_result();
             result.success = o;
             result.setSuccessIsSet(true);
             try {
@@ -24971,7 +24971,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            deleteGatewayDataStoragePreference_result result = new deleteGatewayDataStoragePreference_result();
+            deleteGatewayStoragePreference_result result = new deleteGatewayStoragePreference_result();
             if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -25012,8 +25012,8 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, deleteGatewayDataStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
-        iface.deleteGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId,resultHandler);
+      public void start(I iface, deleteGatewayStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.deleteGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId,resultHandler);
       }
     }
 
@@ -178045,31 +178045,31 @@ public class Airavata {
 
   }
 
-  public static class addGatewayDataStoragePreference_args implements org.apache.thrift.TBase<addGatewayDataStoragePreference_args, addGatewayDataStoragePreference_args._Fields>, java.io.Serializable, Cloneable, Comparable<addGatewayDataStoragePreference_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addGatewayDataStoragePreference_args");
+  public static class addGatewayStoragePreference_args implements org.apache.thrift.TBase<addGatewayStoragePreference_args, addGatewayStoragePreference_args._Fields>, java.io.Serializable, Cloneable, Comparable<addGatewayStoragePreference_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addGatewayStoragePreference_args");
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayID", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField DATA_MOVE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMoveId", org.apache.thrift.protocol.TType.STRING, (short)3);
-    private static final org.apache.thrift.protocol.TField DATA_STORAGE_PREFERENCE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataStoragePreference", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+    private static final org.apache.thrift.protocol.TField STORAGE_PREFERENCE_FIELD_DESC = new org.apache.thrift.protocol.TField("storagePreference", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new addGatewayDataStoragePreference_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new addGatewayDataStoragePreference_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new addGatewayStorage

<TRUNCATED>