From bf512ada0b6335e3dae1dc231b5f45fef21570c9 Mon Sep 17 00:00:00 2001 From: Wouter de Bruijn Date: Fri, 12 Sep 2025 16:45:03 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20Codebase=20formatting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/tools.py | 6 ++++-- netbox_zabbix_sync.py | 16 ++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/modules/tools.py b/modules/tools.py index 023cef8..db6a1a6 100644 --- a/modules/tools.py +++ b/modules/tools.py @@ -57,7 +57,9 @@ def cf_to_string(cf, key="name", logger=None): if isinstance(cf, dict): if key in cf: return cf[key] - logger.error("Conversion of custom field failed, '%s' not found in cf dict.", key) + logger.error( + "Conversion of custom field failed, '%s' not found in cf dict.", key + ) return None return cf @@ -172,7 +174,7 @@ def verify_hg_format( if ( hg_object not in allowed_objects[hg_type] and hg_object not in allowed_objects["cfs"][hg_type] - and not hg_object.startswith(('"',"'")) + and not hg_object.startswith(('"', "'")) ): e = ( f"Hostgroup item {hg_object} is not valid. Make sure you" diff --git a/netbox_zabbix_sync.py b/netbox_zabbix_sync.py index 4ee2ba0..8791e47 100755 --- a/netbox_zabbix_sync.py +++ b/netbox_zabbix_sync.py @@ -12,6 +12,7 @@ from pynetbox import api from pynetbox.core.query import RequestError as NBRequestError from requests.exceptions import ConnectionError as RequestsConnectionError from zabbix_utils import APIRequestError, ProcessingError, ZabbixAPI + from modules.config import load_config from modules.device import PhysicalDevice from modules.exceptions import EnvironmentVarError, SyncError @@ -82,8 +83,9 @@ def main(arguments): device_cfs = [] vm_cfs = [] device_cfs = list( - netbox.extras.custom_fields.filter(type=["text","object","select"], - content_types="dcim.device") + netbox.extras.custom_fields.filter( + type=["text", "object", "select"], content_types="dcim.device" + ) ) verify_hg_format( config["hostgroup_format"], device_cfs=device_cfs, hg_type="dev", logger=logger @@ -91,8 +93,8 @@ def main(arguments): if config["sync_vms"]: vm_cfs = list( netbox.extras.custom_fields.filter( - type=["text","object","select"], - content_types="virtualization.virtualmachine" + type=["text", "object", "select"], + content_types="virtualization.virtualmachine", ) ) verify_hg_format( @@ -170,7 +172,7 @@ def main(arguments): continue if config["extended_site_properties"] and nb_vm.site: logger.debug("VM %s: extending site information.", vm.name) - vm.site=(convert_recordset(netbox.dcim.sites.filter(id=nb_vm.site.id))) + vm.site = convert_recordset(netbox.dcim.sites.filter(id=nb_vm.site.id)) vm.set_inventory(nb_vm) vm.set_usermacros() vm.set_tags() @@ -245,7 +247,9 @@ def main(arguments): continue if config["extended_site_properties"] and nb_device.site: logger.debug("Device %s: extending site information.", device.name) - device.site=(convert_recordset(netbox.dcim.sites.filter(id=nb_device.site.id))) + device.site = convert_recordset( + netbox.dcim.sites.filter(id=nb_device.site.id) + ) device.set_inventory(nb_device) device.set_usermacros() device.set_tags()