@@ -17,13 +17,13 @@
# You should have received a copy of the GNU General Public License along with
# Django Conntrackt. If not, see <http://www.gnu.org/licenses/>.
#
# Django imports.
from django.contrib.admin.util import NestedObjects
from django.contrib.admin.utils import NestedObjects
from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse
from django.db import models
from django.db.models.query_utils import Q
# Application imports.
@@ -343,14 +343,14 @@ class Interface(RelatedCollectorMixin, m
denoting the network netmask.
"""
name = models.CharField(max_length=100, default='eth0')
description = models.TextField(blank=True, default='Main network interface.')
entity = models.ForeignKey(Entity)
address = models.IPAddressField()
netmask = models.IPAddressField(default='255.255.255.255')
address = models.GenericIPAddressField()
netmask = models.GenericIPAddressField(default='255.255.255.255')
class Meta:
# Enforce uniqueness of interface name in an entity. Enforce uniqueness
# of IP address in a subnet for an entity.
unique_together = (("name", "entity"),
("entity", "address", "netmask"),)