From d008b5ca11ede2e6437d821eb97a082498f11af5 Mon Sep 17 00:00:00 2001 From: Jamie Murphy Date: Thu, 22 Jun 2023 14:55:10 +0100 Subject: [PATCH] requested changes --- netbox/ipam/forms/model_forms.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index f682a62c4..90e0680da 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -362,13 +362,12 @@ class IPAddressForm(TenancyForm, NetBoxModelForm): # Do not allow assigning a network ID or broadcast address to an interface. if interface and (address := self.cleaned_data.get('address')): - prefix_str = f"{address.network}/{address.prefixlen}" allow_assignment_error = True if self.instance.vrf is None: - prefix_obj = Prefix.objects.filter(prefix=prefix_str) + prefix_obj = Prefix.objects.filter(prefix=address.cidr) else: - prefix_obj = Prefix.objects.filter(prefix=prefix_str, vrf=self.vrf) - if prefix_obj.exists() and prefix_obj[0].is_pool: + prefix_obj = Prefix.objects.filter(prefix=address.cidr, vrf=self.vrf) + if prefix_obj.exists() and prefix_obj.first().is_pool: allow_assignment_error = False if allow_assignment_error: