From 5dc59035f564b8b9f2d8641d9e15d25d48d8a475 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Wed, 11 Jul 2018 19:46:13 +0200
Subject: [PATCH] =?UTF-8?q?Cr=C3=A9e=20sp=C3=A9cific=20role,=20l'utilise?=
 =?UTF-8?q?=20pour=20get=20l'ip=20du=20serveur=20des=20config=20switchs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/serializers.py                            | 44 +++++++++++++++++++
 .../migrations/0094_role_specific_role.py     | 20 +++++++++
 machines/models.py                            | 13 ++++++
 machines/templates/machines/aff_role.html     |  2 +
 4 files changed, 79 insertions(+)
 create mode 100644 machines/migrations/0094_role_specific_role.py

diff --git a/api/serializers.py b/api/serializers.py
index 398f2b19..ffb3aaba 100644
--- a/api/serializers.py
+++ b/api/serializers.py
@@ -622,6 +622,50 @@ class ServiceRegenSerializer(NamespacedHMSerializer):
             'api_url': {'view_name': 'serviceregen-detail'}
         }
 
+# Switches et ports
+
+class InterfaceVlanSerializer(NamespacedHMSerializer):
+    domain = serializers.CharField(read_only=True)
+    ipv4 = serializers.CharField(read_only=True)
+    ipv6 = Ipv6ListSerializer(read_only=True, many=True)
+    vlan_id = serializers.IntegerField(source='type.ip_type.vlan.vlan_id', read_only=True)
+
+    class Meta:
+        model = machines.Interface
+        fields = ('ipv4', 'ipv6', 'domain', 'vlan_id')
+
+class InterfaceRoleSerializer(NamespacedHMSerializer):
+    interface = InterfaceVlanSerializer(source='machine.interface_set', read_only=True, many=True)
+
+    class Meta:
+        model = machines.Interface
+        fields = ('interface',)
+
+
+class RoleSerializer(NamespacedHMSerializer):
+    """Serialize `machines.models.OuverturePort` objects.
+    """
+    servers = InterfaceRoleSerializer(read_only=True, many=True)
+
+    class Meta:
+        model = machines.Role
+        fields = ('role_type', 'servers', 'specific_role')
+
+
+class VlanPortSerializer(NamespacedHMSerializer):
+    class Meta:
+        model = machines.Vlan
+        fields = ('vlan_id', 'name')
+
+
+class ProfilSerializer(NamespacedHMSerializer):
+    vlan_untagged = VlanSerializer(read_only=True)
+    vlan_tagged = VlanPortSerializer(read_only=True, many=True)
+
+    class Meta:
+        model = topologie.PortProfile
+        fields = ('name', 'profil_default', 'vlan_untagged', 'vlan_tagged', 'radius_type', 'radius_mode', 'speed', 'mac_limit', 'flow_control', 'dhcp_snooping', 'dhcpv6_snooping', 'arp_protect', 'ra_guard', 'loop_protect', 'vlan_untagged', 'vlan_tagged')
+
 
 # LOCAL EMAILS
 
diff --git a/machines/migrations/0094_role_specific_role.py b/machines/migrations/0094_role_specific_role.py
new file mode 100644
index 00000000..73cade7b
--- /dev/null
+++ b/machines/migrations/0094_role_specific_role.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-07-11 16:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0093_merge_20180710_0226'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='role',
+            name='specific_role',
+            field=models.CharField(blank=True, choices=[('dhcp-server', 'dhcp-server'), ('switch-conf-server', 'switch-conf-server'), ('dns-recursif-server', 'dns-recursif-server'), ('ntp-server', 'ntp-server'), ('radius-server', 'radius-server'), ('ntp-server', 'ntp-server'), ('log-server', 'log-server'), ('ldap-master-server', 'ldap-master-server'), ('ldap-backup-server', 'ldap-backup-server'), ('smtp-server', 'smtp-server'), ('postgresql-server', 'postgresql-server'), ('mysql-server', 'mysql-server'), ('sql-client', 'sql-client'), ('gateway', 'gateway')], max_length=32, null=True),
+        ),
+    ]
diff --git a/machines/models.py b/machines/models.py
index 4c528c45..2f401301 100644
--- a/machines/models.py
+++ b/machines/models.py
@@ -1478,6 +1478,19 @@ class Role(RevMixin, AclMixin, models.Model):
             ("view_role", "Peut voir un objet service"),
         )
 
+    @classmethod
+    def get_instance(cls, machineid, *_args, **_kwargs):
+        """Get the Machine instance with machineid.
+        :param userid: The id
+        :return: The user
+        """
+        return cls.objects.get(pk=machineid)
+
+    @classmethod
+    def interface_for_roletype(cls, roletype):
+        """Return interfaces for a roletype"""
+        return Interface.objects.filter(role=cls.objects.filter(specific_role=roletype))
+
     def save(self, *args, **kwargs):
         super(Role, self).save(*args, **kwargs)
 
diff --git a/machines/templates/machines/aff_role.html b/machines/templates/machines/aff_role.html
index f914cd24..691cc0c2 100644
--- a/machines/templates/machines/aff_role.html
+++ b/machines/templates/machines/aff_role.html
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <thead>
             <tr>
                 <th>Nom du role</th>
+		<th>Role spécifique</th>
                 <th>Serveurs inclus</th>
 		<th></th>
                 <th></th>
@@ -36,6 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% for role in role_list %}
         <tr>
             <td>{{ role.role_type }}</td>
+	    <td>{{ role.specific_role }}</td>
 	    <td>{% for serv in role.servers.all %}{{ serv }}, {% endfor %}</td>
             <td class="text-right">
 		{% can_edit role %}