updated to use the Organization wide BSSID endpoint

Author: wifijanitor

bssid.py

@@ -8,13 +8,13 @@
 A Python 3 script to pull of the enabled BSSID from an Organization.
 
 Required Python modules:
-    meraki
+    meraki 1.48.0 or higher
 
 Usage:
 bssid.py
 
-If you have only one Organization, it will find all BSSID in each Network
-and create a csv for each in Documents/BSSID/Organization
+If you have only one Organization, it will find all BSSID
+and create a csv for each network in Documents/BSSID/Organization
 
 If you have multiple Organizations, it will ask you which org to run against
 
@@ -30,11 +30,17 @@
 
 
 def base_folder():
+    '''
+    Check if the root folder exists and create it if not
+    '''
     if not Path.is_dir(loc):
         Path.mkdir(loc)
 
 
 def get_orgs():
+    '''
+    get a list of organizations the user has access to and return that dict
+    '''
     orgs = dashboard.organizations.getOrganizations()
     org_dict = {}
     for i in orgs:
@@ -43,10 +49,17 @@ def get_orgs():
 
 
 def find_org(org_dict):
+    '''
+    If only one organizaiton exists, use that org_id
+    '''
     if len(org_dict) == 1:
         org_id = org_dict[0]['id']
         org_name = org_dict[0]['name']
     else:
+        '''
+        If there are multiple organizations, ask the use which one to use
+        then store that information to be used
+        '''
         org_id = input(
             f"Please type the number of the Organization you want to find "
             f"the bssid in{json.dumps(org_dict, indent=4)}" "\n")
@@ -55,6 +68,9 @@ def find_org(org_dict):
 
 
 def org_folder(org_name):
+    '''
+    check if the organizaiton folder exists, create if not
+    '''
     loc2 = Path.joinpath(loc, org_name)
     if not Path.is_dir(loc2):
         Path.mkdir(loc2)
@@ -63,6 +79,7 @@ def org_folder(org_name):
 def get_networks(org_id):
     net_list = dashboard.organizations.getOrganizationNetworks(
         org_id, total_pages='all')
+    print(net_list)
     return net_list
 
 
@@ -71,60 +88,35 @@ def find_networks(net_list):
     for i in net_list:
         if 'wireless' in i['productTypes']:
             net_ids[i['id']] = i['name']
-            net_name = i['name']
-    return net_ids, net_name
+    return net_ids
 
 
-def find_ap(net_ids):
-    ap_dict = {}
-    for k, v in net_ids.items():
-        name = v
-        lst = []
-        devices = dashboard.networks.getNetworkDevices(k)
-        for i in devices:
-            model = i['model'][:2]
-            if model == 'MR' or model == 'CW':
-                dic = {}
-                if i.get('name') is None:
-                    dic.update(name=i['mac'], serial=i['serial'])
-                else:
-                    dic.update(name=i['name'], serial=i['serial'])
-                lst.append(dic)
-        ap_dict[name] = lst
-    return ap_dict
-
-
-def get_bssid(ap_dict, net_ids):
-    bssid_dict = {}
-    for k, v in net_ids.items():
-        name = v
-        lst = []
-        for data in ap_dict[name]:
-            ap = data['serial']
-            response = dashboard.wireless.getDeviceWirelessStatus(ap)
-            for value in response['basicServiceSets']:
-                info_dict = {}
-                good = value['enabled']
-                if good is True:
-                    info_dict['name'] = data['name']
-                    info_dict['ssidName'] = value['ssidName']
-                    info_dict['band'] = value['band']
-                    info_dict['bssid'] = value['bssid']
-                    lst.append(info_dict)
-        bssid_dict[name] = lst
+def get_bssid(org_id, net_ids):
+    '''
+    dump the BSSID list for the organization
+    '''
+    bssid_dict = dashboard.wireless.getOrganizationWirelessSsidsStatusesByDevice\
+         (org_id, total_pages='all')
     return bssid_dict
 
 
 def file_writer(bssid_dict, net_ids, org_name):
+    print(f'writing BSSID to file')
     for k, v in net_ids.items():
-        network = v
-        file = f'{loc}/{org_name}/{network}.csv'
+        net_name = v
+        file = f'{loc}/{org_name}/{net_name}.csv'
         with open(file, mode='w') as f:
-            f.write(f"AP Name , SSID Name , Frequency , BSSID" + "\n")
-            for data in bssid_dict[network]:
-                f.write(f"{data['name']}, {data['ssidName']}, "
-                    f"{data['band']}, {data['bssid']}" + "\n")
-    print(f'Your file {network}.csv has been created in {loc} / {org_name}')
+            f.write(f"AP Name , SSID Name , Frequency , BSSID, AP Serial" + "\n")
+            for ap in bssid_dict['items']:
+                network = ap['network']['name']
+                if net_name == network:
+                    for bss in ap['basicServiceSets']:
+                        f.write(f"{ap['name']}, "
+                            f"{bss['ssid']['name']}, "
+                            f"{bss['radio']['band']} GHz, "
+                            f"{bss['bssid']}, "
+                            f"{ap['serial']}" + "\n")
+        print(f'Your file {net_name}.csv has been created in {loc}/{org_name}')
 
 
 def main():
@@ -133,10 +125,8 @@ def main():
     org_id, org_name = find_org(org_dict)
     org_folder(org_name)
     net_list = get_networks(org_id)
-    net_ids, net_name = find_networks(net_list)
-    ap_dict = find_ap(net_ids)
-    bssid_dict = get_bssid(ap_dict, net_ids)
-    print(f'writing BSSID to file')
+    net_ids = find_networks(net_list)
+    bssid_dict = get_bssid(org_id, net_ids)
     file_writer(bssid_dict, net_ids, org_name)