Browse Source

Simplify clean() method of IP Pool objects

Baptiste Jonglez 11 years ago
parent
commit
3c886c39fe
1 changed files with 4 additions and 6 deletions
  1. 4 6
      coin/resources/models.py

+ 4 - 6
coin/resources/models.py

@@ -16,12 +16,10 @@ class IPPool(models.Model):
     objects = NetManager()
 
     def clean(self):
-        if self.inet is not None and self.inet.version == 4:
-            if not self.inet.prefixlen <= self.default_subnetsize <= 32:
-                raise ValidationError('Invalid default subnet size')
-        elif self.inet is not None and self.inet.version == 6:
-            if not self.inet.prefixlen <= self.default_subnetsize <= 64:
-                raise ValidationError('Invalid default subnet size')
+        if self.inet:
+            max_subnet = 64 if self.inet.version == 6 else 32
+            if not self.inet.prefixlen <= self.default_subnetsize <= max_subnet:
+                    raise ValidationError('Invalid default subnet size')
 
     def __unicode__(self):
         return self.name