From bd22464547488268990ad5f864d5e10ba5f6a4a3 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Wed, 4 Oct 2017 03:05:00 +0200
Subject: [PATCH] =?UTF-8?q?Split=20le=20champ=20radius=20entre=20le=20mode?=
 =?UTF-8?q?=20radius=20et=20le=20vlan=20forc=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 freeradius_utils/auth.py                      |  7 +++--
 .../migrations/0029_auto_20171002_0334.py     | 20 ++++++++++++++
 .../migrations/0030_auto_20171004_0235.py     | 26 +++++++++++++++++++
 topologie/models.py                           |  9 +++----
 topologie/templates/topologie/aff_port.html   |  2 ++
 5 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 topologie/migrations/0029_auto_20171002_0334.py
 create mode 100644 topologie/migrations/0030_auto_20171004_0235.py

diff --git a/freeradius_utils/auth.py b/freeradius_utils/auth.py
index 64ddbc9d..55964b83 100644
--- a/freeradius_utils/auth.py
+++ b/freeradius_utils/auth.py
@@ -273,6 +273,9 @@ def decide_vlan_and_register_switch(nas, nas_type, port_number, mac_address):
         return (sw_name, u'Port inconnu', VLAN_OK)
 
     port = port.first()
+    # Si un vlan a été précisé, on l'utilise pour VLAN_OK
+    if port.vlan_force:
+        VLAN_OK = int(port.vlan_force.vlan_id)
 
     if port.radius == 'NO':
         return (sw_name, u"Pas d'authentification sur ce port", VLAN_OK)
@@ -317,8 +320,4 @@ def decide_vlan_and_register_switch(nas, nas_type, port_number, mac_address):
         else:
             return (sw_name, u'Machine OK', VLAN_OK)
 
-    # On gere bien tous les autres états possibles, il ne reste que le VLAN en dur
-    return (sw_name, u'VLAN impose', int(port.radius))
-
-
 
diff --git a/topologie/migrations/0029_auto_20171002_0334.py b/topologie/migrations/0029_auto_20171002_0334.py
new file mode 100644
index 00000000..73ddff1b
--- /dev/null
+++ b/topologie/migrations/0029_auto_20171002_0334.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-10-02 01:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0028_auto_20170913_1503'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='port',
+            name='radius',
+            field=models.CharField(choices=[('NO', 'NO'), ('STRICT', 'STRICT'), ('BLOQ', 'BLOQ'), ('COMMON', 'COMMON'), ('3', '3'), ('7', '7'), ('8', '8'), ('13', '13'), ('20', '20'), ('42', '42'), ('69', '69')], default='NO', max_length=32),
+        ),
+    ]
diff --git a/topologie/migrations/0030_auto_20171004_0235.py b/topologie/migrations/0030_auto_20171004_0235.py
new file mode 100644
index 00000000..83f3b022
--- /dev/null
+++ b/topologie/migrations/0030_auto_20171004_0235.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-10-04 00:35
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0029_auto_20171002_0334'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='port',
+            name='vlan_force',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='machines.Vlan'),
+        ),
+        migrations.AlterField(
+            model_name='port',
+            name='radius',
+            field=models.CharField(choices=[('NO', 'NO'), ('STRICT', 'STRICT'), ('BLOQ', 'BLOQ'), ('COMMON', 'COMMON')], default='NO', max_length=32),
+        ),
+    ]
diff --git a/topologie/models.py b/topologie/models.py
index 0aafa24e..7ac10243 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -91,23 +91,20 @@ class Switch(models.Model):
 
 class Port(models.Model):
     PRETTY_NAME = "Port de switch"
-    STATES_BASE = (
+    STATES = (
             ('NO', 'NO'),
             ('STRICT', 'STRICT'),
             ('BLOQ', 'BLOQ'),
             ('COMMON', 'COMMON'),
             )
-    try:
-        STATES = STATES_BASE + tuple([(str(id), str(id)) for id in list(Vlan.objects.values_list('vlan_id', flat=True).order_by('vlan_id'))])
-    except:
-        STATES = STATES_BASE 
-
+    
     switch = models.ForeignKey('Switch', related_name="ports")
     port = models.IntegerField()
     room = models.ForeignKey('Room', on_delete=models.PROTECT, blank=True, null=True)
     machine_interface = models.ForeignKey('machines.Interface', on_delete=models.SET_NULL, blank=True, null=True)
     related = models.OneToOneField('self', null=True, blank=True, related_name='related_port')
     radius = models.CharField(max_length=32, choices=STATES, default='NO')
+    vlan_force = models.ForeignKey('machines.Vlan', on_delete=models.SET_NULL, blank=True, null=True)
     details = models.CharField(max_length=255, blank=True)
 
     class Meta:
diff --git a/topologie/templates/topologie/aff_port.html b/topologie/templates/topologie/aff_port.html
index 6bd84abc..609d4349 100644
--- a/topologie/templates/topologie/aff_port.html
+++ b/topologie/templates/topologie/aff_port.html
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <th>Interface machine</th>
             <th>Related</th>
             <th>Radius</th>
+	    <th>Vlan forcé</th>
             <th>Détails</th>
             <th></th>
         </tr>
@@ -53,6 +54,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% endif %}
         </td>
         <td>{{ port.radius }}</td>
+	<td>{% if not port.vlan_force %} Aucun{%else %}{{ port.vlan_force }}{% endif %}</td>
         <td>{{ port.details }}</td>
         <td class="text-right">
             <a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'port' port.pk %}">