Changeset 6231

Timestamp:

Aug 23, 2008, 12:44:18 PM (16 years ago)

Author:

roland

Message:

added basic addinterlink functionality

Files:

• TODO (modified) (1 diff)
• exodus/views.py (modified) (2 diffs)
• exodus/wllogic.py (modified) (2 diffs)

TODO

@@ -14 +14 @@
         views.py and the templates. See:
         http://www.djangoproject.com/documentation/url_dispatch/#reverse
+* remove hardcoding in wllogic.py for 172.17 and higher as master ip 
 * Interface cleanups:
 ** option to edit/delete fields

exodus/views.py

@@ -9 +9 @@
 
 from exodus.models import *
-from exodus.wllogic import freemasterip, newSSIDName
+from exodus.wllogic import freemasterip, newSSIDName, freeinterlinkip
 
 class AddLocationForm(forms.ModelForm):
@@ -83 +83 @@
                                         print '''these ifaces are of the same type'''
                                         instance.same=True
-                                        print instance.same
-
-                                if str(instance.iface1.type) == '11b' or str(instance.iface1.type) == '11g':
-                                        print '''it's 11b or g'''
-
-                                #if (instance.iface1.type == '11b' | instance.iface2.type == '11b' )  &
-                                #               (instance.iface1.type == '11g' || instance.iface2.type == '11g'):
-                                #               print '''11b and 11g are compatible'''
+                                if str(instance.iface1.type) == '11b' and str(instance.iface2.type) == '11g':
+                                        instance.same=True
+                                        print '11b + 11g'
+                                if str(instance.iface1.type) == '11g' and str(instance.iface2.type) == '11b':
+                                        instance.same=True
+                                        print '11g + 11b'
+                                #Generate IP addresses
+                                if instance.same == True:
+                                        instance.ip1,instance.ip2 = freeinterlinkip()
+                                        netmask = '30'
+                                        instance.save()
+                                        
                         #if wifi: check master and managed states for existings NICs/Interlinks
                                 #Generate SSID
+                        # add descriptions
                         #Generate ips and netmask
                         #Save form

exodus/wllogic.py

@@ -1 +1 @@
 # (c) Roland van Laar
 
-from exodus.models import Node, Network
+from exodus.models import Node, Network, Interlink
 
 def newSSIDName(node, nic, desc):
@@ -39 +39 @@
     
         return showaddr(i)
+
+def freeinterlinkip():
+        taken = {}
+        
+        #add all interlink ipaddresses in taken[]
+        for link in Interlink.objects.all():
+                addr = parseaddr(link.ip1)
+                taken[addr] = 1
+                addr = parseaddr(link.ip2)
+                taken[addr] = 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