Changeset 8784edeece399f9d7eae5a786ea7a0f30a7732da

Timestamp:

02/10/09 20:16:04 (3 years ago)

Author:

Frederic Lepied <frederic.lepied@…>

Children:

7218e7ce77d425dcf3e8c6e1bea40242315868c4

Parents:

0cdcde4b0b7371a511bb3681726d4102b8fac1af

git-committer:

Frederic Lepied <frederic.lepied@…> (02/10/09 20:16:04)

Message:

transparently find the mac address

Files:

• pxe/common.py (modified) (2 diffs)
• pxe/views.py (modified) (2 diffs)
• settings.py (modified) (4 diffs)
• urls.py (modified) (2 diffs)

pxe/common.py

@@ -10 +10 @@
 import sys
 import os
+import re
 import settings
-from pxe.models import *
+from models import *
 
+IP_REGEXP = re.compile('^.*\s([0-9A-F:]+)\s.*')
+
+def mac_to_ip(mac):
+    for line in open('/proc/net/arp').readlines():
+        if line.find(mac) != -1:
+            res = IP_REGEXP.search(line)
+            if res:
+                return res.group(1)
+    return False
+
+def get_mac(request):
+    mac = mac_to_ip(request.META['REMOTE_ADDR'])
+    if not mac:
+        raise Http404
+    print 'get_mac', mac
+    return mac
+    
 def error(str):
     sys.stderr.write(str + '\n')
@@ -19 +37 @@
 def simplify_mac(s):
     '''Remove : or - between hexa numbers for a MAC address. Always return the address in lowercase'''
+    print 'simplify_mac', s
     ss = s.replace('-', '')
     sss = ss.replace(':', '')
     if len(sss) != 12:
+        print 'invalid length (not 12)', sss, len(sss)
         raise ValueError
     return sss.lower()

pxe/views.py

@@ -8 +8 @@
 #---------------------------------------------------------------
 
-from django.http import HttpResponse
+from django.http import HttpResponse, Http404
 from django.shortcuts import get_object_or_404
 from common import *
 from models import *
 
+def localboot1(request):
+    return localboot(request, get_mac(request))
+    
 def localboot(request, mac):
     system = get_object_or_404(System, macaddress__mac=simplify_mac(mac))
@@ -18 +21 @@
     return HttpResponse("Next boot set to local", mimetype="text/plain")
 
+def profile1(request):
+    return profile(request, get_mac(request))
+    
 def profile(request, mac):
     system = get_object_or_404(System, macaddress__mac=simplify_mac(mac))

settings.py

@@ -1 +1 @@
 # Django settings for pxemngr project.
 
-DEBUG = False
+DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -11 +11 @@
 
 DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = '/home/fred/work/pxemngr/pxe.db'             # Or path to database file if using sqlite3.
+DATABASE_NAME = '/home/flepied/work/pxemngr/pxe.db'             # Or path to database file if using sqlite3.
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
@@ -70 +70 @@
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    '/home/fred/work/pxemngr/pxe/templates',
+    '/home/flepied/work/pxemngr/pxe/templates',
 )
 
@@ -79 +79 @@
     'django.contrib.sites',
     'pxe',
+#    'django.contrib.admin',
 )
 

urls.py

@@ -2 +2 @@
 
 # Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+#from django.contrib import admin
+#admin.autodiscover()
 
 urlpatterns = patterns('',
@@ -13 +13 @@
     # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
+    (r'^localboot/(?P<mac>[a-fA-F0-9:-]+)/$', 'pxe.views.localboot'),
+    (r'^localboot/$', 'pxe.views.localboot1'),
+    (r'^profile/(?P<mac>[a-fA-F0-9:-]+)/$', 'pxe.views.profile'),
+    (r'^profile/$', 'pxe.views.profile1'),
+    
     # Uncomment the next line to enable the admin:
-    # (r'^admin/(.*)', admin.site.root),
-    (r'^localboot/(?P<mac>[a-fA-F0-9:-]+)/$', 'pxe.views.localboot'),
-    (r'^profile/(?P<mac>[a-fA-F0-9:-]+)/$', 'pxe.views.profile'),
+    #(r'^admin/(.*)', admin.site.root),
 )