fixed read_scan_status.py

Author: snps-kumykov

blackduck/HubRestApi.py

@@ -111,7 +111,7 @@ class HubInstance(object):
     from .Versions import ( add_version_as_component, remove_version_as_component )
     from .Scans import (
         delete_codelocation, delete_unmapped_codelocations, download_project_scans, 
-        get_codelocation_scan_summaries, get_codelocations, get_scan_locations, upload_scan
+        get_codelocation_scan_summaries, get_codelocations, get_codelocations_internal, get_scan_locations, upload_scan
     )
     from .Components import (
         _get_components_url, find_component_info_for_protex_component, get_component_by_id, 

blackduck/Scans.py

@@ -63,6 +63,19 @@ def get_codelocations(self, limit=100, unmapped=False, parameters={}):
         jsondata['totalCount'] = len(jsondata['items'])
     return jsondata
 
+def get_codelocations_internal(self, limit=100, unmapped=False, parameters={}):
+    parameters['limit'] = limit
+    paramstring = self._get_parameter_string(parameters)
+    headers = self.get_headers()
+    url = self.get_apibase() + "/codelocations" + paramstring
+    headers['Accept'] = 'application/vnd.blackducksoftware.internal-1+json'
+    response = requests.get(url, headers=headers, verify = not self.config['insecure'])
+    jsondata = response.json()
+    if unmapped:
+        jsondata['items'] = [s for s in jsondata['items'] if 'mappedProjectVersion' not in s]
+        jsondata['totalCount'] = len(jsondata['items'])
+    return jsondata
+
 def get_codelocation_scan_summaries(self, code_location_id = None, code_location_obj = None, limit=100):
     '''Retrieve the scans (aka scan summaries) for the given location. You can give either
     code_location_id or code_location_obj. If both are supplied, precedence is to use code_location_obj

examples/read_scan_status.py

@@ -13,13 +13,13 @@
 
 batch_size=500
 
-codelocations = hub.get_codelocations(limit=1, offset=1)
+codelocations = hub.get_codelocations(limit=1)
 total_count = codelocations['totalCount']
 
 status = {"in_progress": 0, "unstarted": 0, "completed": 0, "error": 0, "skipped": 0}
 
 for i in status.keys():
-    codelocations = hub.get_codelocations_internal(limit=1, offset=0, parameters={"filter": "codeLocationStatus:{}".format(i)})
+    codelocations = hub.get_codelocations_internal(limit=1, parameters={"filter": "codeLocationStatus:{}".format(i)})
     status[i] = codelocations['totalCount']
 
 print (total_count, status)