From ba6df87d10de7b92e8507566fce5d2eadcb224c2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jan 2020 16:26:06 -0500
Subject: [PATCH] Move min/max prefix length validators to ipam.validators

---
 netbox/extras/scripts.py       |  2 +-
 netbox/ipam/validators.py      | 18 +++++++++++++++++-
 netbox/utilities/validators.py | 18 +-----------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index fed003bed..b213a9a11 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -16,7 +16,7 @@ from mptt.models import MPTTModel
 
 from ipam.formfields import IPFormField
 from utilities.exceptions import AbortTransaction
-from utilities.validators import MaxPrefixLengthValidator, MinPrefixLengthValidator
+from ipam.validators import MaxPrefixLengthValidator, MinPrefixLengthValidator
 from .constants import LOG_DEFAULT, LOG_FAILURE, LOG_INFO, LOG_SUCCESS, LOG_WARNING
 from .forms import ScriptForm
 from .signals import purge_changelog
diff --git a/netbox/ipam/validators.py b/netbox/ipam/validators.py
index 960675643..f95e174a3 100644
--- a/netbox/ipam/validators.py
+++ b/netbox/ipam/validators.py
@@ -1,4 +1,20 @@
-from django.core.validators import RegexValidator
+from django.core.validators import BaseValidator, RegexValidator
+
+
+class MaxPrefixLengthValidator(BaseValidator):
+    message = 'The prefix length must be less than or equal to %(limit_value)s.'
+    code = 'max_prefix_length'
+
+    def compare(self, a, b):
+        return a.prefixlen > b
+
+
+class MinPrefixLengthValidator(BaseValidator):
+    message = 'The prefix length must be greater than or equal to %(limit_value)s.'
+    code = 'min_prefix_length'
+
+    def compare(self, a, b):
+        return a.prefixlen < b
 
 
 DNSValidator = RegexValidator(
diff --git a/netbox/utilities/validators.py b/netbox/utilities/validators.py
index fb7a5bba7..cfa733208 100644
--- a/netbox/utilities/validators.py
+++ b/netbox/utilities/validators.py
@@ -1,6 +1,6 @@
 import re
 
-from django.core.validators import _lazy_re_compile, BaseValidator, URLValidator
+from django.core.validators import _lazy_re_compile, URLValidator
 
 
 class EnhancedURLValidator(URLValidator):
@@ -26,19 +26,3 @@ class EnhancedURLValidator(URLValidator):
         r'(?:[/?#][^\s]*)?'                 # Path
         r'\Z', re.IGNORECASE)
     schemes = AnyURLScheme()
-
-
-class MaxPrefixLengthValidator(BaseValidator):
-    message = 'The prefix length must be less than or equal to %(limit_value)s.'
-    code = 'max_prefix_length'
-
-    def compare(self, a, b):
-        return a.prefixlen > b
-
-
-class MinPrefixLengthValidator(BaseValidator):
-    message = 'The prefix length must be greater than or equal to %(limit_value)s.'
-    code = 'min_prefix_length'
-
-    def compare(self, a, b):
-        return a.prefixlen < b