Browse Source

Fixes #785: Trigger validation error when importing a prefix assigned to a nonexistent VLAN

Jeremy Stretch 8 years ago
parent
commit
07997b24ca
1 changed files with 2 additions and 0 deletions
  1. 2 0
      netbox/ipam/forms.py

+ 2 - 0
netbox/ipam/forms.py

@@ -215,6 +215,8 @@ class PrefixFromCSVForm(forms.ModelForm):
         elif vlan_vid and site:
         elif vlan_vid and site:
             try:
             try:
                 self.instance.vlan = VLAN.objects.get(site=site, vid=vlan_vid)
                 self.instance.vlan = VLAN.objects.get(site=site, vid=vlan_vid)
+            except VLAN.DoesNotExist:
+                self.add_error('vlan_vid', "Invalid VLAN ID ({}) for site {}.".format(vlan_vid, site))
             except VLAN.MultipleObjectsReturned:
             except VLAN.MultipleObjectsReturned:
                 self.add_error('vlan_vid', "Multiple VLANs found ({} - VID {})".format(site, vlan_vid))
                 self.add_error('vlan_vid', "Multiple VLANs found ({} - VID {})".format(site, vlan_vid))
         elif vlan_vid:
         elif vlan_vid: