From e269b28381b0148f2a9c351e5984755fb3fcc3e7 Mon Sep 17 00:00:00 2001 From: TheNetworkGuy Date: Wed, 12 Apr 2023 17:51:56 +0200 Subject: [PATCH] Rolled back contaminated code meant for #27 in main branch, issue created in #34 --- netbox_zabbix_sync.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/netbox_zabbix_sync.py b/netbox_zabbix_sync.py index b515616..cca5b68 100755 --- a/netbox_zabbix_sync.py +++ b/netbox_zabbix_sync.py @@ -215,21 +215,14 @@ class NetworkDevice(): # Gather device Zabbix templates device_type_cf = self.nb.device_type.custom_fields - if(templates_config_context): - try: - self.zbx_templates = self.config_context["zabbix"]["templates"] - except KeyError: - e = "Config context for Zabbix template was not found for host {self.name}" + if(template_cf in device_type_cf): + self.template_name = device_type_cf[template_cf] else: - if(template_cf in device_type_cf): - self.template_name = device_type_cf[template_cf] - self.zbx_templates = [device_type_cf[template_cf]] - else: - e = (f"Custom field {template_cf} not " - f"found for {self.nb.device_type.manufacturer.name}" - f" - {self.nb.device_type.display}.") - logger.warning(e) - raise SyncInventoryError(e) + e = (f"Custom field {template_cf} not " + f"found for {self.nb.device_type.manufacturer.name}" + f" - {self.nb.device_type.display}.") + logger.warning(e) + raise SyncInventoryError(e) def set_hostgroup(self, format): """Set the hostgroup for this device"""