Browse Source

Fix indentation

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

+ 4 - 4
coin/resources/models.py

@@ -27,9 +27,9 @@ class IPPool(models.Model):
 
     def clean(self):
         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')
+            max_subnetsize = 64 if self.inet.version == 6 else 32
+            if not self.inet.prefixlen <= self.default_subnetsize <= max_subnetsize:
+                raise ValidationError('Invalid default subnet size')
 
     def __unicode__(self):
         return self.name
@@ -62,7 +62,7 @@ class IPSubnet(models.Model):
             self.inet = first_free.subnet(SUBNET_SIZE, 1).next()
         else:
             # Check that we are included in the IP pool.
-            if not subnet in pool:
+            if not self.inet in self.ip_pool.inet:
                 raise ValidationError('Subnet must be included in the IP pool.')
             # Check that we don't conflict with existing subnets.
             # TODO: use precise database query instead of querying all