ajout des antennes

accounts/migrations/0006_auto_20170607_2306.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-06-07 21:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0005_profile_ssh_keys'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='ssh_keys',
+            field=models.TextField(blank=True, default='', verbose_name='Clefs SSH'),
+        ),
+    ]

djadhere/settings.py

@@ -49,6 +49,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.gis',
 ]
 
 MIDDLEWARE = [
@@ -89,11 +90,14 @@ WSGI_APPLICATION = 'djadhere.wsgi.application'
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
+        #'ENGINE': 'django.db.backends.sqlite3',
+        'ENGINE': 'django.contrib.gis.db.backends.spatialite',
         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
 
+SPATIALITE_LIBRARY_PATH = 'mod_spatialite'
+
 
 # Password validation
 # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators

djadhere/urls.py

@@ -14,7 +14,7 @@ Including another URLconf
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
 from django.conf.urls import url, include
-from django.contrib import admin
+from django.contrib.gis import admin
 from django.conf import settings
 
 

requirements.dev.txt

@@ -0,0 +1,6 @@
+-r requirements.txt
+
+# geos
+# proj
+# gdal
+# libspatialite

requirements.prod.txt

@@ -0,0 +1,6 @@
+-r requirements.txt
+
+# geos
+# proj
+# gdal
+# postgis

services/admin.py

@@ -1,5 +1,7 @@
 from django.contrib import admin
+from django.contrib.gis import admin as geo_admin
 from django.db import models
+from django.db.models import Q
 from django.forms import ModelForm, BaseInlineFormSet
 from django.utils import timezone
 from django.core.urlresolvers import reverse
@@ -7,8 +9,7 @@ from django.utils.html import format_html
 from django.core.mail import mail_managers
 
 from adhesions.models import Adhesion
-from djadhere.utils import get_active_filter
-from .models import Service, ServiceType, IPResource, Route, ResourceAllocation
+from .models import Service, ServiceType, IPResource, Route, ServiceAllocation, Antenna, AntennaAllocation, Allocation
 from .utils import notify_allocation
 
 
@@ -25,53 +26,32 @@ class ResourceInUseFilter(admin.SimpleListFilter):
         )
 
     def queryset(self, request, queryset):
-        now = timezone.now()
-        active_filter = get_active_filter('allocation')
+        available_filter = Q(reserved=False, in_use=False)
         if self.value() == '0': # non disponible
-            return queryset.filter(active_filter | models.Q(reserved=True))
+            return queryset.exclude(available_filter)
         if self.value() == '1': # disponible
-            return queryset.exclude(reserved=True).exclude(active_filter)
-
-
-class AllocationStatusFilter(admin.SimpleListFilter):
-    title = 'statut'
-    parameter_name = 'status'
-
-    def lookups(self, request, model_admin):
-        return (
-            (1, 'En cours'),
-            (0, 'Terminée'),
-        )
-
-    def queryset(self, request, queryset):
-        now = timezone.now()
-        active_filter = get_active_filter()
-        if self.value() == '0': # inactif
-            return queryset.exclude(active_filter)
-        if self.value() == '1': # actif
-            return queryset.filter(active_filter)
+            return queryset.filter(available_filter)
 
 
 ### Inlines
 
-class ResourceAllocationInlineFormSet(BaseInlineFormSet):
+class AllocationInlineFormSet(BaseInlineFormSet):
     def save_new(self, form, commit=True):
         obj = super().save_new(form, commit)
-        notify_allocation(self.request, obj)
+        if type(obj) == ServiceAllocation:
+            notify_allocation(self.request, obj)
         return obj
 
     def save_existing(self, form, instance, commit=True):
-        old = ResourceAllocation.objects.get(pk=instance.pk)
-        notify_allocation(self.request, instance, old)
+        old = type(instance).objects.get(pk=instance.pk)
+        if type(instance) == ServiceAllocation:
+            notify_allocation(self.request, instance, old)
         return super().save_existing(form, instance, commit)
 
 
 class AllocationInline(admin.TabularInline):
-    model = ResourceAllocation
-    formset = ResourceAllocationInlineFormSet
+    formset = AllocationInlineFormSet
     extra = 0
-    fields = ('id', 'service', 'resource', 'route', 'start', 'end')
-    raw_id_fields = ('service', 'resource',)
     verbose_name_plural = 'Allocations'
     show_change_link = True
 
@@ -90,6 +70,18 @@ class AllocationInline(admin.TabularInline):
         return False
 
 
+class ServiceAllocationInline(AllocationInline):
+    model = ServiceAllocation
+    fields = ('id', 'service', 'resource', 'route', 'start', 'end')
+    raw_id_fields = ('service', 'resource',)
+
+
+class AntennaAllocationInline(AllocationInline):
+    model = AntennaAllocation
+    fields = ('id', 'antenna', 'resource', 'start', 'end')
+    raw_id_fields = ('antenna', 'resource',)
+
+
 ### Actions
 
 def ends_resource(resource, request, queryset):
@@ -108,7 +100,7 @@ class ServiceAdmin(admin.ModelAdmin):
         'active',
         ('service_type', admin.RelatedOnlyFieldListFilter),
     )
-    inlines = (AllocationInline,)
+    inlines = (ServiceAllocationInline,)
     search_fields = ('id', 'service_type__name', 'label', 'adhesion__id',)
     raw_id_fields = ('adhesion',)
 
@@ -129,21 +121,47 @@ class ServiceAdmin(admin.ModelAdmin):
 
 
 class IPResourceAdmin(admin.ModelAdmin):
-    list_display = ('__str__', 'available_display')
+    list_display = ('__str__', 'available_display', 'last_use',)
     list_filter = (
+        'category',
         ResourceInUseFilter,
         ('prefixes', admin.RelatedOnlyFieldListFilter),
     )
     fields = ('ip', 'reserved', 'notes')
     readonly_fields = ('ip', 'reserved',)
     search_fields = ('ip',)
-    inlines = (AllocationInline,)
+
+    def get_inline_instances(self, request, obj=None):
+        if obj:
+            if obj.category == 0:
+                inlines = (ServiceAllocationInline,)
+            elif obj.category == 1:
+                inlines = (AntennaAllocationInline,)
+        else:
+            inlines = ()
+        return [inline(self.model, self.admin_site) for inline in inlines]
+
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        qs = qs.annotate(last_use=models.Case(
+                    models.When(category=0, then=models.Max('service_allocation__end')),
+                    models.When(category=1, then=models.Max('antenna_allocation__end')),
+                ))
+        return qs
 
     def available_display(self, obj):
         return not obj.reserved and not obj.in_use
     available_display.short_description = 'Disponible'
     available_display.boolean = True
 
+    def last_use(self, obj):
+        if obj.allocations.exists():
+            return obj.allocations.last().end
+        else:
+            return None
+    last_use.short_description = 'Dernière utilisation'
+    last_use.admin_order_field = 'last_use'
+
     def get_actions(self, request):
         actions = super().get_actions(request)
         if 'delete_selected' in actions:
@@ -174,32 +192,6 @@ class RouteAdmin(admin.ModelAdmin):
         return False
 
 
-class ResourceAllocationAdmin(admin.ModelAdmin):
-    list_display = ('id', 'resource', 'service', 'start', 'end',)
-    list_display_links = ('resource', 'service',)
-    list_filter = (AllocationStatusFilter,)
-    #actions = (ends_resource,)
-    raw_id_fields = ('resource', 'service',)
-    search_fields = ('resource__ip', 'service__id', 'service__service_type__name', 'service__label')
-
-    def get_actions(self, request):
-        actions = super().get_actions(request)
-        if 'delete_selected' in actions:
-            del actions['delete_selected']
-        return actions
-
-    def has_delete_permission(self, request, obj=None):
-        return False
-
-    def save_model(self, request, obj, form, change):
-        if change:
-            old_alloc = ResourceAllocation.objects.get(pk=obj.pk)
-        else:
-            old_alloc = None
-        super().save_model(request, obj, form, change)
-        notify_allocation(request, obj, old_alloc)
-
-
 class ServiceTypeAdmin(admin.ModelAdmin):
     fields = ('name',)
     readonly_fields = ('name',)
@@ -217,8 +209,12 @@ class ServiceTypeAdmin(admin.ModelAdmin):
         return False
 
 
+class AntennaAdmin(geo_admin.OSMGeoAdmin):
+    inlines = (AntennaAllocationInline,)
+
+
 admin.site.register(ServiceType, ServiceTypeAdmin)
 admin.site.register(Service, ServiceAdmin)
 admin.site.register(IPResource, IPResourceAdmin)
 admin.site.register(Route, RouteAdmin)
-admin.site.register(ResourceAllocation, ResourceAllocationAdmin)
+geo_admin.site.register(Antenna, AntennaAdmin)

services/migrations/0026_auto_20170607_2306.py

@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-06-07 21:06
+from __future__ import unicode_literals
+
+import django.contrib.gis.db.models.fields
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('services', '0025_ipresource_notes'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Antenna',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('position', django.contrib.gis.db.models.fields.PointField(null=True, srid=4326)),
+                ('mac', models.CharField(blank=True, default='', max_length=17, validators=[django.core.validators.RegexValidator('^([0-9a-fA-F]{2}([:-]?|$)){6}$')])),
+                ('notes', models.TextField(blank=True)),
+            ],
+            options={
+                'verbose_name': 'antenne',
+            },
+        ),
+        migrations.CreateModel(
+            name='AntennaAllocation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('start', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Début de la période d’allocation')),
+                ('end', models.DateTimeField(blank=True, null=True, verbose_name='Fin de la période d’allocation')),
+                ('notes', models.TextField(blank=True, default='')),
+                ('antenna', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allocations', related_query_name='allocation', to='services.Antenna')),
+            ],
+            options={
+                'verbose_name': 'allocation',
+                'verbose_name_plural': 'allocations',
+            },
+        ),
+        migrations.CreateModel(
+            name='ServiceAllocation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('start', models.DateTimeField(default=django.utils.timezone.now, verbose_name='Début de la période d’allocation')),
+                ('end', models.DateTimeField(blank=True, null=True, verbose_name='Fin de la période d’allocation')),
+                ('notes', models.TextField(blank=True, default='')),
+            ],
+            options={
+                'verbose_name': 'allocation',
+                'verbose_name_plural': 'allocations',
+            },
+        ),
+        migrations.RemoveField(
+            model_name='resourceallocation',
+            name='resource',
+        ),
+        migrations.RemoveField(
+            model_name='resourceallocation',
+            name='route',
+        ),
+        migrations.RemoveField(
+            model_name='resourceallocation',
+            name='service',
+        ),
+        migrations.AddField(
+            model_name='ipresource',
+            name='category',
+            field=models.IntegerField(choices=[(0, 'IP Public'), (1, 'IP Antenne')], default=0, verbose_name='catégorie'),
+            preserve_default=False,
+        ),
+        migrations.DeleteModel(
+            name='ResourceAllocation',
+        ),
+        migrations.AddField(
+            model_name='serviceallocation',
+            name='resource',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='service_allocations', related_query_name='service_allocation', to='services.IPResource', verbose_name='Ressource'),
+        ),
+        migrations.AddField(
+            model_name='serviceallocation',
+            name='route',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='services', related_query_name='allocation', to='services.Route', verbose_name='Route'),
+        ),
+        migrations.AddField(
+            model_name='serviceallocation',
+            name='service',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allocations', related_query_name='allocation', to='services.Service'),
+        ),
+        migrations.AddField(
+            model_name='antennaallocation',
+            name='resource',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='antenna_allocations', related_query_name='antenna_allocation', to='services.IPResource', verbose_name='Ressource'),
+        ),
+    ]

services/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.contrib.gis.db import models as geo_models
 from django.db.models import Q
 from django.core.validators import MaxValueValidator
 from django.utils import timezone
@@ -8,6 +9,7 @@ from django.core.exceptions import ValidationError
 from django.urls import reverse
 from django.utils import timezone
 from django.core.exceptions import PermissionDenied
+from django.core.validators import RegexValidator
 
 from djadhere.utils import get_active_filter, is_overlapping
 from adhesions.models import Adhesion
@@ -21,22 +23,46 @@ class IPPrefix(models.Model):
         return self.prefix
 
 
+class IPResourceManager(models.Manager):
+    def get_queryset(self):
+        qs = super().get_queryset()
+        # On rajoute une super annotation « in_use » pour savoir si l’IP est dispo ou non :-)
+        query = Q(resource=models.OuterRef('pk')) & get_active_filter()
+        qs = qs.annotate(
+                    in_use_by_service=models.Exists(
+                        ServiceAllocation.objects.filter(query)
+                    ),
+                    in_use_by_antenna=models.Exists(
+                        AntennaAllocation.objects.filter(query)
+                    ),
+                    in_use=models.ExpressionWrapper(
+                        models.F('in_use_by_service') + models.F('in_use_by_antenna'),
+                        output_field=models.BooleanField()
+                    )
+        )
+        return qs
+
+
 class IPResource(models.Model):
+    CATEGORIES = (
+        (0, 'IP Public'),
+        (1, 'IP Antenne'),
+    )
+
     ip = models.GenericIPAddressField(verbose_name='IP', primary_key=True)
     prefixes = models.ManyToManyField(IPPrefix, verbose_name='préfixes')
     reserved = models.BooleanField(default=False, verbose_name='réservée')
+    category = models.IntegerField(choices=CATEGORIES, verbose_name='catégorie')
     notes = models.TextField(blank=True, default='')
 
-    @property
-    def in_use(self):
-        return self.allocation is not None
+    objects = IPResourceManager()
 
     @property
-    def allocation(self):
-        try:
-            return self.allocations.get(get_active_filter())
-        except ResourceAllocation.DoesNotExist:
-            return None
+    def allocations(self):
+        if self.category == 0:
+            return self.service_allocations
+        if self.category == 1:
+            return self.antenna_allocations
 
     class Meta:
         ordering = ['ip']
@@ -80,14 +106,6 @@ class Service(models.Model):
             return None
         # MultipleObjectsReturned non catché volontairement, cf remarque adhesions.Adhesion.contribution
 
-    @property
-    def active_allocations(self):
-        return self.allocations.filter(get_active_filter())
-
-    @property
-    def inactive_allocations(self):
-        return self.allocations.exclude(get_active_filter())
-
     def clean(self):
         super().clean()
         # Vérification de l’unicité par type de service du label
@@ -101,6 +119,24 @@ class Service(models.Model):
         return s
 
 
+class Antenna(models.Model):
+    position = geo_models.PointField(null=True)
+    mac = models.CharField(
+            blank=True,
+            default='',
+            max_length=17,
+            validators=[
+                RegexValidator(r'^([0-9a-fA-F]{2}([:-]?|$)){6}$'),
+            ])
+    notes = models.TextField(blank=True)
+
+    class Meta:
+        verbose_name = 'antenne'
+
+    def __str__(self):
+        return 'Antenne %d' % self.pk
+
+
 class Route(models.Model):
     name = models.CharField(max_length=64)
 
@@ -108,10 +144,7 @@ class Route(models.Model):
         return self.name
 
 
-class ResourceAllocation(models.Model):
-    resource = models.ForeignKey(IPResource, verbose_name='Ressource', related_name='allocations', related_query_name='allocation')
-    service = models.ForeignKey(Service, related_name='allocations', related_query_name='allocation')
-    route = models.ForeignKey(Route, verbose_name='Route', related_name='allocations', related_query_name='allocation')
+class Allocation(models.Model):
     start = models.DateTimeField(verbose_name='Début de la période d’allocation', default=timezone.now)
     end = models.DateTimeField(null=True, blank=True, verbose_name='Fin de la période d’allocation')
     notes = models.TextField(blank=True, default='')
@@ -131,15 +164,35 @@ class ResourceAllocation(models.Model):
             if self.resource.reserved:
                 raise ValidationError("L’IP sélectionnée est réservée")
             # Vérification de l’abscence de chevauchement de la période d’allocation
-            allocations = ResourceAllocation.objects.filter(resource__pk=self.resource.pk)
+            allocations = type(self).objects.filter(resource__pk=self.resource.pk)
             if is_overlapping(self, allocations):
                 raise ValidationError("La période d’allocation de cette ressource chevauche "
                                         "avec une période d’allocation précédente.")
 
     class Meta:
-        verbose_name = 'allocation'
-        verbose_name_plural = 'allocations'
+        abstract = True
         ordering = ['-start']
 
     def __str__(self):
         return str(self.resource)
+
+
+class ServiceAllocation(Allocation):
+    resource = models.ForeignKey(IPResource, verbose_name='Ressource', related_name='service_allocations',
+                        related_query_name='service_allocation', limit_choices_to={'category': 0})
+    service = models.ForeignKey(Service, related_name='allocations', related_query_name='allocation')
+    route = models.ForeignKey(Route, verbose_name='Route', related_name='services', related_query_name='allocation')
+
+    class Meta:
+        verbose_name = 'allocation'
+        verbose_name_plural = 'allocations'
+
+
+class AntennaAllocation(Allocation):
+    resource = models.ForeignKey(IPResource, verbose_name='Ressource', related_name='antenna_allocations',
+                        related_query_name='antenna_allocation', limit_choices_to={'category': 1})
+    antenna = models.ForeignKey(Antenna, related_name='allocations', related_query_name='allocation')
+
+    class Meta:
+        verbose_name = 'allocation'
+        verbose_name_plural = 'allocations'

services/utils.py

@@ -2,8 +2,6 @@ from django.core.mail.message import EmailMultiAlternatives
 from django.core.urlresolvers import reverse
 from django.conf import settings
 
-from .models import ResourceAllocation
-
 
 def mail_managers(subject, message, fail_silently=False, connection=None,
                   html_message=None, **kwargs):
@@ -44,7 +42,7 @@ def notify_allocation(request, new_alloc, old_alloc=None):
 
     url = 'https' if request.is_secure() else 'http'
     url += '://' + request.get_host()
-    url += reverse('admin:services_resourceallocation_change', args=(new_alloc.pk,))
+    url += reverse('admin:services_ipresource_change', args=(new_alloc.resource.pk,))
     message += '\n\nVoir : ' + url
 
     if old_alloc and diff: