From bf137a9755211a145651596d29f7700e4e902f9d Mon Sep 17 00:00:00 2001 From: Jokob-sk Date: Wed, 22 Nov 2023 08:07:31 +1100 Subject: [PATCH] =?UTF-8?q?fix=20UNFIMP=20#508=F0=9F=A9=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/plugins/unifi_import/script.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/front/plugins/unifi_import/script.py b/front/plugins/unifi_import/script.py index a3f10c14..b5d5ff0a 100755 --- a/front/plugins/unifi_import/script.py +++ b/front/plugins/unifi_import/script.py @@ -32,6 +32,9 @@ LOCK_FILE = os.path.join(CUR_PATH, 'full_run.lock') requests.packages.urllib3.disable_warnings(InsecureRequestWarning) + +pluginName = 'UNFIMP' + # Workflow def main(): @@ -131,9 +134,15 @@ def get_entries(plugin_objects: Plugin_Objects) -> Plugin_Objects: name = set_name(name, hostName) + ipTmp = get_unifi_val(ap, 'ip') + + # if IP not found use a default value + if ipTmp == "null": + ipTmp = '0.0.0.0' + plugin_objects.add_object( primaryId=ap['mac'], - secondaryId=get_unifi_val(ap, 'ip'), + secondaryId=ipTmp, watched1=name, watched2='Ubiquiti Networks Inc.', watched3=deviceType, @@ -175,6 +184,10 @@ def get_entries(plugin_objects: Plugin_Objects) -> Plugin_Objects: if ipTmp == 'null': ipTmp = get_unifi_val(user, 'fixed_ip') + # if IP not found use a default value + if ipTmp == "null": + ipTmp = '0.0.0.0' + plugin_objects.add_object( primaryId=user['mac'], secondaryId=ipTmp, @@ -206,6 +219,7 @@ def get_unifi_val(obj, key): if res not in ['','None', None]: return res + mylog('debug', [f'[{pluginName}] Value not found for key "{key}" in obj "{json.dumps(obj)}"']) return 'null'