Corrected error reporting on duplicate InterfaceConnections

This commit is contained in:
Jeremy Stretch 2016-07-20 16:42:04 -04:00
parent e1fc78bc44
commit 48b8602c3f

View File

@ -1,7 +1,7 @@
from collections import OrderedDict from collections import OrderedDict
from django.conf import settings from django.conf import settings
from django.core.exceptions import ValidationError from django.core.exceptions import MultipleObjectsReturned, ValidationError
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.core.validators import MinValueValidator from django.core.validators import MinValueValidator
from django.db import models from django.db import models
@ -957,8 +957,8 @@ class Interface(models.Model):
return connection.interface_a return connection.interface_a
except InterfaceConnection.DoesNotExist: except InterfaceConnection.DoesNotExist:
return None return None
except InterfaceConnection.MultipleObjectsReturned as e: except InterfaceConnection.MultipleObjectsReturned:
raise e("Multiple connections found for {0} interface {1}!".format(self.device, self)) raise MultipleObjectsReturned("Multiple connections found for {} interface {}!".format(self.device, self))
class InterfaceConnection(models.Model): class InterfaceConnection(models.Model):