From 6b3448986df107c71fa335620c4beaa3580f47b3 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Mon, 16 Apr 2018 20:26:47 +0200
Subject: [PATCH 01/16] Dossier media/images

---
 media/images/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 media/images/__init__.py

diff --git a/media/images/__init__.py b/media/images/__init__.py
new file mode 100644
index 00000000..e69de29b

From 736c676bbe1f2a29dd4d30eabd001a41391a6455 Mon Sep 17 00:00:00 2001
From: grisel-davy <grisel-davy@re2o-server.crans.org>
Date: Tue, 17 Apr 2018 21:34:59 +0200
Subject: [PATCH 02/16] =?UTF-8?q?Graph=20cach=C3=A9=20par=20d=C3=A9faut=20?=
 =?UTF-8?q?sur=20la=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 topologie/templates/topologie/index.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/topologie/templates/topologie/index.html b/topologie/templates/topologie/index.html
index 6e140251..a69d87d0 100644
--- a/topologie/templates/topologie/index.html
+++ b/topologie/templates/topologie/index.html
@@ -29,10 +29,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}Switchs{% endblock %}
 
 {% block content %}
+
+
+<button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#collImg" aria-expanded="false" aria-controls="collapse">
+    Topologie des Switchs
+  </button>
+
+<div id="collImg">
 <img id="zoom_01" src="/media/images/switchs.png" data-zoom-image="/media/images/switchs.png" width=100% />
+</div>
 
 <script type="text/javascript" src="/static/js/jquery.ez-plus.js"></script>
-
 <script>
 $("#zoom_01").ezPlus({
     scrollZoom: true,

From f7b2e22d3c57a5fb3cbffd4dd66d0b5784e52eab Mon Sep 17 00:00:00 2001
From: grisel-davy <grisel-davy@re2o-server.crans.org>
Date: Wed, 18 Apr 2018 16:48:46 +0200
Subject: [PATCH 03/16] Templatisation du graphe

---
 .../templates/topologie/graph_switch.dot      |  79 ++++++++++
 topologie/views.py                            | 135 ++++++++----------
 2 files changed, 141 insertions(+), 73 deletions(-)
 create mode 100644 topologie/templates/topologie/graph_switch.dot

diff --git a/topologie/templates/topologie/graph_switch.dot b/topologie/templates/topologie/graph_switch.dot
new file mode 100644
index 00000000..c9dcaed3
--- /dev/null
+++ b/topologie/templates/topologie/graph_switch.dot
@@ -0,0 +1,79 @@
+{% block graph_dot %}
+digraph switchs {
+node [
+fontname=Helvetica
+fontsize=8
+shape=plaintext]
+edge[arrowhead=odot,arrowtail=dot]
+
+
+{% block subgraphs %}
+{% for sub in subs %}
+subgraph cluster_{{ sub.bat_id }} {
+label="Batiment {{ sub.bat_name }}";
+{% block switchs %}
+{% for switch in sub.switchs %}
+node [label=<
+<TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+<TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
+<FONT FACE="Helvetica Bold" COLOR="white">
+{{ switch.name }}
+</FONT></TD></TR>
+<TR><TD ALIGN="LEFT" BORDER="0">
+<FONT COLOR="#7B7B7B" >Modèle</FONT>
+</TD>
+<TD ALIGN="LEFT">
+<FONT COLOR="#7B7B7B" >{{ switch.model }}</FONT>
+</TD></TR>
+<TR><TD ALIGN="LEFT" BORDER="0">
+<FONT COLOR="#7B7B7B" >Nombre de ports</FONT>
+</TD>
+<TD ALIGN="LEFT">
+<FONT>{{ switch.nombre }}</FONT>
+</TD></TR>
+<TR><TD ALIGN="LEFT" BORDER="0">
+<FONT COLOR="#7B7B7B" >21</FONT>
+</TD>
+<TD ALIGN="LEFT">
+<FONT>bata-2</FONT>
+</TD></TR>
+{% block liens %}
+{% for port in switch.ports %}
+<TR><TD ALIGN="LEFT" BORDER="0">
+<FONT COLOR="#7B7B7B" >{{ port.numero }}</FONT>
+</TD>
+<TD ALIGN="LEFT">
+<FONT>{{ port.related }}</FONT>
+</TD></TR>
+{% endfor %}
+{% endblock %}
+</TABLE>
+>] {{ switch.id }} ;
+{% endfor %}
+{% endblock %}
+}
+{% endfor %}
+{% endblock %}
+
+
+{% block isoles %}
+{% for switchs in alone %}
+{{switchs.id}} [label=<
+<TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+<TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
+<FONT FACE="Helvetica Bold" COLOR="white">
+{{switchs.name}}
+</FONT></TD></TR>
+</TABLE>
+>]
+{% endfor %}
+{% endblock %}
+
+
+{% block links %}
+{% for link in links %}
+"{{ link.depart }}" -> "{{ link.arrive }}";
+{% endfor %}
+{% endblock %}
+}
+{% endblock %}
\ No newline at end of file
diff --git a/topologie/views.py b/topologie/views.py
index 283f4ffe..c981fc94 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -43,6 +43,10 @@ from django.db import IntegrityError
 from django.db.models import ProtectedError, Prefetch
 from django.core.exceptions import ValidationError
 from django.contrib.staticfiles.storage import staticfiles_storage
+from django.template.loader import get_template
+from django.template import Context, Template, loader
+
+import pprint
 
 from users.views import form
 from re2o.utils import re2o_paginator, SortTable
@@ -940,93 +944,78 @@ def make_machine_graph():
     """
     Crée le fichier dot et l'image du graph des Switchs
     """
-    #Syntaxe DOT temporaire, A mettre dans un template:
-    lignes=['''digraph Switchs {
-node [
-fontname=Helvetica
-fontsize=8
-shape=plaintext]
-edge[arrowhead=odot,arrowtail=dot]''']
-    node_fixe='''node [label=<
-<TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
-<TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
-<FONT FACE="Helvetica Bold" COLOR="white">
-{}
-</FONT></TD></TR>
-<TR><TD ALIGN="LEFT" BORDER="0">
-<FONT COLOR="#7B7B7B" >{}</FONT>
-</TD>
-<TD ALIGN="LEFT">
-<FONT COLOR="#7B7B7B" >{}</FONT> 
-</TD></TR>
-<TR><TD ALIGN="LEFT" BORDER="0">
-<FONT COLOR="#7B7B7B" >{}</FONT>
-</TD>
-<TD ALIGN="LEFT">
-<FONT>{}</FONT>
-</TD></TR>'''
-    node_ports='''<TR><TD ALIGN="LEFT" BORDER="0">
-<FONT COLOR="#7B7B7B" >{}</FONT>
-</TD>
-<TD ALIGN="LEFT">
-<FONT>{}</FONT>
-</TD></TR>'''
-    cluster='''subgraph cluster_{} {{
-color=blue;
-label="Batiment {}";'''
-    end_table='''</TABLE>
->] \"{}_{}\" ;'''
-    switch_alone='''{} [label=<
-<TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
-<TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
-<FONT FACE="Helvetica Bold" COLOR="white">
-{}
-</FONT></TD></TR>
-</TABLE>
->]'''
+    dico={'subs':[],'links':[],'alone':[]}
     missing=[]
     detected=[]
     for sw in Switch.objects.all():
         if(sw not in detected):
             missing.append(sw)
-    for building in Building.objects.all():
-        lignes.append(cluster.format(len(lignes),building))
-        for switch in Switch.objects.filter(switchbay__building=building):
-            lignes.append(node_fixe.format(switch.main_interface().domain.name,"Modèle",switch.model,"Nombre de ports",switch.number))
-            for p in switch.ports.all().filter(related__isnull=False):
-                lignes.append(node_ports.format(p.port,p.related.switch.main_interface().domain.name))
-            lignes.append(end_table.format(building.id,switch.id))
-        lignes.append("}")
-    while(missing!=[]):
-        lignes,new_detected=recursive_switchs(missing[0].ports.all().filter(related=None).first(),None,lignes,[missing[0]])
+    for building in Building.objects.all():#Parcour tous les batiments
+        dico['subs'].append({'bat_id':building.id,'bat_name':building,'switchs':[]})
+        for switch in Switch.objects.filter(switchbay__building=building):#Parcour tous les switchs de ce batiment
+            dico['subs'][-1]['switchs'].append({'name':switch.main_interface().domain.name,'nombre':switch.number,'model':switch.model,'id':switch.id,'batiment':building,'ports':[]})
+
+
+            for p in switch.ports.all().filter(related__isnull=False):#Parcour tout les ports liés de ce switch 
+                dico['subs'][-1]['switchs'][-1]['ports'].append({'numero':p.port,'related':p.related.switch.main_interface().domain.name})
+
+    while(missing!=[]):#Tant que la liste des oubliés n'est pas vide i.e on les a pas tous passer
+        links,new_detected=recursive_switchs(missing[0].ports.all().filter(related=None).first(),None,[missing[0]])
+        for link in links:
+            dico['links'].append(link)
+            
+
+        #on recrée la liste des oubliés et des detectés
         missing=[i for i in missing if i not in new_detected]
         detected+=new_detected
-    for switch in Switch.objects.all().filter(switchbay__isnull=True).exclude(ports__related__isnull=False):
-        lignes.append(switch_alone.format(switch.id,switch.main_interface().domain.name))
-    lignes.append("}")
+
+
+    for switch in Switch.objects.all().filter(switchbay__isnull=True).exclude(ports__related__isnull=False):#Tous ceux qui ne sont ni connectés ni dans un batiment
+        dico['alone'].append({'id':switch.id,'name':switch.main_interface().domain.name})
+
+    dot_data=generate_image(dico)
     fichier = open("media/images/switchs.dot","w")
-    for ligne in lignes:
-        fichier.write(ligne+"\n")
+    fichier.write(dot_data)
     fichier.close()
     unflatten = Popen(["unflatten","-l", "3", "media/images/switchs.dot"], stdout=PIPE)
     image = Popen(["dot", "-Tpng", "-o", "media/images/switchs.png"], stdin=unflatten.stdout, stdout=PIPE)
 
+def generate_image(data,template='topologie/graph_switch.dot'):
 
-def recursive_switchs(port_start, switch_before, lignes,detected):
+
+    t = loader.get_template(template)
+
+    if not isinstance(t, Template) and not (hasattr(t, 'template') and isinstance(t.template, Template)):
+        raise Exception("Le template par défaut de Django n'est pas utilisé."
+                        "Cela peut mener à des erreurs de rendu."
+                        "Vérifiez les paramètres")
+
+    c = Context(data).flatten()
+    dot = t.render(c)
+
+    return(dot)
+
+def recursive_switchs(port_start, switch_before, detected):
     """
     Parcour récursivement le switchs auquel appartient port_start pour trouver les ports suivants liés
     """
-    l_ports=port_start.switch.ports.filter(related__isnull=False)
+    links_return=[]#Liste de dictionaires qui stockes les nouveaux liens détéctés
+
+    l_ports=port_start.switch.ports.filter(related__isnull=False)#Liste des ports dont le related est non null
     for port in l_ports:
-        if port.related.switch!=switch_before and port.related.switch!=port.switch:
-            links=[]
-            for sw in [switch for switch in [port_start.switch,port.related.switch]]:
-                if(sw not in detected):
-                    detected.append(sw)
-                if(sw.switchbay.building):
-                    links.append("\"{}_{}\"".format(sw.switchbay.building.id,sw.id))
-                else:
-                    links.append("\"{}\"".format(sw.id))
-            lignes.append(links[0]+" -> "+links[1])
-            lignes, detected = recursive_switchs(port.related, port_start.switch, lignes, detected)
-    return (lignes, detected)
+
+        if port.related.switch!=switch_before and port.related.switch!=port.switch:#Pas le switch dont on vient, pas le switch actuel
+
+            detected.append(port_start.switch)
+            detected.append(port.related.switch)
+
+            links={'depart':port_start.switch.id,'arrive':port.related.switch.id}
+            links_down, detected = recursive_switchs(port.related, port_start.switch, detected)
+
+            links_return.append(links)
+            for link in links_down:
+                if(link!=[]):
+                    links_return.append(link)
+
+    return (links_return, detected)
+

From 30140de2ae11b05e161271c7d523c72dc32ea1fa Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Wed, 18 Apr 2018 18:11:36 +0200
Subject: [PATCH 04/16] Des methodes raccourci pour mon gentil grizzly

---
 topologie/models.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/topologie/models.py b/topologie/models.py
index 23b72b75..354c975d 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -103,6 +103,23 @@ class AccessPoint(AclMixin, Machine):
             ("view_accesspoint", "Peut voir une borne"),
         )
 
+    def switch(self):
+        """Return the switch where this is plugged"""
+        return Switch.objects.filter(
+            ports__machine_interface__machine=self
+            )
+
+    def building(self):
+        """Return the building of the AP (building of the switchs connected to...)"""
+        return Building.objects.filter(
+            switchbay__switch=self.switch()
+            )
+
+    @classmethod
+    def all_ap_in(cls, building_instance):
+        """Get a building as argument, returns all ap of a building"""
+        return cls.objects.filter(interface__port__switch__switchbay__building=building_instance)
+
     def __str__(self):
         return str(self.interface_set.first())
 

From 22d49864a7fa17f42e699a69894a1fb579791a1b Mon Sep 17 00:00:00 2001
From: grisel-davy <grisel-davy@re2o-server.crans.org>
Date: Wed, 18 Apr 2018 18:38:59 +0200
Subject: [PATCH 05/16] Ajout des bornes wifi

---
 .../templates/topologie/graph_switch.dot      |  7 +++++++
 topologie/views.py                            | 19 +++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/topologie/templates/topologie/graph_switch.dot b/topologie/templates/topologie/graph_switch.dot
index c9dcaed3..6ca2b65b 100644
--- a/topologie/templates/topologie/graph_switch.dot
+++ b/topologie/templates/topologie/graph_switch.dot
@@ -11,6 +11,13 @@ edge[arrowhead=odot,arrowtail=dot]
 {% for sub in subs %}
 subgraph cluster_{{ sub.bat_id }} {
 label="Batiment {{ sub.bat_name }}";
+
+{% block bornes %}
+{% for borne in sub.bornes %}
+node[label="{{borne.name}}"] {{borne.id}};
+{% endfor %}
+{% endblock %}
+
 {% block switchs %}
 {% for switch in sub.switchs %}
 node [label=<
diff --git a/topologie/views.py b/topologie/views.py
index c981fc94..ff6d65a1 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -944,21 +944,31 @@ def make_machine_graph():
     """
     Crée le fichier dot et l'image du graph des Switchs
     """
-    dico={'subs':[],'links':[],'alone':[]}
+    dico={'subs':[],'links':[],'alone':[],'bornes':[]}
     missing=[]
     detected=[]
     for sw in Switch.objects.all():
         if(sw not in detected):
             missing.append(sw)
+
     for building in Building.objects.all():#Parcour tous les batiments
-        dico['subs'].append({'bat_id':building.id,'bat_name':building,'switchs':[]})
+
+        dico['subs'].append({'bat_id':building.id,'bat_name':building,'switchs':[],'bornes':[]})
+
+
         for switch in Switch.objects.filter(switchbay__building=building):#Parcour tous les switchs de ce batiment
             dico['subs'][-1]['switchs'].append({'name':switch.main_interface().domain.name,'nombre':switch.number,'model':switch.model,'id':switch.id,'batiment':building,'ports':[]})
-
-
             for p in switch.ports.all().filter(related__isnull=False):#Parcour tout les ports liés de ce switch 
                 dico['subs'][-1]['switchs'][-1]['ports'].append({'numero':p.port,'related':p.related.switch.main_interface().domain.name})
 
+
+        for ap in AccessPoint.all_ap_in(building):
+            dico['subs'][-1]['bornes'].append({'name':ap.short_name,'id':ap.id})
+            dico['links'].append({'depart':ap.switch()[0].id,'arrive':ap.id})
+
+
+    for ap in AccessPoint.objects.all():
+        dico['bornes'].append({'name':str(ap)})
     while(missing!=[]):#Tant que la liste des oubliés n'est pas vide i.e on les a pas tous passer
         links,new_detected=recursive_switchs(missing[0].ports.all().filter(related=None).first(),None,[missing[0]])
         for link in links:
@@ -1017,5 +1027,6 @@ def recursive_switchs(port_start, switch_before, detected):
                 if(link!=[]):
                     links_return.append(link)
 
+
     return (links_return, detected)
 

From d6cc00c9d75bddedd43bc0489b33835674e45e69 Mon Sep 17 00:00:00 2001
From: grisel-davy <grisel-davy@re2o-server.crans.org>
Date: Wed, 18 Apr 2018 18:59:55 +0200
Subject: [PATCH 06/16] Correction d'erreur dans les labels

---
 topologie/templates/topologie/graph_switch.dot | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/topologie/templates/topologie/graph_switch.dot b/topologie/templates/topologie/graph_switch.dot
index 6ca2b65b..20df6c2d 100644
--- a/topologie/templates/topologie/graph_switch.dot
+++ b/topologie/templates/topologie/graph_switch.dot
@@ -38,12 +38,6 @@ node [label=<
 <TD ALIGN="LEFT">
 <FONT>{{ switch.nombre }}</FONT>
 </TD></TR>
-<TR><TD ALIGN="LEFT" BORDER="0">
-<FONT COLOR="#7B7B7B" >21</FONT>
-</TD>
-<TD ALIGN="LEFT">
-<FONT>bata-2</FONT>
-</TD></TR>
 {% block liens %}
 {% for port in switch.ports %}
 <TR><TD ALIGN="LEFT" BORDER="0">

From 4e2f426c1da557a6281c2a14ebbe0a90100aed20 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Wed, 18 Apr 2018 21:26:57 +0200
Subject: [PATCH 07/16] Short name ap

---
 topologie/models.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/topologie/models.py b/topologie/models.py
index 354c975d..7bfe3204 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -41,6 +41,7 @@ import itertools
 
 from django.db import models
 from django.db.models.signals import post_save, post_delete
+from django.utils.functional import cached_property
 from django.dispatch import receiver
 from django.core.exceptions import ValidationError
 from django.db import IntegrityError
@@ -123,6 +124,9 @@ class AccessPoint(AclMixin, Machine):
     def __str__(self):
         return str(self.interface_set.first())
 
+    @cached_property
+    def short_name(self):
+        return str(self.interface_set.first().domain.name)
 
 class Switch(AclMixin, Machine):
     """ Definition d'un switch. Contient un nombre de ports (number),

From e2f969f831ce07a9b16289046ad8dbf294763acc Mon Sep 17 00:00:00 2001
From: grisel-davy <grisel-davy@re2o-server.crans.org>
Date: Thu, 19 Apr 2018 16:48:50 +0200
Subject: [PATCH 08/16] Modification esthetiques

---
 .../templates/topologie/graph_switch.dot      | 55 ++++++++++++++-----
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/topologie/templates/topologie/graph_switch.dot b/topologie/templates/topologie/graph_switch.dot
index 20df6c2d..3835cd91 100644
--- a/topologie/templates/topologie/graph_switch.dot
+++ b/topologie/templates/topologie/graph_switch.dot
@@ -1,5 +1,5 @@
 {% block graph_dot %}
-digraph switchs {
+digraph Topologie {
 node [
 fontname=Helvetica
 fontsize=8
@@ -12,44 +12,71 @@ edge[arrowhead=odot,arrowtail=dot]
 subgraph cluster_{{ sub.bat_id }} {
 label="Batiment {{ sub.bat_name }}";
 
+{% if sub.bornes %}
+node [label=<
+<TABLE BGCOLOR="{{ colors.back}}" BORDER="1" COLOR="#021f87" CELLBORDER="0" CELLSPACING="0">
+<TH>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_bornes }}"> 
+	<FONT FACE="Helvetica Bold" COLOR="white">Borne</FONT></TD>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_bornes }}"> 
+	<FONT FACE="Helvetica Bold" COLOR="white">Switch</FONT></TD>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_bornes }}"> 
+	<FONT FACE="Helvetica Bold" COLOR="white">Port</FONT></TD>
+</TH>
+
 {% block bornes %}
 {% for borne in sub.bornes %}
-node[label="{{borne.name}}"] {{borne.id}};
+<TR>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BORDER="0">
+		<FONT COLOR="{{ colors.texte }}" >{{ borne.name }}</FONT>
+	</TD>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BORDER="0">
+		<FONT COLOR="{{ colors.texte }}" >{{ borne.switch }}</FONT>
+	</TD>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BORDER="0">
+		<FONT COLOR="{{ colors.texte }}" >{{ borne.port }}</FONT>
+	</TD>
+</TR>
 {% endfor %}
 {% endblock %}
 
+</TABLE>
+>] {{sub.bat_name}}bornes;
+{% endif %}
+
+
 {% block switchs %}
 {% for switch in sub.switchs %}
 node [label=<
-<TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
-<TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
+<TABLE BGCOLOR="{{ colors.back }}" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+<TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head }}">
 <FONT FACE="Helvetica Bold" COLOR="white">
 {{ switch.name }}
 </FONT></TD></TR>
 <TR><TD ALIGN="LEFT" BORDER="0">
-<FONT COLOR="#7B7B7B" >Modèle</FONT>
+<FONT COLOR="{{ colors.texte }}" >Modèle</FONT>
 </TD>
 <TD ALIGN="LEFT">
-<FONT COLOR="#7B7B7B" >{{ switch.model }}</FONT>
+<FONT COLOR="{{ colors.texte }}" >{{ switch.model }}</FONT>
 </TD></TR>
 <TR><TD ALIGN="LEFT" BORDER="0">
-<FONT COLOR="#7B7B7B" >Nombre de ports</FONT>
+<FONT COLOR="{{ colors.texte }}" >Taille</FONT>
 </TD>
 <TD ALIGN="LEFT">
-<FONT>{{ switch.nombre }}</FONT>
+<FONT COLOR="{{ colors.texte }}" >{{ switch.nombre }}</FONT>
 </TD></TR>
 {% block liens %}
 {% for port in switch.ports %}
 <TR><TD ALIGN="LEFT" BORDER="0">
-<FONT COLOR="#7B7B7B" >{{ port.numero }}</FONT>
+<FONT COLOR="{{ colors.texte }}" >{{ port.numero }}</FONT>
 </TD>
 <TD ALIGN="LEFT">
-<FONT>{{ port.related }}</FONT>
+<FONT COLOR="{{ colors.texte }}" >{{ port.related }}</FONT>
 </TD></TR>
 {% endfor %}
 {% endblock %}
 </TABLE>
->] {{ switch.id }} ;
+>] "{{ switch.id }}" ;
 {% endfor %}
 {% endblock %}
 }
@@ -59,9 +86,9 @@ node [label=<
 
 {% block isoles %}
 {% for switchs in alone %}
-{{switchs.id}} [label=<
-<TABLE BGCOLOR="palegoldenrod" BORDER="0" CELLBORDER="0" CELLSPACING="0">
-<TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="olivedrab4">
+"{{switchs.id}}" [label=<
+<TABLE BGCOLOR="{{ colors.back }}" BORDER="0" CELLBORDER="0" CELLSPACING="0">
+<TR><TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head }}">
 <FONT FACE="Helvetica Bold" COLOR="white">
 {{switchs.name}}
 </FONT></TD></TR>

From 2c02a9fb6b309d533fc7b706e11ffd0b8999e8ae Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Wed, 25 Apr 2018 08:36:36 +0200
Subject: [PATCH 09/16] Factorise + fonctions pour recup switch et building
 d'une machine

---
 re2o/mixins.py      | 21 +++++++++++++++++++++
 topologie/models.py | 34 +++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/re2o/mixins.py b/re2o/mixins.py
index c13e841c..036b4f72 100644
--- a/re2o/mixins.py
+++ b/re2o/mixins.py
@@ -24,6 +24,7 @@ A set of mixins used all over the project to avoid duplicating code
 """
 
 from reversion import revisions as reversion
+from django.utils.functional import cached_property
 
 
 class RevMixin(object):
@@ -157,3 +158,23 @@ class AclMixin(object):
             ),
             u"Vous n'avez pas le droit de voir des " + self.get_classname()
         )
+
+
+class SwitchPluggedMixin(object):
+    """Mixin to get building.switch where the device is plugged"""
+
+    def switch(self):
+        """Return the switch where this is plugged"""
+        return Switch.objects.filter(
+            ports__machine_interface__machine=self
+            )
+
+    def building(self):
+        """Return the building of the AP/Server (building of the switchs connected to...)"""
+        return Building.objects.filter(
+            switchbay__switch=self.switch()
+            )
+
+    @cached_property
+    def short_name(self):
+        return str(self.interface_set.first().domain.name)
diff --git a/topologie/models.py b/topologie/models.py
index 7bfe3204..6f4999d1 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -49,7 +49,7 @@ from django.db import transaction
 from reversion import revisions as reversion
 
 from machines.models import Machine, regen
-from re2o.mixins import AclMixin, RevMixin
+from re2o.mixins import AclMixin, RevMixin, SwitchPluggedMixin
 
 
 class Stack(AclMixin, RevMixin, models.Model):
@@ -85,7 +85,7 @@ class Stack(AclMixin, RevMixin, models.Model):
                 inférieure à l'id minimale"})
 
 
-class AccessPoint(AclMixin, Machine):
+class AccessPoint(AclMixin, SwitchPluggedMixin, Machine):
     """Define a wireless AP. Inherit from machines.interfaces
 
     Definition pour une borne wifi , hérite de machines.interfaces
@@ -104,18 +104,6 @@ class AccessPoint(AclMixin, Machine):
             ("view_accesspoint", "Peut voir une borne"),
         )
 
-    def switch(self):
-        """Return the switch where this is plugged"""
-        return Switch.objects.filter(
-            ports__machine_interface__machine=self
-            )
-
-    def building(self):
-        """Return the building of the AP (building of the switchs connected to...)"""
-        return Building.objects.filter(
-            switchbay__switch=self.switch()
-            )
-
     @classmethod
     def all_ap_in(cls, building_instance):
         """Get a building as argument, returns all ap of a building"""
@@ -124,9 +112,21 @@ class AccessPoint(AclMixin, Machine):
     def __str__(self):
         return str(self.interface_set.first())
 
-    @cached_property
-    def short_name(self):
-        return str(self.interface_set.first().domain.name)
+
+class Server(Machine, SwitchPluggedMixin):
+    """Dummy class, to retrieve servers of a building, or get switch of a server"""
+
+    class Meta:
+        proxy = True
+
+    @classmethod
+    def all_server_in(cls, building_instance):
+        """Get a building as argument, returns all server of a building"""
+        return cls.objects.filter(interface__port__switch__switchbay__building=building_instance).exclude(accesspoint__isnull=False)
+
+    def __str__(self):
+        return str(self.interface_set.first())
+
 
 class Switch(AclMixin, Machine):
     """ Definition d'un switch. Contient un nombre de ports (number),

From 9f153c49d80757df31af0184a06520953c0b780a Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Wed, 25 Apr 2018 18:38:40 +0200
Subject: [PATCH 10/16] Ca me broute donc je fais simple

---
 re2o/mixins.py      | 18 ------------------
 topologie/models.py | 40 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/re2o/mixins.py b/re2o/mixins.py
index 036b4f72..5fb3e468 100644
--- a/re2o/mixins.py
+++ b/re2o/mixins.py
@@ -160,21 +160,3 @@ class AclMixin(object):
         )
 
 
-class SwitchPluggedMixin(object):
-    """Mixin to get building.switch where the device is plugged"""
-
-    def switch(self):
-        """Return the switch where this is plugged"""
-        return Switch.objects.filter(
-            ports__machine_interface__machine=self
-            )
-
-    def building(self):
-        """Return the building of the AP/Server (building of the switchs connected to...)"""
-        return Building.objects.filter(
-            switchbay__switch=self.switch()
-            )
-
-    @cached_property
-    def short_name(self):
-        return str(self.interface_set.first().domain.name)
diff --git a/topologie/models.py b/topologie/models.py
index 6f4999d1..57f66901 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -49,7 +49,9 @@ from django.db import transaction
 from reversion import revisions as reversion
 
 from machines.models import Machine, regen
-from re2o.mixins import AclMixin, RevMixin, SwitchPluggedMixin
+from re2o.mixins import AclMixin, RevMixin
+
+
 
 
 class Stack(AclMixin, RevMixin, models.Model):
@@ -85,7 +87,7 @@ class Stack(AclMixin, RevMixin, models.Model):
                 inférieure à l'id minimale"})
 
 
-class AccessPoint(AclMixin, SwitchPluggedMixin, Machine):
+class AccessPoint(AclMixin, Machine):
     """Define a wireless AP. Inherit from machines.interfaces
 
     Definition pour une borne wifi , hérite de machines.interfaces
@@ -104,6 +106,22 @@ class AccessPoint(AclMixin, SwitchPluggedMixin, Machine):
             ("view_accesspoint", "Peut voir une borne"),
         )
 
+    def switch(self):
+        """Return the switch where this is plugged"""
+        return Switch.objects.filter(
+            ports__machine_interface__machine=self
+        )
+
+    def building(self):
+        """Return the building of the AP/Server (building of the switchs connected to...)"""
+        return Building.objects.filter(
+            switchbay__switch=self.switch()
+        )
+
+    @cached_property
+    def short_name(self):
+        return str(self.interface_set.first().domain.name)
+
     @classmethod
     def all_ap_in(cls, building_instance):
         """Get a building as argument, returns all ap of a building"""
@@ -113,12 +131,28 @@ class AccessPoint(AclMixin, SwitchPluggedMixin, Machine):
         return str(self.interface_set.first())
 
 
-class Server(Machine, SwitchPluggedMixin):
+class Server(Machine):
     """Dummy class, to retrieve servers of a building, or get switch of a server"""
 
     class Meta:
         proxy = True
 
+    def switch(self):
+        """Return the switch where this is plugged"""
+        return Switch.objects.filter(
+            ports__machine_interface__machine=self
+        )
+
+    def building(self):
+        """Return the building of the AP/Server (building of the switchs connected to...)"""
+        return Building.objects.filter(
+            switchbay__switch=self.switch()
+        )
+
+    @cached_property
+    def short_name(self):
+        return str(self.interface_set.first().domain.name)
+
     @classmethod
     def all_server_in(cls, building_instance):
         """Get a building as argument, returns all server of a building"""

From 4f4d10b79954b41347da026eee108431cf92c839 Mon Sep 17 00:00:00 2001
From: grisel-davy <grisel-davy@re2o-server.crans.org>
Date: Wed, 25 Apr 2018 20:28:56 +0200
Subject: [PATCH 11/16] ajout des serveurs sur le graph

---
 .../templates/topologie/graph_switch.dot      | 40 +++++++++++++----
 topologie/views.py                            | 45 ++++++-------------
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/topologie/templates/topologie/graph_switch.dot b/topologie/templates/topologie/graph_switch.dot
index 3835cd91..2529e739 100644
--- a/topologie/templates/topologie/graph_switch.dot
+++ b/topologie/templates/topologie/graph_switch.dot
@@ -1,28 +1,27 @@
 {% block graph_dot %}
-digraph Topologie {
-node [
-fontname=Helvetica
-fontsize=8
-shape=plaintext]
-edge[arrowhead=odot,arrowtail=dot]
+digraph {
+graph [label="TOPOLOGIE DU RÉSEAU", labelloc=t, fontsize=40];
+node [fontname=Helvetica fontsize=8 shape=plaintext];
+edge[arrowhead=odot,arrowtail=dot];
 
 
 {% block subgraphs %}
 {% for sub in subs %}
 subgraph cluster_{{ sub.bat_id }} {
+fontsize=15;
 label="Batiment {{ sub.bat_name }}";
 
 {% if sub.bornes %}
 node [label=<
 <TABLE BGCOLOR="{{ colors.back}}" BORDER="1" COLOR="#021f87" CELLBORDER="0" CELLSPACING="0">
-<TH>
+<TR>
 	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_bornes }}"> 
 	<FONT FACE="Helvetica Bold" COLOR="white">Borne</FONT></TD>
 	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_bornes }}"> 
 	<FONT FACE="Helvetica Bold" COLOR="white">Switch</FONT></TD>
 	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_bornes }}"> 
 	<FONT FACE="Helvetica Bold" COLOR="white">Port</FONT></TD>
-</TH>
+</TR>
 
 {% block bornes %}
 {% for borne in sub.bornes %}
@@ -40,6 +39,31 @@ node [label=<
 {% endfor %}
 {% endblock %}
 
+{% if sub.machines %}
+<TR>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_server }}"> 
+	<FONT FACE="Helvetica Bold" COLOR="white">Machine</FONT></TD>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_server }}"> 
+	<FONT FACE="Helvetica Bold" COLOR="white">Switch</FONT></TD>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_server }}"> 
+	<FONT FACE="Helvetica Bold" COLOR="white">Port</FONT></TD>
+</TR>
+
+{% for machine in sub.machines %}
+<TR>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BORDER="0">
+		<FONT COLOR="{{ colors.texte }}" >{{ machine.name }}</FONT>
+	</TD>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BORDER="0">
+		<FONT COLOR="{{ colors.texte }}" >{{ machine.switch }}</FONT>
+	</TD>
+	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BORDER="0">
+		<FONT COLOR="{{ colors.texte }}" >{{ machine.port }}</FONT>
+	</TD>
+</TR>
+{% endfor %}
+{% endif %}
+
 </TABLE>
 >] {{sub.bat_name}}bornes;
 {% endif %}
diff --git a/topologie/views.py b/topologie/views.py
index ff6d65a1..a272d03e 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -75,7 +75,8 @@ from .models import (
     ConstructorSwitch,
     AccessPoint,
     SwitchBay,
-    Building
+    Building,
+    Server
 )
 from .forms import (
     EditPortForm,
@@ -116,6 +117,9 @@ def index(request):
     )
     pagination_number = GeneralOption.get_cached_value('pagination_number')
     switch_list = re2o_paginator(request, switch_list, pagination_number)
+
+    # make_machine_graph()
+
     return render(
         request,
         'topologie/index.html',
@@ -944,45 +948,36 @@ def make_machine_graph():
     """
     Crée le fichier dot et l'image du graph des Switchs
     """
-    dico={'subs':[],'links':[],'alone':[],'bornes':[]}
+    dico={'subs':[],'links':[],'alone':[],'colors':{'head':"#7f0505",'back':"#b5adad",'texte':"#563d01",'border_bornes':"#02078e",'head_bornes':"#25771c",'head_server':"#1c3777"}}
     missing=[]
     detected=[]
     for sw in Switch.objects.all():
         if(sw not in detected):
             missing.append(sw)
-
     for building in Building.objects.all():#Parcour tous les batiments
-
-        dico['subs'].append({'bat_id':building.id,'bat_name':building,'switchs':[],'bornes':[]})
-
-
+        dico['subs'].append({'bat_id':building.id,'bat_name':building,'switchs':[],'bornes':[],'machines':[]})
         for switch in Switch.objects.filter(switchbay__building=building):#Parcour tous les switchs de ce batiment
             dico['subs'][-1]['switchs'].append({'name':switch.main_interface().domain.name,'nombre':switch.number,'model':switch.model,'id':switch.id,'batiment':building,'ports':[]})
             for p in switch.ports.all().filter(related__isnull=False):#Parcour tout les ports liés de ce switch 
                 dico['subs'][-1]['switchs'][-1]['ports'].append({'numero':p.port,'related':p.related.switch.main_interface().domain.name})
 
-
         for ap in AccessPoint.all_ap_in(building):
-            dico['subs'][-1]['bornes'].append({'name':ap.short_name,'id':ap.id})
-            dico['links'].append({'depart':ap.switch()[0].id,'arrive':ap.id})
+            dico['subs'][-1]['bornes'].append({'name':ap.short_name,'switch':ap.switch()[0].main_interface().domain.name,'port':ap.switch()[0].ports.filter(machine_interface__machine=ap)[0].port})
+        for server in Server.all_server_in(building):
+            dico['subs'][-1]['machines'].append({'name':server.short_name,'switch':server.switch()[0].main_interface().domain.name,'port':Port.objects.filter(machine_interface__machine=server)[0].port})
+
+        # for ma in Allmachines_in(building):
+        #     dico['subs'][-1]['machines'].append({'name':ma.short_name,'id':ma.id,'switch':ma.switch()[0].main_interface().domain.name,'port':ma.switch()[0].ports.filter(machine_interface__machine=ap)[0].port})
 
 
-    for ap in AccessPoint.objects.all():
-        dico['bornes'].append({'name':str(ap)})
     while(missing!=[]):#Tant que la liste des oubliés n'est pas vide i.e on les a pas tous passer
         links,new_detected=recursive_switchs(missing[0].ports.all().filter(related=None).first(),None,[missing[0]])
         for link in links:
             dico['links'].append(link)
-            
-
-        #on recrée la liste des oubliés et des detectés
-        missing=[i for i in missing if i not in new_detected]
+        missing=[i for i in missing if i not in new_detected]#on recrée la liste des oubliés et des detectés
         detected+=new_detected
-
-
     for switch in Switch.objects.all().filter(switchbay__isnull=True).exclude(ports__related__isnull=False):#Tous ceux qui ne sont ni connectés ni dans un batiment
         dico['alone'].append({'id':switch.id,'name':switch.main_interface().domain.name})
-
     dot_data=generate_image(dico)
     fichier = open("media/images/switchs.dot","w")
     fichier.write(dot_data)
@@ -991,18 +986,13 @@ def make_machine_graph():
     image = Popen(["dot", "-Tpng", "-o", "media/images/switchs.png"], stdin=unflatten.stdout, stdout=PIPE)
 
 def generate_image(data,template='topologie/graph_switch.dot'):
-
-
     t = loader.get_template(template)
-
     if not isinstance(t, Template) and not (hasattr(t, 'template') and isinstance(t.template, Template)):
         raise Exception("Le template par défaut de Django n'est pas utilisé."
                         "Cela peut mener à des erreurs de rendu."
                         "Vérifiez les paramètres")
-
     c = Context(data).flatten()
     dot = t.render(c)
-
     return(dot)
 
 def recursive_switchs(port_start, switch_before, detected):
@@ -1010,23 +1000,16 @@ def recursive_switchs(port_start, switch_before, detected):
     Parcour récursivement le switchs auquel appartient port_start pour trouver les ports suivants liés
     """
     links_return=[]#Liste de dictionaires qui stockes les nouveaux liens détéctés
-
     l_ports=port_start.switch.ports.filter(related__isnull=False)#Liste des ports dont le related est non null
     for port in l_ports:
-
         if port.related.switch!=switch_before and port.related.switch!=port.switch:#Pas le switch dont on vient, pas le switch actuel
-
             detected.append(port_start.switch)
             detected.append(port.related.switch)
-
             links={'depart':port_start.switch.id,'arrive':port.related.switch.id}
             links_down, detected = recursive_switchs(port.related, port_start.switch, detected)
-
             links_return.append(links)
             for link in links_down:
                 if(link!=[]):
                     links_return.append(link)
-
-
     return (links_return, detected)
 

From f7a74d35767f37a5f1d31b2660f9eedfa700a686 Mon Sep 17 00:00:00 2001
From: grisel-davy <grisel-davy@re2o-server.crans.org>
Date: Tue, 1 May 2018 12:09:59 +0200
Subject: [PATCH 12/16] =?UTF-8?q?d=C3=A9tection=20de=20la=20modification?=
 =?UTF-8?q?=20des=20objects=20du=20graph?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 topologie/models.py                           | 28 ++++++++++++++++++-
 .../templates/topologie/graph_switch.dot      | 16 +++++++----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/topologie/models.py b/topologie/models.py
index 57f66901..8640e6fc 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -40,7 +40,7 @@ from __future__ import unicode_literals
 import itertools
 
 from django.db import models
-from django.db.models.signals import post_save, post_delete
+from django.db.models.signals import pre_save, post_save, post_delete
 from django.utils.functional import cached_property
 from django.dispatch import receiver
 from django.core.exceptions import ValidationError
@@ -51,6 +51,9 @@ from reversion import revisions as reversion
 from machines.models import Machine, regen
 from re2o.mixins import AclMixin, RevMixin
 
+from os.path import isfile 
+from os import remove
+
 
 
 
@@ -106,6 +109,12 @@ class AccessPoint(AclMixin, Machine):
             ("view_accesspoint", "Peut voir une borne"),
         )
 
+    def port(self):
+        """Return the queryset of ports for this device"""
+        return Port.objects.filter(
+            machine_interface__machine=self
+        )
+
     def switch(self):
         """Return the switch where this is plugged"""
         return Switch.objects.filter(
@@ -137,6 +146,12 @@ class Server(Machine):
     class Meta:
         proxy = True
 
+    def port(self):
+        """Return the queryset of ports for this device"""
+        return Port.objects.filter(
+            machine_interface__machine=self
+        )
+
     def switch(self):
         """Return the switch where this is plugged"""
         return Switch.objects.filter(
@@ -489,3 +504,14 @@ def ap_post_delete(**_kwargs):
 def stack_post_delete(**_kwargs):
     """Vide les id des switches membres d'une stack supprimée"""
     Switch.objects.filter(stack=None).update(stack_member_id=None)
+
+#@receiver(post_save, sender=Port)
+#@receiver(post_save, sender=AccessPoint)
+#@receiver(post_save, sender=ModelSwitch)
+#@receiver(post_save, sender=Building)
+#@receiver(post_save, sender=Building)
+#@receiver(post_save, sender=Server)
+@receiver(pre_save, sender=Switch)
+def delete_graph(**_kwargs):
+    if isfile("media/images/switchs.png"):
+        remove("media/images/switchs.png")
diff --git a/topologie/templates/topologie/graph_switch.dot b/topologie/templates/topologie/graph_switch.dot
index 2529e739..bf638d70 100644
--- a/topologie/templates/topologie/graph_switch.dot
+++ b/topologie/templates/topologie/graph_switch.dot
@@ -12,8 +12,9 @@ fontsize=15;
 label="Batiment {{ sub.bat_name }}";
 
 {% if sub.bornes %}
+{% block bornes %}
 node [label=<
-<TABLE BGCOLOR="{{ colors.back}}" BORDER="1" COLOR="#021f87" CELLBORDER="0" CELLSPACING="0">
+<TABLE BGCOLOR="{{ colors.back}}" BORDER="0" CELLBORDER="0" CELLSPACING="0">
 <TR>
 	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_bornes }}"> 
 	<FONT FACE="Helvetica Bold" COLOR="white">Borne</FONT></TD>
@@ -22,8 +23,6 @@ node [label=<
 	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_bornes }}"> 
 	<FONT FACE="Helvetica Bold" COLOR="white">Port</FONT></TD>
 </TR>
-
-{% block bornes %}
 {% for borne in sub.bornes %}
 <TR>
 	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BORDER="0">
@@ -37,9 +36,15 @@ node [label=<
 	</TD>
 </TR>
 {% endfor %}
+</TABLE>
+>] {{sub.bat_name}}bornes;
 {% endblock %}
+{% endif %}
 
 {% if sub.machines %}
+{% block machines %}
+node [label=<
+<TABLE BGCOLOR="{{ colors.back}}" BORDER="0" CELLBORDER="0" CELLSPACING="0">
 <TR>
 	<TD COLSPAN="2" CELLPADDING="4" ALIGN="CENTER" BGCOLOR="{{ colors.head_server }}"> 
 	<FONT FACE="Helvetica Bold" COLOR="white">Machine</FONT></TD>
@@ -62,10 +67,9 @@ node [label=<
 	</TD>
 </TR>
 {% endfor %}
-{% endif %}
-
 </TABLE>
->] {{sub.bat_name}}bornes;
+>] {{sub.bat_name}}machines;
+{% endblock %}
 {% endif %}
 
 

From a975efd7ffc40f75a27a545f8086d851fb716d0d Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Fri, 11 May 2018 18:52:45 +0200
Subject: [PATCH 13/16] Remaniement du code make_machine_graph

---
 topologie/views.py | 115 +++++++++++++++++++++++++++++++++------------
 1 file changed, 86 insertions(+), 29 deletions(-)

diff --git a/topologie/views.py b/topologie/views.py
index a272d03e..5ca5eb7a 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -948,42 +948,95 @@ def make_machine_graph():
     """
     Crée le fichier dot et l'image du graph des Switchs
     """
-    dico={'subs':[],'links':[],'alone':[],'colors':{'head':"#7f0505",'back':"#b5adad",'texte':"#563d01",'border_bornes':"#02078e",'head_bornes':"#25771c",'head_server':"#1c3777"}}
-    missing=[]
-    detected=[]
-    for sw in Switch.objects.all():
-        if(sw not in detected):
-            missing.append(sw)
-    for building in Building.objects.all():#Parcour tous les batiments
-        dico['subs'].append({'bat_id':building.id,'bat_name':building,'switchs':[],'bornes':[],'machines':[]})
-        for switch in Switch.objects.filter(switchbay__building=building):#Parcour tous les switchs de ce batiment
-            dico['subs'][-1]['switchs'].append({'name':switch.main_interface().domain.name,'nombre':switch.number,'model':switch.model,'id':switch.id,'batiment':building,'ports':[]})
-            for p in switch.ports.all().filter(related__isnull=False):#Parcour tout les ports liés de ce switch 
-                dico['subs'][-1]['switchs'][-1]['ports'].append({'numero':p.port,'related':p.related.switch.main_interface().domain.name})
+    dico = {
+        'subs': [],
+        'links' : [],
+        'alone': [],
+        'colors': {
+            'head': "#7f0505",
+            'back': "#b5adad",
+            'texte': "#563d01",
+            'border_bornes': "#02078e",
+            'head_bornes': "#25771c",
+            'head_server': "#1c3777"
+            }
+        }
+    missing = list(Switch.objects.all())
+    detected = []
+
+    #Parcours tous les batiments
+    for building in Building.objects.all():
+        dico['subs'].append(
+            {
+            'bat_id': building.id,
+            'bat_name': building,
+            'switchs': [],
+            'bornes': [],
+            'machines': []
+            }
+        )
+        #Parcours tous les switchs de ce batiment
+        for switch in Switch.objects.filter(switchbay__building=building):
+            dico['subs'][-1]['switchs'].append({
+                'name': switch.main_interface().domain.name,
+                'nombre': switch.number,
+                'model': switch.model,
+                'id': switch.id,
+                'batiment': building,
+                'ports': []
+            })
+            #Parcours tous les ports liés de ce switch, on ajoute les switchs relié à celui-ci
+            for port in switch.ports.filter(related__isnull=False): 
+                dico['subs'][-1]['switchs'][-1]['ports'].append({
+                    'numero': port.port,
+                    'related': port.related.switch.main_interface().domain.name
+                })
 
         for ap in AccessPoint.all_ap_in(building):
-            dico['subs'][-1]['bornes'].append({'name':ap.short_name,'switch':ap.switch()[0].main_interface().domain.name,'port':ap.switch()[0].ports.filter(machine_interface__machine=ap)[0].port})
+            dico['subs'][-1]['bornes'].append({
+                'name': ap.short_name,
+                'switch': ap.switch()[0].main_interface().domain.name,
+                'port': ap.switch()[0].ports.filter(
+                    machine_interface__machine=ap
+                )[0].port
+            })
         for server in Server.all_server_in(building):
-            dico['subs'][-1]['machines'].append({'name':server.short_name,'switch':server.switch()[0].main_interface().domain.name,'port':Port.objects.filter(machine_interface__machine=server)[0].port})
+            dico['subs'][-1]['machines'].append({
+                'name': server.short_name,
+                'switch': server.switch()[0].main_interface().domain.name,
+                'port': Port.objects.filter(machine_interface__machine=server)[0].port
+            })
 
-        # for ma in Allmachines_in(building):
-        #     dico['subs'][-1]['machines'].append({'name':ma.short_name,'id':ma.id,'switch':ma.switch()[0].main_interface().domain.name,'port':ma.switch()[0].ports.filter(machine_interface__machine=ap)[0].port})
-
-
-    while(missing!=[]):#Tant que la liste des oubliés n'est pas vide i.e on les a pas tous passer
-        links,new_detected=recursive_switchs(missing[0].ports.all().filter(related=None).first(),None,[missing[0]])
+    #Tant que la liste des oubliés n'est pas vide i.e on les a pas tous passer
+    while missing:
+        links, new_detected = recursive_switchs(missing[0].ports.filter(related=None).first(), None, [missing[0]])
         for link in links:
             dico['links'].append(link)
-        missing=[i for i in missing if i not in new_detected]#on recrée la liste des oubliés et des detectés
-        detected+=new_detected
-    for switch in Switch.objects.all().filter(switchbay__isnull=True).exclude(ports__related__isnull=False):#Tous ceux qui ne sont ni connectés ni dans un batiment
-        dico['alone'].append({'id':switch.id,'name':switch.main_interface().domain.name})
+        #On recrée la liste des oubliés et des detectés
+        missing=[i for i in missing if i not in new_detected]
+        detected += new_detected
+    
+    #Tous ceux qui ne sont ni connectés ni dans un batiment
+    for switch in Switch.objects.filter(switchbay__isnull=True).exclude(ports__related__isnull=False):
+        dico['alone'].append({
+            'id': switch.id,
+            'name': switch.main_interface().domain.name
+        })
+
+    #Exportation du dot et génération de l'image
     dot_data=generate_image(dico)
     fichier = open("media/images/switchs.dot","w")
     fichier.write(dot_data)
     fichier.close()
-    unflatten = Popen(["unflatten","-l", "3", "media/images/switchs.dot"], stdout=PIPE)
-    image = Popen(["dot", "-Tpng", "-o", "media/images/switchs.png"], stdin=unflatten.stdout, stdout=PIPE)
+    unflatten = Popen(
+        ["unflatten","-l", "3", "media/images/switchs.dot"],
+        stdout=PIPE
+    )
+    image = Popen(
+        ["dot", "-Tpng", "-o", "media/images/switchs.png"],
+        stdin=unflatten.stdout,
+        stdout=PIPE
+    )
 
 def generate_image(data,template='topologie/graph_switch.dot'):
     t = loader.get_template(template)
@@ -1002,14 +1055,18 @@ def recursive_switchs(port_start, switch_before, detected):
     links_return=[]#Liste de dictionaires qui stockes les nouveaux liens détéctés
     l_ports=port_start.switch.ports.filter(related__isnull=False)#Liste des ports dont le related est non null
     for port in l_ports:
-        if port.related.switch!=switch_before and port.related.switch!=port.switch:#Pas le switch dont on vient, pas le switch actuel
+        #Pas le switch dont on vient, pas le switch actuel
+        if port.related.switch!=switch_before and port.related.switch != port.switch:
             detected.append(port_start.switch)
             detected.append(port.related.switch)
-            links={'depart':port_start.switch.id,'arrive':port.related.switch.id}
+            links = {
+                'depart':port_start.switch.id,
+                'arrive':port.related.switch.id
+            }
             links_down, detected = recursive_switchs(port.related, port_start.switch, detected)
             links_return.append(links)
             for link in links_down:
-                if(link!=[]):
+                if link:
                     links_return.append(link)
     return (links_return, detected)
 

From b2d57ec827e37e5702c673f90134f2b28c44d122 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Fri, 11 May 2018 23:17:57 +0200
Subject: [PATCH 14/16] Refactor de la fonction gen_graph + graph quand
 modification des objets

---
 .../migrations/0081_auto_20180511_1254.py     | 21 +++++++++
 machines/models.py                            | 24 ++++++++--
 topologie/migrations/0060_server.py           | 25 +++++++++++
 topologie/models.py                           | 45 ++++++++++++++-----
 topologie/views.py                            | 14 +++---
 5 files changed, 108 insertions(+), 21 deletions(-)
 create mode 100644 machines/migrations/0081_auto_20180511_1254.py
 create mode 100644 topologie/migrations/0060_server.py

diff --git a/machines/migrations/0081_auto_20180511_1254.py b/machines/migrations/0081_auto_20180511_1254.py
new file mode 100644
index 00000000..8f7af9f7
--- /dev/null
+++ b/machines/migrations/0081_auto_20180511_1254.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-05-11 17:54
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0080_auto_20180502_2334'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='service_link',
+            name='server',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='machines.Interface'),
+        ),
+    ]
diff --git a/machines/models.py b/machines/models.py
index fe1923bb..4057bb16 100644
--- a/machines/models.py
+++ b/machines/models.py
@@ -1373,9 +1373,8 @@ class Service(RevMixin, AclMixin, models.Model):
 def regen(service):
     """ Fonction externe pour régérération d'un service, prend un objet service
     en arg"""
-    obj = Service.objects.filter(service_type=service)
-    if obj:
-        obj[0].ask_regen()
+    obj, created = Service.objects.get_or_create(service_type=service)
+    obj.ask_regen()
     return
 
 
@@ -1384,7 +1383,12 @@ class Service_link(RevMixin, AclMixin, models.Model):
     PRETTY_NAME = "Relation entre service et serveur"
 
     service = models.ForeignKey('Service', on_delete=models.CASCADE)
-    server = models.ForeignKey('Interface', on_delete=models.CASCADE)
+    server = models.ForeignKey(
+        'Interface',
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True
+    )
     last_regen = models.DateTimeField(auto_now_add=True)
     asked_regen = models.BooleanField(default=False)
 
@@ -1525,6 +1529,8 @@ def machine_post_save(**kwargs):
     user.ldap_sync(base=False, access_refresh=False, mac_refresh=True)
     regen('dhcp')
     regen('mac_ip_list')
+    if user == preferences.models.OptionalMachine.get_cached_value('utilisateur_asso'):
+        regen('graph_topo')
 
 
 @receiver(post_delete, sender=Machine)
@@ -1549,6 +1555,8 @@ def interface_post_save(**kwargs):
     # Regen services
     regen('dhcp')
     regen('mac_ip_list')
+    if interface.machine.user == preferences.models.OptionalMachine.get_cached_value('utilisateur_asso'):
+        regen('graph_topo')
 
 
 @receiver(post_delete, sender=Interface)
@@ -1659,3 +1667,11 @@ def srv_post_save(**_kwargs):
 def srv_post_delete(**_kwargs):
     """Regeneration dns après modification d'un SRV"""
     regen('dns')
+
+
+@receiver(post_save, sender=Service)
+def service_post_save(**kwargs):
+    """Création d'un service_link si non existant"""
+    service = kwargs['instance']
+    service_link, created = Service_link.objects.get_or_create(service=service)
+
diff --git a/topologie/migrations/0060_server.py b/topologie/migrations/0060_server.py
new file mode 100644
index 00000000..802affcf
--- /dev/null
+++ b/topologie/migrations/0060_server.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-05-11 17:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0081_auto_20180511_1254'),
+        ('topologie', '0059_auto_20180415_2249'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Server',
+            fields=[
+            ],
+            options={
+                'proxy': True,
+            },
+            bases=('machines.machine',),
+        ),
+    ]
diff --git a/topologie/models.py b/topologie/models.py
index 8640e6fc..e1c945c7 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -492,26 +492,47 @@ class Room(AclMixin, RevMixin, models.Model):
 def ap_post_save(**_kwargs):
     """Regeneration des noms des bornes vers le controleur"""
     regen('unifi-ap-names')
-
+    regen("graph_topo")
 
 @receiver(post_delete, sender=AccessPoint)
 def ap_post_delete(**_kwargs):
     """Regeneration des noms des bornes vers le controleur"""
     regen('unifi-ap-names')
-
+    regen("graph_topo")
 
 @receiver(post_delete, sender=Stack)
 def stack_post_delete(**_kwargs):
     """Vide les id des switches membres d'une stack supprimée"""
     Switch.objects.filter(stack=None).update(stack_member_id=None)
 
-#@receiver(post_save, sender=Port)
-#@receiver(post_save, sender=AccessPoint)
-#@receiver(post_save, sender=ModelSwitch)
-#@receiver(post_save, sender=Building)
-#@receiver(post_save, sender=Building)
-#@receiver(post_save, sender=Server)
-@receiver(pre_save, sender=Switch)
-def delete_graph(**_kwargs):
-    if isfile("media/images/switchs.png"):
-        remove("media/images/switchs.png")
+@receiver(post_save, sender=Port)
+def port_post_save(**_kwargs):
+    regen("graph_topo")
+
+@receiver(post_delete, sender=Port)
+def port_post_delete(**_kwargs):
+    regen("graph_topo")
+
+@receiver(post_save, sender=ModelSwitch)
+def modelswitch_post_save(**_kwargs):
+    regen("graph_topo")
+
+@receiver(post_delete, sender=ModelSwitch)
+def modelswitch_post_delete(**_kwargs):
+    regen("graph_topo")
+
+@receiver(post_save, sender=Building)
+def building_post_save(**_kwargs):
+    regen("graph_topo")
+
+@receiver(post_delete, sender=Building)
+def building_post_delete(**_kwargs):
+    regen("graph_topo")
+
+@receiver(post_save, sender=Switch)
+def switch_post_save(**_kwargs):
+    regen("graph_topo")
+
+@receiver(post_delete, sender=Switch)
+def switch_post_delete(**_kwargs):
+    regen("graph_topo")
diff --git a/topologie/views.py b/topologie/views.py
index 992e1df1..7d0fad53 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -57,13 +57,14 @@ from re2o.acl import (
     can_view,
     can_view_all,
 )
+from re2o.settings import MEDIA_ROOT
 from machines.forms import (
     DomainForm,
     EditInterfaceForm,
     AddInterfaceForm
 )
 from machines.views import generate_ipv4_mbf_param
-from machines.models import Interface
+from machines.models import Interface, Service_link
 from preferences.models import AssoOption, GeneralOption
 
 from .models import (
@@ -118,7 +119,10 @@ def index(request):
     pagination_number = GeneralOption.get_cached_value('pagination_number')
     switch_list = re2o_paginator(request, switch_list, pagination_number)
 
-    # make_machine_graph()
+    if any(service_link.need_regen() for service_link in Service_link.objects.filter(service__service_type='graph_topo')):
+        make_machine_graph()
+        for service_link in Service_link.objects.filter(service__service_type='graph_topo'):
+            service_link.done_regen()
 
     return render(
         request,
@@ -1022,15 +1026,15 @@ def make_machine_graph():
 
     #Exportation du dot et génération de l'image
     dot_data=generate_image(dico)
-    fichier = open("media/images/switchs.dot","w")
+    fichier = open(MEDIA_ROOT + "/images/switchs.dot","w", encoding='utf-8')
     fichier.write(dot_data)
     fichier.close()
     unflatten = Popen(
-        ["unflatten","-l", "3", "media/images/switchs.dot"],
+        ["unflatten","-l", "3", MEDIA_ROOT + "/images/switchs.dot"],
         stdout=PIPE
     )
     image = Popen(
-        ["dot", "-Tpng", "-o", "media/images/switchs.png"],
+        ["dot", "-Tpng", "-o", MEDIA_ROOT + "/images/switchs.png"],
         stdin=unflatten.stdout,
         stdout=PIPE
     )

From 47d4cee55a86a56b12bb47ebbefa3ad2ad4dec2e Mon Sep 17 00:00:00 2001
From: grisel-davy <grisel-davy@re2o-server.crans.org>
Date: Mon, 14 May 2018 20:03:04 +0200
Subject: [PATCH 15/16] Gestion des boucles dans le graph et des doublons dans
 les liens

---
 .../templates/topologie/graph_switch.dot      |  4 +--
 topologie/views.py                            | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/topologie/templates/topologie/graph_switch.dot b/topologie/templates/topologie/graph_switch.dot
index bf638d70..46c6a766 100644
--- a/topologie/templates/topologie/graph_switch.dot
+++ b/topologie/templates/topologie/graph_switch.dot
@@ -1,8 +1,8 @@
 {% block graph_dot %}
-digraph {
+strict digraph {
 graph [label="TOPOLOGIE DU RÉSEAU", labelloc=t, fontsize=40];
 node [fontname=Helvetica fontsize=8 shape=plaintext];
-edge[arrowhead=odot,arrowtail=dot];
+edge[arrowhead=none];
 
 
 {% block subgraphs %}
diff --git a/topologie/views.py b/topologie/views.py
index 7d0fad53..4254146d 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -1010,6 +1010,7 @@ def make_machine_graph():
 
     #Tant que la liste des oubliés n'est pas vide i.e on les a pas tous passer
     while missing:
+
         links, new_detected = recursive_switchs(missing[0].ports.filter(related=None).first(), None, [missing[0]])
         for link in links:
             dico['links'].append(link)
@@ -1053,21 +1054,23 @@ def recursive_switchs(port_start, switch_before, detected):
     """
     Parcour récursivement le switchs auquel appartient port_start pour trouver les ports suivants liés
     """
-    links_return=[]#Liste de dictionaires qui stockes les nouveaux liens détéctés
-    l_ports=port_start.switch.ports.filter(related__isnull=False)#Liste des ports dont le related est non null
-    for port in l_ports:
-        #Pas le switch dont on vient, pas le switch actuel
-        if port.related.switch!=switch_before and port.related.switch != port.switch:
-            detected.append(port_start.switch)
-            detected.append(port.related.switch)
+    detected.append(port_start.switch)
+    links_return=[]#Liste de dictionaires qui stockes les nouveaux liens trouvés
+    for port in port_start.switch.ports.filter(related__isnull=False):#Liste des ports dont le related est non null
+        
+        if port.related.switch!=switch_before and port.related.switch != port.switch:#Pas le switch dont on descend, pas le switch actuel
+
             links = {
                 'depart':port_start.switch.id,
                 'arrive':port.related.switch.id
             }
-            links_down, detected = recursive_switchs(port.related, port_start.switch, detected)
+            if(port.related.switch not in detected):
+                links_down, detected = recursive_switchs(port.related, port_start.switch, detected)
+                for link in links_down:
+                    if link:
+                        links_return.append(link)
+            detected.append(port.related.switch)
+
             links_return.append(links)
-            for link in links_down:
-                if link:
-                    links_return.append(link)
     return (links_return, detected)
 

From c1ceb5e2b3ec52870ea0727ef158564edde47556 Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Mon, 14 May 2018 23:16:36 +0200
Subject: [PATCH 16/16] =?UTF-8?q?fix=20de=20l'emm=C3=A9nagement=20forc?=
 =?UTF-8?q?=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 users/forms.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/users/forms.py b/users/forms.py
index 8c6f5db9..8793a4c6 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -340,7 +340,10 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
         """On supprime l'ancien user de la chambre si et seulement si la
         case est cochée"""
         if self.cleaned_data.get('force', False):
-            remove_user_room(self.cleaned_data.get('room'))
+            room = self.cleaned_data.get('room')
+            if room is None:
+                raise forms.ValidationError("Invalid Room")
+            remove_user_room(room)
         return