FQDN incorrect check #1081, vendor work #1080

front/plugins/unifi_import/script.py

@@ -52,7 +52,7 @@ def main():
 
     
     # init global variables
-    global UNIFI_USERNAME, UNIFI_PASSWORD, UNIFI_HOST, UNIFI_SITES, PORT, VERIFYSSL, VERSION, FULL_IMPORT
+    global UNIFI_USERNAME, UNIFI_PASSWORD, UNIFI_HOST, UNIFI_SITES, PORT, VERIFYSSL, VERSION, FULL_IMPORT, API_KEY
 
     # parse output
     plugin_objects = Plugin_Objects(RESULT_FILE)    
@@ -65,6 +65,10 @@ def main():
     VERIFYSSL       = get_setting_value("UNFIMP_verifyssl")
     VERSION         = get_setting_value("UNFIMP_version")
     FULL_IMPORT     = get_setting_value("UNFIMP_fullimport")
+    API_KEY         = get_setting_value("UNFIMP_api_key")
+
+    if API_KEY == '':
+        API_KEY = None
 
     plugin_objects = get_entries(plugin_objects)
 
@@ -96,7 +100,28 @@ def get_entries(plugin_objects: Plugin_Objects) -> Plugin_Objects:
     
         mylog('verbose', [f'[{pluginName}] site: {site}'])
 
-        c = Controller(UNIFI_HOST, UNIFI_USERNAME, UNIFI_PASSWORD, port=PORT, version=VERSION, ssl_verify=VERIFYSSL, site_id=site)
+
+        # def __init__(  
+        #         self,
+        #         host,
+        #         username=None,
+        #         password=None,
+        #         port=8443,
+        #         version="v5",
+        #         site_id="default",
+        #         ssl_verify=True,
+        #         api_key=None
+        # ):
+
+        c = Controller(
+            UNIFI_HOST, 
+            UNIFI_USERNAME, 
+            UNIFI_PASSWORD, 
+            port=PORT, 
+            version=VERSION, 
+            ssl_verify=VERIFYSSL, 
+            site_id=site,
+            api_key=API_KEY)
         
         online_macs = set()
         processed_macs = []