airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [17/24] airavata git commit: implementing airavata sharing manager
Date Sun, 09 Oct 2016 05:47:43 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/82e57526/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 fda9c8e..e868a3c 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
@@ -2748,13 +2748,16 @@ class Iface:
     """
     pass
 
-  def getUserResourceProfile(self, authzToken, userId):
+  def getUserResourceProfile(self, authzToken, userId, gatewayID):
     """
     Fetch the given User Resource Profile.
 
     @param userId
       The identifier for the requested user resource profile.
 
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
     @return UserResourceProfile
        User Resource Profile Object.
 
@@ -2762,16 +2765,20 @@ class Iface:
     Parameters:
      - authzToken
      - userId
+     - gatewayID
     """
     pass
 
-  def updateUserResourceProfile(self, authzToken, userId, userResourceProfile):
+  def updateUserResourceProfile(self, authzToken, userId, gatewayID, userResourceProfile):
     """
     Update a User Resource Profile.
 
     @param userId
       The identifier for the requested user resource to be updated.
 
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
     @param UserResourceProfile
        User Resource Profile Object.
 
@@ -2782,17 +2789,21 @@ class Iface:
     Parameters:
      - authzToken
      - userId
+     - gatewayID
      - userResourceProfile
     """
     pass
 
-  def deleteUserResourceProfile(self, authzToken, userId):
+  def deleteUserResourceProfile(self, authzToken, userId, gatewayID):
     """
     Delete the given User Resource Profile.
 
     @param userId
       The identifier for the requested user resource to be deleted.
 
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
     @return status
       Returns a success/failure of the deletion.
 
@@ -2800,16 +2811,20 @@ class Iface:
     Parameters:
      - authzToken
      - userId
+     - gatewayID
     """
     pass
 
-  def addUserComputeResourcePreference(self, authzToken, userId, computeResourceId, computeResourcePreference):
+  def addUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId, userComputeResourcePreference):
     """
     Add a Compute Resource Preference to a registered User profile.
 
     @param userId
       The identifier for the User resource profile to be added.
 
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
     @param computeResourceId
       Preferences related to a particular compute resource
 
@@ -2824,18 +2839,22 @@ class Iface:
     Parameters:
      - authzToken
      - userId
-     - computeResourceId
-     - computeResourcePreference
+     - gatewayID
+     - userComputeResourceId
+     - userComputeResourcePreference
     """
     pass
 
-  def addUserStoragePreference(self, authzToken, userId, storageResourceId, storagePreference):
+  def addUserStoragePreference(self, authzToken, userId, gatewayID, userStorageResourceId, userStoragePreference):
     """
     Add a Storage Resource Preference to a registered user resource profile.
 
     @param userId
       The identifier of the user resource profile to be added.
 
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
     @param storageResourceId
       Preferences related to a particular compute resource
 
@@ -2850,12 +2869,13 @@ class Iface:
     Parameters:
      - authzToken
      - userId
-     - storageResourceId
-     - storagePreference
+     - gatewayID
+     - userStorageResourceId
+     - userStoragePreference
     """
     pass
 
-  def getUserComputeResourcePreference(self, authzToken, userId, computeResourceId):
+  def getUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId):
     """
 
     Fetch a Compute Resource Preference of a registered user resource profile.
@@ -2863,7 +2883,10 @@ class Iface:
     @param userId
       The identifier for the user profile to be requested
 
-    @param computeResourceId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userComputeResourceId
       Preferences related to a particular compute resource
 
     @return computeResourcePreference
@@ -2873,11 +2896,12 @@ class Iface:
     Parameters:
      - authzToken
      - userId
-     - computeResourceId
+     - gatewayID
+     - userComputeResourceId
     """
     pass
 
-  def getUserStoragePreference(self, authzToken, userId, storageResourceId):
+  def getUserStoragePreference(self, authzToken, userId, gatewayID, userStorageResourceId):
     """
 
     Fetch a Storage Resource Preference of a registered user resource profile.
@@ -2885,9 +2909,56 @@ class Iface:
     @param userId
       The identifier of the user resource profile to request to fetch the particular storage resource preference.
 
-    @param storageResourceId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userStorageResourceId
       Identifier of the Stprage Preference required to be fetched.
 
+    @return UserStoragePreference
+      Returns the StoragePreference object.
+
+
+    Parameters:
+     - authzToken
+     - userId
+     - gatewayID
+     - userStorageResourceId
+    """
+    pass
+
+  def getAllUserComputeResourcePreferences(self, authzToken, userId, gatewayID):
+    """
+
+    Fetch all Compute Resource Preferences of a registered gateway profile.
+
+    @param userId
+      The identifier of the user resource profile to request to fetch the particular storage resource preference.
+
+    @param gatewayID
+      The identifier for the gateway profile to be requested
+
+    @return computeResourcePreference
+      Returns the ComputeResourcePreference object.
+
+
+    Parameters:
+     - authzToken
+     - userId
+     - gatewayID
+    """
+    pass
+
+  def getAllUserStoragePreferences(self, authzToken, userId, gatewayID):
+    """
+    Fetch all User Storage Resource Preferences of a registered user profile.
+
+    @param userId
+      The identifier of the user resource profile to request to fetch the particular storage resource preference.
+
+    @param gatewayID
+      The identifier for the gateway profile to be requested
+
     @return StoragePreference
       Returns the StoragePreference object.
 
@@ -2895,7 +2966,7 @@ class Iface:
     Parameters:
      - authzToken
      - userId
-     - storageResourceId
+     - gatewayID
     """
     pass
 
@@ -2914,17 +2985,20 @@ class Iface:
     """
     pass
 
-  def updateUserComputeResourcePreference(self, authzToken, userId, computeResourceId, computeResourcePreference):
+  def updateUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId, userComputeResourcePreference):
     """
     Update a Compute Resource Preference to a registered user resource profile.
 
     @param userId
       The identifier for the user profile to be updated.
 
-    @param computeResourceId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userComputeResourceId
       Preferences related to a particular compute resource
 
-    @param computeResourcePreference
+    @param userComputeResourcePreference
       The ComputeResourcePreference object to be updated to the resource profile.
 
     @return status
@@ -2934,22 +3008,26 @@ class Iface:
     Parameters:
      - authzToken
      - userId
-     - computeResourceId
-     - computeResourcePreference
+     - gatewayID
+     - userComputeResourceId
+     - userComputeResourcePreference
     """
     pass
 
-  def updateUserStoragePreference(self, authzToken, userId, storageId, storagePreference):
+  def updateUserStoragePreference(self, authzToken, userId, gatewayID, userStorageId, userStoragePreference):
     """
     Update a Storage Resource Preference of a registered user resource profile.
 
     @param userId
       The identifier of the user resource profile to be updated.
 
-    @param storageId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userStorageId
       The Storage resource identifier of the one that you want to update
 
-    @param storagePreference
+    @param userStoragePreference
       The storagePreference object to be updated to the resource profile.
 
     @return status
@@ -2959,19 +3037,23 @@ class Iface:
     Parameters:
      - authzToken
      - userId
-     - storageId
-     - storagePreference
+     - gatewayID
+     - userStorageId
+     - userStoragePreference
     """
     pass
 
-  def deleteUserComputeResourcePreference(self, authzToken, userId, computeResourceId):
+  def deleteUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId):
     """
     Delete the Compute Resource Preference of a registered user resource profile.
 
     @param userId
       The identifier for the user resource profile to be deleted.
 
-    @param computeResourceId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userComputeResourceId
       Preferences related to a particular compute resource
 
     @return status
@@ -2981,18 +3063,22 @@ class Iface:
     Parameters:
      - authzToken
      - userId
-     - computeResourceId
+     - gatewayID
+     - userComputeResourceId
     """
     pass
 
-  def deleteUserStoragePreference(self, authzToken, userId, storageId):
+  def deleteUserStoragePreference(self, authzToken, userId, gatewayID, userStorageId):
     """
     Delete the Storage Resource Preference of a registered user resource profile.
 
     @param userId
       The identifier of the user profile to be deleted.
 
-    @param storageId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userStorageId
       ID of the storage preference you want to delete.
 
     @return status
@@ -3002,7 +3088,8 @@ class Iface:
     Parameters:
      - authzToken
      - userId
-     - storageId
+     - gatewayID
+     - userStorageId
     """
     pass
 
@@ -3187,9 +3274,6 @@ class Iface:
     """
     pass
 
-  def isDataSharingEnabled(self):
-    pass
-
 
 class Client(Iface):
   def __init__(self, iprot, oprot=None):
@@ -10305,13 +10389,16 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "registerUserResourceProfile failed: unknown result")
 
-  def getUserResourceProfile(self, authzToken, userId):
+  def getUserResourceProfile(self, authzToken, userId, gatewayID):
     """
     Fetch the given User Resource Profile.
 
     @param userId
       The identifier for the requested user resource profile.
 
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
     @return UserResourceProfile
        User Resource Profile Object.
 
@@ -10319,15 +10406,17 @@ class Client(Iface):
     Parameters:
      - authzToken
      - userId
+     - gatewayID
     """
-    self.send_getUserResourceProfile(authzToken, userId)
+    self.send_getUserResourceProfile(authzToken, userId, gatewayID)
     return self.recv_getUserResourceProfile()
 
-  def send_getUserResourceProfile(self, authzToken, userId):
+  def send_getUserResourceProfile(self, authzToken, userId, gatewayID):
     self._oprot.writeMessageBegin('getUserResourceProfile', TMessageType.CALL, self._seqid)
     args = getUserResourceProfile_args()
     args.authzToken = authzToken
     args.userId = userId
+    args.gatewayID = gatewayID
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -10355,13 +10444,16 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserResourceProfile failed: unknown result")
 
-  def updateUserResourceProfile(self, authzToken, userId, userResourceProfile):
+  def updateUserResourceProfile(self, authzToken, userId, gatewayID, userResourceProfile):
     """
     Update a User Resource Profile.
 
     @param userId
       The identifier for the requested user resource to be updated.
 
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
     @param UserResourceProfile
        User Resource Profile Object.
 
@@ -10372,16 +10464,18 @@ class Client(Iface):
     Parameters:
      - authzToken
      - userId
+     - gatewayID
      - userResourceProfile
     """
-    self.send_updateUserResourceProfile(authzToken, userId, userResourceProfile)
+    self.send_updateUserResourceProfile(authzToken, userId, gatewayID, userResourceProfile)
     return self.recv_updateUserResourceProfile()
 
-  def send_updateUserResourceProfile(self, authzToken, userId, userResourceProfile):
+  def send_updateUserResourceProfile(self, authzToken, userId, gatewayID, userResourceProfile):
     self._oprot.writeMessageBegin('updateUserResourceProfile', TMessageType.CALL, self._seqid)
     args = updateUserResourceProfile_args()
     args.authzToken = authzToken
     args.userId = userId
+    args.gatewayID = gatewayID
     args.userResourceProfile = userResourceProfile
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
@@ -10410,13 +10504,16 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "updateUserResourceProfile failed: unknown result")
 
-  def deleteUserResourceProfile(self, authzToken, userId):
+  def deleteUserResourceProfile(self, authzToken, userId, gatewayID):
     """
     Delete the given User Resource Profile.
 
     @param userId
       The identifier for the requested user resource to be deleted.
 
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
     @return status
       Returns a success/failure of the deletion.
 
@@ -10424,15 +10521,17 @@ class Client(Iface):
     Parameters:
      - authzToken
      - userId
+     - gatewayID
     """
-    self.send_deleteUserResourceProfile(authzToken, userId)
+    self.send_deleteUserResourceProfile(authzToken, userId, gatewayID)
     return self.recv_deleteUserResourceProfile()
 
-  def send_deleteUserResourceProfile(self, authzToken, userId):
+  def send_deleteUserResourceProfile(self, authzToken, userId, gatewayID):
     self._oprot.writeMessageBegin('deleteUserResourceProfile', TMessageType.CALL, self._seqid)
     args = deleteUserResourceProfile_args()
     args.authzToken = authzToken
     args.userId = userId
+    args.gatewayID = gatewayID
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -10460,13 +10559,16 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteUserResourceProfile failed: unknown result")
 
-  def addUserComputeResourcePreference(self, authzToken, userId, computeResourceId, computeResourcePreference):
+  def addUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId, userComputeResourcePreference):
     """
     Add a Compute Resource Preference to a registered User profile.
 
     @param userId
       The identifier for the User resource profile to be added.
 
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
     @param computeResourceId
       Preferences related to a particular compute resource
 
@@ -10481,19 +10583,21 @@ class Client(Iface):
     Parameters:
      - authzToken
      - userId
-     - computeResourceId
-     - computeResourcePreference
+     - gatewayID
+     - userComputeResourceId
+     - userComputeResourcePreference
     """
-    self.send_addUserComputeResourcePreference(authzToken, userId, computeResourceId, computeResourcePreference)
+    self.send_addUserComputeResourcePreference(authzToken, userId, gatewayID, userComputeResourceId, userComputeResourcePreference)
     return self.recv_addUserComputeResourcePreference()
 
-  def send_addUserComputeResourcePreference(self, authzToken, userId, computeResourceId, computeResourcePreference):
+  def send_addUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId, userComputeResourcePreference):
     self._oprot.writeMessageBegin('addUserComputeResourcePreference', TMessageType.CALL, self._seqid)
     args = addUserComputeResourcePreference_args()
     args.authzToken = authzToken
     args.userId = userId
-    args.computeResourceId = computeResourceId
-    args.computeResourcePreference = computeResourcePreference
+    args.gatewayID = gatewayID
+    args.userComputeResourceId = userComputeResourceId
+    args.userComputeResourcePreference = userComputeResourcePreference
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -10521,13 +10625,16 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "addUserComputeResourcePreference failed: unknown result")
 
-  def addUserStoragePreference(self, authzToken, userId, storageResourceId, storagePreference):
+  def addUserStoragePreference(self, authzToken, userId, gatewayID, userStorageResourceId, userStoragePreference):
     """
     Add a Storage Resource Preference to a registered user resource profile.
 
     @param userId
       The identifier of the user resource profile to be added.
 
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
     @param storageResourceId
       Preferences related to a particular compute resource
 
@@ -10542,19 +10649,21 @@ class Client(Iface):
     Parameters:
      - authzToken
      - userId
-     - storageResourceId
-     - storagePreference
+     - gatewayID
+     - userStorageResourceId
+     - userStoragePreference
     """
-    self.send_addUserStoragePreference(authzToken, userId, storageResourceId, storagePreference)
+    self.send_addUserStoragePreference(authzToken, userId, gatewayID, userStorageResourceId, userStoragePreference)
     return self.recv_addUserStoragePreference()
 
-  def send_addUserStoragePreference(self, authzToken, userId, storageResourceId, storagePreference):
+  def send_addUserStoragePreference(self, authzToken, userId, gatewayID, userStorageResourceId, userStoragePreference):
     self._oprot.writeMessageBegin('addUserStoragePreference', TMessageType.CALL, self._seqid)
     args = addUserStoragePreference_args()
     args.authzToken = authzToken
     args.userId = userId
-    args.storageResourceId = storageResourceId
-    args.storagePreference = storagePreference
+    args.gatewayID = gatewayID
+    args.userStorageResourceId = userStorageResourceId
+    args.userStoragePreference = userStoragePreference
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -10582,7 +10691,7 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "addUserStoragePreference failed: unknown result")
 
-  def getUserComputeResourcePreference(self, authzToken, userId, computeResourceId):
+  def getUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId):
     """
 
     Fetch a Compute Resource Preference of a registered user resource profile.
@@ -10590,7 +10699,10 @@ class Client(Iface):
     @param userId
       The identifier for the user profile to be requested
 
-    @param computeResourceId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userComputeResourceId
       Preferences related to a particular compute resource
 
     @return computeResourcePreference
@@ -10600,17 +10712,19 @@ class Client(Iface):
     Parameters:
      - authzToken
      - userId
-     - computeResourceId
+     - gatewayID
+     - userComputeResourceId
     """
-    self.send_getUserComputeResourcePreference(authzToken, userId, computeResourceId)
+    self.send_getUserComputeResourcePreference(authzToken, userId, gatewayID, userComputeResourceId)
     return self.recv_getUserComputeResourcePreference()
 
-  def send_getUserComputeResourcePreference(self, authzToken, userId, computeResourceId):
+  def send_getUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId):
     self._oprot.writeMessageBegin('getUserComputeResourcePreference', TMessageType.CALL, self._seqid)
     args = getUserComputeResourcePreference_args()
     args.authzToken = authzToken
     args.userId = userId
-    args.computeResourceId = computeResourceId
+    args.gatewayID = gatewayID
+    args.userComputeResourceId = userComputeResourceId
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -10638,7 +10752,7 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserComputeResourcePreference failed: unknown result")
 
-  def getUserStoragePreference(self, authzToken, userId, storageResourceId):
+  def getUserStoragePreference(self, authzToken, userId, gatewayID, userStorageResourceId):
     """
 
     Fetch a Storage Resource Preference of a registered user resource profile.
@@ -10646,27 +10760,32 @@ class Client(Iface):
     @param userId
       The identifier of the user resource profile to request to fetch the particular storage resource preference.
 
-    @param storageResourceId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userStorageResourceId
       Identifier of the Stprage Preference required to be fetched.
 
-    @return StoragePreference
+    @return UserStoragePreference
       Returns the StoragePreference object.
 
 
     Parameters:
      - authzToken
      - userId
-     - storageResourceId
+     - gatewayID
+     - userStorageResourceId
     """
-    self.send_getUserStoragePreference(authzToken, userId, storageResourceId)
+    self.send_getUserStoragePreference(authzToken, userId, gatewayID, userStorageResourceId)
     return self.recv_getUserStoragePreference()
 
-  def send_getUserStoragePreference(self, authzToken, userId, storageResourceId):
+  def send_getUserStoragePreference(self, authzToken, userId, gatewayID, userStorageResourceId):
     self._oprot.writeMessageBegin('getUserStoragePreference', TMessageType.CALL, self._seqid)
     args = getUserStoragePreference_args()
     args.authzToken = authzToken
     args.userId = userId
-    args.storageResourceId = storageResourceId
+    args.gatewayID = gatewayID
+    args.userStorageResourceId = userStorageResourceId
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -10694,6 +10813,117 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserStoragePreference failed: unknown result")
 
+  def getAllUserComputeResourcePreferences(self, authzToken, userId, gatewayID):
+    """
+
+    Fetch all Compute Resource Preferences of a registered gateway profile.
+
+    @param userId
+      The identifier of the user resource profile to request to fetch the particular storage resource preference.
+
+    @param gatewayID
+      The identifier for the gateway profile to be requested
+
+    @return computeResourcePreference
+      Returns the ComputeResourcePreference object.
+
+
+    Parameters:
+     - authzToken
+     - userId
+     - gatewayID
+    """
+    self.send_getAllUserComputeResourcePreferences(authzToken, userId, gatewayID)
+    return self.recv_getAllUserComputeResourcePreferences()
+
+  def send_getAllUserComputeResourcePreferences(self, authzToken, userId, gatewayID):
+    self._oprot.writeMessageBegin('getAllUserComputeResourcePreferences', TMessageType.CALL, self._seqid)
+    args = getAllUserComputeResourcePreferences_args()
+    args.authzToken = authzToken
+    args.userId = userId
+    args.gatewayID = gatewayID
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_getAllUserComputeResourcePreferences(self):
+    iprot = self._iprot
+    (fname, mtype, rseqid) = iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(iprot)
+      iprot.readMessageEnd()
+      raise x
+    result = getAllUserComputeResourcePreferences_result()
+    result.read(iprot)
+    iprot.readMessageEnd()
+    if result.success is not None:
+      return result.success
+    if result.ire is not None:
+      raise result.ire
+    if result.ace is not None:
+      raise result.ace
+    if result.ase is not None:
+      raise result.ase
+    if result.ae is not None:
+      raise result.ae
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserComputeResourcePreferences failed: unknown result")
+
+  def getAllUserStoragePreferences(self, authzToken, userId, gatewayID):
+    """
+    Fetch all User Storage Resource Preferences of a registered user profile.
+
+    @param userId
+      The identifier of the user resource profile to request to fetch the particular storage resource preference.
+
+    @param gatewayID
+      The identifier for the gateway profile to be requested
+
+    @return StoragePreference
+      Returns the StoragePreference object.
+
+
+    Parameters:
+     - authzToken
+     - userId
+     - gatewayID
+    """
+    self.send_getAllUserStoragePreferences(authzToken, userId, gatewayID)
+    return self.recv_getAllUserStoragePreferences()
+
+  def send_getAllUserStoragePreferences(self, authzToken, userId, gatewayID):
+    self._oprot.writeMessageBegin('getAllUserStoragePreferences', TMessageType.CALL, self._seqid)
+    args = getAllUserStoragePreferences_args()
+    args.authzToken = authzToken
+    args.userId = userId
+    args.gatewayID = gatewayID
+    args.write(self._oprot)
+    self._oprot.writeMessageEnd()
+    self._oprot.trans.flush()
+
+  def recv_getAllUserStoragePreferences(self):
+    iprot = self._iprot
+    (fname, mtype, rseqid) = iprot.readMessageBegin()
+    if mtype == TMessageType.EXCEPTION:
+      x = TApplicationException()
+      x.read(iprot)
+      iprot.readMessageEnd()
+      raise x
+    result = getAllUserStoragePreferences_result()
+    result.read(iprot)
+    iprot.readMessageEnd()
+    if result.success is not None:
+      return result.success
+    if result.ire is not None:
+      raise result.ire
+    if result.ace is not None:
+      raise result.ace
+    if result.ase is not None:
+      raise result.ase
+    if result.ae is not None:
+      raise result.ae
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserStoragePreferences failed: unknown result")
+
   def getAllUserResourceProfiles(self, authzToken):
     """
 
@@ -10741,17 +10971,20 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserResourceProfiles failed: unknown result")
 
-  def updateUserComputeResourcePreference(self, authzToken, userId, computeResourceId, computeResourcePreference):
+  def updateUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId, userComputeResourcePreference):
     """
     Update a Compute Resource Preference to a registered user resource profile.
 
     @param userId
       The identifier for the user profile to be updated.
 
-    @param computeResourceId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userComputeResourceId
       Preferences related to a particular compute resource
 
-    @param computeResourcePreference
+    @param userComputeResourcePreference
       The ComputeResourcePreference object to be updated to the resource profile.
 
     @return status
@@ -10761,19 +10994,21 @@ class Client(Iface):
     Parameters:
      - authzToken
      - userId
-     - computeResourceId
-     - computeResourcePreference
+     - gatewayID
+     - userComputeResourceId
+     - userComputeResourcePreference
     """
-    self.send_updateUserComputeResourcePreference(authzToken, userId, computeResourceId, computeResourcePreference)
+    self.send_updateUserComputeResourcePreference(authzToken, userId, gatewayID, userComputeResourceId, userComputeResourcePreference)
     return self.recv_updateUserComputeResourcePreference()
 
-  def send_updateUserComputeResourcePreference(self, authzToken, userId, computeResourceId, computeResourcePreference):
+  def send_updateUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId, userComputeResourcePreference):
     self._oprot.writeMessageBegin('updateUserComputeResourcePreference', TMessageType.CALL, self._seqid)
     args = updateUserComputeResourcePreference_args()
     args.authzToken = authzToken
     args.userId = userId
-    args.computeResourceId = computeResourceId
-    args.computeResourcePreference = computeResourcePreference
+    args.gatewayID = gatewayID
+    args.userComputeResourceId = userComputeResourceId
+    args.userComputeResourcePreference = userComputeResourcePreference
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -10801,17 +11036,20 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "updateUserComputeResourcePreference failed: unknown result")
 
-  def updateUserStoragePreference(self, authzToken, userId, storageId, storagePreference):
+  def updateUserStoragePreference(self, authzToken, userId, gatewayID, userStorageId, userStoragePreference):
     """
     Update a Storage Resource Preference of a registered user resource profile.
 
     @param userId
       The identifier of the user resource profile to be updated.
 
-    @param storageId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userStorageId
       The Storage resource identifier of the one that you want to update
 
-    @param storagePreference
+    @param userStoragePreference
       The storagePreference object to be updated to the resource profile.
 
     @return status
@@ -10821,19 +11059,21 @@ class Client(Iface):
     Parameters:
      - authzToken
      - userId
-     - storageId
-     - storagePreference
+     - gatewayID
+     - userStorageId
+     - userStoragePreference
     """
-    self.send_updateUserStoragePreference(authzToken, userId, storageId, storagePreference)
+    self.send_updateUserStoragePreference(authzToken, userId, gatewayID, userStorageId, userStoragePreference)
     return self.recv_updateUserStoragePreference()
 
-  def send_updateUserStoragePreference(self, authzToken, userId, storageId, storagePreference):
+  def send_updateUserStoragePreference(self, authzToken, userId, gatewayID, userStorageId, userStoragePreference):
     self._oprot.writeMessageBegin('updateUserStoragePreference', TMessageType.CALL, self._seqid)
     args = updateUserStoragePreference_args()
     args.authzToken = authzToken
     args.userId = userId
-    args.storageId = storageId
-    args.storagePreference = storagePreference
+    args.gatewayID = gatewayID
+    args.userStorageId = userStorageId
+    args.userStoragePreference = userStoragePreference
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -10861,14 +11101,17 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "updateUserStoragePreference failed: unknown result")
 
-  def deleteUserComputeResourcePreference(self, authzToken, userId, computeResourceId):
+  def deleteUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId):
     """
     Delete the Compute Resource Preference of a registered user resource profile.
 
     @param userId
       The identifier for the user resource profile to be deleted.
 
-    @param computeResourceId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userComputeResourceId
       Preferences related to a particular compute resource
 
     @return status
@@ -10878,17 +11121,19 @@ class Client(Iface):
     Parameters:
      - authzToken
      - userId
-     - computeResourceId
+     - gatewayID
+     - userComputeResourceId
     """
-    self.send_deleteUserComputeResourcePreference(authzToken, userId, computeResourceId)
+    self.send_deleteUserComputeResourcePreference(authzToken, userId, gatewayID, userComputeResourceId)
     return self.recv_deleteUserComputeResourcePreference()
 
-  def send_deleteUserComputeResourcePreference(self, authzToken, userId, computeResourceId):
+  def send_deleteUserComputeResourcePreference(self, authzToken, userId, gatewayID, userComputeResourceId):
     self._oprot.writeMessageBegin('deleteUserComputeResourcePreference', TMessageType.CALL, self._seqid)
     args = deleteUserComputeResourcePreference_args()
     args.authzToken = authzToken
     args.userId = userId
-    args.computeResourceId = computeResourceId
+    args.gatewayID = gatewayID
+    args.userComputeResourceId = userComputeResourceId
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -10916,14 +11161,17 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteUserComputeResourcePreference failed: unknown result")
 
-  def deleteUserStoragePreference(self, authzToken, userId, storageId):
+  def deleteUserStoragePreference(self, authzToken, userId, gatewayID, userStorageId):
     """
     Delete the Storage Resource Preference of a registered user resource profile.
 
     @param userId
       The identifier of the user profile to be deleted.
 
-    @param storageId
+    @param gatewayID
+      The identifier to link a gateway for the requested user resource profile.
+
+    @param userStorageId
       ID of the storage preference you want to delete.
 
     @return status
@@ -10933,17 +11181,19 @@ class Client(Iface):
     Parameters:
      - authzToken
      - userId
-     - storageId
+     - gatewayID
+     - userStorageId
     """
-    self.send_deleteUserStoragePreference(authzToken, userId, storageId)
+    self.send_deleteUserStoragePreference(authzToken, userId, gatewayID, userStorageId)
     return self.recv_deleteUserStoragePreference()
 
-  def send_deleteUserStoragePreference(self, authzToken, userId, storageId):
+  def send_deleteUserStoragePreference(self, authzToken, userId, gatewayID, userStorageId):
     self._oprot.writeMessageBegin('deleteUserStoragePreference', TMessageType.CALL, self._seqid)
     args = deleteUserStoragePreference_args()
     args.authzToken = authzToken
     args.userId = userId
-    args.storageId = storageId
+    args.gatewayID = gatewayID
+    args.userStorageId = userStorageId
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -11347,7 +11597,6 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "getDataProduct failed: unknown result")
 
-<<<<<<< HEAD
   def registerReplicaLocation(self, authzToken, replicaLocationModel):
     """
     Parameters:
@@ -11365,197 +11614,6 @@ class Client(Iface):
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
-=======
-  def isDataSharingEnabled(self):
-    self.send_isDataSharingEnabled()
-    return self.recv_isDataSharingEnabled()
-
-  def send_isDataSharingEnabled(self):
-    self._oprot.writeMessageBegin('isDataSharingEnabled', TMessageType.CALL, self._seqid)
-    args = isDataSharingEnabled_args()
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_isDataSharingEnabled(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = isDataSharingEnabled_result()
-    result.read(iprot)
-    iprot.readMessageEnd()
-    if result.success is not None:
-      return result.success
-    if result.ire is not None:
-      raise result.ire
-    if result.ace is not None:
-      raise result.ace
-    if result.ase is not None:
-      raise result.ase
-    if result.ae is not None:
-      raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "isDataSharingEnabled failed: unknown result")
-
-
-class Processor(Iface, TProcessor):
-  def __init__(self, handler):
-    self._handler = handler
-    self._processMap = {}
-    self._processMap["getAPIVersion"] = Processor.process_getAPIVersion
-    self._processMap["isUserExists"] = Processor.process_isUserExists
-    self._processMap["addGateway"] = Processor.process_addGateway
-    self._processMap["getAllUsersInGateway"] = Processor.process_getAllUsersInGateway
-    self._processMap["updateGateway"] = Processor.process_updateGateway
-    self._processMap["getGateway"] = Processor.process_getGateway
-    self._processMap["deleteGateway"] = Processor.process_deleteGateway
-    self._processMap["getAllGateways"] = Processor.process_getAllGateways
-    self._processMap["isGatewayExist"] = Processor.process_isGatewayExist
-    self._processMap["createNotification"] = Processor.process_createNotification
-    self._processMap["updateNotification"] = Processor.process_updateNotification
-    self._processMap["deleteNotification"] = Processor.process_deleteNotification
-    self._processMap["getNotification"] = Processor.process_getNotification
-    self._processMap["getAllNotifications"] = Processor.process_getAllNotifications
-    self._processMap["generateAndRegisterSSHKeys"] = Processor.process_generateAndRegisterSSHKeys
-    self._processMap["registerPwdCredential"] = Processor.process_registerPwdCredential
-    self._processMap["getSSHPubKey"] = Processor.process_getSSHPubKey
-    self._processMap["getAllGatewaySSHPubKeys"] = Processor.process_getAllGatewaySSHPubKeys
-    self._processMap["getAllGatewayPWDCredentials"] = Processor.process_getAllGatewayPWDCredentials
-    self._processMap["deleteSSHPubKey"] = Processor.process_deleteSSHPubKey
-    self._processMap["deletePWDCredential"] = Processor.process_deletePWDCredential
-    self._processMap["createProject"] = Processor.process_createProject
-    self._processMap["updateProject"] = Processor.process_updateProject
-    self._processMap["getProject"] = Processor.process_getProject
-    self._processMap["deleteProject"] = Processor.process_deleteProject
-    self._processMap["getUserProjects"] = Processor.process_getUserProjects
-    self._processMap["searchProjects"] = Processor.process_searchProjects
-    self._processMap["searchExperiments"] = Processor.process_searchExperiments
-    self._processMap["getExperimentStatistics"] = Processor.process_getExperimentStatistics
-    self._processMap["getExperimentsInProject"] = Processor.process_getExperimentsInProject
-    self._processMap["getUserExperiments"] = Processor.process_getUserExperiments
-    self._processMap["createExperiment"] = Processor.process_createExperiment
-    self._processMap["deleteExperiment"] = Processor.process_deleteExperiment
-    self._processMap["getExperiment"] = Processor.process_getExperiment
-    self._processMap["getDetailedExperimentTree"] = Processor.process_getDetailedExperimentTree
-    self._processMap["updateExperiment"] = Processor.process_updateExperiment
-    self._processMap["updateExperimentConfiguration"] = Processor.process_updateExperimentConfiguration
-    self._processMap["updateResourceScheduleing"] = Processor.process_updateResourceScheduleing
-    self._processMap["validateExperiment"] = Processor.process_validateExperiment
-    self._processMap["launchExperiment"] = Processor.process_launchExperiment
-    self._processMap["getExperimentStatus"] = Processor.process_getExperimentStatus
-    self._processMap["getExperimentOutputs"] = Processor.process_getExperimentOutputs
-    self._processMap["getIntermediateOutputs"] = Processor.process_getIntermediateOutputs
-    self._processMap["getJobStatuses"] = Processor.process_getJobStatuses
-    self._processMap["getJobDetails"] = Processor.process_getJobDetails
-    self._processMap["cloneExperiment"] = Processor.process_cloneExperiment
-    self._processMap["terminateExperiment"] = Processor.process_terminateExperiment
-    self._processMap["registerApplicationModule"] = Processor.process_registerApplicationModule
-    self._processMap["getApplicationModule"] = Processor.process_getApplicationModule
-    self._processMap["updateApplicationModule"] = Processor.process_updateApplicationModule
-    self._processMap["getAllAppModules"] = Processor.process_getAllAppModules
-    self._processMap["deleteApplicationModule"] = Processor.process_deleteApplicationModule
-    self._processMap["registerApplicationDeployment"] = Processor.process_registerApplicationDeployment
-    self._processMap["getApplicationDeployment"] = Processor.process_getApplicationDeployment
-    self._processMap["updateApplicationDeployment"] = Processor.process_updateApplicationDeployment
-    self._processMap["deleteApplicationDeployment"] = Processor.process_deleteApplicationDeployment
-    self._processMap["getAllApplicationDeployments"] = Processor.process_getAllApplicationDeployments
-    self._processMap["getAppModuleDeployedResources"] = Processor.process_getAppModuleDeployedResources
-    self._processMap["registerApplicationInterface"] = Processor.process_registerApplicationInterface
-    self._processMap["cloneApplicationInterface"] = Processor.process_cloneApplicationInterface
-    self._processMap["getApplicationInterface"] = Processor.process_getApplicationInterface
-    self._processMap["updateApplicationInterface"] = Processor.process_updateApplicationInterface
-    self._processMap["deleteApplicationInterface"] = Processor.process_deleteApplicationInterface
-    self._processMap["getAllApplicationInterfaceNames"] = Processor.process_getAllApplicationInterfaceNames
-    self._processMap["getAllApplicationInterfaces"] = Processor.process_getAllApplicationInterfaces
-    self._processMap["getApplicationInputs"] = Processor.process_getApplicationInputs
-    self._processMap["getApplicationOutputs"] = Processor.process_getApplicationOutputs
-    self._processMap["getAvailableAppInterfaceComputeResources"] = Processor.process_getAvailableAppInterfaceComputeResources
-    self._processMap["registerComputeResource"] = Processor.process_registerComputeResource
-    self._processMap["getComputeResource"] = Processor.process_getComputeResource
-    self._processMap["getAllComputeResourceNames"] = Processor.process_getAllComputeResourceNames
-    self._processMap["updateComputeResource"] = Processor.process_updateComputeResource
-    self._processMap["deleteComputeResource"] = Processor.process_deleteComputeResource
-    self._processMap["registerStorageResource"] = Processor.process_registerStorageResource
-    self._processMap["getStorageResource"] = Processor.process_getStorageResource
-    self._processMap["getAllStorageResourceNames"] = Processor.process_getAllStorageResourceNames
-    self._processMap["updateStorageResource"] = Processor.process_updateStorageResource
-    self._processMap["deleteStorageResource"] = Processor.process_deleteStorageResource
-    self._processMap["addLocalSubmissionDetails"] = Processor.process_addLocalSubmissionDetails
-    self._processMap["updateLocalSubmissionDetails"] = Processor.process_updateLocalSubmissionDetails
-    self._processMap["getLocalJobSubmission"] = Processor.process_getLocalJobSubmission
-    self._processMap["addSSHJobSubmissionDetails"] = Processor.process_addSSHJobSubmissionDetails
-    self._processMap["addSSHForkJobSubmissionDetails"] = Processor.process_addSSHForkJobSubmissionDetails
-    self._processMap["getSSHJobSubmission"] = Processor.process_getSSHJobSubmission
-    self._processMap["addUNICOREJobSubmissionDetails"] = Processor.process_addUNICOREJobSubmissionDetails
-    self._processMap["getUnicoreJobSubmission"] = Processor.process_getUnicoreJobSubmission
-    self._processMap["addCloudJobSubmissionDetails"] = Processor.process_addCloudJobSubmissionDetails
-    self._processMap["getCloudJobSubmission"] = Processor.process_getCloudJobSubmission
-    self._processMap["updateSSHJobSubmissionDetails"] = Processor.process_updateSSHJobSubmissionDetails
-    self._processMap["updateCloudJobSubmissionDetails"] = Processor.process_updateCloudJobSubmissionDetails
-    self._processMap["updateUnicoreJobSubmissionDetails"] = Processor.process_updateUnicoreJobSubmissionDetails
-    self._processMap["addLocalDataMovementDetails"] = Processor.process_addLocalDataMovementDetails
-    self._processMap["updateLocalDataMovementDetails"] = Processor.process_updateLocalDataMovementDetails
-    self._processMap["getLocalDataMovement"] = Processor.process_getLocalDataMovement
-    self._processMap["addSCPDataMovementDetails"] = Processor.process_addSCPDataMovementDetails
-    self._processMap["updateSCPDataMovementDetails"] = Processor.process_updateSCPDataMovementDetails
-    self._processMap["getSCPDataMovement"] = Processor.process_getSCPDataMovement
-    self._processMap["addUnicoreDataMovementDetails"] = Processor.process_addUnicoreDataMovementDetails
-    self._processMap["updateUnicoreDataMovementDetails"] = Processor.process_updateUnicoreDataMovementDetails
-    self._processMap["getUnicoreDataMovement"] = Processor.process_getUnicoreDataMovement
-    self._processMap["addGridFTPDataMovementDetails"] = Processor.process_addGridFTPDataMovementDetails
-    self._processMap["updateGridFTPDataMovementDetails"] = Processor.process_updateGridFTPDataMovementDetails
-    self._processMap["getGridFTPDataMovement"] = Processor.process_getGridFTPDataMovement
-    self._processMap["changeJobSubmissionPriority"] = Processor.process_changeJobSubmissionPriority
-    self._processMap["changeDataMovementPriority"] = Processor.process_changeDataMovementPriority
-    self._processMap["changeJobSubmissionPriorities"] = Processor.process_changeJobSubmissionPriorities
-    self._processMap["changeDataMovementPriorities"] = Processor.process_changeDataMovementPriorities
-    self._processMap["deleteJobSubmissionInterface"] = Processor.process_deleteJobSubmissionInterface
-    self._processMap["deleteDataMovementInterface"] = Processor.process_deleteDataMovementInterface
-    self._processMap["registerResourceJobManager"] = Processor.process_registerResourceJobManager
-    self._processMap["updateResourceJobManager"] = Processor.process_updateResourceJobManager
-    self._processMap["getResourceJobManager"] = Processor.process_getResourceJobManager
-    self._processMap["deleteResourceJobManager"] = Processor.process_deleteResourceJobManager
-    self._processMap["deleteBatchQueue"] = Processor.process_deleteBatchQueue
-    self._processMap["registerGatewayResourceProfile"] = Processor.process_registerGatewayResourceProfile
-    self._processMap["getGatewayResourceProfile"] = Processor.process_getGatewayResourceProfile
-    self._processMap["updateGatewayResourceProfile"] = Processor.process_updateGatewayResourceProfile
-    self._processMap["deleteGatewayResourceProfile"] = Processor.process_deleteGatewayResourceProfile
-    self._processMap["addGatewayComputeResourcePreference"] = Processor.process_addGatewayComputeResourcePreference
-    self._processMap["addGatewayStoragePreference"] = Processor.process_addGatewayStoragePreference
-    self._processMap["getGatewayComputeResourcePreference"] = Processor.process_getGatewayComputeResourcePreference
-    self._processMap["getGatewayStoragePreference"] = Processor.process_getGatewayStoragePreference
-    self._processMap["getAllGatewayComputeResourcePreferences"] = Processor.process_getAllGatewayComputeResourcePreferences
-    self._processMap["getAllGatewayStoragePreferences"] = Processor.process_getAllGatewayStoragePreferences
-    self._processMap["getAllGatewayResourceProfiles"] = Processor.process_getAllGatewayResourceProfiles
-    self._processMap["updateGatewayComputeResourcePreference"] = Processor.process_updateGatewayComputeResourcePreference
-    self._processMap["updateGatewayStoragePreference"] = Processor.process_updateGatewayStoragePreference
-    self._processMap["deleteGatewayComputeResourcePreference"] = Processor.process_deleteGatewayComputeResourcePreference
-    self._processMap["deleteGatewayStoragePreference"] = Processor.process_deleteGatewayStoragePreference
-    self._processMap["getAllWorkflows"] = Processor.process_getAllWorkflows
-    self._processMap["getWorkflow"] = Processor.process_getWorkflow
-    self._processMap["deleteWorkflow"] = Processor.process_deleteWorkflow
-    self._processMap["registerWorkflow"] = Processor.process_registerWorkflow
-    self._processMap["updateWorkflow"] = Processor.process_updateWorkflow
-    self._processMap["getWorkflowTemplateId"] = Processor.process_getWorkflowTemplateId
-    self._processMap["isWorkflowExistWithName"] = Processor.process_isWorkflowExistWithName
-    self._processMap["registerDataProduct"] = Processor.process_registerDataProduct
-    self._processMap["getDataProduct"] = Processor.process_getDataProduct
-    self._processMap["registerReplicaLocation"] = Processor.process_registerReplicaLocation
-    self._processMap["getParentDataProduct"] = Processor.process_getParentDataProduct
-    self._processMap["getChildDataProducts"] = Processor.process_getChildDataProducts
-    self._processMap["shareResourceWithUsers"] = Processor.process_shareResourceWithUsers
-    self._processMap["revokeSharingOfResourceFromUsers"] = Processor.process_revokeSharingOfResourceFromUsers
-    self._processMap["getAllAccessibleUsers"] = Processor.process_getAllAccessibleUsers
-    self._processMap["createGroup"] = Processor.process_createGroup
-    self._processMap["updateGroup"] = Processor.process_updateGroup
-    self._processMap["deleteGroup"] = Processor.process_deleteGroup
-    self._processMap["getGroup"] = Processor.process_getGroup
-    self._processMap["getAllGroupsUserBelongs"] = Processor.process_getAllGroupsUserBelongs
-    self._processMap["isDataSharingEnabled"] = Processor.process_isDataSharingEnabled
->>>>>>> upstream/develop
 
   def recv_registerReplicaLocation(self):
     iprot = self._iprot
@@ -12153,6 +12211,8 @@ class Processor(Iface, TProcessor):
     self._processMap["addUserStoragePreference"] = Processor.process_addUserStoragePreference
     self._processMap["getUserComputeResourcePreference"] = Processor.process_getUserComputeResourcePreference
     self._processMap["getUserStoragePreference"] = Processor.process_getUserStoragePreference
+    self._processMap["getAllUserComputeResourcePreferences"] = Processor.process_getAllUserComputeResourcePreferences
+    self._processMap["getAllUserStoragePreferences"] = Processor.process_getAllUserStoragePreferences
     self._processMap["getAllUserResourceProfiles"] = Processor.process_getAllUserResourceProfiles
     self._processMap["updateUserComputeResourcePreference"] = Processor.process_updateUserComputeResourcePreference
     self._processMap["updateUserStoragePreference"] = Processor.process_updateUserStoragePreference
@@ -16239,7 +16299,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = getUserResourceProfile_result()
     try:
-      result.success = self._handler.getUserResourceProfile(args.authzToken, args.userId)
+      result.success = self._handler.getUserResourceProfile(args.authzToken, args.userId, args.gatewayID)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -16270,7 +16330,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = updateUserResourceProfile_result()
     try:
-      result.success = self._handler.updateUserResourceProfile(args.authzToken, args.userId, args.userResourceProfile)
+      result.success = self._handler.updateUserResourceProfile(args.authzToken, args.userId, args.gatewayID, args.userResourceProfile)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -16301,7 +16361,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = deleteUserResourceProfile_result()
     try:
-      result.success = self._handler.deleteUserResourceProfile(args.authzToken, args.userId)
+      result.success = self._handler.deleteUserResourceProfile(args.authzToken, args.userId, args.gatewayID)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -16332,7 +16392,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = addUserComputeResourcePreference_result()
     try:
-      result.success = self._handler.addUserComputeResourcePreference(args.authzToken, args.userId, args.computeResourceId, args.computeResourcePreference)
+      result.success = self._handler.addUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId, args.userComputeResourcePreference)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -16363,7 +16423,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = addUserStoragePreference_result()
     try:
-      result.success = self._handler.addUserStoragePreference(args.authzToken, args.userId, args.storageResourceId, args.storagePreference)
+      result.success = self._handler.addUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageResourceId, args.userStoragePreference)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -16394,7 +16454,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = getUserComputeResourcePreference_result()
     try:
-      result.success = self._handler.getUserComputeResourcePreference(args.authzToken, args.userId, args.computeResourceId)
+      result.success = self._handler.getUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -16425,7 +16485,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = getUserStoragePreference_result()
     try:
-      result.success = self._handler.getUserStoragePreference(args.authzToken, args.userId, args.storageResourceId)
+      result.success = self._handler.getUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageResourceId)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -16450,6 +16510,68 @@ class Processor(Iface, TProcessor):
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
+  def process_getAllUserComputeResourcePreferences(self, seqid, iprot, oprot):
+    args = getAllUserComputeResourcePreferences_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = getAllUserComputeResourcePreferences_result()
+    try:
+      result.success = self._handler.getAllUserComputeResourcePreferences(args.authzToken, args.userId, args.gatewayID)
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+      msg_type = TMessageType.REPLY
+      result.ire = ire
+    except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+      msg_type = TMessageType.REPLY
+      result.ace = ace
+    except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+      msg_type = TMessageType.REPLY
+      result.ase = ase
+    except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+      msg_type = TMessageType.REPLY
+      result.ae = ae
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+    oprot.writeMessageBegin("getAllUserComputeResourcePreferences", msg_type, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
+  def process_getAllUserStoragePreferences(self, seqid, iprot, oprot):
+    args = getAllUserStoragePreferences_args()
+    args.read(iprot)
+    iprot.readMessageEnd()
+    result = getAllUserStoragePreferences_result()
+    try:
+      result.success = self._handler.getAllUserStoragePreferences(args.authzToken, args.userId, args.gatewayID)
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+      msg_type = TMessageType.REPLY
+      result.ire = ire
+    except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+      msg_type = TMessageType.REPLY
+      result.ace = ace
+    except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+      msg_type = TMessageType.REPLY
+      result.ase = ase
+    except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+      msg_type = TMessageType.REPLY
+      result.ae = ae
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+    oprot.writeMessageBegin("getAllUserStoragePreferences", msg_type, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
+
   def process_getAllUserResourceProfiles(self, seqid, iprot, oprot):
     args = getAllUserResourceProfiles_args()
     args.read(iprot)
@@ -16487,7 +16609,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = updateUserComputeResourcePreference_result()
     try:
-      result.success = self._handler.updateUserComputeResourcePreference(args.authzToken, args.userId, args.computeResourceId, args.computeResourcePreference)
+      result.success = self._handler.updateUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId, args.userComputeResourcePreference)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -16518,7 +16640,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = updateUserStoragePreference_result()
     try:
-      result.success = self._handler.updateUserStoragePreference(args.authzToken, args.userId, args.storageId, args.storagePreference)
+      result.success = self._handler.updateUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageId, args.userStoragePreference)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -16549,7 +16671,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = deleteUserComputeResourcePreference_result()
     try:
-      result.success = self._handler.deleteUserComputeResourcePreference(args.authzToken, args.userId, args.computeResourceId)
+      result.success = self._handler.deleteUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -16580,7 +16702,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = deleteUserStoragePreference_result()
     try:
-      result.success = self._handler.deleteUserStoragePreference(args.authzToken, args.userId, args.storageId)
+      result.success = self._handler.deleteUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageId)
       msg_type = TMessageType.REPLY
     except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
       raise
@@ -19064,44 +19186,10 @@ class isGatewayExist_result:
     value = (value * 31) ^ hash(self.ae)
     return value
 
-<<<<<<< HEAD
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
     return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-=======
-  def process_isDataSharingEnabled(self, seqid, iprot, oprot):
-    args = isDataSharingEnabled_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = isDataSharingEnabled_result()
-    try:
-      result.success = self._handler.isDataSharingEnabled()
-      msg_type = TMessageType.REPLY
-    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
-      raise
-    except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
-      msg_type = TMessageType.REPLY
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException as ace:
-      msg_type = TMessageType.REPLY
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
-      msg_type = TMessageType.REPLY
-      result.ase = ase
-    except apache.airavata.api.error.ttypes.AuthorizationException as ae:
-      msg_type = TMessageType.REPLY
-      result.ae = ae
-    except Exception as ex:
-      msg_type = TMessageType.EXCEPTION
-      logging.exception(ex)
-      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
-    oprot.writeMessageBegin("isDataSharingEnabled", msg_type, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
->>>>>>> upstream/develop
 
   def __eq__(self, other):
     return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
@@ -45378,17 +45466,20 @@ class getUserResourceProfile_args:
   Attributes:
    - authzToken
    - userId
+   - gatewayID
   """
 
   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, 'userId', None, None, ), # 2
+    (3, TType.STRING, 'gatewayID', None, None, ), # 3
   )
 
-  def __init__(self, authzToken=None, userId=None,):
+  def __init__(self, authzToken=None, userId=None, gatewayID=None,):
     self.authzToken = authzToken
     self.userId = userId
+    self.gatewayID = gatewayID
 
   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:
@@ -45410,6 +45501,11 @@ class getUserResourceProfile_args:
           self.userId = iprot.readString()
         else:
           iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRING:
+          self.gatewayID = iprot.readString()
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -45428,6 +45524,10 @@ class getUserResourceProfile_args:
       oprot.writeFieldBegin('userId', TType.STRING, 2)
       oprot.writeString(self.userId)
       oprot.writeFieldEnd()
+    if self.gatewayID is not None:
+      oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
+      oprot.writeString(self.gatewayID)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
@@ -45436,6 +45536,8 @@ class getUserResourceProfile_args:
       raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
     if self.userId is None:
       raise TProtocol.TProtocolException(message='Required field userId is unset!')
+    if self.gatewayID is None:
+      raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
     return
 
 
@@ -45443,6 +45545,7 @@ class getUserResourceProfile_args:
     value = 17
     value = (value * 31) ^ hash(self.authzToken)
     value = (value * 31) ^ hash(self.userId)
+    value = (value * 31) ^ hash(self.gatewayID)
     return value
 
   def __repr__(self):
@@ -45582,6 +45685,7 @@ class updateUserResourceProfile_args:
   Attributes:
    - authzToken
    - userId
+   - gatewayID
    - userResourceProfile
   """
 
@@ -45589,12 +45693,14 @@ class updateUserResourceProfile_args:
     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, 'userId', None, None, ), # 2
-    (3, TType.STRUCT, 'userResourceProfile', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile.thrift_spec), None, ), # 3
+    (3, TType.STRING, 'gatewayID', None, None, ), # 3
+    (4, TType.STRUCT, 'userResourceProfile', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile.thrift_spec), None, ), # 4
   )
 
-  def __init__(self, authzToken=None, userId=None, userResourceProfile=None,):
+  def __init__(self, authzToken=None, userId=None, gatewayID=None, userResourceProfile=None,):
     self.authzToken = authzToken
     self.userId = userId
+    self.gatewayID = gatewayID
     self.userResourceProfile = userResourceProfile
 
   def read(self, iprot):
@@ -45618,6 +45724,11 @@ class updateUserResourceProfile_args:
         else:
           iprot.skip(ftype)
       elif fid == 3:
+        if ftype == TType.STRING:
+          self.gatewayID = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
         if ftype == TType.STRUCT:
           self.userResourceProfile = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
           self.userResourceProfile.read(iprot)
@@ -45641,8 +45752,12 @@ class updateUserResourceProfile_args:
       oprot.writeFieldBegin('userId', TType.STRING, 2)
       oprot.writeString(self.userId)
       oprot.writeFieldEnd()
+    if self.gatewayID is not None:
+      oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
+      oprot.writeString(self.gatewayID)
+      oprot.writeFieldEnd()
     if self.userResourceProfile is not None:
-      oprot.writeFieldBegin('userResourceProfile', TType.STRUCT, 3)
+      oprot.writeFieldBegin('userResourceProfile', TType.STRUCT, 4)
       self.userResourceProfile.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -45653,6 +45768,8 @@ class updateUserResourceProfile_args:
       raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
     if self.userId is None:
       raise TProtocol.TProtocolException(message='Required field userId is unset!')
+    if self.gatewayID is None:
+      raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
     if self.userResourceProfile is None:
       raise TProtocol.TProtocolException(message='Required field userResourceProfile is unset!')
     return
@@ -45662,6 +45779,7 @@ class updateUserResourceProfile_args:
     value = 17
     value = (value * 31) ^ hash(self.authzToken)
     value = (value * 31) ^ hash(self.userId)
+    value = (value * 31) ^ hash(self.gatewayID)
     value = (value * 31) ^ hash(self.userResourceProfile)
     return value
 
@@ -45801,226 +45919,20 @@ class deleteUserResourceProfile_args:
   Attributes:
    - authzToken
    - userId
+   - gatewayID
   """
 
   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, 'userId', None, None, ), # 2
+    (3, TType.STRING, 'gatewayID', None, None, ), # 3
   )
 
-  def __init__(self, authzToken=None, userId=None,):
-    self.authzToken = authzToken
-    self.userId = userId
-
-  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:
-      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
-      return
-    iprot.readStructBegin()
-    while True:
-      (fname, ftype, fid) = iprot.readFieldBegin()
-      if ftype == TType.STOP:
-        break
-      if fid == 1:
-        if ftype == TType.STRUCT:
-          self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
-          self.authzToken.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 2:
-        if ftype == TType.STRING:
-          self.userId = iprot.readString()
-        else:
-          iprot.skip(ftype)
-      else:
-        iprot.skip(ftype)
-      iprot.readFieldEnd()
-    iprot.readStructEnd()
-
-  def write(self, oprot):
-    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('deleteUserResourceProfile_args')
-    if self.authzToken is not None:
-      oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
-      self.authzToken.write(oprot)
-      oprot.writeFieldEnd()
-    if self.userId is not None:
-      oprot.writeFieldBegin('userId', TType.STRING, 2)
-      oprot.writeString(self.userId)
-      oprot.writeFieldEnd()
-    oprot.writeFieldStop()
-    oprot.writeStructEnd()
-
-  def validate(self):
-    if self.authzToken is None:
-      raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
-    if self.userId is None:
-      raise TProtocol.TProtocolException(message='Required field userId is unset!')
-    return
-
-
-  def __hash__(self):
-    value = 17
-    value = (value * 31) ^ hash(self.authzToken)
-    value = (value * 31) ^ hash(self.userId)
-    return value
-
-  def __repr__(self):
-    L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
-    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
-  def __eq__(self, other):
-    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
-  def __ne__(self, other):
-    return not (self == other)
-
-class deleteUserResourceProfile_result:
-  """
-  Attributes:
-   - success
-   - ire
-   - ace
-   - ase
-   - ae
-  """
-
-  thrift_spec = (
-    (0, TType.BOOL, 'success', None, 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
-    (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
-  )
-
-  def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
-    self.success = success
-    self.ire = ire
-    self.ace = ace
-    self.ase = ase
-    self.ae = ae
-
-  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:
-      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
-      return
-    iprot.readStructBegin()
-    while True:
-      (fname, ftype, fid) = iprot.readFieldBegin()
-      if ftype == TType.STOP:
-        break
-      if fid == 0:
-        if ftype == TType.BOOL:
-          self.success = iprot.readBool()
-        else:
-          iprot.skip(ftype)
-      elif fid == 1:
-        if ftype == TType.STRUCT:
-          self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
-          self.ire.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 2:
-        if ftype == TType.STRUCT:
-          self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
-          self.ace.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 3:
-        if ftype == TType.STRUCT:
-          self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
-          self.ase.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 4:
-        if ftype == TType.STRUCT:
-          self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
-          self.ae.read(iprot)
-        else:
-          iprot.skip(ftype)
-      else:
-        iprot.skip(ftype)
-      iprot.readFieldEnd()
-    iprot.readStructEnd()
-
-  def write(self, oprot):
-    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('deleteUserResourceProfile_result')
-    if self.success is not None:
-      oprot.writeFieldBegin('success', TType.BOOL, 0)
-      oprot.writeBool(self.success)
-      oprot.writeFieldEnd()
-    if self.ire is not None:
-      oprot.writeFieldBegin('ire', TType.STRUCT, 1)
-      self.ire.write(oprot)
-      oprot.writeFieldEnd()
-    if self.ace is not None:
-      oprot.writeFieldBegin('ace', TType.STRUCT, 2)
-      self.ace.write(oprot)
-      oprot.writeFieldEnd()
-    if self.ase is not None:
-      oprot.writeFieldBegin('ase', TType.STRUCT, 3)
-      self.ase.write(oprot)
-      oprot.writeFieldEnd()
-    if self.ae is not None:
-      oprot.writeFieldBegin('ae', TType.STRUCT, 4)
-      self.ae.write(oprot)
-      oprot.writeFieldEnd()
-    oprot.writeFieldStop()
-    oprot.writeStructEnd()
-
-  def validate(self):
-    return
-
-
-  def __hash__(self):
-    value = 17
-    value = (value * 31) ^ hash(self.success)
-    value = (value * 31) ^ hash(self.ire)
-    value = (value * 31) ^ hash(self.ace)
-    value = (value * 31) ^ hash(self.ase)
-    value = (value * 31) ^ hash(self.ae)
-    return value
-
-  def __repr__(self):
-    L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
-    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
-  def __eq__(self, other):
-    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
-  def __ne__(self, other):
-    return not (self == other)
-
-class addUserComputeResourcePreference_args:
-  """
-  Attributes:
-   - authzToken
-   - userId
-   - computeResourceId
-   - computeResourcePreference
-  """
-
-  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, 'userId', None, None, ), # 2
-    (3, TType.STRING, 'computeResourceId', None, None, ), # 3
-    (4, TType.STRUCT, 'computeResourcePreference', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.ComputeResourcePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.ComputeResourcePreference.thrift_spec), None, ), # 4
-  )
-
-  def __init__(self, authzToken=None, userId=None, computeResourceId=None, computeResourcePreference=None,):
+  def __init__(self, authzToken=None, userId=None, gatewayID=None,):
     self.authzToken = authzToken
     self.userId = userId
-    self.computeResourceId = computeResourceId
-    self.computeResourcePreference = computeResourcePreference
+    self.gatewayID = gatewayID
 
   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:
@@ -46044,13 +45956,7 @@ class addUserComputeResourcePreference_args:
           iprot.skip(ftype)
       elif fid == 3:
         if ftype == TType.STRING:
-          self.computeResourceId = iprot.readString()
-        else:
-          iprot.skip(ftype)
-      elif fid == 4:
-        if ftype == TType.STRUCT:
-          self.computeResourcePreference = apache.airavata.model.appcatalog.userresourceprofile.ttypes.ComputeResourcePreference()
-          self.computeResourcePreference.read(iprot)
+          self.gatewayID = iprot.readString()
         else:
           iprot.skip(ftype)
       else:
@@ -46062,7 +45968,7 @@ class addUserComputeResourcePreference_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('addUserComputeResourcePreference_args')
+    oprot.writeStructBegin('deleteUserResourceProfile_args')
     if self.authzToken is not None:
       oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
       self.authzToken.write(oprot)
@@ -46071,13 +45977,9 @@ class addUserComputeResourcePreference_args:
       oprot.writeFieldBegin('userId', TType.STRING, 2)
       oprot.writeString(self.userId)
       oprot.writeFieldEnd()
-    if self.computeResourceId is not None:
-      oprot.writeFieldBegin('computeResourceId', TType.STRING, 3)
-      oprot.writeString(self.computeResourceId)
-      oprot.writeFieldEnd()
-    if self.computeResourcePreference is not None:
-      oprot.writeFieldBegin('computeResourcePreference', TType.STRUCT, 4)
-      self.computeResourcePreference.write(oprot)
+    if self.gatewayID is not None:
+      oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
+      oprot.writeString(self.gatewayID)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
@@ -46087,10 +45989,8 @@ class addUserComputeResourcePreference_args:
       raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
     if self.userId is None:
       raise TProtocol.TProtocolException(message='Required field userId is unset!')
-    if self.computeResourceId is None:
-      raise TProtocol.TProtocolException(message='Required field computeResourceId is unset!')
-    if self.computeResourcePreference is None:
-      raise TProtocol.TProtocolException(message='Required field computeResourcePreference is unset!')
+    if self.gatewayID is None:
+      raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
     return
 
 
@@ -46098,8 +45998,7 @@ class addUserComputeResourcePreference_args:
     value = 17
     value = (value * 31) ^ hash(self.authzToken)
     value = (value * 31) ^ hash(self.userId)
-    value = (value * 31) ^ hash(self.computeResourceId)
-    value = (value * 31) ^ hash(self.computeResourcePreference)
+    value = (value * 31) ^ hash(self.gatewayID)
     return value
 
   def __repr__(self):
@@ -46113,7 +46012,7 @@ class addUserComputeResourcePreference_args:
   def __ne__(self, other):
     return not (self == other)
 
-class addUserComputeResourcePreference_result:
+class deleteUserResourceProfile_result:
   """
   Attributes:
    - success
@@ -46185,7 +46084,7 @@ class addUserComputeResourcePreference_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('addUserComputeResourcePreference_result')
+    oprot.writeStructBegin('deleteUserResourceProfile_result')
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.BOOL, 0)
       oprot.writeBool(self.success)
@@ -46233,28 +46132,31 @@ class addUserComputeResourcePreference_result:
   def __ne__(self, other):
     return not (self == other)
 
-class addUserStoragePreference_args:
+class addUserComputeResourcePreference_args:
   """
   Attributes:
    - authzToken
    - userId
-   - storageResourceId
-   - storagePreference
+   - gatewayID
+   - userComputeResourceId
+   - userComputeResourcePreference
   """
 
   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, 'userId', None, None, ), # 2
-    (3, TType.STRING, 'storageResourceId', None, None, ), # 3
-    (4, TType.STRUCT, 'storagePreference', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.StoragePreference.thrift_spec), None, ), # 4
+    (3, TType.STRING, 'gatewayID', None, None, ), # 3
+    (4, TType.STRING, 'userComputeResourceId', None, None, ), # 4
+    (5, TType.STRUCT, 'userComputeResourcePreference', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference.thrift_spec), None, ), # 5
   )
 
-  def __init__(self, authzToken=None, userId=None, storageResourceId=None, storagePreference=None,):
+  def __init__(self, authzToken=None, userId=None, gatewayID=None, userComputeResourceId=None, userComputeResourcePreference=None,):
     self.authzToken = authzToken
     self.userId = userId
-    self.storageResourceId = storageResourceId
-    self.storagePreference = storagePreference
+    self.gatewayID = gatewayID
+    self.userComputeResourceId = userComputeResourceId
+    self.userComputeResourcePreference = userComputeResourcePreference
 
   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:
@@ -46278,13 +46180,18 @@ class addUserStoragePreference_args:
           iprot.skip(ftype)
       elif fid == 3:
         if ftype == TType.STRING:
-          self.storageResourceId = iprot.readString()
+          self.gatewayID = iprot.readString()
         else:
           iprot.skip(ftype)
       elif fid == 4:
+        if ftype == TType.STRING:
+          self.userComputeResourceId = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 5:
         if ftype == TType.STRUCT:
-          self.storagePreference = apache.airavata.model.appcatalog.userresourceprofile.ttypes.StoragePreference()
-          self.storagePreference.read(iprot)
+          self.userComputeResourcePreference = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
+          self.userComputeResourcePreference.read(iprot)
         else:
           iprot.skip(ftype)
       else:
@@ -46296,7 +46203,7 @@ class addUserStoragePreference_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('addUserStoragePreference_args')
+    oprot.writeStructBegin('addUserComputeResourcePreference_args')
     if self.authzToken is not None:
       oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
       self.authzToken.write(oprot)
@@ -46305,13 +46212,17 @@ class addUserStoragePreference_args:
       oprot.writeFieldBegin('userId', TType.STRING, 2)
       oprot.writeString(self.userId)
       oprot.writeFieldEnd()
-    if self.storageResourceId is not None:
-      oprot.writeFieldBegin('storageResourceId', TType.STRING, 3)
-      oprot.writeString(self.storageResourceId)
+    if self.gatewayID is not None:
+      oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
+      oprot.writeString(self.gatewayID)
       oprot.writeFieldEnd()
-    if self.storagePreference is not None:
-      oprot.writeFieldBegin('storagePreference', TType.STRUCT, 4)
-      self.storagePreference.write(oprot)
+    if self.userComputeResourceId is not None:
+      oprot.writeFieldBegin('userComputeResourceId', TType.STRING, 4)
+      oprot.writeString(self.userComputeResourceId)
+      oprot.writeFieldEnd()
+    if self.userComputeResourcePreference is not None:
+      oprot.writeFieldBegin('userComputeResourcePreference', TType.STRUCT, 5)
+      self.userComputeResourcePreference.write(oprot)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
@@ -46321,10 +46232,12 @@ class addUserStoragePreference_args:
       raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
     if self.userId is None:
       raise TProtocol.TProtocolException(message='Required field userId is unset!')
-    if self.storageResourceId is None:
-      raise TProtocol.TProtocolException(message='Required field storageResourceId is unset!')
-    if self.storagePreference is None:
-      raise TProtocol.TProtocolException(message='Required field storagePreference is unset!')
+    if self.gatewayID is None:
+      raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
+    if self.userComputeResourceId is None:
+      raise TProtocol.TProtocolException(message='Required field userComputeResourceId is unset!')
+    if self.userComputeResourcePreference is None:
+      raise TProtocol.TProtocolException(message='Required field userComputeResourcePreference is unset!')
     return
 
 
@@ -46332,8 +46245,9 @@ class addUserStoragePreference_args:
     value = 17
     value = (value * 31) ^ hash(self.authzToken)
     value = (value * 31) ^ hash(self.userId)
-    value = (value * 31) ^ hash(self.storageResourceId)
-    value = (value * 31) ^ hash(self.storagePreference)
+    value = (value * 31) ^ hash(self.gatewayID)
+    value = (value * 31) ^ hash(self.userComputeResourceId)
+    value = (value * 31) ^ hash(self.userComputeResourcePreference)
     return value
 
   def __repr__(self):
@@ -46347,7 +46261,7 @@ class addUserStoragePreference_args:
   def __ne__(self, other):
     return not (self == other)
 
-class addUserStoragePreference_result:
+class addUserComputeResourcePreference_result:
   """
   Attributes:
    - success
@@ -46419,7 +46333,7 @@ class addUserStoragePreference_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('addUserStoragePreference_result')
+    oprot.writeStructBegin('addUserComputeResourcePreference_result')
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.BOOL, 0)
       oprot.writeBool(self.success)
@@ -46467,25 +46381,31 @@ class addUserStoragePreference_result:
   def __ne__(self, other):
     return not (self == other)
 
-class getUserComputeResourcePreference_args:
+class addUserStoragePreference_args:
   """
   Attributes:
    - authzToken
    - userId
-   - computeResourceId
+   - gatewayID
+   - userStorageResourceId
+   - userStoragePreference
   """
 
   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, 'userId', None, None, ), # 2
-    (3, TType.STRING, 'computeResourceId', None, None, ), # 3
+    (3, TType.STRING, 'gatewayID', None, None, ), # 3
+    (4, TType.STRING, 'userStorageResourceId', None, None, ), # 4
+    (5, TType.STRUCT, 'userStoragePreference', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference.thrift_spec), None, ), # 5
   )
 

<TRUNCATED>

Mime
View raw message