From a61c0762c235577f1153e472bf511ab470fc69b4 Mon Sep 17 00:00:00 2001
From: chirac <chirac@arachne>
Date: Sun, 3 Jul 2016 14:02:46 +0200
Subject: [PATCH] Refondation de topologie

---
 topologie/__pycache__/admin.cpython-34.pyc    | Bin 1135 -> 993 bytes
 topologie/__pycache__/models.cpython-34.pyc   | Bin 1670 -> 2792 bytes
 topologie/admin.py                            |  17 +++---
 topologie/migrations/0001_initial.py          |  21 ++-----
 .../migrations/0002_auto_20160703_1118.py     |  30 ++++++++++
 topologie/migrations/0003_link.py             |  24 --------
 topologie/migrations/0003_room.py             |  23 ++++++++
 .../migrations/0004_auto_20160703_1122.py     |  18 ++++++
 .../migrations/0005_auto_20160703_1123.py     |  18 ++++++
 .../migrations/0006_auto_20160703_1129.py     |  34 +++++++++++
 ...703_0103.py => 0007_auto_20160703_1148.py} |   6 +-
 topologie/migrations/0008_port_room.py        |  21 +++++++
 .../migrations/0009_auto_20160703_1200.py     |  20 +++++++
 .../__pycache__/0001_initial.cpython-34.pyc   | Bin 1050 -> 794 bytes
 .../0002_auto_20160703_0103.cpython-34.pyc    | Bin 669 -> 0 bytes
 .../0002_auto_20160703_1118.cpython-34.pyc    | Bin 0 -> 1260 bytes
 .../__pycache__/0003_link.cpython-34.pyc      | Bin 1005 -> 0 bytes
 .../__pycache__/0003_room.cpython-34.pyc      | Bin 0 -> 875 bytes
 .../0004_auto_20160703_1122.cpython-34.pyc    | Bin 0 -> 656 bytes
 .../0005_auto_20160703_1123.cpython-34.pyc    | Bin 0 -> 682 bytes
 .../0006_auto_20160703_1129.cpython-34.pyc    | Bin 0 -> 946 bytes
 .../0007_auto_20160703_1148.cpython-34.pyc    | Bin 0 -> 670 bytes
 .../__pycache__/0008_port_room.cpython-34.pyc | Bin 0 -> 842 bytes
 .../0009_auto_20160703_1200.cpython-34.pyc    | Bin 0 -> 800 bytes
 .../__pycache__/__init__.cpython-34.pyc       | Bin 129 -> 129 bytes
 topologie/models.py                           |  54 +++++++++++++-----
 26 files changed, 217 insertions(+), 69 deletions(-)
 create mode 100644 topologie/migrations/0002_auto_20160703_1118.py
 delete mode 100644 topologie/migrations/0003_link.py
 create mode 100644 topologie/migrations/0003_room.py
 create mode 100644 topologie/migrations/0004_auto_20160703_1122.py
 create mode 100644 topologie/migrations/0005_auto_20160703_1123.py
 create mode 100644 topologie/migrations/0006_auto_20160703_1129.py
 rename topologie/migrations/{0002_auto_20160703_0103.py => 0007_auto_20160703_1148.py} (66%)
 create mode 100644 topologie/migrations/0008_port_room.py
 create mode 100644 topologie/migrations/0009_auto_20160703_1200.py
 delete mode 100644 topologie/migrations/__pycache__/0002_auto_20160703_0103.cpython-34.pyc
 create mode 100644 topologie/migrations/__pycache__/0002_auto_20160703_1118.cpython-34.pyc
 delete mode 100644 topologie/migrations/__pycache__/0003_link.cpython-34.pyc
 create mode 100644 topologie/migrations/__pycache__/0003_room.cpython-34.pyc
 create mode 100644 topologie/migrations/__pycache__/0004_auto_20160703_1122.cpython-34.pyc
 create mode 100644 topologie/migrations/__pycache__/0005_auto_20160703_1123.cpython-34.pyc
 create mode 100644 topologie/migrations/__pycache__/0006_auto_20160703_1129.cpython-34.pyc
 create mode 100644 topologie/migrations/__pycache__/0007_auto_20160703_1148.cpython-34.pyc
 create mode 100644 topologie/migrations/__pycache__/0008_port_room.cpython-34.pyc
 create mode 100644 topologie/migrations/__pycache__/0009_auto_20160703_1200.cpython-34.pyc

diff --git a/topologie/__pycache__/admin.cpython-34.pyc b/topologie/__pycache__/admin.cpython-34.pyc
index 6966844f5da0d1bf82c3029b4bdcd381acf8da11..398466f35256cd81abcb54bdc4f659590e3e1e76 100644
GIT binary patch
delta 490
zcmZurJx{|h5Ix5xpM|z+87g%^WI&neMnPo)7F3Y|iH#BishR|wRz+FMAE+$;34el#
z6@>}0!^Fgb?X*x;*t*l*d#Cr_r}<{MAEj0M<@@gR2?4yr!Xskth)N%)?xk<RJwRXq
zMbOt_g5j)~ZRk5dF;EjG8X!p*5CLi}K`THF1qC+vo-_U0G<1I)4ll0x4&H7%#k?Ox
zVVs-2Q8);~_$t@qQPiU>Hv&354+rV7hqGTco3Z=>b@Z}G%gX!}9q>cEwcAbDun^Nz
z<&u*d0Wn*gNs$?vDKwkQdxSaSfZuBCZXqaDE3#EZvqYtuXeFd}-bAgVlO&0h6Eg*q
z6DD>hFK1q4A+RFnvHx?eFS*vG8GpuIROK6_(fXs+B$MT4J4%AlfbPj;>6&O2t*JGz
I{54cVKN4<n;s5{u

literal 1135
zcmb_b&2G~`5T3Qyzi~?;2nmS;S6>>5GeY6iONkIYAo*gs*(Gf7Pgpw*&9%HtABGp$
zE2my~03;-4)=897IDoLdquH6+*>AoXe@hPH>AO#Fe=vZru=jA($GF-rC<J~CN`Q(%
z#()V2gbSqul?#~*6^D#N<w52FI}sd&2cPkX2a>_uhbxQ<;6(T!0_zC&93eWwKRF^0
zu{{y*ortU+!+ZeJ1sTAV1B`C!O&nzSiwS{5)+7dSmL@k?5~R#{g{V}0gQY|28veS`
zo#AhqrZW6g)gPu5wtaSdJVJ{Eq5)aSkO-eBz*^7Jz(kbeC1o|?`BIfa)idL_E7eWk
z8@`|m0wKFXmF*<u>s`!x6SKB4>upTRO_=9(QOP_vah_L=SeB$GdH!)(lp9Y{s<z98
zY8Pd3c@6pqAzJbM>FA=+qt$9P((+j|>Y7DUHZvthw({e}r4BIG$JIJ05@z?e3Mc!R
z0`3%!UB|**EZj2@(bgBvHL7}mM<%JWw!6K8bb=0jK;n?ZJrX;>y>_2$4^Tw7w!mor
z_rPo#J*0&H1red&Ai4#{Mf;e1cUZ!|0$Jk7l5Zj!E6b9OF?b)ByJ`JD^YsuD5}8}R
zXg^7l>`=^$de$6Io4V8LTvI=dkCP<JR?}2#j|9ztiC>Yq2S|g_vqzZ>Z&fEvsO1c2
dP3qsZ%!JST0ewMtwA9oi=ZW*!?cX6AvY%3`+OYrt

diff --git a/topologie/__pycache__/models.cpython-34.pyc b/topologie/__pycache__/models.cpython-34.pyc
index ebba5e08eed33ef9d9aba8aeb1367818b96e39d0..5c9f77573b4cba3fe68f8f24743caf2feac5a581 100644
GIT binary patch
literal 2792
zcmai0&vV;E6n-nozvbpv(=;$ZVcG!!O&GW_4C78H9fqmtG?^*rqH(N^qg0mMmE1I*
zb~uE8hJR_VoO<ENp$Fi5E8CHs5}fRMci&3;?R($*p8s^)&9DD{@#L>6(H~U$I2d=(
zvR~1K_!krt4F&mv1kWvsEgIV7+r`|b*r8#C{0fN&p+jMXe#5p3NkJ!7I>*i$JqW85
z){LQ6GSp$HQ`j(uM#<2iuu1z~>oq`-Cv<g~hBD4DYVD;-E|dJ=Y$P#Vdmt03qW<@(
zlF=afQJ(erk=dt$K?g09=+JNp+`+d<+H?Y}m|ApB0^oTCaA5_)xz(oPO6O$xjJ9-*
zbBlc7oZ<JIQ_Q-$e;VceW8EC~UIejB2Kn*pCeDBT4?0~rjC;w`g9Vrt3>~!W2D&m#
z91cH+HhfW;w2JrcJd}A)*AK^097f4NSCjGZP^zwHP3DV}>7wW8dJrVNp$r1u3<9`u
z9P`)>f@kAiJhiNhljzx426;M=`LR^LlUfB5)4lm{_jyn4o}QlWD*0u)o2R2RP6v_P
zEn>1WI@1nAYVig5CazHH`05LE{NZmKZ4WJb2VG9|lITRxxtNU+1wmW;p6GhEwzFI*
z_L$;#BFauC<D&~mY7NV}76jNA1lKSz=aQIQo4ROf>Uu5Z@_X9c@kYe}bz|?ir@oJ5
z9GYXa`vW*NkkchTRM$dWDT*_56}8Ea&RtTB7=&ViA%!SoxUN_iuDEG!*k*kp#C6y^
zypbtg4spRXS(%Yh2)}9wSTkg-n=yDcV<ITXWNgkzT4M_GOIn<COi*mb9%1_~2n$xW
zOnSA53EQ4NCa=vNTe<Yus@b!)xQ-*&Np4W+QrI@Hx=wPFLcC{%-;eP5Hz-`CaE+(_
z7KQ6z?S^(9r7G91l5sDWq2Z!m8DT9`>^Q}aQ4Mql+IgI&L)}P|0Ld<MshwmT#|v)c
z@O99x&Xfk9S>#DO=of+!<WLOcKzev0`*{$BoG^>lNy+Lt%gkB9v2W!7lYNUZF}NxD
z)%(2r19bB=;1pnLnKXEa0nz|DaAKKcu-SvJ1fAWX+%fBh5igC1LZmohOypl#^dxaf
z2v+0$UlKt-zqH_KyX&tl+%*VBPYnXErub}KE3TgDHnKc8N)^k2jCCUj`f)GIf<SHa
zJ{x9jMWJV_>pZXYjq57%Idr$=0h5LGemay#Djo8LGfp<LHia$jpf$v#Z6Yz-Gxx=U
zB=D1ENq{PEP3JRNu(}ib*4<k`w1LgKniUG`FpoT8U@ieODf=-t&!oXMNan(Db2+>m
zJl(vgBPNB_Cs<V+T;*}c`mAoE)3ryBe>%9o2hu8#wor+}%X|0s_wIdn-!MR5f0SlX
z9zB-}3d6im4m#f%q<O0ABbAP%%Fh%d{%^J6@UYi2j*BZcS#88^=*?|>uUP916Tm)<
z^A8JD2Q7Pr?y~L_6|fK&mX)FomMi0BF@oaE#mF&Y)VN$3p*!=+2xT(WT)hhn%UQ49
z!{P#Dc4G(aa*pFyhB<lPt4<m$7AD7wQt>&SF!cfzq*Mq^crMD}a@4O(>Ms~XDXHI1
z-_NkCOy33Smbh#(93{@`z7cmJFU;g6=vPqrs~HwlIoDi$PGxubQVjWms>K<G!*d_~
zPgUbMeaZ)NJ~PMWb&V}uuc;g1NiP|sJK<qbQ9qi_S!`8wxHA=97LIJE_@Q7#$iH&q
s5tro5WQMLhWN|98ka=H_=Pfl@*T2C5_*wHUtBNVas{()ac58e4U)KT?Gynhq

literal 1670
zcma)6%}(1u5T3Oi=Lc7%&=&fmsy+HpBK2HVNT{HykfMTA$rmf&ZQ|hAuyzVWz0sHH
z!}JCA+7p*P0GIZgbugv^2`4+*opE-)`R3=3cdv6HPrm%JiGEY<aj;*-%0q|<UqK1c
zSWqBHY(y4CHvNFwCMjrS(V0zwO&gIzQNtJ-HG>0#OHtDpnl(d%q89D=?Q=LGUubun
zMKa0v`FQy>uvx{*k02y50N@EMk~WRt4oA2r5x^rfF7_0_Nwsg)-n6Mict%#xzK-h5
zqM*ZgqBi3U<|yg_+njc`Ggau$xPKBRG947d^A3=l|Ao+vy`-NW>|O(G!?22#KZd9S
z1~cFY0Cs$L+U8qVwq()Qt-VQ{L~%OMZhjmW`$O#<!r1feX=R$uOjBd>9o-7Uv_F<%
zs5@Z@+9nC_y)ZnQ^plz8{v?f$CNeCtfh>kn{UmiCn2fl1)&162-Q(lqu99!EZjl{k
zNj8XOx6HxH;i+~QUYkR)AUvTS;AdYz@Wa0x>l#+xg(!%=6O9C&At!>CW@lsvhnm7R
ziXGqTP3@PjUm_SgFO+KG3dP<O^NVV5a+!R+LagSY*3B@)%VFr@U|^A$dWOrHq33&Q
zj&I>N)IAoAUbokVeYGCTBr=|~_aQChK+aT^U)_ulbe!ZSSoM(qUy)Ys7>DA>dFAZJ
z6AQw_XW3e`jb$Io>ZvMt6RLVa)GHXBgv#K$EbI8PvQacMJv!*JiBR8V<7nq|mW`Ez
zi<Qfw39+l)GV#|^#Uz+iF(vg>?f9bSTWSGn?I>L53$=(tEo>7pQ^ER*b#}c{vEI6g
zb@hlZT4M2(#jSKM!^$-090iC3m5O!Oh-BL;Rz8BbjYuZ7feI6WYZ@O^U3NYAV}h%J
z08=?ez%jnC3LXnrGXV2oHUl=}^uT0Rx3e_FkdlS`pY{@Py*=*2`K;P+rTjSu%olN?
zGmI<B=We20ch)l{<3ajSp6cfI=TE!u*LIDQJ165Aobm9=xh2bFys#8&d%mmN(Wsve
qvXyABY^=r>4{bw^VZgjtD<0E5rgvL!%R%*yIWn1^x1M-Un*RU<d?VTb

diff --git a/topologie/admin.py b/topologie/admin.py
index 4a0c1b67..7c06c2e0 100644
--- a/topologie/admin.py
+++ b/topologie/admin.py
@@ -1,20 +1,17 @@
 
 from django.contrib import admin
 
-from .models import Port, Room, Link
+from .models import Port, Room, Switch
+
+class SwitchAdmin(admin.ModelAdmin):
+    list_display = ('building','number','details')
 
 class PortAdmin(admin.ModelAdmin):
-    list_display = ('building','switch', 'port','details')
+    list_display = ('switch', 'port','details')
 
 class RoomAdmin(admin.ModelAdmin):
-    list_display = ('room','details')
-
-class RoomAdmin(admin.ModelAdmin):
-    list_display = ('room','details')
-
-class LinkAdmin(admin.ModelAdmin):
-    list_display = ('port', 'room','details')
+    list_display = ('building','room','number','details')
 
 admin.site.register(Port, PortAdmin)
 admin.site.register(Room, RoomAdmin)
-admin.site.register(Link, LinkAdmin)
+admin.site.register(Switch, SwitchAdmin)
diff --git a/topologie/migrations/0001_initial.py b/topologie/migrations/0001_initial.py
index 3f8163b9..fba57af8 100644
--- a/topologie/migrations/0001_initial.py
+++ b/topologie/migrations/0001_initial.py
@@ -11,25 +11,12 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Port',
+            name='Switch',
             fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')),
+                ('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
                 ('building', models.CharField(max_length=10)),
-                ('switch', models.IntegerField()),
-                ('port', models.IntegerField()),
-                ('details', models.CharField(blank=True, max_length=255)),
+                ('number', models.IntegerField()),
+                ('details', models.CharField(max_length=255, blank=True)),
             ],
         ),
-        migrations.CreateModel(
-            name='Room',
-            fields=[
-                ('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')),
-                ('details', models.CharField(blank=True, max_length=255)),
-                ('room', models.CharField(max_length=255)),
-            ],
-        ),
-        migrations.AlterUniqueTogether(
-            name='port',
-            unique_together=set([('building', 'switch', 'port')]),
-        ),
     ]
diff --git a/topologie/migrations/0002_auto_20160703_1118.py b/topologie/migrations/0002_auto_20160703_1118.py
new file mode 100644
index 00000000..77ae0bff
--- /dev/null
+++ b/topologie/migrations/0002_auto_20160703_1118.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('topologie', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Port',
+            fields=[
+                ('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
+                ('port', models.IntegerField()),
+                ('details', models.CharField(max_length=255, blank=True)),
+                ('_object_id', models.PositiveIntegerField(null=True, blank=True)),
+                ('_content_type', models.ForeignKey(null=True, blank=True, to='contenttypes.ContentType')),
+                ('switch', models.ForeignKey(related_name='ports', to='topologie.Switch')),
+            ],
+        ),
+        migrations.AlterUniqueTogether(
+            name='port',
+            unique_together=set([('_content_type', '_object_id')]),
+        ),
+    ]
diff --git a/topologie/migrations/0003_link.py b/topologie/migrations/0003_link.py
deleted file mode 100644
index 49574716..00000000
--- a/topologie/migrations/0003_link.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('topologie', '0002_auto_20160703_0103'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Link',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
-                ('details', models.CharField(blank=True, max_length=255)),
-                ('port', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='topologie.Port')),
-                ('room', models.ForeignKey(to='topologie.Room', on_delete=django.db.models.deletion.PROTECT, blank=True)),
-            ],
-        ),
-    ]
diff --git a/topologie/migrations/0003_room.py b/topologie/migrations/0003_room.py
new file mode 100644
index 00000000..b679776d
--- /dev/null
+++ b/topologie/migrations/0003_room.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0002_auto_20160703_1118'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Room',
+            fields=[
+                ('id', models.AutoField(serialize=False, auto_created=True, verbose_name='ID', primary_key=True)),
+                ('details', models.CharField(max_length=255, blank=True)),
+                ('building', models.CharField(max_length=255, unique=True)),
+                ('number', models.IntegerField()),
+            ],
+        ),
+    ]
diff --git a/topologie/migrations/0004_auto_20160703_1122.py b/topologie/migrations/0004_auto_20160703_1122.py
new file mode 100644
index 00000000..e4b9cb29
--- /dev/null
+++ b/topologie/migrations/0004_auto_20160703_1122.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0003_room'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='switch',
+            unique_together=set([('building', 'number')]),
+        ),
+    ]
diff --git a/topologie/migrations/0005_auto_20160703_1123.py b/topologie/migrations/0005_auto_20160703_1123.py
new file mode 100644
index 00000000..6bf61b07
--- /dev/null
+++ b/topologie/migrations/0005_auto_20160703_1123.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0004_auto_20160703_1122'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='room',
+            unique_together=set([('building', 'number')]),
+        ),
+    ]
diff --git a/topologie/migrations/0006_auto_20160703_1129.py b/topologie/migrations/0006_auto_20160703_1129.py
new file mode 100644
index 00000000..7b787451
--- /dev/null
+++ b/topologie/migrations/0006_auto_20160703_1129.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0005_auto_20160703_1123'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='room',
+            name='room',
+            field=models.IntegerField(default=1),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='room',
+            name='building',
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='room',
+            name='number',
+            field=models.IntegerField(blank=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name='room',
+            unique_together=set([('building', 'room', 'number')]),
+        ),
+    ]
diff --git a/topologie/migrations/0002_auto_20160703_0103.py b/topologie/migrations/0007_auto_20160703_1148.py
similarity index 66%
rename from topologie/migrations/0002_auto_20160703_0103.py
rename to topologie/migrations/0007_auto_20160703_1148.py
index 83a290ac..498e79c8 100644
--- a/topologie/migrations/0002_auto_20160703_0103.py
+++ b/topologie/migrations/0007_auto_20160703_1148.py
@@ -7,13 +7,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('topologie', '0001_initial'),
+        ('topologie', '0006_auto_20160703_1129'),
     ]
 
     operations = [
         migrations.AlterField(
             model_name='room',
-            name='room',
-            field=models.CharField(unique=True, max_length=255),
+            name='number',
+            field=models.IntegerField(null=True, blank=True),
         ),
     ]
diff --git a/topologie/migrations/0008_port_room.py b/topologie/migrations/0008_port_room.py
new file mode 100644
index 00000000..d8a8072e
--- /dev/null
+++ b/topologie/migrations/0008_port_room.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0007_auto_20160703_1148'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='port',
+            name='room',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, blank=True, default=1, to='topologie.Room'),
+            preserve_default=False,
+        ),
+    ]
diff --git a/topologie/migrations/0009_auto_20160703_1200.py b/topologie/migrations/0009_auto_20160703_1200.py
new file mode 100644
index 00000000..e2935d18
--- /dev/null
+++ b/topologie/migrations/0009_auto_20160703_1200.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topologie', '0008_port_room'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='port',
+            name='room',
+            field=models.ForeignKey(to='topologie.Room', on_delete=django.db.models.deletion.PROTECT, blank=True, null=True),
+        ),
+    ]
diff --git a/topologie/migrations/__pycache__/0001_initial.cpython-34.pyc b/topologie/migrations/__pycache__/0001_initial.cpython-34.pyc
index ee41182236715d7bd94032d5d6718f1e687447d2..dd1a3024d4f3095ea61fb1ddbff39aeffb1c77bc 100644
GIT binary patch
delta 294
zcmXAku};G<5QZ;qa1$p5O3T7hHq?;;#J~VcH&}{Pi6wGkH?`_Gm6M2;l_v-pkSg&2
ztgL+#zd;vR*dd|A-TnIY4d1PuH6~wvhg|<GClM;iySEPjH}zz1P<~#vF)#<1TYg`~
z_3Z%b0y_eR;RVnXL2Nf6w&0Nf>%n-~H}0K?HO)n;jIC(G4IV#<JenCi6<o5+Ai<1J
zi#!b?&1ufrgYgzxBvh}0IbT)hs5f#mt_79inU9PU7D6(iVnY(T3?x@^KHHMo(O^|1
zA=jqOcus}Pw!clg7fPz;_d~DRAk`=7g718?572`e(1U8yy6rZf`Uu;uh0&RHY#mga
Q*2Uot_@|n6`f8v20l)879{>OV

delta 522
zcmaKo&u$Yj5XQ$|XPez@ltL+`jgT5uDar+LC>6(6s*pH<P-%q(hiH?TZrpBmgV$Ty
zTzbe8q`6h%0gyOx<te!O1yC>L5x|>2*UID3XMO&D*7(M~Df@Rp)o<X%$B`KO-zqf#
z*t0u(!Nxy#m&$-1V0rxa)s6=vfD;b*0LX<?>pZj$U=?u1THIPusSqUKv;@ciAB}&n
zUCj}IK48WA;(i9MF7R_OE5ObIY#|oB4EPwR0{8?X1|wU*?VV2n;2L~rtsC#Hj8v#)
znj9LDgncsNeX6u^Pb9^d87|Ry87UdYa!9XDWuRm~RF~~Dx;!#LnCrCNRTOGM6P%Ok
zq#3oR9RB8D@`FA7oPCwL+cRQNV3&||DC5kOI&qks-Tt#bXvATf_Ki?QujPsSl2co!
z5$PVOcP(dF?&LB?nM6Z(1{+Rct?J|tOP;Un$C}jfG<Gyk87Cuc{B%IG*|P7Tn)WHx
roJhXEwP|I*UEwj8KVz$`W>>?Ro$9P!sL3z>a(Nb+=8Cp`?QHx9P?U@K

diff --git a/topologie/migrations/__pycache__/0002_auto_20160703_0103.cpython-34.pyc b/topologie/migrations/__pycache__/0002_auto_20160703_0103.cpython-34.pyc
deleted file mode 100644
index d397a4366a101e78f34c59a8c89e9065357ea740..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmY+A%}(4f5P&DK6E-18oZuO9A=yQ0FHli|=%wXCrAm9T+_ec_Iq~8oEO1@kpijXo
z`PvhgJ^&XOXGOR5&uBa|p800}WIO4Zxcl)d0Qe36EQ<OG-u4uQz!QK5r~{Y=5cqcp
zI)s|Qlt4{kN+I|n2nY&~=%gSC%p+K#KLQcKWgb6cBFF=`+c#=vgk)NE(sJGAp-XF3
zS>7qrv@WjEsoR+ke_z|EoZxN0qLAPrkYO5v$e=<d0+RZAYXYo?1R@3*!+Z+_o)L%y
zL<%biS3vw1v}_~Rj!VA1*LF!~7Dk&&NtcynIcBO+o#Gn#JQHhpEgiMS)Q%2%bfu&g
zF2<H_difpW_#M--sk-auS46$Y!-q}MhyRl1i5syYC1WmS3`_J{qMk8!({t?$_?M6i
z*$COplx!`*q%QreadPLrw58sVoL=+w+ofiKLmejh1a=R-gLpYEZn-U%%VlBZ#1wxU
zEjE)cu;mHkeP`ID9DgW3mWQkymxl+7dmCY*Exc`tA|nY+f*AK;zsO_Hf7N%rMPeIb
mh)cwrH<dXMKL_T4bBNwBt+jn0Jvv%<|H=PteNVgL9(e=p_Nqky

diff --git a/topologie/migrations/__pycache__/0002_auto_20160703_1118.cpython-34.pyc b/topologie/migrations/__pycache__/0002_auto_20160703_1118.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..945645eb50a6301aff93da651e98b2af6adfd632
GIT binary patch
literal 1260
zcmaJ=OK%e~5T1Qx+fBDLyx)()0p&m*MFI|hKt)9efsiOd>c!f|)9n^#9c-s1xt4#x
zui!8F%83gnPDlvGPD+ytyK8G^zwyjBpY0#na{bHCPw!hXz&DtA$cHC1^g2zPz5oP3
zKY*<O0_TSyLg+`Z6+u6Str&vmJOUoWX98ou2=;1lNO%o+4c<1B@019dfo%+{vL`t*
zQ5saa(9O`+`(>eWQ_4!)q)(vGJr{oTG{|^DL;t1;!I2;iTOsfpz*nIN9Sw|KNh-z@
z;0wSP0Tb9GBL!Xuz63l2zU=K2z*pc9;vLG+@L`MOf^$!LmzJCYej4~07k>z$gU))0
zQl0ZjW})*Qq7pL@zX1Fqt&QB;OGg2hfnNa!U7e;a5@$H_M32ZffL{Y7o;RTg;E+BD
zU4z8=I_Y@Jrmv2~vRO}71}kGm1Jw3vr_)(u3j1;&*%V<8VpZNpn;JQgLKY?3j3T?N
ztV&bn!p0ts-$-R_vQwhq+J+^!O9NH*b2VZgaI|Stjf$enF>cr_9~#Me3Uh<pX8WkN
zrJj}vUp%w%z~x%tX!25M+TQ#V6Ic~y_xm5(L0j7vdG*28ncUvPo?%ohu7*O`<vHFq
zG;(}lw#U}`q~T5K$|m}tG`(G$DHM*#q|KVEt;daj-L~FN!dB?ueH<b)vOu$o>UA?5
z&j~pGzkn2eEa7-gLW1U*k7rtIuGmH9xiLm9GdkZxfn;ZleH`Y(sqZ|F1FSe!y%M#G
zoJ>pWUg1~nLa5mNNuQGN8*Yni_JX#)KsE8w_1%1Go_QlRZR|eI1=KgB!m_Ad;>ezU
zD(LFH^KxuX)v%F9W9xE2chX<Pub}QwNk9F1)ZWik`{3Z9t#D1Y|7qJkzPN3F`uxFI
z>vZpR?sx98ZnyiOH5jQHC0d}NFVU1mQIN)Ikc78`mEbbHtHEkSe&FL?HxsAQ&d>}M
q>7qhfVpG1CSA}fxZLf?M!$%);oLDUvz4&mV@ng4EJK-APx#%x1k!b(`

literal 0
HcmV?d00001

diff --git a/topologie/migrations/__pycache__/0003_link.cpython-34.pyc b/topologie/migrations/__pycache__/0003_link.cpython-34.pyc
deleted file mode 100644
index 763b79d8e9d8df46339536e10582869bd81aac7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1005
zcmZuwOK;Oa5FS6`#EzSmS4-i<g(?zC+*X1MLPdol1bwJfLds?3WH;`nYj0RPeO=3+
z;ji!$_R6UjegGGkT`O%5Sl-d>&NrXGnH~R*7ouW({`G|i@C)udKKfg@%6&8xUk3z0
z?!dqS$Lw7YF615zJji_*`1Pp=q5*>dK2RTM1HL1$0nCF*6Rr^31nR+;Zg7pH&~^0E
ztl%R_84<i<Divkd)ltqfl~!C9r4DioigIsc@bhO8oh@ADPc#gSA`~=mfv!S^0zF_p
zOd94>wF(*l3ycJcZwqJ$Gy>WN8UtN0{uTIROz&720v0V`3Ftixxh8bqhA{B~um~n?
zm>^*c6HI>y^wAu)Jcr@o%KyNY`3gMb%zTq&1b2Ww#;!ck;qJV29aeHGh0Hk9D@l@U
zkaSi_vXQL6OkO3MBw0^3wO^z;)Ba~(oakW8nV_Y1Io0tgQ$txYV&m?|cRIG&BgN8+
z(IXv}Oz~9kOSYriQ^oUCU62!Yp_`OdDHo+~3`L5pQJ$U?!HTRpzW$5d*8WtgN{6x_
zcrUDC+O6be=SFMqz=VAzWq$Yc5chjs_wu$V)kL=LqHYl@k`Nscf|orL4E>mpZ?jYw
z`DRDilogZ}BhE^Ng9^I6ZA;lT)1iEG628U$?3f<taQiq_wHxh7#dubH!rB5lNsCNs
zmkxEys>c!2&4a`JqxaiKI+9bIKs$CnKs`rJYyR~6r>W|not^a++mQX6Qv0`K+Q$pp
z#1Sq|deaNlz|<D5vV$h}LO*l@cg=a~tT{H;ZJAofvudWWI^`lthqbmI9oqWpl2&gH
ld-ZS7o2ypOFv*hL3a!00!`6CTck+$lE(0`6?y?hm{{U9a3yuH)

diff --git a/topologie/migrations/__pycache__/0003_room.cpython-34.pyc b/topologie/migrations/__pycache__/0003_room.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..36dc8c6efe80bf6882220a765d16745d56ae71bd
GIT binary patch
literal 875
zcmZ`&J#*7Q5M6y(wrnLaUr9j)4dW(~of)8Dm@r|&q(};2h8Z_EXWvFS=Oj5NDT&jD
z9|9%+fZuX0RT?TP8rYKw2?ZzJ&7R)w?R$Hx@6k&4>yPsfpIv}&aBKKvZ__MyXc6=}
zpa3!l#tt}k?}Bn6^I+^j=EK+r=Z)|{`0$ZHAJBtY3oZ$7foQ?IL2yL}!N4*7I+xQz
zAXBnJ%~d&YO*fON=9Mh+(gYcSs+?N)>#<74HqG)AEeMtbaTvQG)*&TM9-wdYEg4Wg
z5da1-YlEP-10n>`1<?Z$fmpHjCHRLFzS_8v!y1S_h&xNjwb0#vp?kNW`wbM*AwZs~
zPlju0P>Kg6b;E@F*LqA?74t$BsYJ7pB*}>Jx+>Tx89q&(C0lGb96mRG&NDRr+oH%!
za41oU(zsHXutY7nk{7sZq9$&tkyj|*o9Gnvq$rU!q3+&m)0=CValK&2xG-&j6_=`{
z%JOrjFi)$at6x++)0!xrADhmkmP*JxH38knNsT7R>uiGhVBlWdaK88-=RwbOSd*MF
z(`Ae<tyV~O#MnvAm8E5O0_T_u%%>7d?O6i7okqjHy=Cp&FX1aH$*z@c!kr_omu9q=
zSD50TUALH1vosy@1@t2dYnGpJe9Covc6JtP92N23V#hZf6;s)_n5N=x&KJ5xp>3L_
z?WxEM{m=>AC(c898th;YSUrbzRclh9>Bk_3V#f2d*c6jSLqogqzG1So9$W9ui)A%l
M+St-c?7QpUZ<GAz3;+NC

literal 0
HcmV?d00001

diff --git a/topologie/migrations/__pycache__/0004_auto_20160703_1122.cpython-34.pyc b/topologie/migrations/__pycache__/0004_auto_20160703_1122.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5a17e0f497b8e73e8268d54d4ed97cb78d1c9451
GIT binary patch
literal 656
zcmYk2&2H2%5XZ-{H%-DKD)I3Sxir}Y!G)qC4xH!(5Yk?(?AoNMoOtVxF6;@ZybQ18
zD<>}8xNu^e?RK&3(PZYIncvLs>HXr{pD&-T3BXVI?=bYw@Yy$L1YQCPpeL{(K;m}-
zDuJHDf<n(=!GOFK6a<6sm}DR+Tu$Hy^AivgcweT!un?3a9Q&bLX(74loHUKHWfF?M
zYfa-iJ=l=;m{fKZ<@<Al&KW*?ibg_&K!!yEB8L{4C`cCj?Fg`+OhFVeb%Pg@s5t_W
zA;-OtzuPwpxzlT{blb_0*LD4r8?F1mhNhPxwVTeZF2V!kz4DSf-AZ>MO~{tMQ=%K%
zkPg0IN^@Q&+e4-8p%TXL#M@hOnT3q=*n#s<aE{Y@75ypaSH4lVnW>O#IS4tdI%y5X
zvBSgH3K#Zqr1`Lip;o$3=rwL~T;C5ck5D|Czo*r8W2((&QyDqe)!newVcivu{fsx>
zX+E!K&+8YsgxPF9KUse@6D$-rZ!<JgnzNjwWQ?AdX=MNGoj1sC5)_17TsA|iPsDQM
cH4KBJ`arbv9!GWdayR*__^*xH<Kzkb2a!>$wEzGB

literal 0
HcmV?d00001

diff --git a/topologie/migrations/__pycache__/0005_auto_20160703_1123.cpython-34.pyc b/topologie/migrations/__pycache__/0005_auto_20160703_1123.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ffc76c06ed018dd359da28c7659ec75d1de0b90f
GIT binary patch
literal 682
zcmZ`$O>fjN5FN+fGzp8S#Mf`grO9sjxKLEYffK#72x%`?c5Ol`C*Im|x9pMfXZRib
z3tu^L;l_m%<7~H!gs|+<#P7|_%k$6i-R#@1tM{J?z<2m-G0czg*w+{YZUPFRB`_mE
z!gmBJf|kOJLd#&rfV>eD1cNUKGLRI`M{te!2*e0Z^Y{lgf}Hq$*EI_*Bv(x@O{Hue
z`K)bfQ}vDRtdCm+m0bk-cI{zujK>~fkPt+mhFJt6g&H+ckSxsGD8P9#29X8m8aG6N
zvj-wU9d~^Cc00_cy<Tdi>qh#=Wm!JqmFqR1mXl}Y^YV~SCex{BUDZm@jMlBchuSZk
z<h`zC|4|yB%w3~I)73uiTsxQMB#+j+uIvAGMb>TU`ld8be8PE{#<|ZpM<1LD`Iz$y
zSE(ChEaXylLUxNrT0_wgfB%(2E8h*;&bHF1mA%jO5<MP_{R-v*l85m7sJN_5v0AMP
zBd5B!wV~KOM1h7p{nwDggXJeP!baguY=U7-Q<jpL47VqF9JGIMy)&rYL`d+dIIp@|
gABg#&*D$;s*gHj=>|tOhFE)SvGSu3@-H#s8KN1tMa{vGU

literal 0
HcmV?d00001

diff --git a/topologie/migrations/__pycache__/0006_auto_20160703_1129.cpython-34.pyc b/topologie/migrations/__pycache__/0006_auto_20160703_1129.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a787a596ab69e74b3e926e1b34576cff587caaf7
GIT binary patch
literal 946
zcmZWnO>fgc5FLNkc2gQ!KCZycm)dPb5fY$Qm5Mmf3q?q|teo!Dak{qCwcV6l!=K?F
z@LTrEsTZzDTwvBongI5C{dV{5?3=gqqq7lsKW{!=SpeT*<*^AL(pMc*$Eg`00CEF*
z1{iv5f-oVspl3mDL(c}|Ew_N%@P!s_KnsQrOljQ#?!br8y`?}98mikA*?Gy4iL6GM
zh$=KykY}k(>Z~j(<>s^~s&h?WJnIAw>8rj`hoD7}hMoz08&c9_0owY!nF2bG6mS>N
zh2a`-Y935UwhufYU~96sLSA2xiO>PQp~+LQ{-xbp&?w+0@a_sN&`Ih;?*me_2U^vX
z8ki}WLov6=f``g~zsOVhbvY_UnP#XS$8r3eB~4wjy?FN^ei84p-QB%?vPE0LiX=y6
z%d*Us-D2k=L&4P=$BU#9^{qj!sP0H&h4LENeELLr{U#GUD^iM-+%SPfS`Ti2Yqnc7
zc^{>6`XVVV&(tQ}%2k7`E>o-rC{IIkvXm&-XisQO?gCC)Ig@#ma6@^lmC2Y27$ez@
zK*Alyu9`$>(R##jgayaqJi|&-#ewpUI6u+JNLvp(?}{2zl<kxXjs#W64Ex7}WDd96
z>5r}6v$<SlRamQ_98pEJW%L!~6N=b&zg|bziHyeMaU^lCjP9I|mSq>w9UT0B2QPO<
zpQS^Av;oyK>N=Kh`-V&Jmf@On^w+=TpN6h>;-aY=Nx4gtwkn?wlOip5c)!iQ&ADYS
Xwa(B}&Guf+e0-z#R@$Gg`N;YMyw36h

literal 0
HcmV?d00001

diff --git a/topologie/migrations/__pycache__/0007_auto_20160703_1148.cpython-34.pyc b/topologie/migrations/__pycache__/0007_auto_20160703_1148.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f8b8a0cea7bd1db46dbab4cfeb5cde6114a227f8
GIT binary patch
literal 670
zcmZWl%}(4f5T3+Nb`yfc37#PrlHFF&N-d&7Dyjrrid1PYR(5ToY#n>+B;A(l_BDE~
z#4GvQ6Bix;E*)o~i-Z%8#`E*d_sw0h9shaw@#VJ%@E4vPivBU)<^&DL-vbFydoc09
zb8jD{4>f@afttdEf_KUZa0<ULNkI^p2e86?06c)tX?Tl3ka~8fQ`Jm!!DQ76Q^+Ru
zZCqESDcVY_#)dT}WixZ-PiG6AW4z578Uc<3a+vtQ6DW}r0YTloH3OW-L*N4tA<PHB
zhrlD?v9l}iS3q0~2DgybwvEo8X4|OM3oUh73A>l)`2j1sR<m(FI>-<6S8OyIzeTE!
z9#cgvEHzr!miB(Ax_T;%4X!F7IR-l^FKsZDh5CAt`qvw5Ge8k(WQVLrVa&#iA!;WD
z`Uzv-x<Wck_u^t96c=h%iN+9YwDAXtd;93780rGaC)JAbF=S)Cz^(SHyaBU|1--d{
zpM5V(wp=bVBgQ)WuQc1NK10oiFEqb?v%mOh0t9lrn;1<(A{u!ietrBR4V{FmuI&tx
oHa?cvh|ddE>U}=#Y4=q7>J6v0x96&d@74=Aa=nd{wd3!Se~uoh6aWAK

literal 0
HcmV?d00001

diff --git a/topologie/migrations/__pycache__/0008_port_room.cpython-34.pyc b/topologie/migrations/__pycache__/0008_port_room.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5974134db606365a85d3fdabec57e0e12818e9c9
GIT binary patch
literal 842
zcmZ{i&2G~`5P-+Ou}#tjkU+hZb1sQfD%t}=MTl@fw5UWv%4OwbHj$0(HEX+}xt5pV
zmG;W17ao8EV%Am?F08$yncbP$Z)W#bw-@yPeEWQC0{n!3hE4hf&GL!_(r-WtkQp#D
zz|gh{sR@|{GYc{sW_G)3LF&NFg?DHJI`Eww9pDxu9k?Uk4xj~}2JSs2g@K{^bsjGS
za+bywmr+^{OciADN=8*I@>01OZKmbrLi=yWAt@I$%Y+06O+-L56YvqN2+#s<L*nS8
zS_*UlJHTB{fgW%V5+4#W14teK`hWo-DP6!G-~rr$jfa4Jt>}cb{*b62EC0h5P5G55
zL@HJ>S5Lz*JY!K^33d{WUxa7jb2c8Io>L{7p5;--m0bu~DZACB5Sen8F;7wXB4^~q
zE3TY*8s%T6s)KwP)oFEaP=U&<#O7dk+VEP(_6x~NE^j!6Hm;M)fw|c;ZT`nJ=qZmi
zM2x9`F(Rx}PI{NIuXU7aK5Zc{c#b?@#JrT2#_(PvPBgK!wHZu=<nbzh&u^8BNtCaI
zGI6fFrWU$9)%kdRHGTVLssd5a-8L8c1LQG9H{$o{=q8e*^?E&${6vg)C64wFU_`Aw
zXS#Jv_iR|)N{8Y-nq`+n*Ya)OaOn$;W@q5(s+M(COR7WCs|Mw_cte~wm9+dvyTxJq
i#)eyPc|<`?vOR07J=58|mu=5p>D;ADqHjJiy4GLtzuzqY

literal 0
HcmV?d00001

diff --git a/topologie/migrations/__pycache__/0009_auto_20160703_1200.cpython-34.pyc b/topologie/migrations/__pycache__/0009_auto_20160703_1200.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..91251c86ce2fb7c4e58f5c2160c6a7400ae8de71
GIT binary patch
literal 800
zcmZ8f&5qMB5T5)t32nD05E48<E={&but>1l6=FFccF|G^DHkiPy;Xt}2PfIGy_T2Z
zm3-yIg$p+hh;gE}2*)0cKhMuMGx<3j1?PXheEekqe20IQjrtj$`U(ZbZ2$)-3`h(x
z^xXt*LSaE-L19B;_oxNjfy9M3)CTInS2T2hS&$E4i?#!x7JLZZ9~cxuLrvN;TMEhu
z&l)CEUWcX%ifkp*CKF|?+yWnYeYw>3yLE)h8J-$x00YekwZsH^1S=$H0ka`@bgG^O
zb%73mxtay_fciiKU>@W?<Ol|k-vf$!2y~?77VIrpIus&f<U3LRyB#UzH=+_;tTLv?
zaU7qJO2~#tAqu3f>5?)nn6fpj>|XC)otunts?0`g#`_r4YwhTZlAtGRm~s|8EkDiC
zv*r9UG&hHQoB#5KBju4U8zCwn1hcoCp*|$!bDMIVTi+<FSV>vA%vdcgY?=zrIrjTP
z^O1H3TnNdsRr!|PDVOGHxf05x3*~jJa29It{`zYE`qf+oqQX&i^Z5qy5qfvx_si%u
zmC<^=jwG9jXkTG;m}i9jdQQ@|5o8u0KaHQoPss5sj;Ga~bTE*Irw&jIE#LMH7rzb<
zJzd^S+q4o3k|tUxzh^n6i>{=;jE8%0+W$Gz9e?=%ow{HL%DwhjNAq6v%{$exYZt}D
Iyl)JxzxlJ&>Hq)$

literal 0
HcmV?d00001

diff --git a/topologie/migrations/__pycache__/__init__.cpython-34.pyc b/topologie/migrations/__pycache__/__init__.cpython-34.pyc
index b9761cda6f77e967ec561b9e4c42fe46bde1425a..5ca470a4ef35b5e6132d7f73cc63fc75c9ede1a5 100644
GIT binary patch
delta 14
VcmZo<Y-D76$HU8I^JOAiH2@w51YQ6D

delta 14
VcmZo<Y-D76$HU8|oIH`O8UPzc1GE4D

diff --git a/topologie/models.py b/topologie/models.py
index 60060c83..c488d6f3 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -1,29 +1,53 @@
 from django.db import models
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.contenttypes.fields import GenericForeignKey
+ 
 
-class Port(models.Model):
+class Switch(models.Model):
     building = models.CharField(max_length=10)
-    switch = models.IntegerField()
-    port = models.IntegerField()
+    number = models.IntegerField()
     details = models.CharField(max_length=255, blank=True)
 
     class Meta:
-        unique_together = ("building", "switch", "port")
+        unique_together = ('building', 'number')
 
     def __str__(self):
-        return str(self.building) + " - " + str(self.switch) + " - " + str(self.port)
+        return str(self.building) + str(self.number)
+
+class Port(models.Model):
+    switch = models.ForeignKey(Switch, related_name="ports")
+    port = models.IntegerField()
+    details = models.CharField(max_length=255, blank=True)
+    room = models.ForeignKey('Room', on_delete=models.PROTECT, blank=True, null=True)
+
+    class Meta:
+        unique_together = ('_content_type', '_object_id')
+
+    _content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE, blank=True, null=True)
+    _object_id = models.PositiveIntegerField(blank=True, null=True)
+    goto = GenericForeignKey('_content_type', '_object_id')
+ 
+    @property
+    def comefrom(self):
+        ctype = ContentType.objects.get_for_model(self.__class__)
+        try:
+            event = Port.objects.get(_content_type__pk=ctype.id, _object_id=self.id)
+        except:
+            return None
+        return event
+
+    def __str__(self):
+        return str(self.switch) + " - " + str(self.port)
 
 class Room(models.Model):
     details = models.CharField(max_length=255, blank=True)
-    room = models.CharField(max_length=255, unique=True)
+    building = models.CharField(max_length=255)
+    room = models.IntegerField()
+    number = models.IntegerField(blank=True, null=True)
+
+    class Meta:
+        unique_together = ('building', 'room', 'number')
 
     def __str__(self):
-        return str(self.room)
+        return str(self.building) + str(self.room) + '-' + str(self.number)
 
-class Link(models.Model):
-    port = models.ForeignKey('Port', on_delete=models.PROTECT)
-    details = models.CharField(max_length=255, blank=True)
-    #port_linked = models.ForeignKey('Port', on_delete=models.PROTECT, blank=True)
-    room = models.ForeignKey('Room', on_delete=models.PROTECT, blank=True)
-
-    def __str__(self):
-        return str(self.port)