airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [03/13] airavata git commit: removing non paginated versions of API methods for project and experiment retrieval, from Airavata API
Date Sun, 02 Aug 2015 20:42:44 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc61c676/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 680a7d6..d4de996 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
@@ -162,25 +162,7 @@ class Iface:
     """
     pass
 
-  def getAllUserProjects(self, gatewayId, userName):
-    """
-      * Get all Project by user
-      *
-      * @param gatewayId
-      *    The identifier for the requested gateway.
-      *
-      * @param userName
-      *    The Project Object described in the workspace_model
-      * @deprecated Instead use getAllUserProjectsWithPagination
-    *
-
-    Parameters:
-     - gatewayId
-     - userName
-    """
-    pass
-
-  def getAllUserProjectsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
+  def getUserProjects(self, authzToken, gatewayId, userName, limit, offset):
     """
       * Get all Project by user with pagination. Results will be ordered based
       * on creation time DESC
@@ -204,26 +186,7 @@ class Iface:
     """
     pass
 
-  def searchProjectsByProjectName(self, gatewayId, userName, projectName):
-    """
-    Get all Project for user by project name
-
-    @param gatewayId
-       The identifier for the requested gateway.
-    @param userName
-       The identifier of the user
-    @param projectName
-       The name of the project on which the results to be fetched
-    @deprecated Instead use searchProjectsByProjectNameWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-     - projectName
-    """
-    pass
-
-  def searchProjectsByProjectNameWithPagination(self, authzToken, gatewayId, userName, projectName, limit, offset):
+  def searchProjectsByProjectName(self, authzToken, gatewayId, userName, projectName, limit, offset):
     """
     Get all Project for user by project name with pagination.Results will be ordered based
     on creation time DESC
@@ -249,25 +212,7 @@ class Iface:
     """
     pass
 
-  def searchProjectsByProjectDesc(self, gatewayId, userName, description):
-    """
-    Get all Project for user by project description
-    @param gatewayId
-       The identifier for the requested gateway.
-    @param userName
-       The identifier of the user
-    @param description
-       The description to be matched
-    @deprecated Instead use searchProjectsByProjectDescWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-     - description
-    """
-    pass
-
-  def searchProjectsByProjectDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
+  def searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
     """
     Search and get all Projects for user by project description with pagination. Results
     will be ordered based on creation time DESC
@@ -293,28 +238,7 @@ class Iface:
     """
     pass
 
-  def searchExperimentsByName(self, gatewayId, userName, expName):
-    """
-    Search Experiments by experiment name
-
-    @param gatewayId
-          Identifier of the requested gateway
-    @param useNname
-          Username of the requested user
-    @param expName
-          Experiment name to be matched
-    @deprecated
-          Instead use searchExperimentsByNameWithPagination
-
-
-    Parameters:
-     - gatewayId
-     - userName
-     - expName
-    """
-    pass
-
-  def searchExperimentsByNameWithPagination(self, authzToken, gatewayId, userName, expName, limit, offset):
+  def searchExperimentsByName(self, authzToken, gatewayId, userName, expName, limit, offset):
     """
     Search Experiments by experiment name with pagination. Results will be sorted
     based on creation time DESC
@@ -340,27 +264,7 @@ class Iface:
     """
     pass
 
-  def searchExperimentsByDesc(self, gatewayId, userName, description):
-    """
-    Search Experiments by experiment name
-
-    @param gatewayId
-          Identifier of the requested gateway
-    @param userName
-          Username of the requested user
-    @param description
-          Experiment description to be matched
-    @deprecated
-          Instead use searchExperimentsByDescWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-     - description
-    """
-    pass
-
-  def searchExperimentsByDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
+  def searchExperimentsByDesc(self, authzToken, gatewayId, userName, description, limit, offset):
     """
     Search Experiments by experiment name with pagination. Results will be sorted
     based on creation time DESC
@@ -386,27 +290,7 @@ class Iface:
     """
     pass
 
-  def searchExperimentsByApplication(self, gatewayId, userName, applicationId):
-    """
-    Search Experiments by application id
-
-    @param gatewayId
-          Identifier of the requested gateway
-    @param userName
-          Username of the requested user
-    @param applicationId
-          Application id to be matched
-    @deprecated
-          Instead use searchExperimentsByApplicationWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-     - applicationId
-    """
-    pass
-
-  def searchExperimentsByApplicationWithPagination(self, authzToken, gatewayId, userName, applicationId, limit, offset):
+  def searchExperimentsByApplication(self, authzToken, gatewayId, userName, applicationId, limit, offset):
     """
     Search Experiments by application id with pagination. Results will be sorted
     based on creation time DESC
@@ -432,27 +316,7 @@ class Iface:
     """
     pass
 
-  def searchExperimentsByStatus(self, gatewayId, userName, experimentState):
-    """
-    Search Experiments by experiment status
-
-    @param gatewayId
-          Identifier of the requested gateway
-    @param userName
-          Username of the requested user
-    @param experimentState
-          Experiement state to be matched
-    @deprecated
-          Instead use searchExperimentsByStatusWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-     - experimentState
-    """
-    pass
-
-  def searchExperimentsByStatusWithPagination(self, authzToken, gatewayId, userName, experimentState, limit, offset):
+  def searchExperimentsByStatus(self, authzToken, gatewayId, userName, experimentState, limit, offset):
     """
     Search Experiments by experiment status with pagination. Results will be sorted
     based on creation time DESC
@@ -478,30 +342,7 @@ class Iface:
     """
     pass
 
-  def searchExperimentsByCreationTime(self, gatewayId, userName, fromTime, toTime):
-    """
-    Search Experiments by experiment creation time
-
-    @param gatewayId
-          Identifier of the requested gateway
-    @param userName
-          Username of the requested user
-    @param fromTime
-          Start time of the experiments creation time
-    @param toTime
-          End time of the  experiement creation time
-    @deprecated
-          Instead use searchExperimentsByCreationTimeWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-     - fromTime
-     - toTime
-    """
-    pass
-
-  def searchExperimentsByCreationTimeWithPagination(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
+  def searchExperimentsByCreationTime(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
     """
     Search Experiments by experiment creation time with pagination. Results will be sorted
     based on creation time DESC
@@ -575,23 +416,9 @@ class Iface:
     """
     pass
 
-  def getAllExperimentsInProject(self, projectId):
-    """
-    Get all Experiments within a Project
-
-    @param projectId
-          Identifier of the project
-    @deprecated
-          Instead use  getAllExperimentsInProjectWithPagination
-
-    Parameters:
-     - projectId
+  def getExperimentsInProject(self, authzToken, projectId, limit, offset):
     """
-    pass
-
-  def getAllExperimentsInProjectWithPagination(self, authzToken, projectId, limit, offset):
-    """
-    Get all Experiments within project with pagination. Results will be sorted
+    Get Experiments within project with pagination. Results will be sorted
     based on creation time DESC
 
     @param projectId
@@ -609,26 +436,9 @@ class Iface:
     """
     pass
 
-  def getAllUserExperiments(self, gatewayId, userName):
+  def getUserExperiments(self, authzToken, gatewayId, userName, limit, offset):
     """
-    Get all Experiments by user
-
-    @param gatewayId
-          Identifier of the requesting gateway
-    @param userName
-          Username of the requested user
-    @deprecated
-          Instead use getAllUserExperimentsWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-    """
-    pass
-
-  def getAllUserExperimentsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
-    """
-    Get all Experiments by user pagination. Results will be sorted
+    Get experiments by user with pagination. Results will be sorted
     based on creation time DESC
 
     @param gatewayId
@@ -2879,56 +2689,7 @@ class Client(Iface):
       raise result.ae
     raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteProject failed: unknown result");
 
-  def getAllUserProjects(self, gatewayId, userName):
-    """
-      * Get all Project by user
-      *
-      * @param gatewayId
-      *    The identifier for the requested gateway.
-      *
-      * @param userName
-      *    The Project Object described in the workspace_model
-      * @deprecated Instead use getAllUserProjectsWithPagination
-    *
-
-    Parameters:
-     - gatewayId
-     - userName
-    """
-    self.send_getAllUserProjects(gatewayId, userName)
-    return self.recv_getAllUserProjects()
-
-  def send_getAllUserProjects(self, gatewayId, userName):
-    self._oprot.writeMessageBegin('getAllUserProjects', TMessageType.CALL, self._seqid)
-    args = getAllUserProjects_args()
-    args.gatewayId = gatewayId
-    args.userName = userName
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_getAllUserProjects(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = getAllUserProjects_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
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserProjects failed: unknown result");
-
-  def getAllUserProjectsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
+  def getUserProjects(self, authzToken, gatewayId, userName, limit, offset):
     """
       * Get all Project by user with pagination. Results will be ordered based
       * on creation time DESC
@@ -2950,12 +2711,12 @@ class Client(Iface):
      - limit
      - offset
     """
-    self.send_getAllUserProjectsWithPagination(authzToken, gatewayId, userName, limit, offset)
-    return self.recv_getAllUserProjectsWithPagination()
+    self.send_getUserProjects(authzToken, gatewayId, userName, limit, offset)
+    return self.recv_getUserProjects()
 
-  def send_getAllUserProjectsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
-    self._oprot.writeMessageBegin('getAllUserProjectsWithPagination', TMessageType.CALL, self._seqid)
-    args = getAllUserProjectsWithPagination_args()
+  def send_getUserProjects(self, authzToken, gatewayId, userName, limit, offset):
+    self._oprot.writeMessageBegin('getUserProjects', TMessageType.CALL, self._seqid)
+    args = getUserProjects_args()
     args.authzToken = authzToken
     args.gatewayId = gatewayId
     args.userName = userName
@@ -2965,7 +2726,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_getAllUserProjectsWithPagination(self):
+  def recv_getUserProjects(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -2973,7 +2734,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = getAllUserProjectsWithPagination_result()
+    result = getUserProjects_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -2986,60 +2747,9 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserProjectsWithPagination failed: unknown result");
-
-  def searchProjectsByProjectName(self, gatewayId, userName, projectName):
-    """
-    Get all Project for user by project name
-
-    @param gatewayId
-       The identifier for the requested gateway.
-    @param userName
-       The identifier of the user
-    @param projectName
-       The name of the project on which the results to be fetched
-    @deprecated Instead use searchProjectsByProjectNameWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-     - projectName
-    """
-    self.send_searchProjectsByProjectName(gatewayId, userName, projectName)
-    return self.recv_searchProjectsByProjectName()
-
-  def send_searchProjectsByProjectName(self, gatewayId, userName, projectName):
-    self._oprot.writeMessageBegin('searchProjectsByProjectName', TMessageType.CALL, self._seqid)
-    args = searchProjectsByProjectName_args()
-    args.gatewayId = gatewayId
-    args.userName = userName
-    args.projectName = projectName
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_searchProjectsByProjectName(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = searchProjectsByProjectName_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
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectName failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserProjects failed: unknown result");
 
-  def searchProjectsByProjectNameWithPagination(self, authzToken, gatewayId, userName, projectName, limit, offset):
+  def searchProjectsByProjectName(self, authzToken, gatewayId, userName, projectName, limit, offset):
     """
     Get all Project for user by project name with pagination.Results will be ordered based
     on creation time DESC
@@ -3063,12 +2773,12 @@ class Client(Iface):
      - limit
      - offset
     """
-    self.send_searchProjectsByProjectNameWithPagination(authzToken, gatewayId, userName, projectName, limit, offset)
-    return self.recv_searchProjectsByProjectNameWithPagination()
+    self.send_searchProjectsByProjectName(authzToken, gatewayId, userName, projectName, limit, offset)
+    return self.recv_searchProjectsByProjectName()
 
-  def send_searchProjectsByProjectNameWithPagination(self, authzToken, gatewayId, userName, projectName, limit, offset):
-    self._oprot.writeMessageBegin('searchProjectsByProjectNameWithPagination', TMessageType.CALL, self._seqid)
-    args = searchProjectsByProjectNameWithPagination_args()
+  def send_searchProjectsByProjectName(self, authzToken, gatewayId, userName, projectName, limit, offset):
+    self._oprot.writeMessageBegin('searchProjectsByProjectName', TMessageType.CALL, self._seqid)
+    args = searchProjectsByProjectName_args()
     args.authzToken = authzToken
     args.gatewayId = gatewayId
     args.userName = userName
@@ -3079,7 +2789,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_searchProjectsByProjectNameWithPagination(self):
+  def recv_searchProjectsByProjectName(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -3087,7 +2797,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = searchProjectsByProjectNameWithPagination_result()
+    result = searchProjectsByProjectName_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -3100,59 +2810,9 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectNameWithPagination failed: unknown result");
-
-  def searchProjectsByProjectDesc(self, gatewayId, userName, description):
-    """
-    Get all Project for user by project description
-    @param gatewayId
-       The identifier for the requested gateway.
-    @param userName
-       The identifier of the user
-    @param description
-       The description to be matched
-    @deprecated Instead use searchProjectsByProjectDescWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-     - description
-    """
-    self.send_searchProjectsByProjectDesc(gatewayId, userName, description)
-    return self.recv_searchProjectsByProjectDesc()
-
-  def send_searchProjectsByProjectDesc(self, gatewayId, userName, description):
-    self._oprot.writeMessageBegin('searchProjectsByProjectDesc', TMessageType.CALL, self._seqid)
-    args = searchProjectsByProjectDesc_args()
-    args.gatewayId = gatewayId
-    args.userName = userName
-    args.description = description
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_searchProjectsByProjectDesc(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = searchProjectsByProjectDesc_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
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectName failed: unknown result");
 
-  def searchProjectsByProjectDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
+  def searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
     """
     Search and get all Projects for user by project description with pagination. Results
     will be ordered based on creation time DESC
@@ -3176,12 +2836,12 @@ class Client(Iface):
      - limit
      - offset
     """
-    self.send_searchProjectsByProjectDescWithPagination(authzToken, gatewayId, userName, description, limit, offset)
-    return self.recv_searchProjectsByProjectDescWithPagination()
+    self.send_searchProjectsByProjectDesc(authzToken, gatewayId, userName, description, limit, offset)
+    return self.recv_searchProjectsByProjectDesc()
 
-  def send_searchProjectsByProjectDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
-    self._oprot.writeMessageBegin('searchProjectsByProjectDescWithPagination', TMessageType.CALL, self._seqid)
-    args = searchProjectsByProjectDescWithPagination_args()
+  def send_searchProjectsByProjectDesc(self, authzToken, gatewayId, userName, description, limit, offset):
+    self._oprot.writeMessageBegin('searchProjectsByProjectDesc', TMessageType.CALL, self._seqid)
+    args = searchProjectsByProjectDesc_args()
     args.authzToken = authzToken
     args.gatewayId = gatewayId
     args.userName = userName
@@ -3192,7 +2852,7 @@ class Client(Iface):
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_searchProjectsByProjectDescWithPagination(self):
+  def recv_searchProjectsByProjectDesc(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -3200,7 +2860,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = searchProjectsByProjectDescWithPagination_result()
+    result = searchProjectsByProjectDesc_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -3213,36 +2873,44 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectDescWithPagination failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchProjectsByProjectDesc failed: unknown result");
 
-  def searchExperimentsByName(self, gatewayId, userName, expName):
+  def searchExperimentsByName(self, authzToken, gatewayId, userName, expName, limit, offset):
     """
-    Search Experiments by experiment name
+    Search Experiments by experiment name with pagination. Results will be sorted
+    based on creation time DESC
 
     @param gatewayId
           Identifier of the requested gateway
-    @param useNname
+    @param userName
           Username of the requested user
     @param expName
           Experiment name to be matched
-    @deprecated
-          Instead use searchExperimentsByNameWithPagination
-
+    @param limit
+          Amount of results to be fetched
+    @param offset
+          The starting point of the results to be fetched
 
     Parameters:
+     - authzToken
      - gatewayId
      - userName
      - expName
+     - limit
+     - offset
     """
-    self.send_searchExperimentsByName(gatewayId, userName, expName)
+    self.send_searchExperimentsByName(authzToken, gatewayId, userName, expName, limit, offset)
     return self.recv_searchExperimentsByName()
 
-  def send_searchExperimentsByName(self, gatewayId, userName, expName):
+  def send_searchExperimentsByName(self, authzToken, gatewayId, userName, expName, limit, offset):
     self._oprot.writeMessageBegin('searchExperimentsByName', TMessageType.CALL, self._seqid)
     args = searchExperimentsByName_args()
+    args.authzToken = authzToken
     args.gatewayId = gatewayId
     args.userName = userName
     args.expName = expName
+    args.limit = limit
+    args.offset = offset
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
@@ -3266,9 +2934,11 @@ class Client(Iface):
       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, "searchExperimentsByName failed: unknown result");
 
-  def searchExperimentsByNameWithPagination(self, authzToken, gatewayId, userName, expName, limit, offset):
+  def searchExperimentsByDesc(self, authzToken, gatewayId, userName, description, limit, offset):
     """
     Search Experiments by experiment name with pagination. Results will be sorted
     based on creation time DESC
@@ -3277,8 +2947,8 @@ class Client(Iface):
           Identifier of the requested gateway
     @param userName
           Username of the requested user
-    @param expName
-          Experiment name to be matched
+    @param description
+          Experiment description to be matched
     @param limit
           Amount of results to be fetched
     @param offset
@@ -3288,27 +2958,27 @@ class Client(Iface):
      - authzToken
      - gatewayId
      - userName
-     - expName
+     - description
      - limit
      - offset
     """
-    self.send_searchExperimentsByNameWithPagination(authzToken, gatewayId, userName, expName, limit, offset)
-    return self.recv_searchExperimentsByNameWithPagination()
+    self.send_searchExperimentsByDesc(authzToken, gatewayId, userName, description, limit, offset)
+    return self.recv_searchExperimentsByDesc()
 
-  def send_searchExperimentsByNameWithPagination(self, authzToken, gatewayId, userName, expName, limit, offset):
-    self._oprot.writeMessageBegin('searchExperimentsByNameWithPagination', TMessageType.CALL, self._seqid)
-    args = searchExperimentsByNameWithPagination_args()
+  def send_searchExperimentsByDesc(self, authzToken, gatewayId, userName, description, limit, offset):
+    self._oprot.writeMessageBegin('searchExperimentsByDesc', TMessageType.CALL, self._seqid)
+    args = searchExperimentsByDesc_args()
     args.authzToken = authzToken
     args.gatewayId = gatewayId
     args.userName = userName
-    args.expName = expName
+    args.description = description
     args.limit = limit
     args.offset = offset
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_searchExperimentsByNameWithPagination(self):
+  def recv_searchExperimentsByDesc(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -3316,7 +2986,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = searchExperimentsByNameWithPagination_result()
+    result = searchExperimentsByDesc_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -3329,40 +2999,49 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByNameWithPagination failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByDesc failed: unknown result");
 
-  def searchExperimentsByDesc(self, gatewayId, userName, description):
+  def searchExperimentsByApplication(self, authzToken, gatewayId, userName, applicationId, limit, offset):
     """
-    Search Experiments by experiment name
+    Search Experiments by application id with pagination. Results will be sorted
+    based on creation time DESC
 
     @param gatewayId
           Identifier of the requested gateway
     @param userName
           Username of the requested user
-    @param description
-          Experiment description to be matched
-    @deprecated
-          Instead use searchExperimentsByDescWithPagination
+    @param applicationId
+          Application id to be matched
+    @param limit
+          Amount of results to be fetched
+    @param offset
+          The starting point of the results to be fetched
 
     Parameters:
+     - authzToken
      - gatewayId
      - userName
-     - description
+     - applicationId
+     - limit
+     - offset
     """
-    self.send_searchExperimentsByDesc(gatewayId, userName, description)
-    return self.recv_searchExperimentsByDesc()
+    self.send_searchExperimentsByApplication(authzToken, gatewayId, userName, applicationId, limit, offset)
+    return self.recv_searchExperimentsByApplication()
 
-  def send_searchExperimentsByDesc(self, gatewayId, userName, description):
-    self._oprot.writeMessageBegin('searchExperimentsByDesc', TMessageType.CALL, self._seqid)
-    args = searchExperimentsByDesc_args()
+  def send_searchExperimentsByApplication(self, authzToken, gatewayId, userName, applicationId, limit, offset):
+    self._oprot.writeMessageBegin('searchExperimentsByApplication', TMessageType.CALL, self._seqid)
+    args = searchExperimentsByApplication_args()
+    args.authzToken = authzToken
     args.gatewayId = gatewayId
     args.userName = userName
-    args.description = description
+    args.applicationId = applicationId
+    args.limit = limit
+    args.offset = offset
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_searchExperimentsByDesc(self):
+  def recv_searchExperimentsByApplication(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -3370,7 +3049,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = searchExperimentsByDesc_result()
+    result = searchExperimentsByApplication_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -3381,19 +3060,21 @@ class Client(Iface):
       raise result.ace
     if result.ase is not None:
       raise result.ase
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByDesc failed: unknown result");
+    if result.ae is not None:
+      raise result.ae
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByApplication failed: unknown result");
 
-  def searchExperimentsByDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
+  def searchExperimentsByStatus(self, authzToken, gatewayId, userName, experimentState, limit, offset):
     """
-    Search Experiments by experiment name with pagination. Results will be sorted
+    Search Experiments by experiment status with pagination. Results will be sorted
     based on creation time DESC
 
     @param gatewayId
           Identifier of the requested gateway
     @param userName
           Username of the requested user
-    @param description
-          Experiment description to be matched
+    @param experimentState
+          Experiement state to be matched
     @param limit
           Amount of results to be fetched
     @param offset
@@ -3403,27 +3084,27 @@ class Client(Iface):
      - authzToken
      - gatewayId
      - userName
-     - description
+     - experimentState
      - limit
      - offset
     """
-    self.send_searchExperimentsByDescWithPagination(authzToken, gatewayId, userName, description, limit, offset)
-    return self.recv_searchExperimentsByDescWithPagination()
+    self.send_searchExperimentsByStatus(authzToken, gatewayId, userName, experimentState, limit, offset)
+    return self.recv_searchExperimentsByStatus()
 
-  def send_searchExperimentsByDescWithPagination(self, authzToken, gatewayId, userName, description, limit, offset):
-    self._oprot.writeMessageBegin('searchExperimentsByDescWithPagination', TMessageType.CALL, self._seqid)
-    args = searchExperimentsByDescWithPagination_args()
+  def send_searchExperimentsByStatus(self, authzToken, gatewayId, userName, experimentState, limit, offset):
+    self._oprot.writeMessageBegin('searchExperimentsByStatus', TMessageType.CALL, self._seqid)
+    args = searchExperimentsByStatus_args()
     args.authzToken = authzToken
     args.gatewayId = gatewayId
     args.userName = userName
-    args.description = description
+    args.experimentState = experimentState
     args.limit = limit
     args.offset = offset
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_searchExperimentsByDescWithPagination(self):
+  def recv_searchExperimentsByStatus(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -3431,7 +3112,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = searchExperimentsByDescWithPagination_result()
+    result = searchExperimentsByStatus_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -3444,40 +3125,53 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByDescWithPagination failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByStatus failed: unknown result");
 
-  def searchExperimentsByApplication(self, gatewayId, userName, applicationId):
+  def searchExperimentsByCreationTime(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
     """
-    Search Experiments by application id
+    Search Experiments by experiment creation time with pagination. Results will be sorted
+    based on creation time DESC
 
     @param gatewayId
           Identifier of the requested gateway
     @param userName
           Username of the requested user
-    @param applicationId
-          Application id to be matched
-    @deprecated
-          Instead use searchExperimentsByApplicationWithPagination
+    @param fromTime
+          Start time of the experiments creation time
+    @param toTime
+          End time of the  experiement creation time
+    @param limit
+          Amount of results to be fetched
+    @param offset
+          The starting point of the results to be fetched
 
     Parameters:
+     - authzToken
      - gatewayId
      - userName
-     - applicationId
+     - fromTime
+     - toTime
+     - limit
+     - offset
     """
-    self.send_searchExperimentsByApplication(gatewayId, userName, applicationId)
-    return self.recv_searchExperimentsByApplication()
+    self.send_searchExperimentsByCreationTime(authzToken, gatewayId, userName, fromTime, toTime, limit, offset)
+    return self.recv_searchExperimentsByCreationTime()
 
-  def send_searchExperimentsByApplication(self, gatewayId, userName, applicationId):
-    self._oprot.writeMessageBegin('searchExperimentsByApplication', TMessageType.CALL, self._seqid)
-    args = searchExperimentsByApplication_args()
+  def send_searchExperimentsByCreationTime(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
+    self._oprot.writeMessageBegin('searchExperimentsByCreationTime', TMessageType.CALL, self._seqid)
+    args = searchExperimentsByCreationTime_args()
+    args.authzToken = authzToken
     args.gatewayId = gatewayId
     args.userName = userName
-    args.applicationId = applicationId
+    args.fromTime = fromTime
+    args.toTime = toTime
+    args.limit = limit
+    args.offset = offset
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_searchExperimentsByApplication(self):
+  def recv_searchExperimentsByCreationTime(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -3485,7 +3179,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = searchExperimentsByApplication_result()
+    result = searchExperimentsByCreationTime_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -3496,19 +3190,21 @@ class Client(Iface):
       raise result.ace
     if result.ase is not None:
       raise result.ase
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByApplication failed: unknown result");
+    if result.ae is not None:
+      raise result.ae
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByCreationTime failed: unknown result");
 
-  def searchExperimentsByApplicationWithPagination(self, authzToken, gatewayId, userName, applicationId, limit, offset):
+  def searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
     """
-    Search Experiments by application id with pagination. Results will be sorted
+    Search Experiments by using multiple filter criteria with pagination. Results will be sorted
     based on creation time DESC
 
     @param gatewayId
           Identifier of the requested gateway
     @param userName
           Username of the requested user
-    @param applicationId
-          Application id to be matched
+    @param filters
+          map of multiple filter criteria.
     @param limit
           Amount of results to be fetched
     @param offset
@@ -3518,27 +3214,27 @@ class Client(Iface):
      - authzToken
      - gatewayId
      - userName
-     - applicationId
+     - filters
      - limit
      - offset
     """
-    self.send_searchExperimentsByApplicationWithPagination(authzToken, gatewayId, userName, applicationId, limit, offset)
-    return self.recv_searchExperimentsByApplicationWithPagination()
+    self.send_searchExperiments(authzToken, gatewayId, userName, filters, limit, offset)
+    return self.recv_searchExperiments()
 
-  def send_searchExperimentsByApplicationWithPagination(self, authzToken, gatewayId, userName, applicationId, limit, offset):
-    self._oprot.writeMessageBegin('searchExperimentsByApplicationWithPagination', TMessageType.CALL, self._seqid)
-    args = searchExperimentsByApplicationWithPagination_args()
+  def send_searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
+    self._oprot.writeMessageBegin('searchExperiments', TMessageType.CALL, self._seqid)
+    args = searchExperiments_args()
     args.authzToken = authzToken
     args.gatewayId = gatewayId
     args.userName = userName
-    args.applicationId = applicationId
+    args.filters = filters
     args.limit = limit
     args.offset = offset
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_searchExperimentsByApplicationWithPagination(self):
+  def recv_searchExperiments(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -3546,7 +3242,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = searchExperimentsByApplicationWithPagination_result()
+    result = searchExperiments_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -3559,40 +3255,40 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByApplicationWithPagination failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperiments failed: unknown result");
 
-  def searchExperimentsByStatus(self, gatewayId, userName, experimentState):
+  def getExperimentStatistics(self, authzToken, gatewayId, fromTime, toTime):
     """
-    Search Experiments by experiment status
-
+    Get Experiment Statisitics for the given gateway for a specific time period
     @param gatewayId
           Identifier of the requested gateway
-    @param userName
-          Username of the requested user
-    @param experimentState
-          Experiement state to be matched
-    @deprecated
-          Instead use searchExperimentsByStatusWithPagination
+    @param fromTime
+          Starting date time
+    @param toTime
+          Ending data time
+
 
     Parameters:
+     - authzToken
      - gatewayId
-     - userName
-     - experimentState
+     - fromTime
+     - toTime
     """
-    self.send_searchExperimentsByStatus(gatewayId, userName, experimentState)
-    return self.recv_searchExperimentsByStatus()
+    self.send_getExperimentStatistics(authzToken, gatewayId, fromTime, toTime)
+    return self.recv_getExperimentStatistics()
 
-  def send_searchExperimentsByStatus(self, gatewayId, userName, experimentState):
-    self._oprot.writeMessageBegin('searchExperimentsByStatus', TMessageType.CALL, self._seqid)
-    args = searchExperimentsByStatus_args()
+  def send_getExperimentStatistics(self, authzToken, gatewayId, fromTime, toTime):
+    self._oprot.writeMessageBegin('getExperimentStatistics', TMessageType.CALL, self._seqid)
+    args = getExperimentStatistics_args()
+    args.authzToken = authzToken
     args.gatewayId = gatewayId
-    args.userName = userName
-    args.experimentState = experimentState
+    args.fromTime = fromTime
+    args.toTime = toTime
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_searchExperimentsByStatus(self):
+  def recv_getExperimentStatistics(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -3600,7 +3296,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = searchExperimentsByStatus_result()
+    result = getExperimentStatistics_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -3611,19 +3307,17 @@ class Client(Iface):
       raise result.ace
     if result.ase is not None:
       raise result.ase
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByStatus failed: unknown result");
+    if result.ae is not None:
+      raise result.ae
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getExperimentStatistics failed: unknown result");
 
-  def searchExperimentsByStatusWithPagination(self, authzToken, gatewayId, userName, experimentState, limit, offset):
+  def getExperimentsInProject(self, authzToken, projectId, limit, offset):
     """
-    Search Experiments by experiment status with pagination. Results will be sorted
+    Get Experiments within project with pagination. Results will be sorted
     based on creation time DESC
 
-    @param gatewayId
-          Identifier of the requested gateway
-    @param userName
-          Username of the requested user
-    @param experimentState
-          Experiement state to be matched
+    @param projectId
+          Identifier of the project
     @param limit
           Amount of results to be fetched
     @param offset
@@ -3631,29 +3325,25 @@ class Client(Iface):
 
     Parameters:
      - authzToken
-     - gatewayId
-     - userName
-     - experimentState
+     - projectId
      - limit
      - offset
     """
-    self.send_searchExperimentsByStatusWithPagination(authzToken, gatewayId, userName, experimentState, limit, offset)
-    return self.recv_searchExperimentsByStatusWithPagination()
+    self.send_getExperimentsInProject(authzToken, projectId, limit, offset)
+    return self.recv_getExperimentsInProject()
 
-  def send_searchExperimentsByStatusWithPagination(self, authzToken, gatewayId, userName, experimentState, limit, offset):
-    self._oprot.writeMessageBegin('searchExperimentsByStatusWithPagination', TMessageType.CALL, self._seqid)
-    args = searchExperimentsByStatusWithPagination_args()
+  def send_getExperimentsInProject(self, authzToken, projectId, limit, offset):
+    self._oprot.writeMessageBegin('getExperimentsInProject', TMessageType.CALL, self._seqid)
+    args = getExperimentsInProject_args()
     args.authzToken = authzToken
-    args.gatewayId = gatewayId
-    args.userName = userName
-    args.experimentState = experimentState
+    args.projectId = projectId
     args.limit = limit
     args.offset = offset
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_searchExperimentsByStatusWithPagination(self):
+  def recv_getExperimentsInProject(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -3661,7 +3351,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = searchExperimentsByStatusWithPagination_result()
+    result = getExperimentsInProject_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -3672,79 +3362,21 @@ class Client(Iface):
       raise result.ace
     if result.ase is not None:
       raise result.ase
+    if result.pnfe is not None:
+      raise result.pnfe
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByStatusWithPagination failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getExperimentsInProject failed: unknown result");
 
-  def searchExperimentsByCreationTime(self, gatewayId, userName, fromTime, toTime):
+  def getUserExperiments(self, authzToken, gatewayId, userName, limit, offset):
     """
-    Search Experiments by experiment creation time
-
-    @param gatewayId
-          Identifier of the requested gateway
-    @param userName
-          Username of the requested user
-    @param fromTime
-          Start time of the experiments creation time
-    @param toTime
-          End time of the  experiement creation time
-    @deprecated
-          Instead use searchExperimentsByCreationTimeWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-     - fromTime
-     - toTime
-    """
-    self.send_searchExperimentsByCreationTime(gatewayId, userName, fromTime, toTime)
-    return self.recv_searchExperimentsByCreationTime()
-
-  def send_searchExperimentsByCreationTime(self, gatewayId, userName, fromTime, toTime):
-    self._oprot.writeMessageBegin('searchExperimentsByCreationTime', TMessageType.CALL, self._seqid)
-    args = searchExperimentsByCreationTime_args()
-    args.gatewayId = gatewayId
-    args.userName = userName
-    args.fromTime = fromTime
-    args.toTime = toTime
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_searchExperimentsByCreationTime(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = searchExperimentsByCreationTime_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
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByCreationTime failed: unknown result");
-
-  def searchExperimentsByCreationTimeWithPagination(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
-    """
-    Search Experiments by experiment creation time with pagination. Results will be sorted
+    Get experiments by user with pagination. Results will be sorted
     based on creation time DESC
 
     @param gatewayId
-          Identifier of the requested gateway
+          Identifier of the requesting gateway
     @param userName
           Username of the requested user
-    @param fromTime
-          Start time of the experiments creation time
-    @param toTime
-          End time of the  experiement creation time
     @param limit
           Amount of results to be fetched
     @param offset
@@ -3754,29 +3386,25 @@ class Client(Iface):
      - authzToken
      - gatewayId
      - userName
-     - fromTime
-     - toTime
      - limit
      - offset
     """
-    self.send_searchExperimentsByCreationTimeWithPagination(authzToken, gatewayId, userName, fromTime, toTime, limit, offset)
-    return self.recv_searchExperimentsByCreationTimeWithPagination()
+    self.send_getUserExperiments(authzToken, gatewayId, userName, limit, offset)
+    return self.recv_getUserExperiments()
 
-  def send_searchExperimentsByCreationTimeWithPagination(self, authzToken, gatewayId, userName, fromTime, toTime, limit, offset):
-    self._oprot.writeMessageBegin('searchExperimentsByCreationTimeWithPagination', TMessageType.CALL, self._seqid)
-    args = searchExperimentsByCreationTimeWithPagination_args()
+  def send_getUserExperiments(self, authzToken, gatewayId, userName, limit, offset):
+    self._oprot.writeMessageBegin('getUserExperiments', TMessageType.CALL, self._seqid)
+    args = getUserExperiments_args()
     args.authzToken = authzToken
     args.gatewayId = gatewayId
     args.userName = userName
-    args.fromTime = fromTime
-    args.toTime = toTime
     args.limit = limit
     args.offset = offset
     args.write(self._oprot)
     self._oprot.writeMessageEnd()
     self._oprot.trans.flush()
 
-  def recv_searchExperimentsByCreationTimeWithPagination(self):
+  def recv_getUserExperiments(self):
     iprot = self._iprot
     (fname, mtype, rseqid) = iprot.readMessageBegin()
     if mtype == TMessageType.EXCEPTION:
@@ -3784,7 +3412,7 @@ class Client(Iface):
       x.read(iprot)
       iprot.readMessageEnd()
       raise x
-    result = searchExperimentsByCreationTimeWithPagination_result()
+    result = getUserExperiments_result()
     result.read(iprot)
     iprot.readMessageEnd()
     if result.success is not None:
@@ -3797,334 +3425,7 @@ class Client(Iface):
       raise result.ase
     if result.ae is not None:
       raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "searchExperimentsByCreationTimeWithPagination failed: unknown result");
-
-  def searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
-    """
-    Search Experiments by using multiple filter criteria with pagination. Results will be sorted
-    based on creation time DESC
-
-    @param gatewayId
-          Identifier of the requested gateway
-    @param userName
-          Username of the requested user
-    @param filters
-          map of multiple filter criteria.
-    @param limit
-          Amount of results to be fetched
-    @param offset
-          The starting point of the results to be fetched
-
-    Parameters:
-     - authzToken
-     - gatewayId
-     - userName
-     - filters
-     - limit
-     - offset
-    """
-    self.send_searchExperiments(authzToken, gatewayId, userName, filters, limit, offset)
-    return self.recv_searchExperiments()
-
-  def send_searchExperiments(self, authzToken, gatewayId, userName, filters, limit, offset):
-    self._oprot.writeMessageBegin('searchExperiments', TMessageType.CALL, self._seqid)
-    args = searchExperiments_args()
-    args.authzToken = authzToken
-    args.gatewayId = gatewayId
-    args.userName = userName
-    args.filters = filters
-    args.limit = limit
-    args.offset = offset
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_searchExperiments(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = searchExperiments_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, "searchExperiments failed: unknown result");
-
-  def getExperimentStatistics(self, authzToken, gatewayId, fromTime, toTime):
-    """
-    Get Experiment Statisitics for the given gateway for a specific time period
-    @param gatewayId
-          Identifier of the requested gateway
-    @param fromTime
-          Starting date time
-    @param toTime
-          Ending data time
-
-
-    Parameters:
-     - authzToken
-     - gatewayId
-     - fromTime
-     - toTime
-    """
-    self.send_getExperimentStatistics(authzToken, gatewayId, fromTime, toTime)
-    return self.recv_getExperimentStatistics()
-
-  def send_getExperimentStatistics(self, authzToken, gatewayId, fromTime, toTime):
-    self._oprot.writeMessageBegin('getExperimentStatistics', TMessageType.CALL, self._seqid)
-    args = getExperimentStatistics_args()
-    args.authzToken = authzToken
-    args.gatewayId = gatewayId
-    args.fromTime = fromTime
-    args.toTime = toTime
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_getExperimentStatistics(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = getExperimentStatistics_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, "getExperimentStatistics failed: unknown result");
-
-  def getAllExperimentsInProject(self, projectId):
-    """
-    Get all Experiments within a Project
-
-    @param projectId
-          Identifier of the project
-    @deprecated
-          Instead use  getAllExperimentsInProjectWithPagination
-
-    Parameters:
-     - projectId
-    """
-    self.send_getAllExperimentsInProject(projectId)
-    return self.recv_getAllExperimentsInProject()
-
-  def send_getAllExperimentsInProject(self, projectId):
-    self._oprot.writeMessageBegin('getAllExperimentsInProject', TMessageType.CALL, self._seqid)
-    args = getAllExperimentsInProject_args()
-    args.projectId = projectId
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_getAllExperimentsInProject(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = getAllExperimentsInProject_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.pnfe is not None:
-      raise result.pnfe
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllExperimentsInProject failed: unknown result");
-
-  def getAllExperimentsInProjectWithPagination(self, authzToken, projectId, limit, offset):
-    """
-    Get all Experiments within project with pagination. Results will be sorted
-    based on creation time DESC
-
-    @param projectId
-          Identifier of the project
-    @param limit
-          Amount of results to be fetched
-    @param offset
-          The starting point of the results to be fetched
-
-    Parameters:
-     - authzToken
-     - projectId
-     - limit
-     - offset
-    """
-    self.send_getAllExperimentsInProjectWithPagination(authzToken, projectId, limit, offset)
-    return self.recv_getAllExperimentsInProjectWithPagination()
-
-  def send_getAllExperimentsInProjectWithPagination(self, authzToken, projectId, limit, offset):
-    self._oprot.writeMessageBegin('getAllExperimentsInProjectWithPagination', TMessageType.CALL, self._seqid)
-    args = getAllExperimentsInProjectWithPagination_args()
-    args.authzToken = authzToken
-    args.projectId = projectId
-    args.limit = limit
-    args.offset = offset
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_getAllExperimentsInProjectWithPagination(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = getAllExperimentsInProjectWithPagination_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.pnfe is not None:
-      raise result.pnfe
-    if result.ae is not None:
-      raise result.ae
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllExperimentsInProjectWithPagination failed: unknown result");
-
-  def getAllUserExperiments(self, gatewayId, userName):
-    """
-    Get all Experiments by user
-
-    @param gatewayId
-          Identifier of the requesting gateway
-    @param userName
-          Username of the requested user
-    @deprecated
-          Instead use getAllUserExperimentsWithPagination
-
-    Parameters:
-     - gatewayId
-     - userName
-    """
-    self.send_getAllUserExperiments(gatewayId, userName)
-    return self.recv_getAllUserExperiments()
-
-  def send_getAllUserExperiments(self, gatewayId, userName):
-    self._oprot.writeMessageBegin('getAllUserExperiments', TMessageType.CALL, self._seqid)
-    args = getAllUserExperiments_args()
-    args.gatewayId = gatewayId
-    args.userName = userName
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_getAllUserExperiments(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = getAllUserExperiments_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
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserExperiments failed: unknown result");
-
-  def getAllUserExperimentsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
-    """
-    Get all Experiments by user pagination. Results will be sorted
-    based on creation time DESC
-
-    @param gatewayId
-          Identifier of the requesting gateway
-    @param userName
-          Username of the requested user
-    @param limit
-          Amount of results to be fetched
-    @param offset
-          The starting point of the results to be fetched
-
-    Parameters:
-     - authzToken
-     - gatewayId
-     - userName
-     - limit
-     - offset
-    """
-    self.send_getAllUserExperimentsWithPagination(authzToken, gatewayId, userName, limit, offset)
-    return self.recv_getAllUserExperimentsWithPagination()
-
-  def send_getAllUserExperimentsWithPagination(self, authzToken, gatewayId, userName, limit, offset):
-    self._oprot.writeMessageBegin('getAllUserExperimentsWithPagination', TMessageType.CALL, self._seqid)
-    args = getAllUserExperimentsWithPagination_args()
-    args.authzToken = authzToken
-    args.gatewayId = gatewayId
-    args.userName = userName
-    args.limit = limit
-    args.offset = offset
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_getAllUserExperimentsWithPagination(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = getAllUserExperimentsWithPagination_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, "getAllUserExperimentsWithPagination failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserExperiments failed: unknown result");
 
   def createExperiment(self, authzToken, gatewayId, experiment):
     """
@@ -8816,28 +8117,18 @@ class Processor(Iface, TProcessor):
     self._processMap["updateProject"] = Processor.process_updateProject
     self._processMap["getProject"] = Processor.process_getProject
     self._processMap["deleteProject"] = Processor.process_deleteProject
-    self._processMap["getAllUserProjects"] = Processor.process_getAllUserProjects
-    self._processMap["getAllUserProjectsWithPagination"] = Processor.process_getAllUserProjectsWithPagination
+    self._processMap["getUserProjects"] = Processor.process_getUserProjects
     self._processMap["searchProjectsByProjectName"] = Processor.process_searchProjectsByProjectName
-    self._processMap["searchProjectsByProjectNameWithPagination"] = Processor.process_searchProjectsByProjectNameWithPagination
     self._processMap["searchProjectsByProjectDesc"] = Processor.process_searchProjectsByProjectDesc
-    self._processMap["searchProjectsByProjectDescWithPagination"] = Processor.process_searchProjectsByProjectDescWithPagination
     self._processMap["searchExperimentsByName"] = Processor.process_searchExperimentsByName
-    self._processMap["searchExperimentsByNameWithPagination"] = Processor.process_searchExperimentsByNameWithPagination
     self._processMap["searchExperimentsByDesc"] = Processor.process_searchExperimentsByDesc
-    self._processMap["searchExperimentsByDescWithPagination"] = Processor.process_searchExperimentsByDescWithPagination
     self._processMap["searchExperimentsByApplication"] = Processor.process_searchExperimentsByApplication
-    self._processMap["searchExperimentsByApplicationWithPagination"] = Processor.process_searchExperimentsByApplicationWithPagination
     self._processMap["searchExperimentsByStatus"] = Processor.process_searchExperimentsByStatus
-    self._processMap["searchExperimentsByStatusWithPagination"] = Processor.process_searchExperimentsByStatusWithPagination
     self._processMap["searchExperimentsByCreationTime"] = Processor.process_searchExperimentsByCreationTime
-    self._processMap["searchExperimentsByCreationTimeWithPagination"] = Processor.process_searchExperimentsByCreationTimeWithPagination
     self._processMap["searchExperiments"] = Processor.process_searchExperiments
     self._processMap["getExperimentStatistics"] = Processor.process_getExperimentStatistics
-    self._processMap["getAllExperimentsInProject"] = Processor.process_getAllExperimentsInProject
-    self._processMap["getAllExperimentsInProjectWithPagination"] = Processor.process_getAllExperimentsInProjectWithPagination
-    self._processMap["getAllUserExperiments"] = Processor.process_getAllUserExperiments
-    self._processMap["getAllUserExperimentsWithPagination"] = Processor.process_getAllUserExperimentsWithPagination
+    self._processMap["getExperimentsInProject"] = Processor.process_getExperimentsInProject
+    self._processMap["getUserExperiments"] = Processor.process_getUserExperiments
     self._processMap["createExperiment"] = Processor.process_createExperiment
     self._processMap["getExperiment"] = Processor.process_getExperiment
     self._processMap["updateExperiment"] = Processor.process_updateExperiment
@@ -9225,31 +8516,13 @@ class Processor(Iface, TProcessor):
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_getAllUserProjects(self, seqid, iprot, oprot):
-    args = getAllUserProjects_args()
+  def process_getUserProjects(self, seqid, iprot, oprot):
+    args = getUserProjects_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = getAllUserProjects_result()
+    result = getUserProjects_result()
     try:
-      result.success = self._handler.getAllUserProjects(args.gatewayId, args.userName)
-    except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException, ace:
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
-      result.ase = ase
-    oprot.writeMessageBegin("getAllUserProjects", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
-  def process_getAllUserProjectsWithPagination(self, seqid, iprot, oprot):
-    args = getAllUserProjectsWithPagination_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = getAllUserProjectsWithPagination_result()
-    try:
-      result.success = self._handler.getAllUserProjectsWithPagination(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset)
+      result.success = self._handler.getUserProjects(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9258,7 +8531,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("getAllUserProjectsWithPagination", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("getUserProjects", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -9269,25 +8542,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = searchProjectsByProjectName_result()
     try:
-      result.success = self._handler.searchProjectsByProjectName(args.gatewayId, args.userName, args.projectName)
-    except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException, ace:
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
-      result.ase = ase
-    oprot.writeMessageBegin("searchProjectsByProjectName", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
-  def process_searchProjectsByProjectNameWithPagination(self, seqid, iprot, oprot):
-    args = searchProjectsByProjectNameWithPagination_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = searchProjectsByProjectNameWithPagination_result()
-    try:
-      result.success = self._handler.searchProjectsByProjectNameWithPagination(args.authzToken, args.gatewayId, args.userName, args.projectName, args.limit, args.offset)
+      result.success = self._handler.searchProjectsByProjectName(args.authzToken, args.gatewayId, args.userName, args.projectName, args.limit, args.offset)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9296,7 +8551,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("searchProjectsByProjectNameWithPagination", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("searchProjectsByProjectName", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -9307,25 +8562,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = searchProjectsByProjectDesc_result()
     try:
-      result.success = self._handler.searchProjectsByProjectDesc(args.gatewayId, args.userName, args.description)
-    except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException, ace:
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
-      result.ase = ase
-    oprot.writeMessageBegin("searchProjectsByProjectDesc", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
-  def process_searchProjectsByProjectDescWithPagination(self, seqid, iprot, oprot):
-    args = searchProjectsByProjectDescWithPagination_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = searchProjectsByProjectDescWithPagination_result()
-    try:
-      result.success = self._handler.searchProjectsByProjectDescWithPagination(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset)
+      result.success = self._handler.searchProjectsByProjectDesc(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9334,7 +8571,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("searchProjectsByProjectDescWithPagination", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("searchProjectsByProjectDesc", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -9345,25 +8582,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = searchExperimentsByName_result()
     try:
-      result.success = self._handler.searchExperimentsByName(args.gatewayId, args.userName, args.expName)
-    except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException, ace:
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
-      result.ase = ase
-    oprot.writeMessageBegin("searchExperimentsByName", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
-  def process_searchExperimentsByNameWithPagination(self, seqid, iprot, oprot):
-    args = searchExperimentsByNameWithPagination_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = searchExperimentsByNameWithPagination_result()
-    try:
-      result.success = self._handler.searchExperimentsByNameWithPagination(args.authzToken, args.gatewayId, args.userName, args.expName, args.limit, args.offset)
+      result.success = self._handler.searchExperimentsByName(args.authzToken, args.gatewayId, args.userName, args.expName, args.limit, args.offset)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9372,7 +8591,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("searchExperimentsByNameWithPagination", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("searchExperimentsByName", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -9383,25 +8602,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = searchExperimentsByDesc_result()
     try:
-      result.success = self._handler.searchExperimentsByDesc(args.gatewayId, args.userName, args.description)
-    except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException, ace:
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
-      result.ase = ase
-    oprot.writeMessageBegin("searchExperimentsByDesc", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
-  def process_searchExperimentsByDescWithPagination(self, seqid, iprot, oprot):
-    args = searchExperimentsByDescWithPagination_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = searchExperimentsByDescWithPagination_result()
-    try:
-      result.success = self._handler.searchExperimentsByDescWithPagination(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset)
+      result.success = self._handler.searchExperimentsByDesc(args.authzToken, args.gatewayId, args.userName, args.description, args.limit, args.offset)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9410,7 +8611,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("searchExperimentsByDescWithPagination", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("searchExperimentsByDesc", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -9421,25 +8622,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = searchExperimentsByApplication_result()
     try:
-      result.success = self._handler.searchExperimentsByApplication(args.gatewayId, args.userName, args.applicationId)
-    except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException, ace:
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
-      result.ase = ase
-    oprot.writeMessageBegin("searchExperimentsByApplication", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
-  def process_searchExperimentsByApplicationWithPagination(self, seqid, iprot, oprot):
-    args = searchExperimentsByApplicationWithPagination_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = searchExperimentsByApplicationWithPagination_result()
-    try:
-      result.success = self._handler.searchExperimentsByApplicationWithPagination(args.authzToken, args.gatewayId, args.userName, args.applicationId, args.limit, args.offset)
+      result.success = self._handler.searchExperimentsByApplication(args.authzToken, args.gatewayId, args.userName, args.applicationId, args.limit, args.offset)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9448,7 +8631,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("searchExperimentsByApplicationWithPagination", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("searchExperimentsByApplication", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -9459,25 +8642,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = searchExperimentsByStatus_result()
     try:
-      result.success = self._handler.searchExperimentsByStatus(args.gatewayId, args.userName, args.experimentState)
-    except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException, ace:
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
-      result.ase = ase
-    oprot.writeMessageBegin("searchExperimentsByStatus", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
-  def process_searchExperimentsByStatusWithPagination(self, seqid, iprot, oprot):
-    args = searchExperimentsByStatusWithPagination_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = searchExperimentsByStatusWithPagination_result()
-    try:
-      result.success = self._handler.searchExperimentsByStatusWithPagination(args.authzToken, args.gatewayId, args.userName, args.experimentState, args.limit, args.offset)
+      result.success = self._handler.searchExperimentsByStatus(args.authzToken, args.gatewayId, args.userName, args.experimentState, args.limit, args.offset)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9486,7 +8651,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("searchExperimentsByStatusWithPagination", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("searchExperimentsByStatus", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -9497,25 +8662,7 @@ class Processor(Iface, TProcessor):
     iprot.readMessageEnd()
     result = searchExperimentsByCreationTime_result()
     try:
-      result.success = self._handler.searchExperimentsByCreationTime(args.gatewayId, args.userName, args.fromTime, args.toTime)
-    except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException, ace:
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
-      result.ase = ase
-    oprot.writeMessageBegin("searchExperimentsByCreationTime", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
-  def process_searchExperimentsByCreationTimeWithPagination(self, seqid, iprot, oprot):
-    args = searchExperimentsByCreationTimeWithPagination_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = searchExperimentsByCreationTimeWithPagination_result()
-    try:
-      result.success = self._handler.searchExperimentsByCreationTimeWithPagination(args.authzToken, args.gatewayId, args.userName, args.fromTime, args.toTime, args.limit, args.offset)
+      result.success = self._handler.searchExperimentsByCreationTime(args.authzToken, args.gatewayId, args.userName, args.fromTime, args.toTime, args.limit, args.offset)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9524,7 +8671,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("searchExperimentsByCreationTimeWithPagination", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("searchExperimentsByCreationTime", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -9569,33 +8716,13 @@ class Processor(Iface, TProcessor):
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_getAllExperimentsInProject(self, seqid, iprot, oprot):
-    args = getAllExperimentsInProject_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = getAllExperimentsInProject_result()
-    try:
-      result.success = self._handler.getAllExperimentsInProject(args.projectId)
-    except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException, ace:
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
-      result.ase = ase
-    except apache.airavata.api.error.ttypes.ProjectNotFoundException, pnfe:
-      result.pnfe = pnfe
-    oprot.writeMessageBegin("getAllExperimentsInProject", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
-  def process_getAllExperimentsInProjectWithPagination(self, seqid, iprot, oprot):
-    args = getAllExperimentsInProjectWithPagination_args()
+  def process_getExperimentsInProject(self, seqid, iprot, oprot):
+    args = getExperimentsInProject_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = getAllExperimentsInProjectWithPagination_result()
+    result = getExperimentsInProject_result()
     try:
-      result.success = self._handler.getAllExperimentsInProjectWithPagination(args.authzToken, args.projectId, args.limit, args.offset)
+      result.success = self._handler.getExperimentsInProject(args.authzToken, args.projectId, args.limit, args.offset)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9606,36 +8733,18 @@ class Processor(Iface, TProcessor):
       result.pnfe = pnfe
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("getAllExperimentsInProjectWithPagination", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
-
-  def process_getAllUserExperiments(self, seqid, iprot, oprot):
-    args = getAllUserExperiments_args()
-    args.read(iprot)
-    iprot.readMessageEnd()
-    result = getAllUserExperiments_result()
-    try:
-      result.success = self._handler.getAllUserExperiments(args.gatewayId, args.userName)
-    except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
-      result.ire = ire
-    except apache.airavata.api.error.ttypes.AiravataClientException, ace:
-      result.ace = ace
-    except apache.airavata.api.error.ttypes.AiravataSystemException, ase:
-      result.ase = ase
-    oprot.writeMessageBegin("getAllUserExperiments", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("getExperimentsInProject", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
 
-  def process_getAllUserExperimentsWithPagination(self, seqid, iprot, oprot):
-    args = getAllUserExperimentsWithPagination_args()
+  def process_getUserExperiments(self, seqid, iprot, oprot):
+    args = getUserExperiments_args()
     args.read(iprot)
     iprot.readMessageEnd()
-    result = getAllUserExperimentsWithPagination_result()
+    result = getUserExperiments_result()
     try:
-      result.success = self._handler.getAllUserExperimentsWithPagination(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset)
+      result.success = self._handler.getUserExperiments(args.authzToken, args.gatewayId, args.userName, args.limit, args.offset)
     except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
       result.ire = ire
     except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -9644,7 +8753,7 @@ class Processor(Iface, TProcessor):
       result.ase = ase
     except apache.airavata.api.error.ttypes.AuthorizationException, ae:
       result.ae = ae
-    oprot.writeMessageBegin("getAllUserExperimentsWithPagination", TMessageType.REPLY, seqid)
+    oprot.writeMessageBegin("getUserExperiments", TMessageType.REPLY, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -14235,2404 +13344,12 @@ class deleteProject_result:
           iprot.skip(ftype)
       elif fid == 4:
         if ftype == TType.STRUCT:
-          self.pnfe = apache.airavata.api.error.ttypes.ProjectNotFoundException()
-          self.pnfe.read(iprot)
-        else:
-          iprot.skip(ftype)
-      elif fid == 5:
-        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('deleteProject_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.pnfe is not None:
-      oprot.writeFieldBegin('pnfe', TType.STRUCT, 4)
-      self.pnfe.write(oprot)
-      oprot.writeFieldEnd()
-    if self.ae is not None:
-      oprot.writeFieldBegin('ae', TType.STRUCT, 5)
-      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.pnfe)
-    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 getAllUserProjects_args:
-  """
-  Attributes:
-   - gatewayId
-   - userName
-  """
-
-  thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'gatewayId', None, None, ), # 1
-    (2, TType.STRING, 'userName', None, None, ), # 2
-  )
-
-  def __init__(self, gatewayId=None, userName=None,):
-    self.gatewayId = gatewayId
-    self.userName = userName
-
-  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.STRING:
-          self.gatewayId = iprot.readString();
-        else:
-          iprot.skip(ftype)
-      elif fid == 2:
-        if ftype == TType.STRING:
-          self.userName = 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('getAllUserProjects_args')
-    if self.gatewayId is not None:
-      oprot.writeFieldBegin('gatewayId', TType.STRING, 1)
-      oprot.writeString(self.gatewayId)
-      oprot.writeFieldEnd()
-    if self.userName is not None:
-      oprot.writeFieldBegin('userName', TType.STRING, 2)
-      oprot.writeString(self.userName)
-      oprot.writeFieldEnd()
-    oprot.writeFieldStop()
-    oprot.writeStructEnd()
-
-  def validate(self):
-    if self.gatewayId is None:
-      raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
-    if self.userName is None:
-      raise TProtocol.TProtocolException(message='Required field userName is unset!')
-    return
-
-
-  def __hash__(self):
-    value = 17
-    value = (value * 31) ^ hash(self.gatewayId)
-    value = (value * 31) ^ hash(self.userName)
-    return value
-
-  def __repr__(self):
-    L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
-    return '%s(%s)

<TRUNCATED>

Mime
View raw message