From 1b8ece350c7e3d39e348b8f5777e2247b53c639d Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sun, 3 Jul 2016 16:49:29 +0200
Subject: [PATCH] Modele machines/interface complet

---
 machines/__pycache__/admin.cpython-34.pyc     | Bin 696 -> 1201 bytes
 machines/__pycache__/models.cpython-34.pyc    | Bin 939 -> 1888 bytes
 machines/admin.py                             |  10 +++-
 .../migrations/0002_auto_20160703_1444.py     |  43 ++++++++++++++++++
 .../0002_auto_20160703_1444.cpython-34.pyc    | Bin 0 -> 1468 bytes
 machines/models.py                            |  16 +++++++
 6 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 machines/migrations/0002_auto_20160703_1444.py
 create mode 100644 machines/migrations/__pycache__/0002_auto_20160703_1444.cpython-34.pyc

diff --git a/machines/__pycache__/admin.cpython-34.pyc b/machines/__pycache__/admin.cpython-34.pyc
index 737c879ef5f67027a5ffc1cb9b1ee83e623f78b9..ee624fa2498dd87b53ab6fcee6a2aac1ad9f6828 100644
GIT binary patch
literal 1201
zcmbVM&2G~`5FXp>pV&?a6d`d!LgL^{BO#6mg;Q0D<`N{3FP6zJ#gUzaU8hleEic1s
z@EChVLh6MF;Ka;2uH2RbV8^4Go!Q;*`(~7%@i6@MZ2#`P4e%X$4?};7pZbA@<IjQ;
zpt2yfz~VM=2TB_%2T}(r1}THeh17-0gVY1-gfrkSe8G(_2n&`zTw-kiC)@+>n}pv>
z3@{M@ADG0Tmk2Qt0*_20>Lpq~hUE~110sM+8!Wo1U1A^xx0Vn{cx%Z65t$_(!#o*Y
zAy-H&?dH5HR#z59O#5f~;#08_IyyLS_Zy+T)6JVg)p~Hcs)hWRFT{d&cMs~>>h}m8
z0VEr$n4)kfmP7K*6IaKF6JOJPnr)Skn$>vxEU_CCHYP+AL6)uZN@ST1v#eV4ZApHd
zWuLcsdC0^iBFcE7Hf6s53i2M_ZOpGHlZ#wVcDvm~is$P|)iP2OL-csFmjRZ#_$dM&
zTPD6ih{Tvu!5u<o25=<ih;rPM$dHmD?wKW4$3sRK%b3iN%!tf2&ej{#+I=(xsslvv
ze*lWwHXQ^mHWx1p7;+N!*I*vt<pjI~L-7qTB;Aw>?x^FNc6+E!phwrU(&F(Ceb9^=
zs3Q!soO3CZl1F%&_PMC@qExfQZMx#d6gU0ih7q5ptNsUK5AhaiK}U?@Su#pTe3`G#
z*T;+Xs+PqENmHRc96M1eN&gL!7)y_gPr2}na&610ZKi*cbdq$YW~!)#4x~885f$=J
aE!V-zcCKI1tSQ<%wx8OMo%TJl==}{o*6)=7

delta 395
zcmZusyGjE=6umP$JNwA4Pf$_^(J5`Lf@qaO5(R~TU2q27kQcKn5*xwf2f}=Ym7U+<
zCrqnN8o$B0yDBLhxQBCJ=bm|u-u%W_lE&|c58WmK_<)ti96xc9KQ9^wPoyOoNFU~a
zs0j3Zn0au`p(Q!Uplk#yjf#iRk3e~#ILs&z+^b3qR8W>=2$v#S;$cCo-;={^v~*rT
zP#d&+H+R`c*;@R=uBH=nMhs8gfKJUP+1uof`Yv+nAR(HY7kXqa=+=4Y3LQZnSuvd`
z!F1$u9V65b5`;?VkF6nFcYwRUikNpqY<Agx*T(I!RD)Brsqu6<ZCRcb%7$9qW_h9X
bf3h}g4#)C-ppNl(Ir`Y3JGAcAy>0Rhq>)Hp

diff --git a/machines/__pycache__/models.cpython-34.pyc b/machines/__pycache__/models.cpython-34.pyc
index 8529d171862d19bb070b45f338953c584d801b3e..1b4447b2c149bd4773c89e367bb1c8f559d8ec98 100644
GIT binary patch
literal 1888
zcmb_dPfrs;6o0dAcf0MD77#^a&=@Ygw22{{jDa*li2RFSO!l%_I|CHAyJe;YA>QhT
z@b1a);wPA^CoX;fFZ$kW3$39_jD>mKdGF26o8SBWrr*6%;p^i0n^G3w8;pE#4l6j+
zCo~-Y8AJeW20jBua|<F1+8OXO={y5b7TP)RbHLVl7I+RmVp<LagJT=|nCZYew}Cq*
z;EV+F7{~*6O~4%qxELq^FPcDcB!Es2_Nt{ztPZM7+wFvlNa0g?Yqhb;xfDvRwM4|x
zm3^&*Y*Oa%b9K5+^a!9s;hB63L<WwrcATcqIp{Oy+e3e5-0uJ%9@NMBZLG-A&Q{nw
zYQ^HB(8Fz2jW*YA5(ikI=n7pN#P`oTqR9po(Kn3-4&|Wv0B{WWKDJE<=wdE?D-j)h
z0a?I=ACK#&p{$>soz<myn$+9ruBx6QQR|#*CkRwm1_7lj3k|S~@?iJcAhum~bv_8<
zuq}c>7lHtn_ab`sg5abVMrlOSa$Q(Uq-Y(+F9p7Q_tnn+i^jgr(lKQo<I*ETyN#G4
zO><~$9Eyy`=GnYud}B??U~GkwYG@`kr4I}l#<3AuA_cYvDYjR&C4r_3?eKjNiTJR4
zbomn<x5L*IUuDw86~9+bN2=f$;x{|ey=x2|S)#R5WXfa=TyEnil!k<Vfro0R7bxPT
z$7U>ZnlW$)-xW&vjAjxz#NHt|2n#~gXPE(ek*h{~1YjP73w=bdV2E7=Qr{@yJ>xHt
zBvF5~WNOTViX`TnF7zSemr0JiWI9p-K7}1AYj-2=3V9GVg|;_3n=RxbwO{AnMq&I8
zi4*stNas5;=_bu2^0OPer^|*Gau)OC9ZI%)aqFaaYoQQZ|Io>Y_{w1?r?1Mp?&I{0
zeJt(7Vn0EX_Hvr)%C<VEOL}fy#6q^38@r=djtMSH;<H~wT?S!#A4wvTb_Pn7b7sax
zH*7^pQfZR~bQhz9ha!r3Y>~|{7iBcV7A#4zF|N?YD>(j5NcV81e1OI@Wa<A%=n0iW
zq5yU=m6G8a^&8bAA7QdwAT#k=p;9UBS~uj`t`@b+kHh#dsqwc)ivBc$KIlU2fPNNK
z+8!^xqtiQ6lKgaTi+)N{9+EH(zS5v_!_}tq&(a(7IbGk%To<fjRjm6C{uO@#Jug_n

delta 414
zcmaFBx0+q~9S<+pX`}M+sf-K^j~S2v3y|#q#KmC~m6hGyQ<xc2SQuIuKx8T-Llz4|
zGc!XJD}#FqD?<t!Sb_~nf{h`CogrA0<0Z&MO~zYnx%nxnImHtnU18*$yq!@GNIqjs
zHf9IP7IA|JPE>*m#05El6^M)3fCLYt1fv8~5zFKnCO<~D$)}mD6+pT*8H+f86q0_h
zR*;$elhv4&>v=%3ydZ)PL@)t~Tb#}riA8RisW~Y{_+0?D7^tHd<P;u8A*Ldbh@U3=
zEzXpz#Ju!;y_6)dkx@LQ#i>QbdJu0GF@tPj^#%IbA_wdZus$S5g1rlJ=`9W$pq|p4
RR6Ae<Kzu5|B)}xe4gh4QMh5@@

diff --git a/machines/admin.py b/machines/admin.py
index 83317546..a3d480ac 100644
--- a/machines/admin.py
+++ b/machines/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import Machine, MachineType
+from .models import Machine, MachineType, IpList, Interface
 
 class MachineAdmin(admin.ModelAdmin):
     list_display = ('user','type')
@@ -8,5 +8,13 @@ class MachineAdmin(admin.ModelAdmin):
 class MachineTypeAdmin(admin.ModelAdmin):
     list_display = ('type',)
 
+class IpListAdmin(admin.ModelAdmin):
+    list_display = ('ipv4',)
+
+class InterfaceAdmin(admin.ModelAdmin):
+    list_display = ('machine','name','mac_address','ipv4','details')
+
 admin.site.register(Machine, MachineAdmin)
 admin.site.register(MachineType, MachineTypeAdmin)
+admin.site.register(IpList, IpListAdmin)
+admin.site.register(Interface, InterfaceAdmin)
diff --git a/machines/migrations/0002_auto_20160703_1444.py b/machines/migrations/0002_auto_20160703_1444.py
new file mode 100644
index 00000000..18ab1768
--- /dev/null
+++ b/machines/migrations/0002_auto_20160703_1444.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import macaddress.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Interface',
+            fields=[
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('ipv6', models.GenericIPAddressField(protocol='IPv6')),
+                ('mac_address', macaddress.fields.MACAddressField(integer=True)),
+                ('details', models.CharField(max_length=255)),
+                ('name', models.CharField(max_length=255, blank=True, unique=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='IpList',
+            fields=[
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('ipv4', models.GenericIPAddressField(protocol='IPv4')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='interface',
+            name='ipv4',
+            field=models.OneToOneField(null=True, to='machines.IpList', blank=True, on_delete=django.db.models.deletion.PROTECT),
+        ),
+        migrations.AddField(
+            model_name='interface',
+            name='machine',
+            field=models.ForeignKey(to='machines.Machine', on_delete=django.db.models.deletion.PROTECT),
+        ),
+    ]
diff --git a/machines/migrations/__pycache__/0002_auto_20160703_1444.cpython-34.pyc b/machines/migrations/__pycache__/0002_auto_20160703_1444.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1c29c05043faa97dc4daacf318a93f83ac00917c
GIT binary patch
literal 1468
zcma)6O>f&q5FLJqB5697lh}=$ex_+t0f8jDLefJ}#Bl3CXq_01fdcAbL33C1G8CyS
zDZAFyz4nLnFYTp=o^t6A$R(ZK6>SITp_F#HJDfN3=IxOGM62On_s@UX^Z@>bYnO}b
zr#Px#aiaLQAP1OQFt)%_dmC~arVfl9n7S}_jn#p?1!GSmaNUNn56`Fzv<1H-s0GY{
zEPxBd1wb8m+4bIF0_a+@GcR~jQbuxKGZE)i*OuXwry{O-Sya-S;={apo+$t3TF1px
z9MvBd00YGi$&GEGUqXsx9bhhGEtSf!pdK&}vNlls`#_OJ2y_K#1awu+7vN41enY#V
z!y3>I8ZBj92NpmULWce~jkC7j(#{y+Hqed68B=4T#z;4HiVqCR!Dwj<J?$%cca%K;
zm)_PjdLJ$`rgjq$3%LvQBVF|t(2uqA4WOTB4xa-343>O82et-T2Qs9(4%tnN;9h{E
zSX~ctuL*JsD8j!0`X4|Wfho2Eif|tf_A412G^Z#1X`Gz!f>kma3<leT7rf?iF5M!Y
zG8v2tJn~7LFzHP=%V{NTPGwLrflhqE_GNU+#Bo_Mq5<~kdl|*^x+IBUan0zFT$u?z
zjm0^6#m=S6XQz*(KNDqLCMBjB9pZikNsyRQ!KzBOIp$26kZsE9nCBHXTl^czS&`N!
zZ{A@~$<}cm7q6s;jrn?x)JC(Pcvb7*LmhI67}b=9RG=c7Dq6Y<tZts?(yq(JT2p^-
z86+qRf=E^~*<L<dbS|9^j9SmT_To~x#e2$iH>6K=UP5F@2=bWc4A&7Mujg^DWKuiI
zW~`vBNI0v6qpDij(~=!1;=)yyU>B9#SGvoMXRJWclhNU>(aD%mnq(=Q2o+@QV0Z65
zk6`a47RK4f2WGYUqF_fQPG;-TEH2Vg+VoiZx_ErCW&7~w7e_zr9m#ON6pW|Ek9dG#
zIm2&&e)0bV@fcI;>FtyLX)O9@XJ>uEcFKMuSpVuf(Z~MUA-Xqq2HTGYj|bn7?cs3P
zo1Kdm#tCp#U*i-xfg4z!{lMC=?%;UfnB84<$KSv<ca7?XO61ABo(q&!*oc>bDW^w|
zwXjCZtxIFie6M;<p<-Ks)~}T8O?0b^hiKPHuIe<aZxz6QVvhDZm9z43>e!oBWJS)u
DdWMAT

literal 0
HcmV?d00001

diff --git a/machines/models.py b/machines/models.py
index 49b794ed..38c5af50 100644
--- a/machines/models.py
+++ b/machines/models.py
@@ -1,4 +1,5 @@
 from django.db import models
+from macaddress.fields import MACAddressField
 
 from users.models import User
 
@@ -16,4 +17,19 @@ class MachineType(models.Model):
         return self.type
 
 
+class Interface(models.Model):
+    ipv4 = models.OneToOneField('IpList', on_delete=models.PROTECT, blank=True, null=True)
+    ipv6 = models.GenericIPAddressField(protocol='IPv6')
+    mac_address = MACAddressField()
+    machine = models.ForeignKey('Machine', on_delete=models.PROTECT)
+    details = models.CharField(max_length=255)
+    name = models.CharField(max_length=255, unique=True, blank=True)
 
+    def __str__(self):
+        return self.name
+
+class IpList(models.Model):
+    ipv4 = models.GenericIPAddressField(protocol='IPv4')
+
+    def __str__(self):
+        return self.type