From ba360d2c2323141e1619d240b39f58f68fd8afb5 Mon Sep 17 00:00:00 2001 From: koalajoe23 Date: Fri, 25 Jul 2025 01:06:06 +0200 Subject: [PATCH 1/2] fix: adapt tests for netbox 4.2+ --- netbox_prometheus_sd/tests/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox_prometheus_sd/tests/utils.py b/netbox_prometheus_sd/tests/utils.py index c62bb68..b49f7f0 100644 --- a/netbox_prometheus_sd/tests/utils.py +++ b/netbox_prometheus_sd/tests/utils.py @@ -114,7 +114,7 @@ def build_vm_full(name, ip_octet=1): vm.tags.add("Tag 2") vm.save() - Service.objects.create(virtual_machine=vm, name="ssh", protocol="tcp", ports=[22]) + Service.objects.create(parent=vm, name="ssh", protocol="tcp", ports=[22]) return vm @@ -229,7 +229,7 @@ def build_device_full(name, ip_octet=1): device.tags.add("Tag 2") device.save() device.position = 1.0 - Service.objects.create(device=device, name="ssh", protocol="tcp", ports=[22]) + Service.objects.create(parent=device, name="ssh", protocol="tcp", ports=[22]) return device From d2c8b91e828f4bf1c7c5a61bc8713be457bfdd43 Mon Sep 17 00:00:00 2001 From: koalajoe23 Date: Fri, 25 Jul 2025 01:06:06 +0200 Subject: [PATCH 2/2] fix: backwards compatibility for tests --- netbox_prometheus_sd/tests/utils.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/netbox_prometheus_sd/tests/utils.py b/netbox_prometheus_sd/tests/utils.py index b49f7f0..0e571bf 100644 --- a/netbox_prometheus_sd/tests/utils.py +++ b/netbox_prometheus_sd/tests/utils.py @@ -114,7 +114,10 @@ def build_vm_full(name, ip_octet=1): vm.tags.add("Tag 2") vm.save() - Service.objects.create(parent=vm, name="ssh", protocol="tcp", ports=[22]) + try: # NetBox 4.2+ + Service.objects.create(parent=vm, name="ssh", protocol="tcp", ports=[22]) + except AttributeError: # NetBox <4.2 + Service.objects.create(virtual_machine=vm, name="ssh", protocol="tcp", ports=[22]) return vm @@ -229,7 +232,10 @@ def build_device_full(name, ip_octet=1): device.tags.add("Tag 2") device.save() device.position = 1.0 - Service.objects.create(parent=device, name="ssh", protocol="tcp", ports=[22]) + try: # NetBox 4.2+ + Service.objects.create(parent=device, name="ssh", protocol="tcp", ports=[22]) + except AttributeError: # NetBox <4.2 + Service.objects.create(device=device, name="ssh", protocol="tcp", ports=[22]) return device