Changeset 6312

Timestamp:

Sep 23, 2008, 10:11:52 PM (16 years ago)

Author:

RIck van der Zwet

Message:

• trunk/exodus/sql/dnsserver.sql: allow DNS to be imported properly again
• trunk/exodus/views.py: After new location redirect to node, which is logical option
• trunk/exodus/wllogic.py: Have freeMasterIP based on the network selected

Location:

trunk/exodus

Files:

• sql/dnsserver.sql (modified) (1 diff)
• views.py (modified) (4 diffs)
• wllogic.py (modified) (2 diffs)

trunk/exodus/sql/dnsserver.sql

@@ -1 @@
-INSERT INTO exodus_DnsServer VALUES ( 1, '172.17.8.68', 1);
-INSERT INTO exodus_DnsServer VALUES ( 2, '172.17.143.4', 1);
-INSERT INTO exodus_DnsServer VALUES ( 3, '172.20.128.98', 1);
-INSERT INTO exodus_DnsServer VALUES ( 4, '172.27.129.66', 1);
+INSERT INTO exodus_DnsServer VALUES ( 1, '172.17.8.68', 'wleiden.net');
+INSERT INTO exodus_DnsServer VALUES ( 2, '172.17.143.4', 'wzoeterwoude.net');

trunk/exodus/views.py

@@ -11 +11 @@
 
 from exodus.models import *
-from exodus.wllogic import freemasterip, newSSIDName, freeinterlinkip
+from exodus.wllogic import freeMasterIP, newSSIDName, freeinterlinkip
 
 class AddLocationForm(forms.ModelForm):
@@ -22 +22 @@
                 if form.is_valid():
                         form.save()
-                        return HttpResponseRedirect(reverse('exodus.views.addNode'))
+                        return HttpResponseRedirect(reverse('exodus.views.addNode') + "?location=" + request.POST['description'])
         else:
                 form = AddLocationForm()
@@ -38 +38 @@
                         # input a valid master ip into new_data
                         instance  = form.save(commit=False)
-                        instance.masterip = freemasterip()
+                        instance.masterip = freeMasterIP(instance)
                         instance.save()
-                        return HttpResponseRedirect(reverse('nodelist'))
-        else:
-                form = AddNodeForm()
+                        return HttpResponseRedirect(reverse('node-detail', args=[instance.name]))
+        else:
+                if 'location' in request.GET:
+                        newNode = Node()
+                        newNode.location = Location.objects.get(description=request.GET['location'])
+                        form = AddNodeForm(instance=newNode)
+                else:
+                        form = AddNodeForm()
         return render_to_response('addnode.html', {'form': form })
 
@@ -68 +73 @@
                         # input a valid master ip into new_data
                         instance  = form.save(commit=False)
-                        instance.masterip = freemasterip()
+                        instance.masterip = freeMasterIP(instance)
                         instance.save()
                         return HttpResponseRedirect(reverse('nodelist'))

trunk/exodus/wllogic.py

@@ -45 +45 @@
         return(showaddr(broadcast(address,netmask)))
 
-
-def freemasterip():
+def freeMasterIP(node):
         taken = {}
 
@@ -53 +52 @@
                 taken[addr] = 1
 
+        #Currently claiming a /24 for every node
         size = 24
         numaddrs = 1 << (32 - size)
 
-        i = 0xAC110001L # hardcoded 172.17.0.1 ## need to fix this
+        #XXX: No out of bond checking done yet
+        i = parseaddr(node.network.ipspacestart)
         while taken.has_key(i):
                 i = i + numaddrs