firewall, vm: upgrade MACAddressField, IPAddressField, IPNetworkField classes, fix tests

django.db.models.field.subclassing.SubfieldBase removed: https://docs.djangoproject.com/en/1.11/releases/1.10/#features-removed-in-1-10
New field classes require to call full_clean() method on Models, because the to_python() din't call automatically.
Related docs: https://docs.djangoproject.com/en/1.11/releases/1.8/#subfieldbase

circle/firewall/fields.py

@@ -52,12 +52,19 @@ class MACAddressFormField(forms.Field):
 
 
 class MACAddressField(models.Field):
 class MACAddressField(models.Field):
     description = _('MAC Address object')
     description = _('MAC Address object')
-    __metaclass__ = models.SubfieldBase
 
 
     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):
         kwargs['max_length'] = 17
         kwargs['max_length'] = 17
         super(MACAddressField, self).__init__(*args, **kwargs)
         super(MACAddressField, self).__init__(*args, **kwargs)
 
 
+    def deconstruct(self):
+        name, path, args, kwargs = super(MACAddressField, self).deconstruct()
+        del kwargs['max_length']
+        return name, path, args, kwargs
+
+    def from_db_value(self, value, expression, connection, context):
+        return self.to_python(value)
+
     def to_python(self, value):
     def to_python(self, value):
         if not value:
         if not value:
             return None
             return None
@@ -105,16 +112,25 @@ class IPAddressFormField(forms.Field):
 
 
 class IPAddressField(models.Field):
 class IPAddressField(models.Field):
     description = _('IP Network object')
     description = _('IP Network object')
-    __metaclass__ = models.SubfieldBase
 
 
     def __init__(self, version=4, serialize=True, *args, **kwargs):
     def __init__(self, version=4, serialize=True, *args, **kwargs):
         kwargs['max_length'] = 100
         kwargs['max_length'] = 100
         self.version = version
         self.version = version
         super(IPAddressField, self).__init__(*args, **kwargs)
         super(IPAddressField, self).__init__(*args, **kwargs)
 
 
+    def deconstruct(self):
+        name, path, args, kwargs = super(IPAddressField, self).deconstruct()
+        del kwargs['max_length']
+        if self.version != 4:
+            kwargs['version'] = self.version
+        return name, path, args, kwargs
+
     def get_internal_type(self):
     def get_internal_type(self):
         return "CharField"
         return "CharField"
 
 
+    def from_db_value(self, value, expression, connection, context):
+        return self.to_python(value)
+
     def to_python(self, value):
     def to_python(self, value):
         if not value:
         if not value:
             return None
             return None
@@ -163,13 +179,22 @@ class IPNetworkFormField(forms.Field):
 
 
 class IPNetworkField(models.Field):
 class IPNetworkField(models.Field):
     description = _('IP Network object')
     description = _('IP Network object')
-    __metaclass__ = models.SubfieldBase
 
 
     def __init__(self, version=4, serialize=True, *args, **kwargs):
     def __init__(self, version=4, serialize=True, *args, **kwargs):
         kwargs['max_length'] = 100
         kwargs['max_length'] = 100
         self.version = version
         self.version = version
         super(IPNetworkField, self).__init__(*args, **kwargs)
         super(IPNetworkField, self).__init__(*args, **kwargs)
 
 
+    def deconstruct(self):
+        name, path, args, kwargs = super(IPNetworkField, self).deconstruct()
+        del kwargs['max_length']
+        if self.version != 4:
+            kwargs['version'] = self.version
+        return name, path, args, kwargs
+
+    def from_db_value(self, value, expression, connection, context):
+        return self.to_python(value)
+
     def to_python(self, value):
     def to_python(self, value):
         if not value:
         if not value:
             return None
             return None

circle/firewall/tests/test_firewall.py

@@ -80,7 +80,7 @@ class GetNewAddressTestCase(MockCeleryMixin, TestCase):
         self.vlan = Vlan(vid=1, name='test', network4='10.0.0.1/29',
         self.vlan = Vlan(vid=1, name='test', network4='10.0.0.1/29',
                          network6='2001:738:2001:4031::/80', domain=d,
                          network6='2001:738:2001:4031::/80', domain=d,
                          owner=self.u1)
                          owner=self.u1)
-        self.vlan.clean()
+        self.vlan.full_clean()
         self.vlan.save()
         self.vlan.save()
         self.vlan.host_set.all().delete()
         self.vlan.host_set.all().delete()
         for i in range(3, 6):
         for i in range(3, 6):

circle/vm/tests/test_models.py

@@ -177,9 +177,9 @@ class InterfaceTestCase(MockCeleryMixin, TestCase):
         i = Instance(id=10, owner=owner, access_method='rdp')
         i = Instance(id=10, owner=owner, access_method='rdp')
         d = Domain(owner=owner)
         d = Domain(owner=owner)
         d.save()
         d.save()
-        v = Vlan(vid=55, network4='127.0.0.1/8',
+        v = Vlan(name='vlan', vid=55, network4='127.0.0.1/8',
                  network6='2001::1/32', domain=d)
                  network6='2001::1/32', domain=d)
-        v.clean()
+        v.full_clean()
         v.save()
         v.save()
         Interface.create(i, v, managed=True, owner=owner)
         Interface.create(i, v, managed=True, owner=owner)