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:57 UTC

[3/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-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
index 4f25769..080a6b7 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
@@ -2091,13 +2091,13 @@ class Iface:
     """
     pass
 
-  def addGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
+  def addGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId, storagePreference):
     """
     Parameters:
      - authzToken
      - gatewayID
      - dataMoveId
-     - dataStoragePreference
+     - storagePreference
     """
     pass
 
@@ -2122,7 +2122,7 @@ class Iface:
     """
     pass
 
-  def getGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
+  def getGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId):
     """
     Parameters:
      - authzToken
@@ -2148,7 +2148,7 @@ class Iface:
     """
     pass
 
-  def getAllGatewayDataStoragePreferences(self, authzToken, gatewayID):
+  def getAllGatewayStoragePreferences(self, authzToken, gatewayID):
     """
     Parameters:
      - authzToken
@@ -2191,13 +2191,13 @@ class Iface:
     """
     pass
 
-  def updateGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
+  def updateGatewayStoragePreference(self, authzToken, gatewayID, storageId, storagePreference):
     """
     Parameters:
      - authzToken
      - gatewayID
-     - dataMoveId
-     - dataStoragePreference
+     - storageId
+     - storagePreference
     """
     pass
 
@@ -2222,12 +2222,12 @@ class Iface:
     """
     pass
 
-  def deleteGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
+  def deleteGatewayStoragePreference(self, authzToken, gatewayID, storageId):
     """
     Parameters:
      - authzToken
      - gatewayID
-     - dataMoveId
+     - storageId
     """
     pass
 
@@ -8193,29 +8193,29 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "addGatewayComputeResourcePreference failed: unknown result");
 
-  def addGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
+  def addGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId, storagePreference):
     """
     Parameters:
      - authzToken
      - gatewayID
      - dataMoveId
-     - dataStoragePreference
+     - storagePreference
     """
-    self.send_addGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference)
-    return self.recv_addGatewayDataStoragePreference()
+    self.send_addGatewayStoragePreference(authzToken, gatewayID, dataMoveId, storagePreference)
+    return self.recv_addGatewayStoragePreference()
 
-  def send_addGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
-    self._oprot.writeMessageBegin('addGatewayDataStoragePreference', TMessageType.CALL, self._seqid)
-    args = addGatewayDataStoragePreference_args()
+  def send_addGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId, storagePreference):
+    self._oprot.writeMessageBegin('addGatewayStoragePreference', TMessageType.CALL, self._seqid)
+    args = addGatewayStoragePreference_args()
     args.authzToken = authzToken
     args.gatewayID = gatewayID
     args.dataMoveId = dataMoveId
-    args.dataStoragePreference = dataStoragePreference
+    args.storagePreference = storagePreference
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_addGatewayDataStoragePreference(self):
+  def recv_addGatewayStoragePreference(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -8223,7 +8223,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = addGatewayDataStoragePreference_result()
+    result = addGatewayStoragePreference_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -8236,7 +8236,7 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "addGatewayDataStoragePreference failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "addGatewayStoragePreference failed: unknown result");
 
   def getGatewayComputeResourcePreference(self, authzToken, gatewayID, computeResourceId):
     """
@@ -8293,19 +8293,19 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "getGatewayComputeResourcePreference failed: unknown result");
 
-  def getGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
+  def getGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId):
     """
     Parameters:
      - authzToken
      - gatewayID
      - dataMoveId
     """
-    self.send_getGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId)
-    return self.recv_getGatewayDataStoragePreference()
+    self.send_getGatewayStoragePreference(authzToken, gatewayID, dataMoveId)
+    return self.recv_getGatewayStoragePreference()
 
-  def send_getGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
-    self._oprot.writeMessageBegin('getGatewayDataStoragePreference', TMessageType.CALL, self._seqid)
-    args = getGatewayDataStoragePreference_args()
+  def send_getGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId):
+    self._oprot.writeMessageBegin('getGatewayStoragePreference', TMessageType.CALL, self._seqid)
+    args = getGatewayStoragePreference_args()
     args.authzToken = authzToken
     args.gatewayID = gatewayID
     args.dataMoveId = dataMoveId
@@ -8313,7 +8313,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getGatewayDataStoragePreference(self):
+  def recv_getGatewayStoragePreference(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -8321,7 +8321,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = getGatewayDataStoragePreference_result()
+    result = getGatewayStoragePreference_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -8334,7 +8334,7 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "getGatewayDataStoragePreference failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getGatewayStoragePreference failed: unknown result");
 
   def getAllGatewayComputeResourcePreferences(self, authzToken, gatewayID):
     """
@@ -8386,25 +8386,25 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewayComputeResourcePreferences failed: unknown result");
 
-  def getAllGatewayDataStoragePreferences(self, authzToken, gatewayID):
+  def getAllGatewayStoragePreferences(self, authzToken, gatewayID):
     """
     Parameters:
      - authzToken
      - gatewayID
     """
-    self.send_getAllGatewayDataStoragePreferences(authzToken, gatewayID)
-    return self.recv_getAllGatewayDataStoragePreferences()
+    self.send_getAllGatewayStoragePreferences(authzToken, gatewayID)
+    return self.recv_getAllGatewayStoragePreferences()
 
-  def send_getAllGatewayDataStoragePreferences(self, authzToken, gatewayID):
-    self._oprot.writeMessageBegin('getAllGatewayDataStoragePreferences', TMessageType.CALL, self._seqid)
-    args = getAllGatewayDataStoragePreferences_args()
+  def send_getAllGatewayStoragePreferences(self, authzToken, gatewayID):
+    self._oprot.writeMessageBegin('getAllGatewayStoragePreferences', TMessageType.CALL, self._seqid)
+    args = getAllGatewayStoragePreferences_args()
     args.authzToken = authzToken
     args.gatewayID = gatewayID
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getAllGatewayDataStoragePreferences(self):
+  def recv_getAllGatewayStoragePreferences(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -8412,7 +8412,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = getAllGatewayDataStoragePreferences_result()
+    result = getAllGatewayStoragePreferences_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -8425,7 +8425,7 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewayDataStoragePreferences failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewayStoragePreferences failed: unknown result");
 
   def getAllGatewayResourceProfiles(self, authzToken):
     """
@@ -8529,29 +8529,29 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "updateGatewayComputeResourcePreference failed: unknown result");
 
-  def updateGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
+  def updateGatewayStoragePreference(self, authzToken, gatewayID, storageId, storagePreference):
     """
     Parameters:
      - authzToken
      - gatewayID
-     - dataMoveId
-     - dataStoragePreference
+     - storageId
+     - storagePreference
     """
-    self.send_updateGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference)
-    return self.recv_updateGatewayDataStoragePreference()
+    self.send_updateGatewayStoragePreference(authzToken, gatewayID, storageId, storagePreference)
+    return self.recv_updateGatewayStoragePreference()
 
-  def send_updateGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
-    self._oprot.writeMessageBegin('updateGatewayDataStoragePreference', TMessageType.CALL, self._seqid)
-    args = updateGatewayDataStoragePreference_args()
+  def send_updateGatewayStoragePreference(self, authzToken, gatewayID, storageId, storagePreference):
+    self._oprot.writeMessageBegin('updateGatewayStoragePreference', TMessageType.CALL, self._seqid)
+    args = updateGatewayStoragePreference_args()
     args.authzToken = authzToken
     args.gatewayID = gatewayID
-    args.dataMoveId = dataMoveId
-    args.dataStoragePreference = dataStoragePreference
+    args.storageId = storageId
+    args.storagePreference = storagePreference
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_updateGatewayDataStoragePreference(self):
+  def recv_updateGatewayStoragePreference(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -8559,7 +8559,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = updateGatewayDataStoragePreference_result()
+    result = updateGatewayStoragePreference_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -8572,7 +8572,7 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "updateGatewayDataStoragePreference failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "updateGatewayStoragePreference failed: unknown result");
 
   def deleteGatewayComputeResourcePreference(self, authzToken, gatewayID, computeResourceId):
     """
@@ -8629,27 +8629,27 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteGatewayComputeResourcePreference failed: unknown result");
 
-  def deleteGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
+  def deleteGatewayStoragePreference(self, authzToken, gatewayID, storageId):
     """
     Parameters:
      - authzToken
      - gatewayID
-     - dataMoveId
+     - storageId
     """
-    self.send_deleteGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId)
-    return self.recv_deleteGatewayDataStoragePreference()
+    self.send_deleteGatewayStoragePreference(authzToken, gatewayID, storageId)
+    return self.recv_deleteGatewayStoragePreference()
 
-  def send_deleteGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
-    self._oprot.writeMessageBegin('deleteGatewayDataStoragePreference', TMessageType.CALL, self._seqid)
-    args = deleteGatewayDataStoragePreference_args()
+  def send_deleteGatewayStoragePreference(self, authzToken, gatewayID, storageId):
+    self._oprot.writeMessageBegin('deleteGatewayStoragePreference', TMessageType.CALL, self._seqid)
+    args = deleteGatewayStoragePreference_args()
     args.authzToken = authzToken
     args.gatewayID = gatewayID
-    args.dataMoveId = dataMoveId
+    args.storageId = storageId
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_deleteGatewayDataStoragePreference(self):
+  def recv_deleteGatewayStoragePreference(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -8657,7 +8657,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = deleteGatewayDataStoragePreference_result()
+    result = deleteGatewayStoragePreference_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -8670,7 +8670,7 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteGatewayDataStoragePreference failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteGatewayStoragePreference failed: unknown result");
 
   def getAllWorkflows(self, authzToken, gatewayId):
     """
@@ -9077,16 +9077,16 @@ class Processor(Iface, TProcessor):
     self._processMap["updateGatewayResourceProfile"] = Processor.process_updateGatewayResourceProfile
     self._processMap["deleteGatewayResourceProfile"] = Processor.process_deleteGatewayResourceProfile
     self._processMap["addGatewayComputeResourcePreference"] = Processor.process_addGatewayComputeResourcePreference
-    self._processMap["addGatewayDataStoragePreference"] = Processor.process_addGatewayDataStoragePreference
+    self._processMap["addGatewayStoragePreference"] = Processor.process_addGatewayStoragePreference
     self._processMap["getGatewayComputeResourcePreference"] = Processor.process_getGatewayComputeResourcePreference
-    self._processMap["getGatewayDataStoragePreference"] = Processor.process_getGatewayDataStoragePreference
+    self._processMap["getGatewayStoragePreference"] = Processor.process_getGatewayStoragePreference
     self._processMap["getAllGatewayComputeResourcePreferences"] = Processor.process_getAllGatewayComputeResourcePreferences
-    self._processMap["getAllGatewayDataStoragePreferences"] = Processor.process_getAllGatewayDataStoragePreferences
+    self._processMap["getAllGatewayStoragePreferences"] = Processor.process_getAllGatewayStoragePreferences
     self._processMap["getAllGatewayResourceProfiles"] = Processor.process_getAllGatewayResourceProfiles
     self._processMap["updateGatewayComputeResourcePreference"] = Processor.process_updateGatewayComputeResourcePreference
-    self._processMap["updateGatewayDataStoragePreference"] = Processor.process_updateGatewayDataStoragePreference
+    self._processMap["updateGatewayStoragePreference"] = Processor.process_updateGatewayStoragePreference
     self._processMap["deleteGatewayComputeResourcePreference"] = Processor.process_deleteGatewayComputeResourcePreference
-    self._processMap["deleteGatewayDataStoragePreference"] = Processor.process_deleteGatewayDataStoragePreference
+    self._processMap["deleteGatewayStoragePreference"] = Processor.process_deleteGatewayStoragePreference
     self._processMap["getAllWorkflows"] = Processor.process_getAllWorkflows
     self._processMap["getWorkflow"] = Processor.process_getWorkflow
     self._processMap["deleteWorkflow"] = Processor.process_deleteWorkflow
@@ -11384,13 +11384,13 @@ class Processor(Iface, TProcessor):
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_addGatewayDataStoragePreference(self, seqid, iprot, oprot):
-    args = addGatewayDataStoragePreference_args()
+  def process_addGatewayStoragePreference(self, seqid, iprot, oprot):
+    args = addGatewayStoragePreference_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = addGatewayDataStoragePreference_result()
+    result = addGatewayStoragePreference_result()
     try:
-      result.success = self._handler.addGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference)
+      result.success = self._handler.addGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.storagePreference)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11399,7 +11399,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("addGatewayDataStoragePreference", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("addGatewayStoragePreference", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -11424,13 +11424,13 @@ class Processor(Iface, TProcessor):
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_getGatewayDataStoragePreference(self, seqid, iprot, oprot):
-    args = getGatewayDataStoragePreference_args()
+  def process_getGatewayStoragePreference(self, seqid, iprot, oprot):
+    args = getGatewayStoragePreference_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = getGatewayDataStoragePreference_result()
+    result = getGatewayStoragePreference_result()
     try:
-      result.success = self._handler.getGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId)
+      result.success = self._handler.getGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11439,7 +11439,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("getGatewayDataStoragePreference", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("getGatewayStoragePreference", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -11464,13 +11464,13 @@ class Processor(Iface, TProcessor):
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_getAllGatewayDataStoragePreferences(self, seqid, iprot, oprot):
-    args = getAllGatewayDataStoragePreferences_args()
+  def process_getAllGatewayStoragePreferences(self, seqid, iprot, oprot):
+    args = getAllGatewayStoragePreferences_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = getAllGatewayDataStoragePreferences_result()
+    result = getAllGatewayStoragePreferences_result()
     try:
-      result.success = self._handler.getAllGatewayDataStoragePreferences(args.authzToken, args.gatewayID)
+      result.success = self._handler.getAllGatewayStoragePreferences(args.authzToken, args.gatewayID)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11479,7 +11479,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("getAllGatewayDataStoragePreferences", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("getAllGatewayStoragePreferences", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -11524,13 +11524,13 @@ class Processor(Iface, TProcessor):
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_updateGatewayDataStoragePreference(self, seqid, iprot, oprot):
-    args = updateGatewayDataStoragePreference_args()
+  def process_updateGatewayStoragePreference(self, seqid, iprot, oprot):
+    args = updateGatewayStoragePreference_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = updateGatewayDataStoragePreference_result()
+    result = updateGatewayStoragePreference_result()
     try:
-      result.success = self._handler.updateGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference)
+      result.success = self._handler.updateGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId, args.storagePreference)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11539,7 +11539,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("updateGatewayDataStoragePreference", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("updateGatewayStoragePreference", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -11564,13 +11564,13 @@ class Processor(Iface, TProcessor):
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_deleteGatewayDataStoragePreference(self, seqid, iprot, oprot):
-    args = deleteGatewayDataStoragePreference_args()
+  def process_deleteGatewayStoragePreference(self, seqid, iprot, oprot):
+    args = deleteGatewayStoragePreference_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = deleteGatewayDataStoragePreference_result()
+    result = deleteGatewayStoragePreference_result()
     try:
-      result.success = self._handler.deleteGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId)
+      result.success = self._handler.deleteGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11579,7 +11579,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("deleteGatewayDataStoragePreference", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("deleteGatewayStoragePreference", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -36420,13 +36420,13 @@ class addGatewayComputeResourcePreference_result:
   def __ne__(self, other):
     return not (self == other)
 
-class addGatewayDataStoragePreference_args:
+class addGatewayStoragePreference_args:
   """
   Attributes:
    - authzToken
    - gatewayID
    - dataMoveId
-   - dataStoragePreference
+   - storagePreference
   """
 
   thrift_spec = (
@@ -36434,14 +36434,14 @@ class addGatewayDataStoragePreference_args:
     (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
     (2, TType.STRING, 'gatewayID', None, None, ), # 2
     (3, TType.STRING, 'dataMoveId', None, None, ), # 3
-    (4, TType.STRUCT, 'dataStoragePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference.thrift_spec), None, ), # 4
+    (4, TType.STRUCT, 'storagePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ), # 4
   )
 
-  def __init__(self, authzToken=None, gatewayID=None, dataMoveId=None, dataStoragePreference=None,):
+  def __init__(self, authzToken=None, gatewayID=None, dataMoveId=None, storagePreference=None,):
     self.authzToken = authzToken
     self.gatewayID = gatewayID
     self.dataMoveId = dataMoveId
-    self.dataStoragePreference = dataStoragePreference
+    self.storagePreference = storagePreference
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -36470,8 +36470,8 @@ class addGatewayDataStoragePreference_args:
           iprot.skip(ftype)
       elif fid == 4:
         if ftype == TType.STRUCT:
-          self.dataStoragePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference()
-          self.dataStoragePreference.read(iprot)
+          self.storagePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+          self.storagePreference.read(iprot)
         else:
           iprot.skip(ftype)
       else:
@@ -36483,7 +36483,7 @@ class addGatewayDataStoragePreference_args:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('addGatewayDataStoragePreference_args')
+    oprot.writeStructBegin('addGatewayStoragePreference_args')
     if self.authzToken is not None:
       oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
       self.authzToken.write(oprot)
@@ -36496,9 +36496,9 @@ class addGatewayDataStoragePreference_args:
       oprot.writeFieldBegin('dataMoveId', TType.STRING, 3)
       oprot.writeString(self.dataMoveId)
       oprot.writeFieldEnd()
-    if self.dataStoragePreference is not None:
-      oprot.writeFieldBegin('dataStoragePreference', TType.STRUCT, 4)
-      self.dataStoragePreference.write(oprot)
+    if self.storagePreference is not None:
+      oprot.writeFieldBegin('storagePreference', TType.STRUCT, 4)
+      self.storagePreference.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
@@ -36510,8 +36510,8 @@ class addGatewayDataStoragePreference_args:
       raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
     if self.dataMoveId is None:
       raise TProtocol.TProtocolException(message='Required field dataMoveId is unset!')
-    if self.dataStoragePreference is None:
-      raise TProtocol.TProtocolException(message='Required field dataStoragePreference is unset!')
+    if self.storagePreference is None:
+      raise TProtocol.TProtocolException(message='Required field storagePreference is unset!')
     return
 
 
@@ -36520,7 +36520,7 @@ class addGatewayDataStoragePreference_args:
     value = (value * 31) ^ hash(self.authzToken)
     value = (value * 31) ^ hash(self.gatewayID)
     value = (value * 31) ^ hash(self.dataMoveId)
-    value = (value * 31) ^ hash(self.dataStoragePreference)
+    value = (value * 31) ^ hash(self.storagePreference)
     return value
 
   def __repr__(self):
@@ -36534,7 +36534,7 @@ class addGatewayDataStoragePreference_args:
   def __ne__(self, other):
     return not (self == other)
 
-class addGatewayDataStoragePreference_result:
+class addGatewayStoragePreference_result:
   """
   Attributes:
    - success
@@ -36606,7 +36606,7 @@ class addGatewayDataStoragePreference_result:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('addGatewayDataStoragePreference_result')
+    oprot.writeStructBegin('addGatewayStoragePreference_result')
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.BOOL, 0)
       oprot.writeBool(self.success)
@@ -36873,7 +36873,7 @@ class getGatewayComputeResourcePreference_result:
   def __ne__(self, other):
     return not (self == other)
 
-class getGatewayDataStoragePreference_args:
+class getGatewayStoragePreference_args:
   """
   Attributes:
    - authzToken
@@ -36927,7 +36927,7 @@ class getGatewayDataStoragePreference_args:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('getGatewayDataStoragePreference_args')
+    oprot.writeStructBegin('getGatewayStoragePreference_args')
     if self.authzToken is not None:
       oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
       self.authzToken.write(oprot)
@@ -36971,7 +36971,7 @@ class getGatewayDataStoragePreference_args:
   def __ne__(self, other):
     return not (self == other)
 
-class getGatewayDataStoragePreference_result:
+class getGatewayStoragePreference_result:
   """
   Attributes:
    - success
@@ -36982,7 +36982,7 @@ class getGatewayDataStoragePreference_result:
   """
 
   thrift_spec = (
-    (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference.thrift_spec), None, ), # 0
+    (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ), # 0
     (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
     (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
     (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -37007,7 +37007,7 @@ class getGatewayDataStoragePreference_result:
         break
       if fid == 0:
         if ftype == TType.STRUCT:
-          self.success = apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference()
+          self.success = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
           self.success.read(iprot)
         else:
           iprot.skip(ftype)
@@ -37044,7 +37044,7 @@ class getGatewayDataStoragePreference_result:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('getGatewayDataStoragePreference_result')
+    oprot.writeStructBegin('getGatewayStoragePreference_result')
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.STRUCT, 0)
       self.success.write(oprot)
@@ -37304,7 +37304,7 @@ class getAllGatewayComputeResourcePreferences_result:
   def __ne__(self, other):
     return not (self == other)
 
-class getAllGatewayDataStoragePreferences_args:
+class getAllGatewayStoragePreferences_args:
   """
   Attributes:
    - authzToken
@@ -37350,7 +37350,7 @@ class getAllGatewayDataStoragePreferences_args:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('getAllGatewayDataStoragePreferences_args')
+    oprot.writeStructBegin('getAllGatewayStoragePreferences_args')
     if self.authzToken is not None:
       oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
       self.authzToken.write(oprot)
@@ -37387,7 +37387,7 @@ class getAllGatewayDataStoragePreferences_args:
   def __ne__(self, other):
     return not (self == other)
 
-class getAllGatewayDataStoragePreferences_result:
+class getAllGatewayStoragePreferences_result:
   """
   Attributes:
    - success
@@ -37398,7 +37398,7 @@ class getAllGatewayDataStoragePreferences_result:
   """
 
   thrift_spec = (
-    (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference.thrift_spec)), None, ), # 0
+    (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec)), None, ), # 0
     (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
     (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
     (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -37426,7 +37426,7 @@ class getAllGatewayDataStoragePreferences_result:
           self.success = []
           (_etype238, _size235) = iprot.readListBegin()
           for _i239 in xrange(_size235):
-            _elem240 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference()
+            _elem240 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
             _elem240.read(iprot)
             self.success.append(_elem240)
           iprot.readListEnd()
@@ -37465,7 +37465,7 @@ class getAllGatewayDataStoragePreferences_result:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('getAllGatewayDataStoragePreferences_result')
+    oprot.writeStructBegin('getAllGatewayStoragePreferences_result')
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
@@ -37947,28 +37947,28 @@ class updateGatewayComputeResourcePreference_result:
   def __ne__(self, other):
     return not (self == other)
 
-class updateGatewayDataStoragePreference_args:
+class updateGatewayStoragePreference_args:
   """
   Attributes:
    - authzToken
    - gatewayID
-   - dataMoveId
-   - dataStoragePreference
+   - storageId
+   - storagePreference
   """
 
   thrift_spec = (
     None, # 0
     (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
     (2, TType.STRING, 'gatewayID', None, None, ), # 2
-    (3, TType.STRING, 'dataMoveId', None, None, ), # 3
-    (4, TType.STRUCT, 'dataStoragePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference.thrift_spec), None, ), # 4
+    (3, TType.STRING, 'storageId', None, None, ), # 3
+    (4, TType.STRUCT, 'storagePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ), # 4
   )
 
-  def __init__(self, authzToken=None, gatewayID=None, dataMoveId=None, dataStoragePreference=None,):
+  def __init__(self, authzToken=None, gatewayID=None, storageId=None, storagePreference=None,):
     self.authzToken = authzToken
     self.gatewayID = gatewayID
-    self.dataMoveId = dataMoveId
-    self.dataStoragePreference = dataStoragePreference
+    self.storageId = storageId
+    self.storagePreference = storagePreference
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -37992,13 +37992,13 @@ class updateGatewayDataStoragePreference_args:
           iprot.skip(ftype)
       elif fid == 3:
         if ftype == TType.STRING:
-          self.dataMoveId = iprot.readString();
+          self.storageId = iprot.readString();
         else:
           iprot.skip(ftype)
       elif fid == 4:
         if ftype == TType.STRUCT:
-          self.dataStoragePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference()
-          self.dataStoragePreference.read(iprot)
+          self.storagePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+          self.storagePreference.read(iprot)
         else:
           iprot.skip(ftype)
       else:
@@ -38010,7 +38010,7 @@ class updateGatewayDataStoragePreference_args:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('updateGatewayDataStoragePreference_args')
+    oprot.writeStructBegin('updateGatewayStoragePreference_args')
     if self.authzToken is not None:
       oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
       self.authzToken.write(oprot)
@@ -38019,13 +38019,13 @@ class updateGatewayDataStoragePreference_args:
       oprot.writeFieldBegin('gatewayID', TType.STRING, 2)
       oprot.writeString(self.gatewayID)
       oprot.writeFieldEnd()
-    if self.dataMoveId is not None:
-      oprot.writeFieldBegin('dataMoveId', TType.STRING, 3)
-      oprot.writeString(self.dataMoveId)
+    if self.storageId is not None:
+      oprot.writeFieldBegin('storageId', TType.STRING, 3)
+      oprot.writeString(self.storageId)
       oprot.writeFieldEnd()
-    if self.dataStoragePreference is not None:
-      oprot.writeFieldBegin('dataStoragePreference', TType.STRUCT, 4)
-      self.dataStoragePreference.write(oprot)
+    if self.storagePreference is not None:
+      oprot.writeFieldBegin('storagePreference', TType.STRUCT, 4)
+      self.storagePreference.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
@@ -38035,10 +38035,10 @@ class updateGatewayDataStoragePreference_args:
       raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
     if self.gatewayID is None:
       raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
-    if self.dataMoveId is None:
-      raise TProtocol.TProtocolException(message='Required field dataMoveId is unset!')
-    if self.dataStoragePreference is None:
-      raise TProtocol.TProtocolException(message='Required field dataStoragePreference is unset!')
+    if self.storageId is None:
+      raise TProtocol.TProtocolException(message='Required field storageId is unset!')
+    if self.storagePreference is None:
+      raise TProtocol.TProtocolException(message='Required field storagePreference is unset!')
     return
 
 
@@ -38046,8 +38046,8 @@ class updateGatewayDataStoragePreference_args:
     value = 17
     value = (value * 31) ^ hash(self.authzToken)
     value = (value * 31) ^ hash(self.gatewayID)
-    value = (value * 31) ^ hash(self.dataMoveId)
-    value = (value * 31) ^ hash(self.dataStoragePreference)
+    value = (value * 31) ^ hash(self.storageId)
+    value = (value * 31) ^ hash(self.storagePreference)
     return value
 
   def __repr__(self):
@@ -38061,7 +38061,7 @@ class updateGatewayDataStoragePreference_args:
   def __ne__(self, other):
     return not (self == other)
 
-class updateGatewayDataStoragePreference_result:
+class updateGatewayStoragePreference_result:
   """
   Attributes:
    - success
@@ -38133,7 +38133,7 @@ class updateGatewayDataStoragePreference_result:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('updateGatewayDataStoragePreference_result')
+    oprot.writeStructBegin('updateGatewayStoragePreference_result')
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.BOOL, 0)
       oprot.writeBool(self.success)
@@ -38399,25 +38399,25 @@ class deleteGatewayComputeResourcePreference_result:
   def __ne__(self, other):
     return not (self == other)
 
-class deleteGatewayDataStoragePreference_args:
+class deleteGatewayStoragePreference_args:
   """
   Attributes:
    - authzToken
    - gatewayID
-   - dataMoveId
+   - storageId
   """
 
   thrift_spec = (
     None, # 0
     (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
     (2, TType.STRING, 'gatewayID', None, None, ), # 2
-    (3, TType.STRING, 'dataMoveId', None, None, ), # 3
+    (3, TType.STRING, 'storageId', None, None, ), # 3
   )
 
-  def __init__(self, authzToken=None, gatewayID=None, dataMoveId=None,):
+  def __init__(self, authzToken=None, gatewayID=None, storageId=None,):
     self.authzToken = authzToken
     self.gatewayID = gatewayID
-    self.dataMoveId = dataMoveId
+    self.storageId = storageId
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -38441,7 +38441,7 @@ class deleteGatewayDataStoragePreference_args:
           iprot.skip(ftype)
       elif fid == 3:
         if ftype == TType.STRING:
-          self.dataMoveId = iprot.readString();
+          self.storageId = iprot.readString();
         else:
           iprot.skip(ftype)
       else:
@@ -38453,7 +38453,7 @@ class deleteGatewayDataStoragePreference_args:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('deleteGatewayDataStoragePreference_args')
+    oprot.writeStructBegin('deleteGatewayStoragePreference_args')
     if self.authzToken is not None:
       oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
       self.authzToken.write(oprot)
@@ -38462,9 +38462,9 @@ class deleteGatewayDataStoragePreference_args:
       oprot.writeFieldBegin('gatewayID', TType.STRING, 2)
       oprot.writeString(self.gatewayID)
       oprot.writeFieldEnd()
-    if self.dataMoveId is not None:
-      oprot.writeFieldBegin('dataMoveId', TType.STRING, 3)
-      oprot.writeString(self.dataMoveId)
+    if self.storageId is not None:
+      oprot.writeFieldBegin('storageId', TType.STRING, 3)
+      oprot.writeString(self.storageId)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
@@ -38474,8 +38474,8 @@ class deleteGatewayDataStoragePreference_args:
       raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
     if self.gatewayID is None:
       raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
-    if self.dataMoveId is None:
-      raise TProtocol.TProtocolException(message='Required field dataMoveId is unset!')
+    if self.storageId is None:
+      raise TProtocol.TProtocolException(message='Required field storageId is unset!')
     return
 
 
@@ -38483,7 +38483,7 @@ class deleteGatewayDataStoragePreference_args:
     value = 17
     value = (value * 31) ^ hash(self.authzToken)
     value = (value * 31) ^ hash(self.gatewayID)
-    value = (value * 31) ^ hash(self.dataMoveId)
+    value = (value * 31) ^ hash(self.storageId)
     return value
 
   def __repr__(self):
@@ -38497,7 +38497,7 @@ class deleteGatewayDataStoragePreference_args:
   def __ne__(self, other):
     return not (self == other)
 
-class deleteGatewayDataStoragePreference_result:
+class deleteGatewayStoragePreference_result:
   """
   Attributes:
    - success
@@ -38569,7 +38569,7 @@ class deleteGatewayDataStoragePreference_result:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('deleteGatewayDataStoragePreference_result')
+    oprot.writeStructBegin('deleteGatewayStoragePreference_result')
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.BOOL, 0)
       oprot.writeBool(self.success)

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/model/appcatalog/gatewayprofile/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
index 9799e52..941655d 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
@@ -225,10 +225,10 @@ class ComputeResourcePreference:
   def __ne__(self, other):
     return not (self == other)
 
-class DataStoragePreference:
+class StoragePreference:
   """
   Attributes:
-   - dataMovememtResourceId
+   - storageResourceId
    - loginUserName
    - fileSystemRootLocation
    - resourceSpecificCredentialStoreToken
@@ -236,14 +236,14 @@ class DataStoragePreference:
 
   thrift_spec = (
     None, # 0
-    (1, TType.STRING, 'dataMovememtResourceId', None, None, ), # 1
+    (1, TType.STRING, 'storageResourceId', None, None, ), # 1
     (2, TType.STRING, 'loginUserName', None, None, ), # 2
     (3, TType.STRING, 'fileSystemRootLocation', None, None, ), # 3
     (4, TType.STRING, 'resourceSpecificCredentialStoreToken', None, None, ), # 4
   )
 
-  def __init__(self, dataMovememtResourceId=None, loginUserName=None, fileSystemRootLocation=None, resourceSpecificCredentialStoreToken=None,):
-    self.dataMovememtResourceId = dataMovememtResourceId
+  def __init__(self, storageResourceId=None, loginUserName=None, fileSystemRootLocation=None, resourceSpecificCredentialStoreToken=None,):
+    self.storageResourceId = storageResourceId
     self.loginUserName = loginUserName
     self.fileSystemRootLocation = fileSystemRootLocation
     self.resourceSpecificCredentialStoreToken = resourceSpecificCredentialStoreToken
@@ -259,7 +259,7 @@ class DataStoragePreference:
         break
       if fid == 1:
         if ftype == TType.STRING:
-          self.dataMovememtResourceId = iprot.readString();
+          self.storageResourceId = iprot.readString();
         else:
           iprot.skip(ftype)
       elif fid == 2:
@@ -286,10 +286,10 @@ class DataStoragePreference:
     if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
-    oprot.writeStructBegin('DataStoragePreference')
-    if self.dataMovememtResourceId is not None:
-      oprot.writeFieldBegin('dataMovememtResourceId', TType.STRING, 1)
-      oprot.writeString(self.dataMovememtResourceId)
+    oprot.writeStructBegin('StoragePreference')
+    if self.storageResourceId is not None:
+      oprot.writeFieldBegin('storageResourceId', TType.STRING, 1)
+      oprot.writeString(self.storageResourceId)
       oprot.writeFieldEnd()
     if self.loginUserName is not None:
       oprot.writeFieldBegin('loginUserName', TType.STRING, 2)
@@ -307,14 +307,14 @@ class DataStoragePreference:
     oprot.writeStructEnd()
 
   def validate(self):
-    if self.dataMovememtResourceId is None:
-      raise TProtocol.TProtocolException(message='Required field dataMovememtResourceId is unset!')
+    if self.storageResourceId is None:
+      raise TProtocol.TProtocolException(message='Required field storageResourceId is unset!')
     return
 
 
   def __hash__(self):
     value = 17
-    value = (value * 31) ^ hash(self.dataMovememtResourceId)
+    value = (value * 31) ^ hash(self.storageResourceId)
     value = (value * 31) ^ hash(self.loginUserName)
     value = (value * 31) ^ hash(self.fileSystemRootLocation)
     value = (value * 31) ^ hash(self.resourceSpecificCredentialStoreToken)
@@ -349,7 +349,7 @@ class GatewayResourceProfile:
    - gatewayID
    - credentialStoreToken
    - computeResourcePreferences
-   - dataStoragePreferences
+   - storagePreferences
   """
 
   thrift_spec = (
@@ -357,14 +357,14 @@ class GatewayResourceProfile:
     (1, TType.STRING, 'gatewayID', None, None, ), # 1
     (2, TType.STRING, 'credentialStoreToken', None, None, ), # 2
     (3, TType.LIST, 'computeResourcePreferences', (TType.STRUCT,(ComputeResourcePreference, ComputeResourcePreference.thrift_spec)), None, ), # 3
-    (4, TType.LIST, 'dataStoragePreferences', (TType.STRUCT,(DataStoragePreference, DataStoragePreference.thrift_spec)), None, ), # 4
+    (4, TType.LIST, 'storagePreferences', (TType.STRUCT,(StoragePreference, StoragePreference.thrift_spec)), None, ), # 4
   )
 
-  def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, dataStoragePreferences=None,):
+  def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, storagePreferences=None,):
     self.gatewayID = gatewayID
     self.credentialStoreToken = credentialStoreToken
     self.computeResourcePreferences = computeResourcePreferences
-    self.dataStoragePreferences = dataStoragePreferences
+    self.storagePreferences = storagePreferences
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -398,12 +398,12 @@ class GatewayResourceProfile:
           iprot.skip(ftype)
       elif fid == 4:
         if ftype == TType.LIST:
-          self.dataStoragePreferences = []
+          self.storagePreferences = []
           (_etype9, _size6) = iprot.readListBegin()
           for _i10 in xrange(_size6):
-            _elem11 = DataStoragePreference()
+            _elem11 = StoragePreference()
             _elem11.read(iprot)
-            self.dataStoragePreferences.append(_elem11)
+            self.storagePreferences.append(_elem11)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -432,10 +432,10 @@ class GatewayResourceProfile:
         iter12.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.dataStoragePreferences is not None:
-      oprot.writeFieldBegin('dataStoragePreferences', TType.LIST, 4)
-      oprot.writeListBegin(TType.STRUCT, len(self.dataStoragePreferences))
-      for iter13 in self.dataStoragePreferences:
+    if self.storagePreferences is not None:
+      oprot.writeFieldBegin('storagePreferences', TType.LIST, 4)
+      oprot.writeListBegin(TType.STRUCT, len(self.storagePreferences))
+      for iter13 in self.storagePreferences:
         iter13.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
@@ -453,7 +453,7 @@ class GatewayResourceProfile:
     value = (value * 31) ^ hash(self.gatewayID)
     value = (value * 31) ^ hash(self.credentialStoreToken)
     value = (value * 31) ^ hash(self.computeResourcePreferences)
-    value = (value * 31) ^ hash(self.dataStoragePreferences)
+    value = (value * 31) ^ hash(self.storagePreferences)
     return value
 
   def __repr__(self):

http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
deleted file mode 100644
index c309d41..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
+++ /dev/null
@@ -1,728 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.appcatalog.gatewayprofile;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
-public class DataStoragePreference implements org.apache.thrift.TBase<DataStoragePreference, DataStoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<DataStoragePreference> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStoragePreference");
-
-  private static final org.apache.thrift.protocol.TField DATA_MOVEMEMT_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovememtResourceId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField LOGIN_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("loginUserName", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField FILE_SYSTEM_ROOT_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSystemRootLocation", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSpecificCredentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)4);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new DataStoragePreferenceStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new DataStoragePreferenceTupleSchemeFactory());
-  }
-
-  private String dataMovememtResourceId; // required
-  private String loginUserName; // optional
-  private String fileSystemRootLocation; // optional
-  private String resourceSpecificCredentialStoreToken; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    DATA_MOVEMEMT_RESOURCE_ID((short)1, "dataMovememtResourceId"),
-    LOGIN_USER_NAME((short)2, "loginUserName"),
-    FILE_SYSTEM_ROOT_LOCATION((short)3, "fileSystemRootLocation"),
-    RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN((short)4, "resourceSpecificCredentialStoreToken");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // DATA_MOVEMEMT_RESOURCE_ID
-          return DATA_MOVEMEMT_RESOURCE_ID;
-        case 2: // LOGIN_USER_NAME
-          return LOGIN_USER_NAME;
-        case 3: // FILE_SYSTEM_ROOT_LOCATION
-          return FILE_SYSTEM_ROOT_LOCATION;
-        case 4: // RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN
-          return RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.FILE_SYSTEM_ROOT_LOCATION,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.DATA_MOVEMEMT_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovememtResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.LOGIN_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("loginUserName", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.FILE_SYSTEM_ROOT_LOCATION, new org.apache.thrift.meta_data.FieldMetaData("fileSystemRootLocation", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("resourceSpecificCredentialStoreToken", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DataStoragePreference.class, metaDataMap);
-  }
-
-  public DataStoragePreference() {
-  }
-
-  public DataStoragePreference(
-    String dataMovememtResourceId)
-  {
-    this();
-    this.dataMovememtResourceId = dataMovememtResourceId;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public DataStoragePreference(DataStoragePreference other) {
-    if (other.isSetDataMovememtResourceId()) {
-      this.dataMovememtResourceId = other.dataMovememtResourceId;
-    }
-    if (other.isSetLoginUserName()) {
-      this.loginUserName = other.loginUserName;
-    }
-    if (other.isSetFileSystemRootLocation()) {
-      this.fileSystemRootLocation = other.fileSystemRootLocation;
-    }
-    if (other.isSetResourceSpecificCredentialStoreToken()) {
-      this.resourceSpecificCredentialStoreToken = other.resourceSpecificCredentialStoreToken;
-    }
-  }
-
-  public DataStoragePreference deepCopy() {
-    return new DataStoragePreference(this);
-  }
-
-  @Override
-  public void clear() {
-    this.dataMovememtResourceId = null;
-    this.loginUserName = null;
-    this.fileSystemRootLocation = null;
-    this.resourceSpecificCredentialStoreToken = null;
-  }
-
-  public String getDataMovememtResourceId() {
-    return this.dataMovememtResourceId;
-  }
-
-  public void setDataMovememtResourceId(String dataMovememtResourceId) {
-    this.dataMovememtResourceId = dataMovememtResourceId;
-  }
-
-  public void unsetDataMovememtResourceId() {
-    this.dataMovememtResourceId = null;
-  }
-
-  /** Returns true if field dataMovememtResourceId is set (has been assigned a value) and false otherwise */
-  public boolean isSetDataMovememtResourceId() {
-    return this.dataMovememtResourceId != null;
-  }
-
-  public void setDataMovememtResourceIdIsSet(boolean value) {
-    if (!value) {
-      this.dataMovememtResourceId = null;
-    }
-  }
-
-  public String getLoginUserName() {
-    return this.loginUserName;
-  }
-
-  public void setLoginUserName(String loginUserName) {
-    this.loginUserName = loginUserName;
-  }
-
-  public void unsetLoginUserName() {
-    this.loginUserName = null;
-  }
-
-  /** Returns true if field loginUserName is set (has been assigned a value) and false otherwise */
-  public boolean isSetLoginUserName() {
-    return this.loginUserName != null;
-  }
-
-  public void setLoginUserNameIsSet(boolean value) {
-    if (!value) {
-      this.loginUserName = null;
-    }
-  }
-
-  public String getFileSystemRootLocation() {
-    return this.fileSystemRootLocation;
-  }
-
-  public void setFileSystemRootLocation(String fileSystemRootLocation) {
-    this.fileSystemRootLocation = fileSystemRootLocation;
-  }
-
-  public void unsetFileSystemRootLocation() {
-    this.fileSystemRootLocation = null;
-  }
-
-  /** Returns true if field fileSystemRootLocation is set (has been assigned a value) and false otherwise */
-  public boolean isSetFileSystemRootLocation() {
-    return this.fileSystemRootLocation != null;
-  }
-
-  public void setFileSystemRootLocationIsSet(boolean value) {
-    if (!value) {
-      this.fileSystemRootLocation = null;
-    }
-  }
-
-  public String getResourceSpecificCredentialStoreToken() {
-    return this.resourceSpecificCredentialStoreToken;
-  }
-
-  public void setResourceSpecificCredentialStoreToken(String resourceSpecificCredentialStoreToken) {
-    this.resourceSpecificCredentialStoreToken = resourceSpecificCredentialStoreToken;
-  }
-
-  public void unsetResourceSpecificCredentialStoreToken() {
-    this.resourceSpecificCredentialStoreToken = null;
-  }
-
-  /** Returns true if field resourceSpecificCredentialStoreToken is set (has been assigned a value) and false otherwise */
-  public boolean isSetResourceSpecificCredentialStoreToken() {
-    return this.resourceSpecificCredentialStoreToken != null;
-  }
-
-  public void setResourceSpecificCredentialStoreTokenIsSet(boolean value) {
-    if (!value) {
-      this.resourceSpecificCredentialStoreToken = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DATA_MOVEMEMT_RESOURCE_ID:
-      if (value == null) {
-        unsetDataMovememtResourceId();
-      } else {
-        setDataMovememtResourceId((String)value);
-      }
-      break;
-
-    case LOGIN_USER_NAME:
-      if (value == null) {
-        unsetLoginUserName();
-      } else {
-        setLoginUserName((String)value);
-      }
-      break;
-
-    case FILE_SYSTEM_ROOT_LOCATION:
-      if (value == null) {
-        unsetFileSystemRootLocation();
-      } else {
-        setFileSystemRootLocation((String)value);
-      }
-      break;
-
-    case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
-      if (value == null) {
-        unsetResourceSpecificCredentialStoreToken();
-      } else {
-        setResourceSpecificCredentialStoreToken((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DATA_MOVEMEMT_RESOURCE_ID:
-      return getDataMovememtResourceId();
-
-    case LOGIN_USER_NAME:
-      return getLoginUserName();
-
-    case FILE_SYSTEM_ROOT_LOCATION:
-      return getFileSystemRootLocation();
-
-    case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
-      return getResourceSpecificCredentialStoreToken();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case DATA_MOVEMEMT_RESOURCE_ID:
-      return isSetDataMovememtResourceId();
-    case LOGIN_USER_NAME:
-      return isSetLoginUserName();
-    case FILE_SYSTEM_ROOT_LOCATION:
-      return isSetFileSystemRootLocation();
-    case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
-      return isSetResourceSpecificCredentialStoreToken();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof DataStoragePreference)
-      return this.equals((DataStoragePreference)that);
-    return false;
-  }
-
-  public boolean equals(DataStoragePreference that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_dataMovememtResourceId = true && this.isSetDataMovememtResourceId();
-    boolean that_present_dataMovememtResourceId = true && that.isSetDataMovememtResourceId();
-    if (this_present_dataMovememtResourceId || that_present_dataMovememtResourceId) {
-      if (!(this_present_dataMovememtResourceId && that_present_dataMovememtResourceId))
-        return false;
-      if (!this.dataMovememtResourceId.equals(that.dataMovememtResourceId))
-        return false;
-    }
-
-    boolean this_present_loginUserName = true && this.isSetLoginUserName();
-    boolean that_present_loginUserName = true && that.isSetLoginUserName();
-    if (this_present_loginUserName || that_present_loginUserName) {
-      if (!(this_present_loginUserName && that_present_loginUserName))
-        return false;
-      if (!this.loginUserName.equals(that.loginUserName))
-        return false;
-    }
-
-    boolean this_present_fileSystemRootLocation = true && this.isSetFileSystemRootLocation();
-    boolean that_present_fileSystemRootLocation = true && that.isSetFileSystemRootLocation();
-    if (this_present_fileSystemRootLocation || that_present_fileSystemRootLocation) {
-      if (!(this_present_fileSystemRootLocation && that_present_fileSystemRootLocation))
-        return false;
-      if (!this.fileSystemRootLocation.equals(that.fileSystemRootLocation))
-        return false;
-    }
-
-    boolean this_present_resourceSpecificCredentialStoreToken = true && this.isSetResourceSpecificCredentialStoreToken();
-    boolean that_present_resourceSpecificCredentialStoreToken = true && that.isSetResourceSpecificCredentialStoreToken();
-    if (this_present_resourceSpecificCredentialStoreToken || that_present_resourceSpecificCredentialStoreToken) {
-      if (!(this_present_resourceSpecificCredentialStoreToken && that_present_resourceSpecificCredentialStoreToken))
-        return false;
-      if (!this.resourceSpecificCredentialStoreToken.equals(that.resourceSpecificCredentialStoreToken))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_dataMovememtResourceId = true && (isSetDataMovememtResourceId());
-    list.add(present_dataMovememtResourceId);
-    if (present_dataMovememtResourceId)
-      list.add(dataMovememtResourceId);
-
-    boolean present_loginUserName = true && (isSetLoginUserName());
-    list.add(present_loginUserName);
-    if (present_loginUserName)
-      list.add(loginUserName);
-
-    boolean present_fileSystemRootLocation = true && (isSetFileSystemRootLocation());
-    list.add(present_fileSystemRootLocation);
-    if (present_fileSystemRootLocation)
-      list.add(fileSystemRootLocation);
-
-    boolean present_resourceSpecificCredentialStoreToken = true && (isSetResourceSpecificCredentialStoreToken());
-    list.add(present_resourceSpecificCredentialStoreToken);
-    if (present_resourceSpecificCredentialStoreToken)
-      list.add(resourceSpecificCredentialStoreToken);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(DataStoragePreference other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetDataMovememtResourceId()).compareTo(other.isSetDataMovememtResourceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDataMovememtResourceId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovememtResourceId, other.dataMovememtResourceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetLoginUserName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.loginUserName, other.loginUserName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetFileSystemRootLocation()).compareTo(other.isSetFileSystemRootLocation());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFileSystemRootLocation()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSystemRootLocation, other.fileSystemRootLocation);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetResourceSpecificCredentialStoreToken()).compareTo(other.isSetResourceSpecificCredentialStoreToken());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceSpecificCredentialStoreToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceSpecificCredentialStoreToken, other.resourceSpecificCredentialStoreToken);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("DataStoragePreference(");
-    boolean first = true;
-
-    sb.append("dataMovememtResourceId:");
-    if (this.dataMovememtResourceId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.dataMovememtResourceId);
-    }
-    first = false;
-    if (isSetLoginUserName()) {
-      if (!first) sb.append(", ");
-      sb.append("loginUserName:");
-      if (this.loginUserName == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.loginUserName);
-      }
-      first = false;
-    }
-    if (isSetFileSystemRootLocation()) {
-      if (!first) sb.append(", ");
-      sb.append("fileSystemRootLocation:");
-      if (this.fileSystemRootLocation == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.fileSystemRootLocation);
-      }
-      first = false;
-    }
-    if (isSetResourceSpecificCredentialStoreToken()) {
-      if (!first) sb.append(", ");
-      sb.append("resourceSpecificCredentialStoreToken:");
-      if (this.resourceSpecificCredentialStoreToken == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.resourceSpecificCredentialStoreToken);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetDataMovememtResourceId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovememtResourceId' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class DataStoragePreferenceStandardSchemeFactory implements SchemeFactory {
-    public DataStoragePreferenceStandardScheme getScheme() {
-      return new DataStoragePreferenceStandardScheme();
-    }
-  }
-
-  private static class DataStoragePreferenceStandardScheme extends StandardScheme<DataStoragePreference> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, DataStoragePreference struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // DATA_MOVEMEMT_RESOURCE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dataMovememtResourceId = iprot.readString();
-              struct.setDataMovememtResourceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // LOGIN_USER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.loginUserName = iprot.readString();
-              struct.setLoginUserNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // FILE_SYSTEM_ROOT_LOCATION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.fileSystemRootLocation = iprot.readString();
-              struct.setFileSystemRootLocationIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.resourceSpecificCredentialStoreToken = iprot.readString();
-              struct.setResourceSpecificCredentialStoreTokenIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, DataStoragePreference struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.dataMovememtResourceId != null) {
-        oprot.writeFieldBegin(DATA_MOVEMEMT_RESOURCE_ID_FIELD_DESC);
-        oprot.writeString(struct.dataMovememtResourceId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.loginUserName != null) {
-        if (struct.isSetLoginUserName()) {
-          oprot.writeFieldBegin(LOGIN_USER_NAME_FIELD_DESC);
-          oprot.writeString(struct.loginUserName);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.fileSystemRootLocation != null) {
-        if (struct.isSetFileSystemRootLocation()) {
-          oprot.writeFieldBegin(FILE_SYSTEM_ROOT_LOCATION_FIELD_DESC);
-          oprot.writeString(struct.fileSystemRootLocation);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.resourceSpecificCredentialStoreToken != null) {
-        if (struct.isSetResourceSpecificCredentialStoreToken()) {
-          oprot.writeFieldBegin(RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN_FIELD_DESC);
-          oprot.writeString(struct.resourceSpecificCredentialStoreToken);
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class DataStoragePreferenceTupleSchemeFactory implements SchemeFactory {
-    public DataStoragePreferenceTupleScheme getScheme() {
-      return new DataStoragePreferenceTupleScheme();
-    }
-  }
-
-  private static class DataStoragePreferenceTupleScheme extends TupleScheme<DataStoragePreference> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, DataStoragePreference struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.dataMovememtResourceId);
-      BitSet optionals = new BitSet();
-      if (struct.isSetLoginUserName()) {
-        optionals.set(0);
-      }
-      if (struct.isSetFileSystemRootLocation()) {
-        optionals.set(1);
-      }
-      if (struct.isSetResourceSpecificCredentialStoreToken()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetLoginUserName()) {
-        oprot.writeString(struct.loginUserName);
-      }
-      if (struct.isSetFileSystemRootLocation()) {
-        oprot.writeString(struct.fileSystemRootLocation);
-      }
-      if (struct.isSetResourceSpecificCredentialStoreToken()) {
-        oprot.writeString(struct.resourceSpecificCredentialStoreToken);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, DataStoragePreference struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.dataMovememtResourceId = iprot.readString();
-      struct.setDataMovememtResourceIdIsSet(true);
-      BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.loginUserName = iprot.readString();
-        struct.setLoginUserNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.fileSystemRootLocation = iprot.readString();
-        struct.setFileSystemRootLocationIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.resourceSpecificCredentialStoreToken = iprot.readString();
-        struct.setResourceSpecificCredentialStoreTokenIsSet(true);
-      }
-    }
-  }
-
-}
-