Merge branch 'master' of git.illyse.org:coin

coin/resources/migrations/0002_auto__del_field_ippool_description__add_field_ippool_default_subnetsiz.py

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'IPPool.description'
+        db.delete_column(u'resources_ippool', 'description')
+
+        # Adding field 'IPPool.default_subnetsize'
+        db.add_column(u'resources_ippool', 'default_subnetsize',
+                      self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=56),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Adding field 'IPPool.description'
+        db.add_column(u'resources_ippool', 'description',
+                      self.gf('django.db.models.fields.TextField')(default='', blank=True),
+                      keep_default=False)
+
+        # Deleting field 'IPPool.default_subnetsize'
+        db.delete_column(u'resources_ippool', 'default_subnetsize')
+
+
+    models = {
+        u'members.member': {
+            'Meta': {'object_name': 'Member'},
+            'address': ('django.db.models.fields.TextField', [], {}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
+            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'})
+        },
+        u'offers.offer': {
+            'Meta': {'object_name': 'Offer'},
+            'billing_period': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'initial_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'period_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Service']"})
+        },
+        u'offers.offersubscription': {
+            'Meta': {'object_name': 'OfferSubscription'},
+            'commitment': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
+            'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Offer']"}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'subscription_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
+        },
+        u'offers.service': {
+            'Meta': {'object_name': 'Service'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'resources.ippool': {
+            'Meta': {'object_name': 'IPPool'},
+            'default_subnetsize': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inet': ('netfields.fields.CidrAddressField', [], {'max_length': '43'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'resources.ipsubnet': {
+            'Meta': {'object_name': 'IPSubnet'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inet': ('netfields.fields.CidrAddressField', [], {'max_length': '43', 'blank': 'True'}),
+            'ip_pool': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['resources.IPPool']"}),
+            'offer_subscription': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ip_subnet'", 'to': u"orm['offers.OfferSubscription']"})
+        }
+    }
+
+    complete_apps = ['resources']

coin/resources/models.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from django.db import models
 from django.core.exceptions import ValidationError
+from django.core.validators import MaxValueValidator
 from netfields import CidrAddressField, NetManager
 from netaddr import IPNetwork, IPSet
 
@@ -8,8 +9,9 @@ class IPPool(models.Model):
     """Pool of IP addresses (either v4 or v6)."""
     name = models.CharField(max_length=255, blank=False, null=False,
                             verbose_name='Name of the IP pool')
-    description = models.TextField(blank=True, null=False,
-                                   verbose_name='Description of the IP pool')
+    default_subnetsize = models.PositiveSmallIntegerField(blank=False,
+                                                          verbose_name='Default subnet size to allocate to subscribers in this pool',
+                                                          validators=[MaxValueValidator(64)])
     inet = CidrAddressField()
     objects = NetManager()
 
@@ -25,16 +27,13 @@ class IPSubnet(models.Model):
                                            related_name='ip_subnet')
 
     def clean(self):
-        # TODO: define default subnet sizes for IPv4 / IPv6. Or better,
-        # integrate it in the pool definition.
         if not self.inet:
             # Automatically allocate a free subnet
             pool = IPSet([self.ip_pool.inet])
             used = IPSet((s.inet for s in self.ip_pool.ipsubnet_set.all()))
             free = pool.difference(used)
-            SUBNET_SIZE = 32 if self.ip_pool.inet.version == 4 else 56
             # Generator for efficiency (we don't build the whole list)
-            available = (p for p in free.iter_cidrs() if p.prefixlen <= SUBNET_SIZE)
+            available = (p for p in free.iter_cidrs() if p.prefixlen <= self.ip_pool.default_subnetsize)
             # TODO: for IPv4, get rid of the network and broadcast
             # addresses? Not really needed nowadays, and we usually don't
             # have a real subnet in practice (i.e. Ethernet segment), but