Merge branch 'polymorphic_configuration' into django17_AbstractU_Polymorph

Conflicts:
	requirements.txt

README.md

@@ -56,7 +56,7 @@ To sync database, the first time run :
 
 You probably want to import some base data to play with:
 
-  python manage.py loaddata offers ip_pool offers
+  python manage.py loaddata offers ip_pool
 
 Then at each code update :
 

coin/configuration/admin.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from django.contrib import admin
+from polymorphic.admin import PolymorphicParentModelAdmin, PolymorphicChildModelAdmin
+
+from coin.configuration.models import Configuration
+from coin.configuration.forms import ConfigurationForm
+
+"""
+Implementation note : When creating child admin class, you have to inherit
+ConfigurationAdminFormMixin. This make use of ConfigurationForm form that
+filter offersubscription select input to avoid selecting wrong subscription.
+"""
+
+class ParentConfigurationAdmin(PolymorphicParentModelAdmin):
+    base_model = Configuration
+    polymorphic_list = True
+    list_display = ('model_name','configuration_type_name', 'offersubscription', 'offer_subscription_member')
+
+    def offer_subscription_member(self, config):
+        return config.offersubscription.member
+    offer_subscription_member.short_description = 'Membre'
+
+    def get_child_models(self):
+        """
+        Renvoi la liste des modèles enfants de Configuration
+        ex :((VPNConfiguration, VPNConfigurationAdmin),
+            (ADSLConfiguration, ADSLConfigurationAdmin))
+        """
+        return (tuple((x.base_model, x) for x in PolymorphicChildModelAdmin.__subclasses__()))
+
+class ConfigurationAdminFormMixin(object):
+    form = ConfigurationForm
+
+admin.site.register(Configuration, ParentConfigurationAdmin)

coin/configuration/forms.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+from django.forms import ModelForm, ValidationError
+from django.db.models import Q
+
+from coin.offers.models import OfferSubscription
+from coin.configuration.models import Configuration
+
+
+class ConfigurationForm(ModelForm):
+
+    class Meta:
+        model = Configuration
+
+    def __init__(self, *args, **kwargs):
+        """
+        This filter the offersubscription select field in configurations forms
+        to only display subscription that are the sames type of actual configuration
+        and that haven't already a configuration associated with
+        """
+        super(ConfigurationForm, self).__init__(*args, **kwargs)
+        if self.instance:
+            queryset = OfferSubscription.objects.filter(
+                Q(offer__configuration_type=self.instance.model_name) & (
+                Q(configuration=None) | Q(configuration=self.instance.pk)))
+            self.fields['offersubscription'].queryset = queryset
+
+    def clean_offersubscription(self):
+        """
+        This check if the selected administrative subscription is linked to an
+        offer which use the same configuration type than the edited configuration.
+        """
+        offersubscription = self.cleaned_data['offersubscription']
+        if offersubscription.offer.configuration_type != self.instance.model_name():
+            raise ValidationError('Administrative subscription must refer an offer having a "{}" configuration type.'.format(self.instance.model_name()))
+
+        return offersubscription

coin/configuration/migrations/0001_initial.py

@@ -0,0 +1,108 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Configuration'
+        db.create_table(u'configuration_configuration', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('polymorphic_ctype', self.gf('django.db.models.fields.related.ForeignKey')(related_name=u'polymorphic_configuration.configuration_set', null=True, to=orm['contenttypes.ContentType'])),
+            ('offersubscription', self.gf('django.db.models.fields.related.OneToOneField')(blank=True, related_name='configuration', unique=True, null=True, to=orm['offers.OfferSubscription'])),
+        ))
+        db.send_create_signal(u'configuration', ['Configuration'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Configuration'
+        db.delete_table(u'configuration_configuration')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'configuration.configuration': {
+            'Meta': {'object_name': 'Configuration'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'offersubscription': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'configuration'", 'unique': 'True', 'null': 'True', 'to': u"orm['offers.OfferSubscription']"}),
+            'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'polymorphic_configuration.configuration_set'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        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'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'default': 'None', 'to': u"orm['auth.User']", 'unique': 'True', 'null': 'True', 'on_delete': 'models.SET_NULL'})
+        },
+        u'offers.offer': {
+            'Meta': {'object_name': 'Offer'},
+            'billing_period': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'configuration_type': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            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'})
+        },
+        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'})
+        }
+    }
+
+    complete_apps = ['configuration']

coin/configuration/models.py

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+from django.db import models
+from polymorphic import PolymorphicModel
+from coin.offers.models import OfferSubscription
+
+"""
+Implementation note : Configuration is a PolymorphicModel.
+The childs of Configuration are the differents models to store
+technical informations of a subscibtion.
+
+To add a new configuration backend, you have to create a new app with a model
+which inherit from Configuration.
+Your model can implement Meta verbose_name to have human readable name and a 
+url_namespace variable to specify the url namespace used by this model.
+"""
+
+class Configuration(PolymorphicModel):
+
+    offersubscription = models.OneToOneField(OfferSubscription, blank=True, 
+                                             null=True,
+                                             related_name='configuration',
+                                             verbose_name='Abonnement')
+
+    @staticmethod
+    def get_configurations_choices_list():
+        """
+        Génère automatiquement la liste de choix possibles de configurations
+        en fonction des classes enfants de Configuration
+        """
+        return tuple((x().__class__.__name__,x()._meta.verbose_name) 
+            for x in Configuration.__subclasses__())
+    
+    def model_name(self):
+        return self.__class__.__name__
+    model_name.short_description = 'Nom du modèle'
+
+    def configuration_type_name(self):
+        return self._meta.verbose_name
+    configuration_type_name.short_description = 'Type'
+
+    def get_absolute_url(self):
+        """
+        Renvoi l'URL d'accès à la page "details" de l'objet
+        Une url doit être nommée "details"
+        """
+        from django.core.urlresolvers import reverse
+        return reverse('%s:details' % self.get_url_namespace(), 
+                       args=[str(self.id)])
+
+    def get_url_namespace(self):
+        """
+        Renvoi le namespace utilisé par la configuration. Utilise en priorité
+        celui définit dans la classe enfant dans url_namespace sinon
+        par défaut utilise le nom de la classe en minuscule
+        """
+        if self.url_namespace:
+            return self.url_namespace
+        else:
+            return self.model_name().lower()

coin/configuration/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

coin/configuration/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

coin/members/templates/members/subscriptions.html

@@ -20,7 +20,8 @@
             <td>{{ subscription.offer.name }}</td>
             <td>{{ subscription.subscription_date }}</td>
             <td>{{ subscription.configuration.comment }}</td>
-            <td><a class="cfglink" href="{% url 'subscription:configuration-redirect' subscription.pk %}">Configuration</a></td>
+            <td>{% if subscription.configuration %}<a class="cfglink" href="{% url subscription.configuration.get_url_namespace|add:":details" id=subscription.configuration.id %}">Configuration</a>{% endif %}</td>
+            
         </tr>
         {% endfor %}
     </tbody>

coin/offers/admin.py

@@ -1,4 +1,6 @@
 from django.contrib import admin
+from polymorphic.admin import PolymorphicChildModelAdmin
+
 from coin.offers.models import Offer, OfferSubscription
 from coin.offers.offersubscription_filter import\
             OfferSubscriptionTerminationFilter,\
@@ -13,17 +15,17 @@ class IPSubnetInline(admin.TabularInline):
 
 
 class OfferAdmin(admin.ModelAdmin):
-    list_display = ('type', 'name', 'billing_period', 'period_fees',
-                    'initial_fees', 'backend')
+    list_display = ('configuration_type', 'name', 'billing_period', 'period_fees',
+                    'initial_fees')
     list_display_links = ('name',)
-    list_filter = ('type',)
+    list_filter = ('configuration_type',)
     search_fields = ['name']
 
-    def get_readonly_fields(self, request, obj=None):
-        if obj:
-            return ['backend',]
-        else:
-            return []
+    # def get_readonly_fields(self, request, obj=None):
+    #     if obj:
+    #         return ['backend',]
+    #     else:
+    #         return []
 
 
 class OfferSubscriptionAdmin(admin.ModelAdmin):
@@ -46,5 +48,17 @@ class OfferSubscriptionAdmin(admin.ModelAdmin):
 
     inlines = [ IPSubnetInline ]
 
+    def get_inline_instances(self, request, obj=None):
+        """
+        Si en edition, alors affiche en inline le formulaire de la configuration
+        """
+        ipsubnet_inline = [IPSubnetInline(self.model, self.admin_site)]
+
+        if obj is not None:
+            for item in PolymorphicChildModelAdmin.__subclasses__():
+                if (item.base_model.__name__ == obj.offer.configuration_type):
+                    return [item.inline(self.model, self.admin_site)] + ipsubnet_inline
+        return ipsubnet_inline
+
 admin.site.register(Offer, OfferAdmin)
 admin.site.register(OfferSubscription, OfferSubscriptionAdmin)

coin/offers/backends.py

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""Various helpers designed to help configuration backends regarding
-repetitive tasks."""
-
-from django.core.exceptions import ValidationError
-from django.db.models import Q
-
-from coin.offers.models import OfferSubscription
-
-
-class ValidateBackendType(object):
-    """Helper validator for configuration backends.
-
-    It ensures that the related subscription has the right backend
-    type. This is a bit ugly, as validators are not meant for
-    database-level sanity checks, but this is the cost of doing genericity
-    the way we do.
-
-    Note that this validator should not be needed for most cases, as the
-    "limit_choices_to" parameter of the "administrative_subscription"
-    OneToOneField should automatically limit the available choices on
-    forms.  But it does not protect us if we fiddle manually with the
-    database: better safe than sorry.
-    """
-
-    def __init__(self, backend_name):
-        self.backend = backend_name
-
-    def __call__(self, subscription):
-        if OfferSubscription.objects.get(pk=subscription).offer.backend != self.backend:
-            raise ValidationError('Administrative subscription must have a "{}" backend.'.format(self.backend))
-
-
-def filter_subscriptions(backend_name, instance):
-    """Helper function for configuration backends, allowing to filter
-    subscriptions that have the right """
-    return Q(offer__backend=backend_name) & (
-        # Select "unassociated" subscriptions, plus our own
-        # subscription (in case we are editing the object).
-        Q((backend_name, None)) | Q((backend_name, instance.pk)))

coin/offers/fixtures/offers.json

@@ -7,8 +7,7 @@
             "name": "VPN standard",
             "initial_fees": "0.00",
             "period_fees": "8.00",
-            "type": "VPN",
-            "backend": "openvpn_ldap"
+            "configuration_type": "VPNConfiguration"
         }
     },
     {
@@ -19,8 +18,7 @@
             "name": "VPN préférentiel",
             "initial_fees": "0.00",
             "period_fees": "5.00",
-            "type": "VPN",
-            "backend": "openvpn_ldap"
+            "configuration_type": "VPNConfiguration"
         }
     },
     {
@@ -31,8 +29,7 @@
             "name": "VPN gratuit",
             "initial_fees": "0.00",
             "period_fees": "0.00",
-            "type": "VPN",
-            "backend": "openvpn_ldap"
+            "configuration_type": "VPNConfiguration"
         }
     },
     {
@@ -43,8 +40,7 @@
             "name": "Marque blanche FDN",
             "initial_fees": "70.00",
             "period_fees": "32.00",
-            "type": "ADSL",
-            "backend": "none"
+            "configuration_type": "none"
         }
     },
     {
@@ -55,8 +51,7 @@
             "name": "Marque blanche FDN (préférentiel)",
             "initial_fees": "70.00",
             "period_fees": "28.00",
-            "type": "ADSL",
-            "backend": "none"
+            "configuration_type": "none"
         }
     }
 ]

coin/offers/migrations/0007_auto__del_field_offer_type__del_field_offer_backend__add_field_offer_c.py

@@ -0,0 +1,123 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as 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 'Offer.type'
+        db.delete_column(u'offers_offer', 'type')
+
+        # Deleting field 'Offer.backend'
+        db.delete_column(u'offers_offer', 'backend')
+
+        # Adding field 'Offer.configuration_type'
+        db.add_column(u'offers_offer', 'configuration_type',
+                      self.gf('django.db.models.fields.CharField')(max_length=50, null=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+
+        # User chose to not deal with backwards NULL issues for 'Offer.type'
+        raise RuntimeError("Cannot reverse this migration. 'Offer.type' and its values cannot be restored.")
+        
+        # The following code is provided here to aid in writing a correct migration        # Adding field 'Offer.type'
+        db.add_column(u'offers_offer', 'type',
+                      self.gf('django.db.models.fields.CharField')(max_length=50),
+                      keep_default=False)
+
+
+        # User chose to not deal with backwards NULL issues for 'Offer.backend'
+        raise RuntimeError("Cannot reverse this migration. 'Offer.backend' and its values cannot be restored.")
+        
+        # The following code is provided here to aid in writing a correct migration        # Adding field 'Offer.backend'
+        db.add_column(u'offers_offer', 'backend',
+                      self.gf('django.db.models.fields.CharField')(max_length=50),
+                      keep_default=False)
+
+        # Deleting field 'Offer.configuration_type'
+        db.delete_column(u'offers_offer', 'configuration_type')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        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'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'default': 'None', 'to': u"orm['auth.User']", 'unique': 'True', 'null': 'True', 'on_delete': 'models.SET_NULL'})
+        },
+        u'offers.offer': {
+            'Meta': {'object_name': 'Offer'},
+            'billing_period': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'configuration_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True'}),
+            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'})
+        },
+        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'})
+        }
+    }
+
+    complete_apps = ['offers']

coin/offers/models.py

@@ -11,29 +11,28 @@ from coin.resources.models import IPSubnet
 class Offer(models.Model):
     """Description of an offer available to subscribers.
 
-    Implementation notes: achieving genericity is difficult, especially
-    because different technologies may have very different configuration
-    parameters.
+    Implementation notes:
+    configuration_type store the model name of the configuration backend
+    (ex VPNConfiguration).
+    The choices list is dynamically generated at start in the __init__
+    """
 
-    Technology-specific configuration (e.g. for VPN) is implemented as a
-    model having a OneToOne relation to OfferSubscription.  In order to
-    reach the technology-specific configuration model from an
-    OfferSubscription, the OneToOne relation MUST have a related_name
-    equal to one of the backends in OFFER_BACKEND_CHOICES (for instance
-    "openvpn_ldap").
+    def __init__(self, *args, **kwargs):
+        from coin.configuration.models import Configuration
+        super(Offer, self).__init__(*args, **kwargs)
+        """
+        Génère automatiquement la liste de choix possibles de types
+        de configurations en fonction des classes enfants de Configuration
+        """
+        self._meta.get_field_by_name('configuration_type')[0]._choices = (
+            Configuration.get_configurations_choices_list())
 
-    """
-    OFFER_BACKEND_CHOICES = (
-        ('openvpn_ldap', 'OpenVPN (LDAP)'),
-        # Use this if you don't actually want to implement a backend, for
-        # instance if you resell somebody else's offers and don't manage
-        # technical information yourself.
-        ('none', 'None'),
-    )
     name = models.CharField(max_length=255, blank=False, null=False,
                             verbose_name='Nom de l\'offre')
-    type = models.CharField(max_length=50,
-                            help_text="Type of offer, for instance technology used (informative only)")
+    configuration_type = models.CharField(max_length=50,
+                            null=True,
+                            choices = (('',''),),
+                            help_text="Type of configuration to use with this offer")
     billing_period = models.IntegerField(blank=False, null=False, default=1,
                                          verbose_name='Période de facturation',
                                          help_text='en mois')
@@ -46,14 +45,22 @@ class Offer(models.Model):
                                       blank=False, null=False,
                                       verbose_name='Frais de mise en service',
                                       help_text='en €')
-    # TODO: really ensure that this field does not change (as it would
-    # seriously break subscriptions)
-    backend = models.CharField(max_length=50, choices=OFFER_BACKEND_CHOICES)
+
+    def get_configuration_type_display(self):
+        """
+        Renvoi le nom affichable du type de configuration
+        """
+        for item in Configuration.get_configurations_choices_list():
+            if item and self.configuration_type in item:
+                return item[1]
+        return self.configuration_type
 
     def __unicode__(self):
-        return u'%s : %s - %d€ / %im [%s]' % (self.type, self.name,
-                                              self.period_fees,
-                                              self.billing_period, self.backend)
+        return u'%s : %s - %d€ / %im' % (
+            self.get_configuration_type_display(),
+            self.name,
+            self.period_fees,
+            self.billing_period)
 
     class Meta:
         verbose_name = 'offre'
@@ -63,13 +70,9 @@ class OfferSubscription(models.Model):
     """Only contains administrative details about a subscription, not
     technical.  Nothing here should end up into the LDAP backend.
 
-    Implementation notes: the model actually implementing the backend
-    (technical configuration for the technology) MUST relate to this class
-    with a OneToOneField whose related name is a member of
-    OFFER_BACKEND_CHOICES, for instance:
-
-      models.OneToOneField('offers.OfferSubscription', related_name="openvpn_ldap")
-
+    Implementation notes: the Configuration model (which actually implementing the backend
+    (technical configuration for the technology)) relate to this class
+    with a OneToOneField
     """
     subscription_date = models.DateField(
         null=False,
@@ -90,21 +93,9 @@ class OfferSubscription(models.Model):
     member = models.ForeignKey('members.Member', verbose_name='Membre')
     offer = models.ForeignKey('Offer', verbose_name='Offre')
 
-    @property
-    def configuration(self):
-        """Returns the configuration object associated to this subscription,
-        according to the backend type specified in the offer.  Yes, this
-        is hand-made genericity.  If you can think of a better way, feel
-        free to propose something.
-        """
-        if self.offer.backend == 'none' or not hasattr(self, self.offer.backend):
-            return
-        return getattr(self, self.offer.backend)
-
     def __unicode__(self):
-        return u'%s - %s - %s - %s' % (self.member, self.offer.name,
-                                       self.subscription_date,
-                                       self.configuration)
+        return u'%s - %s - %s' % (self.member, self.offer.name,
+                                       self.subscription_date)
 
     class Meta:
         verbose_name = 'abonnement'

coin/settings.py

@@ -153,6 +153,7 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     #'django.contrib.admindocs',
+    'polymorphic',
     'south',
     'autocomplete_light', #Automagic autocomplete foreingkey form component
     'activelink', #Detect if a link match actual page
@@ -162,6 +163,7 @@ INSTALLED_APPS = (
     'coin.billing',
     'coin.resources',
     'coin.reverse_dns',
+    'coin.configuration',
     'coin.vpn'
 )
 

coin/vpn/admin.py

@@ -1,12 +1,20 @@
 # -*- coding: utf-8 -*-
 from django.contrib import admin
+from polymorphic.admin import PolymorphicChildModelAdmin
 
-from coin.vpn.models import VPNSubscription
-from coin.vpn.forms import VPNSubscriptionForm
+from coin.vpn.models import VPNConfiguration
+from coin.configuration.admin import ConfigurationAdminFormMixin
 
 
-class VPNAdmin(admin.ModelAdmin):
-    list_display = ('administrative_subscription', 'activated', 'login',
+class VPNConfigurationInline(admin.StackedInline):
+    model = VPNConfiguration
+    # fk_name = 'offersubscription'
+    readonly_fields = ['configuration_ptr']
+
+
+class VPNConfigurationAdmin(ConfigurationAdminFormMixin, PolymorphicChildModelAdmin):
+    base_model = VPNConfiguration
+    list_display = ('offersubscription', 'activated', 'login',
                     'ipv4_endpoint', 'ipv6_endpoint', 'comment')
     list_filter = ('activated',)
     search_fields = ('login', 'comment',
@@ -17,7 +25,7 @@ class VPNAdmin(admin.ModelAdmin):
     actions = ("generate_endpoints", "generate_endpoints_v4",
                "generate_endpoints_v6", "activate", "deactivate")
     exclude = ("password",)
-    form = VPNSubscriptionForm
+    inline = VPNConfigurationInline
 
     def get_readonly_fields(self, request, obj=None):
         if obj:
@@ -69,4 +77,4 @@ class VPNAdmin(admin.ModelAdmin):
         self.generate_endpoints_generic(request, queryset, v4=False)
     generate_endpoints_v6.short_description = "Generate IPv6 endpoints"
 
-admin.site.register(VPNSubscription, VPNAdmin)
+# admin.site.register(VPNConfiguration, VPNAdmin)

coin/vpn/forms.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django.forms import ModelForm
-
-from coin.offers.models import OfferSubscription
-from coin.offers.backends import filter_subscriptions
-from coin.vpn.models import VPNSubscription
-
-
-class VPNSubscriptionForm(ModelForm):
-
-    class Meta:
-        model = VPNSubscription
-
-    def __init__(self, *args, **kwargs):
-        super(VPNSubscriptionForm, self).__init__(*args, **kwargs)
-        if self.instance:
-            query = filter_subscriptions(self.instance.backend_name,
-                                         self.instance)
-            queryset = OfferSubscription.objects.filter(query)
-            self.fields['administrative_subscription'].queryset = queryset

coin/vpn/migrations/0007_auto__del_vpnsubscription__add_vpnconfiguration.py

@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting model 'VPNSubscription'
+        db.delete_table(u'vpn_vpnsubscription')
+
+        # Adding model 'VPNConfiguration'
+        db.create_table(u'vpn_vpnconfiguration', (
+            (u'configuration_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['configuration.Configuration'], unique=True, primary_key=True)),
+            ('activated', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('login', self.gf('django.db.models.fields.CharField')(unique=True, max_length=50, blank=True)),
+            ('password', self.gf('django.db.models.fields.CharField')(max_length=256, null=True, blank=True)),
+            ('ipv4_endpoint', self.gf('netfields.fields.InetAddressField')(max_length=39, null=True, blank=True)),
+            ('ipv6_endpoint', self.gf('netfields.fields.InetAddressField')(max_length=39, null=True, blank=True)),
+            ('comment', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)),
+        ))
+        db.send_create_signal(u'vpn', ['VPNConfiguration'])
+
+
+    def backwards(self, orm):
+        # Adding model 'VPNSubscription'
+        db.create_table(u'vpn_vpnsubscription', (
+            ('comment', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)),
+            ('administrative_subscription', self.gf('django.db.models.fields.related.OneToOneField')(related_name='openvpn_ldap', unique=True, to=orm['offers.OfferSubscription'])),
+            ('ipv6_endpoint', self.gf('netfields.fields.InetAddressField')(max_length=39, null=True, blank=True)),
+            ('ipv4_endpoint', self.gf('netfields.fields.InetAddressField')(max_length=39, null=True, blank=True)),
+            ('password', self.gf('django.db.models.fields.CharField')(max_length=256, null=True, blank=True)),
+            ('activated', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('login', self.gf('django.db.models.fields.CharField')(max_length=50, unique=True)),
+        ))
+        db.send_create_signal(u'vpn', ['VPNSubscription'])
+
+        # Deleting model 'VPNConfiguration'
+        db.delete_table(u'vpn_vpnconfiguration')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'configuration.configuration': {
+            'Meta': {'object_name': 'Configuration'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'offersubscription': ('django.db.models.fields.related.OneToOneField', [], {'blank': 'True', 'related_name': "'configuration'", 'unique': 'True', 'null': 'True', 'to': u"orm['offers.OfferSubscription']"}),
+            'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'polymorphic_configuration.configuration_set'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        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'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'default': 'None', 'to': u"orm['auth.User']", 'unique': 'True', 'null': 'True', 'on_delete': 'models.SET_NULL'})
+        },
+        u'offers.offer': {
+            'Meta': {'object_name': 'Offer'},
+            'billing_period': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'configuration_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True'}),
+            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'})
+        },
+        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'vpn.ldapvpnconfig': {
+            'Meta': {'object_name': 'LdapVPNConfig', 'managed': 'False'},
+            'dn': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+        },
+        u'vpn.vpnconfiguration': {
+            'Meta': {'object_name': 'VPNConfiguration', '_ormbases': [u'configuration.Configuration']},
+            'activated': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            u'configuration_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['configuration.Configuration']", 'unique': 'True', 'primary_key': 'True'}),
+            'ipv4_endpoint': ('netfields.fields.InetAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'ipv6_endpoint': ('netfields.fields.InetAddressField', [], {'max_length': '39', 'null': 'True', 'blank': 'True'}),
+            'login': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['vpn']

coin/vpn/models.py

@@ -8,18 +8,19 @@ from ldapdb.models.fields import CharField, ListField
 
 from coin.mixins import CoinLdapSyncMixin
 from coin.offers.models import OfferSubscription
-from coin.offers.backends import ValidateBackendType
+from coin.configuration.models import Configuration
+# from coin.offers.backends import ValidateBackendType
 from coin import utils
 from coin import validation
 
 
-class VPNSubscription(CoinLdapSyncMixin, models.Model):
+class VPNConfiguration(CoinLdapSyncMixin, Configuration):
     url_namespace = "vpn"
-    backend_name = "openvpn_ldap"
-    administrative_subscription = models.OneToOneField(
-        'offers.OfferSubscription',
-        related_name=backend_name,
-        validators=[ValidateBackendType(backend_name)])
+    # backend_name = "openvpn_ldap"
+    # administrative_subscription = models.OneToOneField(
+    #     'offers.OfferSubscription',
+    #     related_name=backend_name,
+    #     validators=[ValidateBackendType(backend_name)])
     activated = models.BooleanField(default=False)
     login = models.CharField(max_length=50, unique=True, blank=True,
                              help_text="leave empty for automatic generation")
@@ -43,7 +44,7 @@ class VPNSubscription(CoinLdapSyncMixin, models.Model):
         self.save_subnet(subnet, False)
 
     def get_subnets(self, version):
-        subnets = self.administrative_subscription.ip_subnet.all()
+        subnets = self.offersubscription.ip_subnet.all()
         return [subnet for subnet in subnets if subnet.inet.version == version]
 
     def sync_to_ldap(self, creation, *args, **kwargs):
@@ -74,7 +75,7 @@ class VPNSubscription(CoinLdapSyncMixin, models.Model):
         TODO: this should be factored for other technologies (DSL, etc)
 
         """
-        subnets = self.administrative_subscription.ip_subnet.all()
+        subnets = self.offersubscription.ip_subnet.all()
         updated = False
         if v4 and self.ipv4_endpoint is None:
             subnets_v4 = [s for s in subnets if s.inet.version == 4]
@@ -98,7 +99,7 @@ class VPNSubscription(CoinLdapSyncMixin, models.Model):
         If [delete] is True, then simply delete the faulty endpoints
         instead of raising an exception.
         """
-        subnets = self.administrative_subscription.ip_subnet.all()
+        subnets = self.offersubscription.ip_subnet.all()
         is_faulty = lambda endpoint : endpoint and not any([endpoint in subnet.inet for subnet in subnets])
         if is_faulty(self.ipv4_endpoint):
             if delete:
@@ -116,8 +117,8 @@ class VPNSubscription(CoinLdapSyncMixin, models.Model):
         # login should not contain any ".", because graphite uses "." as a
         # separator.
         if not self.login:
-            username = self.administrative_subscription.member.ldap_cn
-            vpns = VPNSubscription.objects.filter(administrative_subscription__member__ldap_cn=username)
+            username = self.offersubscription.member.ldap_cn
+            vpns = VPNConfiguration.objects.filter(offersubscription__member__ldap_cn=username)
             # This is the list of existing VPN logins for this user.
             logins = [vpn.login for vpn in vpns]
             # 100 VPNs ought to be enough for anybody.
@@ -139,6 +140,9 @@ class VPNSubscription(CoinLdapSyncMixin, models.Model):
     def __unicode__(self):
         return 'VPN ' + self.login
 
+    class Meta:
+        verbose_name = 'VPN'
+
 
 class LdapVPNConfig(ldapdb.models.Model):
     # TODO: déplacer ligne suivante dans settings.py

coin/vpn/tests.py

@@ -1,7 +1,7 @@
 from django.test import TestCase
 
 from coin.offers.models import Offer, OfferSubscription
-from coin.vpn.models import VPNSubscription
+from coin.vpn.models import VPNConfiguration
 from coin.resources.models import IPPool, IPSubnet
 from coin.members.models import Member
 from coin.members.tests import MemberTestsUtils
@@ -13,7 +13,7 @@ class VPNTestCase(TestCase):
     def setUp(self):
         self.v6_pool = IPPool.objects.get(default_subnetsize=56)
         self.v4_pool = IPPool.objects.get(default_subnetsize=32)
-        self.offer = Offer.objects.filter(backend="openvpn_ldap")[0]
+        self.offer = Offer.objects.filter(configuration_type="VPNConfiguration")[0]
 
         # Create a member.
         cn = MemberTestsUtils.get_random_ldap_cn()
@@ -32,7 +32,7 @@ class VPNTestCase(TestCase):
         v4 = IPSubnet(ip_pool=self.v4_pool, offer_subscription=abo)
         v4.full_clean()
         v4.save()
-        vpn = VPNSubscription(administrative_subscription=abo)
+        vpn = VPNConfiguration(offersubscription=abo)
         vpn.full_clean()
         vpn.save()
 
@@ -42,37 +42,37 @@ class VPNTestCase(TestCase):
             abo = OfferSubscription(offer=self.offer, member=self.member)
             abo.full_clean()
             abo.save()
-            vpn = VPNSubscription(administrative_subscription=abo)
+            vpn = VPNConfiguration(offersubscription=abo)
             vpn.full_clean()
             vpn.save()
 
     def tearDown(self):
         """Properly clean up objects, so that they don't stay in LDAP"""
-        for vpn in VPNSubscription.objects.all():
+        for vpn in VPNConfiguration.objects.all():
             vpn.delete()
         Member.objects.get().delete()
 
     def test_has_ipv4_endpoint(self):
-        vpn = VPNSubscription.objects.all()[0]
+        vpn = VPNConfiguration.objects.all()[0]
         self.assertIsNotNone(vpn.ipv4_endpoint)
 
     def test_has_correct_ipv4_endpoint(self):
         """If there is not endpoint, we consider it to be correct."""
-        vpn = VPNSubscription.objects.all()[0]
+        vpn = VPNConfiguration.objects.all()[0]
         if vpn.ipv4_endpoint is not None:
-            abo = vpn.administrative_subscription
+            abo = vpn.offersubscription
             subnet = abo.ip_subnet.get(ip_pool=self.v4_pool)
             self.assertIn(vpn.ipv4_endpoint, subnet.inet)
 
     def test_has_ipv6_endpoint(self):
-        vpn = VPNSubscription.objects.all()[0]
+        vpn = VPNConfiguration.objects.all()[0]
         self.assertIsNotNone(vpn.ipv6_endpoint)
 
     def test_has_correct_ipv6_endpoint(self):
         """If there is not endpoint, we consider it to be correct."""
-        vpn = VPNSubscription.objects.all()[0]
+        vpn = VPNConfiguration.objects.all()[0]
         if vpn.ipv6_endpoint is not None:
-            abo = vpn.administrative_subscription
+            abo = vpn.offersubscription
             subnet = abo.ip_subnet.get(ip_pool=self.v6_pool)
             self.assertIn(vpn.ipv6_endpoint, subnet.inet)
 
@@ -93,10 +93,10 @@ class VPNTestCase(TestCase):
         self.test_has_correct_ipv6_endpoint()
 
     def test_automatic_login(self):
-        vpn = VPNSubscription.objects.all()[0]
-        expected_login = vpn.administrative_subscription.member.ldap_cn + "-vpn1"
+        vpn = VPNConfiguration.objects.all()[0]
+        expected_login = vpn.offersubscription.member.ldap_cn + "-vpn1"
         self.assertEqual(vpn.login, expected_login)
 
     def test_has_multiple_vpn(self):
-        vpns = VPNSubscription.objects.all()
+        vpns = VPNConfiguration.objects.all()
         self.assertEqual(len(vpns), 6)

coin/vpn/urls.py

@@ -5,8 +5,8 @@ urlpatterns = patterns(
     '',
     # This is part of the generic configuration interface (the "name" is
     # the same as the "backend_name" of the model).
-    url(r'^([0-9]+)$', VPNView.as_view(template_name="vpn/vpn.html"), name="openvpn_ldap"),
-    url(r'^password/([0-9]+)$', VPNGeneratePasswordView.as_view(template_name="vpn/password.html"), name="generate_password"),
+    url(r'^(?P<id>\d+)$', VPNView.as_view(template_name="vpn/vpn.html"), name="details"),
+    url(r'^password/(?P<id>\d+)$', VPNGeneratePasswordView.as_view(template_name="vpn/password.html"), name="generate_password"),
     url(r'^graph/(?P<vpn_id>[0-9]+)/(?P<period>[a-z]+)$', get_graph, name="get_graph"),
     url(r'^graph/(?P<vpn_id>[0-9]+)$', get_graph, name="get_graph"),
 )

coin/vpn/views.py

@@ -7,14 +7,29 @@ from django.shortcuts import render_to_response, get_object_or_404
 from django.views.generic.detail import DetailView
 from django.conf import settings
 
-from coin.vpn.models import VPNSubscription
+from coin.vpn.models import VPNConfiguration
 
 
 class VPNView(DetailView):
 
     def get_object(self):
-        return get_object_or_404(VPNSubscription, pk=self.args[0],
-                                 administrative_subscription__member__user=self.request.user)
+        return get_object_or_404(VPNConfiguration, pk=self.kwargs.get("id"),
+                                 offersubscription__member__user=self.request.user)
+
+def generate_password(request, id):
+    """This generates a random password, saves it in hashed form, and returns
+    it to the user in cleartext.
+    """
+    vpn = get_object_or_404(VPNConfiguration, pk=id,
+                            offersubscription__member__user=request.user)
+    # This function has nothing to here, but it's convenient.
+    password = User.objects.make_random_password()
+    vpn.password = password
+    # This will hash the password automatically
+    vpn.full_clean()
+    vpn.save()
+    return render_to_response('vpn/password.html', {"vpn": vpn,
+                                                    "password": password})
 
 
 class VPNGeneratePasswordView(VPNView):
@@ -37,8 +52,8 @@ class VPNGeneratePasswordView(VPNView):
 def get_graph(request, vpn_id, period="daily"):
     """ This get the graph for the associated vpn_id and time period
     """
-    vpn = get_object_or_404(VPNSubscription, pk=vpn_id,
-                            administrative_subscription__member__user=request.user.id)
+    vpn = get_object_or_404(VPNConfiguration, pk=vpn_id,
+                            offersubscription__member__user=request.user.id)
     
     time_periods = { 'hourly': '-1hour', 'daily': '-24hours', 'weekly': '-8days', 'monthly': '-32days', 'yearly': '-13months', }
     if period not in time_periods:

requirements.txt

@@ -9,5 +9,6 @@ django-autocomplete-light==2.0.0a8
 reportlab==2.5
 django-activelink==0.4
 html2text
+django-polymorphic==0.5.5
 -e git+https://github.com/jmacul2/django-postgresql-netfields@2d6e597c3d65ba8b0e1f6e3183869216e990e915#egg=django-netfields
 -e git+https://github.com/chrisglass/xhtml2pdf@a5d37ffd0ccb0603bdf668198de0f21766816104#egg=xhtml2pdf-master