Merged release v2.4.5

2018-10-03 11:23:21 -04:00
parent 2ac60bdf48 7583912de7
commit 364bbdeab8
38 changed files with 249 additions and 125 deletions
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -587,7 +587,11 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
        if self.address:

            # Enforce unique IP space (if applicable)
-            if (self.vrf is None and settings.ENFORCE_GLOBAL_UNIQUE) or (self.vrf and self.vrf.enforce_unique):
+            if self.role not in IPADDRESS_ROLES_NONUNIQUE and (
+                self.vrf is None and settings.ENFORCE_GLOBAL_UNIQUE
+            ) or (
+                self.vrf and self.vrf.enforce_unique
+            ):
                duplicate_ips = self.get_duplicates()
                if duplicate_ips:
                    raise ValidationError({