Changeset 6313

Timestamp:

Sep 23, 2008, 11:40:09 PM (17 years ago)

Author:

RIck van der Zwet

Message:

• trunk/Makefile new command was missing it comment, leaving it out of the make help output

• trunk/exodus/templates/node-detail.html IP details for information only, more generic linking

• trunk/exodus/views.py, trunk/exodus/wllogic.py: First attempt to get automatic IP assignment working, yet without boundries and for example checks of non changed interface commits

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• exodus/templates/node-detail.html (modified) (3 diffs)
• exodus/views.py (modified) (3 diffs)
• exodus/wllogic.py (modified) (3 diffs)

trunk/Makefile ¶

@@ -27 +27 @@
 
 new: dist-clean init debug-init debug
+#Fresh start, with new datebase which include debugging code

trunk/exodus/templates/node-detail.html ¶

@@ -2 +2 @@
 
 {% block content %}
+<a href="{% url nodelist %}">Node List</a>
 
 <div style="border:1px solid #000000;">
@@ -21 +22 @@
         <div style="border:1px solid #000000;">
         <h3>iface: {{ nic.iface }} </h3>
-        status: {{ nic.status }} <br>
         type: {{ nic.type }} <br>
         description: {{ nic.shortdesc }} <br>
+        IP: {{ nic.ip }}/{{ nic.netmask }}<br />
         
         {% ifnotequal nic.type "eth" %}
@@ -43 +44 @@
                 <li>Long description: {{ interlink.desc }} </li> 
                 <li>IP: {{ interlink.ip }}/{{ interlink.netmask }} </li>
-                <li> Link to Node: <a href=../../{{ interlink.node }}/node/>
+                <li> Link to Node: <a href="{% url node-detail interlink.node %}">
                         {{ interlink.node }}</a> </li>
                 </ul>

trunk/exodus/views.py ¶

@@ -11 +11 @@
 
 from exodus.models import *
-from exodus.wllogic import freeMasterIP, newSSIDName, freeinterlinkip
+from exodus.wllogic import freeMasterIP, newSSIDName, addInterlinkIP, freeInterlinkIP
 
 class AddLocationForm(forms.ModelForm):
@@ -86 +86 @@
 
 def saveInterface(form):
+        #XXX: Should have checking wether form has actually been changed to avoid creation of IPs every time
         instance  = form.save(commit=False)
         if str(instance.type) != "eth":
@@ -91 +92 @@
                 instance.channel = '1'
                 instance.mode = 1 # set to master
-        if instance.link == None:
+        if not instance.link:
+                instance.ip = freeInterlinkIP(instance)
+        else:
+                instance.ip = addInterlinkIP(instance.link)
+        instance.save()
+        #Dirty to hack to get reference to self working
+        if not instance.link:
                 instance.link = instance
-        #XXX: Needs to be dynamic, using some logic
-        instance.ip = '172.16.0.1'
-        instance.save()
+                instance.save()
 
 def addInterface(request):

trunk/exodus/wllogic.py ¶

@@ -1 +1 @@
 # (c) Roland van Laar
 
-from exodus.models import Node, Network
+from exodus.models import Node, Interface
 
 def newSSIDName(node, nic, desc):
@@ -45 +45 @@
         return(showaddr(broadcast(address,netmask)))
 
+#XXX: freeMasterIP/addInterlinkIP should be more general by writing a function
+#     with finds a range based on a given range, taken ip/netmask and requested subnet
+
 def freeMasterIP(node):
         taken = {}
 
         for node in Node.objects.all():
-                addr = parseaddr(node.masterip)
+                addr = network(node.masterip,24)
                 taken[addr] = 1
 
@@ -63 +66 @@
         return showaddr(i)
 
-def freeinterlinkip():
+def freeInterlinkIP(masterLink):
         taken = {}
         
-        #add all interlink ipaddresses in taken[]
-        for link in Interlink.objects.all():
-                addr = parseaddr(link.ip1)
+        for interface in Interface.objects.filter(node=masterLink.node):
+                #Grr, needs all interfaces which are master requires a bit of a hack
+                addr = network(interface.ip, interface.netmask)
                 taken[addr] = 1
-                addr = parseaddr(link.ip2)
+
+        #Should be dynamic based on the number of hosts in here
+        size = masterLink.netmask
+        numaddrs = 1 << (32 - size)
+        i = network(masterLink.node.masterip,24) + 4
+        while taken.has_key(i):
+                i = i + numaddrs
+        
+        return showaddr(i)
+
+def addInterlinkIP(masterLink):
+        taken = {}
+        
+        for interface in Interface.objects.filter(link=masterLink):
+                #Grr, needs all interfaces which are master requires a bit of a hack
+                addr = parseaddr(interface.ip)
                 taken[addr] = 1
+
+        size = 32
+        numaddrs = 1 << (32 - size)
+        i = network(masterLink.ip, masterLink.netmask) + 1
+        while taken.has_key(i):
+                i = i + 1
         
-        size = 30
-        numaddrs = 1 << (32 -size)
-        i = 0xAC100001L
-        while taken.has_key(i):
-                print showaddr(i)
-                i = i + numaddrs
-        ips = [showaddr(i), showaddr(i+1)]      
-        return ips
+        return showaddr(i)