Ajoute unicode literals + attribue les ip à l'enregistrement auto en fonction du nas

cotisations/admin.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.contrib import admin
 from reversion.admin import VersionAdmin
 

cotisations/forms.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django import forms
 from django.forms import ModelForm, Form
 from django import forms

cotisations/models.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.db import models
 
 from django.db.models.signals import post_save, post_delete

cotisations/urls.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
 from . import views

cotisations/views.py

@@ -23,6 +23,8 @@
 # App de gestion des users pour re2o
 # Goulven Kermarec, Gabriel Détraz
 # Gplv2
+from __future__ import unicode_literals
+
 from django.shortcuts import render, redirect
 from django.shortcuts import get_object_or_404
 from django.template.context_processors import csrf

freeradius_utils/auth.py

@@ -32,6 +32,8 @@ Inspirés d'autres exemples trouvés ici :
 https://github.com/FreeRADIUS/freeradius-server/blob/master/src/modules/rlm_python/
 """
 
+from __future__ import unicode_literals
+
 import logging
 import netaddr
 import radiusd # Module magique freeradius (radiusd.py is dummy)
@@ -238,8 +240,9 @@ def detach(_=None):
 
 def decide_vlan_and_register_macauth(switch_id, port_number, mac_address):
     # Get port from switch and port number
-    switch = Switch.objects.filter(switch_interface=Interface.objects.filter(Q(ipv4=IpList.objects.filter(ipv4=switch_id)) | Q(domain=Domain.objects.filter(name=switch_id))))
-    if not switch:
+    ipv4 = IpList.objects.filter(ipv4=switch_id)
+    switch = Switch.objects.filter(switch_interface=Interface.objects.filter(Q(ipv4=ipv4) | Q(domain=Domain.objects.filter(name=switch_id))))
+    if not switch or not ipv4:
         return ('?', 'Switch inconnu', VLAN_OK)
 
     sw_name = str(switch.first().switch_interface)

logs/admin.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.contrib import admin
 
 # Register your models here.

logs/models.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.db import models
 
 # Create your models here.

logs/urls.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
 from . import views

logs/views.py

@@ -23,6 +23,9 @@
 # App de gestion des statistiques pour re2o
 # Gabriel Détraz
 # Gplv2
+
+from __future__ import unicode_literals
+
 from django.http import HttpResponse
 from django.shortcuts import render, redirect
 from django.shortcuts import get_object_or_404

machines/admin.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.contrib import admin
 from reversion.admin import VersionAdmin
 

machines/forms.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.forms import ModelForm, Form, ValidationError
 from django import forms
 from .models import Domain, Machine, Interface, IpList, MachineType, Extension, Mx, Text, Ns, Service, Vlan, Nas, IpType

machines/models.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.db import models
 from django.db.models.signals import post_save, pre_delete, post_delete
 from django.dispatch import receiver

machines/urls.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
 from . import views

machines/views.py

@@ -23,6 +23,9 @@
 # App de gestion des machines pour re2o
 # Gabriel Détraz, Augustin Lemesle
 # Gplv2
+
+from __future__ import unicode_literals
+
 from django.http import HttpResponse
 from django.shortcuts import render, redirect
 from django.shortcuts import get_object_or_404

preferences/admin.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.contrib import admin
 from reversion.admin import VersionAdmin
 

preferences/forms.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.forms import ModelForm, Form, ValidationError
 from django import forms
 from .models import OptionalUser, OptionalMachine, OptionalTopologie, GeneralOption, AssoOption, MailMessageOption, Service

preferences/models.py

@@ -21,6 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
 
 from django.db import models
 from cotisations.models import Paiement

preferences/urls.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
 from . import views

preferences/views.py

@@ -24,6 +24,7 @@
 # Gabriel Détraz, Augustin Lemesle
 # Gplv2
 
+from __future__ import unicode_literals
 
 from django.shortcuts import render
 from django.shortcuts import get_object_or_404, render, redirect

re2o/context_processors.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from machines.models import Interface, Machine
 from preferences.models import GeneralOption
 

re2o/settings.py

@@ -33,6 +33,8 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.8/ref/settings/
 """
 
+from __future__ import unicode_literals
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 from .settings_local import *

re2o/settings_local.example.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 SECRET_KEY = 'SUPER_SECRET_KEY'
 
 DB_PASSWORD = 'SUPER_SECRET_DB'

re2o/urls.py

@@ -34,6 +34,8 @@ Class-based views
 Including another URLconf
     1. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
+from __future__ import unicode_literals
+
 from django.conf.urls import include, url
 from django.contrib import admin
 from django.contrib.auth import views as auth_views

re2o/views.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.shortcuts import render
 from django.shortcuts import get_object_or_404
 from django.template.context_processors import csrf

re2o/wsgi.py

@@ -29,6 +29,8 @@ For more information on this file, see
 https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
 """
 
+from __future__ import unicode_literals
+
 import os
 from django.core.wsgi import get_wsgi_application
 from os.path import dirname

search/admin.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.contrib import admin
 
 # Register your models here.

search/forms.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.db.models import Q
 from simple_search import BaseSearchForm
 

search/models.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.db import models
 from django import forms
 from django.forms import Form

search/urls.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
 from . import views

search/views.py

@@ -23,6 +23,9 @@
 # App de recherche pour re2o
 # Augustin lemesle, Gabriel Détraz, Goulven Kermarec
 # Gplv2
+
+from __future__ import unicode_literals
+
 from django.shortcuts import render
 from django.shortcuts import get_object_or_404
 from django.template.context_processors import csrf

topologie/admin.py

@@ -21,6 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
 
 from django.contrib import admin
 from reversion.admin import VersionAdmin

topologie/forms.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from .models import Port, Switch, Room, Stack
 from django.forms import ModelForm, Form
 from machines.models import Interface

topologie/models.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.db import models
 from django.db.models.signals import post_delete
 from django.dispatch import receiver

topologie/urls.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
 from . import views

topologie/views.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.shortcuts import render, redirect
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required, permission_required

users/admin.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.contrib import admin
 from django.contrib.auth.models import Group
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin

users/forms.py

@@ -23,6 +23,7 @@
 
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
 
 from django import forms
 from django.forms import ModelForm, Form

users/models.py

@@ -21,6 +21,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.db import models
 from django.db.models import Q
 from django import forms
@@ -47,7 +49,7 @@ from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
 from django.core.validators import MinLengthValidator
 from topologie.models import Room
 from cotisations.models import Cotisation, Facture, Paiement, Vente
-from machines.models import Domain, Interface, MachineType, Machine, regen
+from machines.models import Domain, Interface, MachineType, Machine, Nas, MachineType, regen
 from preferences.models import GeneralOption, AssoOption, OptionalUser, OptionalMachine, MailMessageOption
 
 now = timezone.now()
@@ -453,17 +455,21 @@ class User(AbstractBaseUser):
         general_options.email_from, [req.user.email], fail_silently=False)
         return
 
-    def autoregister_machine(self, mac_address):
+    def autoregister_machine(self, mac_address, nas_ip):
         all_machines = self.all_machines()
         options, created = OptionalMachine.objects.get_or_create() 
-        if all_macines.count() > options.max_lambdauser_interfaces:
+        if all_machines.count() > options.max_lambdauser_interfaces:
             return False, "Maximum de machines enregistrees atteinte"
+        nas_object = Nas.objects.filter(nas_type__in=MachineType.objects.filter(ip_type=nas_ip.ip_type))
+        if not nas_object:
+            return False, "Re2o ne sait pas à quel machinetype affecter cette machine"
+        machine_type_cible = nas_object.first().machine_type
         try:
             machine_parent = Machine()
             machine_parent.user = self
             interface_cible = Interface()
             interface_cible.mac_address = mac_address
-            interface_cible.type = MachineType.objects.all().first()
+            interface_cible.type = machine_type_cible
             interface_cible.clean()
             machine_parent.clean()
             domain = Domain()
@@ -481,7 +487,7 @@ class User(AbstractBaseUser):
         return True, "Ok"
 
     def all_machines(self):
-        return Interfaces.objects.filter(machine__in=Machine.objects.filter(user=self))
+        return Interface.objects.filter(machine__in=Machine.objects.filter(user=self))
 
     def __str__(self):
         return self.pseudo

users/urls.py

@@ -20,6 +20,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
 from . import views

users/views.py

@@ -23,6 +23,9 @@
 # App de gestion des users pour re2o
 # Goulven Kermarec, Gabriel Détraz, Lemesle Augustin
 # Gplv2
+
+from __future__ import unicode_literals
+
 from django.shortcuts import get_object_or_404, render, redirect
 from django.template.context_processors import csrf
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger