Changeset 73db3090c34e51a2508cdc048d3ca2f4cf3da288

Timestamp:

05/12/10 14:10:28 (2 years ago)

Author:

Frederic Lepied <frederic.lepied@…>

Children:

36e3187115d175e2667c28737fdaccbd1fed1723

Parents:

a37e6686ba85de9cf2e143a6485dd63bceff9404

git-committer:

Frederic Lepied <frederic.lepied@…> (05/12/10 14:10:28)

Message:

allow to use IP addresses and sub-adresses instead of mac addresses

Location:

pxe

Files:

• addsystem (modified) (2 diffs)
• common.py (modified) (2 diffs)
• views.py (modified) (2 diffs)

pxe/addsystem

@@ -15 +15 @@
 from pxe.common import *
 
-if len(sys.argv) < 2:
+if len(sys.argv) < 3:
     error('Usage: %s <system name> <MAC> [<MAC2>...]' % sys.argv[0])
 
@@ -28 +28 @@
 
 for addr in sys.argv[2:]:
-    a = simplify_mac(addr)
+    if addr.index('.') >= 0:
+        a = simplify_ip(addr)
+    else:
+        a = simplify_mac(addr)
     try:
         mac = MacAddress.objects.get(mac=a)

pxe/common.py

@@ -80 +80 @@
     create_symlink(prof, name_dst)
     for m in MacAddress.objects.filter(system=system):
-        dst = '%s/01-%s' % (settings.PXE_ROOT, mac2filename(m.mac))
+        if len(m.mac) == 12:
+            dst = '%s/01-%s' % (settings.PXE_ROOT, mac2filename(m.mac))
+        else:
+            dst = '%s/%s' % (settings.PXE_ROOT, m.mac)
         create_symlink(system.name, dst)
         
@@ -89 +92 @@
     log.save()
 
+def simplify_ip(ip):
+    '''Rertun a string containing the hexadecimal representation of an ipv4 address or a sub-part.'''
+    l = ip.split('.')
+    s = ''
+    for e in l:
+        s = s + '%02x' % int(e)
+    return s
+
 # common.py ends here

pxe/views.py

@@ -13 +13 @@
 from pxe.models import *
 
+def get_system(request, mac):
+    try:
+        return System.objects.get(macaddress__mac=simplify_mac(mac))
+    except System.DoesNotExist:
+        pass
+
+    addr = request.META['REMOTE_ADDR']
+    l = map(lambda x: '%02x' % int(x), addr.split('.'))
+    for i in range(len(l), 1, -1):
+        try:
+            return System.objects.get(macaddress__mac=''.join(l[0:i]))
+        except System.DoesNotExist:
+            pass
+    raise Http404
+
 def localboot1(request):
     return localboot(request, get_mac(request))
     
 def localboot(request, mac):
-    system = get_object_or_404(System, macaddress__mac=simplify_mac(mac))
+    system = get_system(request, mac)
     set_next_boot(system, settings.PXE_LOCAL)
     return HttpResponse("Next boot set to local", mimetype="text/plain")
@@ -25 +40 @@
     
 def profile(request, mac):
-    system = get_object_or_404(System, macaddress__mac=simplify_mac(mac))
+    system = get_system(request, mac)
     log = Log.objects.filter(system=system).order_by('-date')[0]
     return HttpResponse(log.boot_name.name, mimetype="text/plain")