NeoAnd/netbox-zabbix-sync
1
0
Fork 0
mirror of https://github.com/TheNetworkGuy/netbox-zabbix-sync.git synced 2025-12-12 03:19:38 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

corrected linting errors and a minor bug in cf_to_string

Browse Source
This commit is contained in:
Raymond Kuiper 2025-09-12 14:39:11 +02:00
parent bc12064b6a
commit c27505b927
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/device.py
View File

@ -483,7 +483,7 @@ class PhysicalDevice:
proxy_name = cf_to_string(self.nb.custom_fields[config[field_config]]) proxy_name = cf_to_string(self.nb.custom_fields[config[field_config]])
elif config[field_config] in self.nb.site.custom_fields: elif config[field_config] in self.nb.site.custom_fields:
if self.nb.site.custom_fields[config[field_config]]: if self.nb.site.custom_fields[config[field_config]]:
proxy_name = cf_to_string(self.nb.site.custom_fields[config[field_config]]) proxy_name = cf_to_string(self.nb.site.custom_fields[config[field_config]])
# Otherwise check if the proxy is configured in NetBox CC # Otherwise check if the proxy is configured in NetBox CC
if (not proxy_name and "zabbix" in self.nb.config_context and if (not proxy_name and "zabbix" in self.nb.config_context and

7
modules/tools.py
View File

@ -55,11 +55,10 @@ def cf_to_string(cf, key="name", logger=None):
Converts a dict custom fields to string Converts a dict custom fields to string
""" """
if isinstance(cf, dict): if isinstance(cf, dict):
if key: if key in cf:
return cf[key] return cf[key]
else: 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 None
return cf return cf