Merge branch 'master' into master

Author: chkp-yuvalfe

cpapi/mgmt_api.py

@@ -376,7 +376,7 @@ def gen_api_query(self, command, details_level="standard", container_keys=None,
         :param payload: a JSON object (or a string representing a JSON object) with the command arguments
         :yields: an APIResponse object as detailed above
         """
-        limit = 50  # each time get no more than 50 objects
+
         finished = False  # will become true after getting all the data
         all_objects = {}  # accumulate all the objects from all the API calls
 
@@ -395,8 +395,11 @@ def gen_api_query(self, command, details_level="standard", container_keys=None,
         for key in container_keys:
             all_objects[key] = []
         iterations = 0  # number of times we've made an API call
+        limit = 50 # page size to get for each api call
         if payload is None:
             payload = {}
+        else:
+            limit = int(payload.get("limit", limit))
 
         payload.update({"limit": limit, "offset": iterations * limit, "details-level": details_level})
         api_res = self.api_call(command, payload)
@@ -543,6 +546,10 @@ def check_fingerprint(self):
         local_fingerprint = self.read_fingerprint_from_file(self.server)
         server_fingerprint = self.get_server_fingerprint()
 
+        #Check if fingerprint is passed and matches
+        if self.fingerprint == server_fingerprint:
+            return True
+
         # If the fingerprint is not stored in the local file
         if local_fingerprint == "" or \
                 local_fingerprint.replace(':', '').upper() != server_fingerprint.replace(':', '').upper():