From 199eb152a3d75c3c1cab28cb9dda9a30b2fdac7c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jeremy@netverity.dev>
Date: Wed, 10 Mar 2021 16:26:27 -0500
Subject: [PATCH] Fix VLAN.clean()

---
 netbox/ipam/models/vlans.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/netbox/ipam/models/vlans.py b/netbox/ipam/models/vlans.py
index a33e4c0d3..30c76d6cf 100644
--- a/netbox/ipam/models/vlans.py
+++ b/netbox/ipam/models/vlans.py
@@ -173,10 +173,11 @@ class VLAN(PrimaryModel):
     def clean(self):
         super().clean()
 
-        # Validate VLAN group
-        if self.group and self.group.site != self.site:
+        # Validate VLAN group (if assigned)
+        if self.group and self.site and self.group.scope != self.site:
             raise ValidationError({
-                'group': "VLAN group must belong to the assigned site ({}).".format(self.site)
+                'group': f"VLAN is assigned to group {self.group} (scope: {self.group.scope}); cannot also assign to "
+                         f"site {self.site}."
             })
 
     def to_csv(self):