Changeset 6477

Timestamp:

Dec 22, 2008, 11:43:12 PM (16 years ago)

Author:

roland

Message:

Adding interlinks automatically generates the correct ipaddresses.
Need to still wirte unittests though.

Location:

trunk/exodus

Files:

• forms.py (modified) (4 diffs)
• models.py (modified) (1 diff)
• settings.py (modified) (1 diff)
• wlipcalc.py (modified) (1 diff)
• wllogic.py (modified) (1 diff)

trunk/exodus/forms.py

@@ -3 +3 @@
 from exodus.wllogic import free_master_ip, link_has_compat_type, \
         link_is_wireless, new_ssid
-from exodus.wllogic import MASTER, MANAGED
-from exodus.settings import AP_SUBNET
+from exodus.wllogic import MASTER, MANAGED, calc_subnet
+from exodus.settings import AP_NETMASK
 from exodus.wlipcalc import IPCalc
 
@@ -60 +60 @@
         # self.instance raises DoesNotExist, 
         # but self.instance.[pk, ssid, polar, etc] doesn't
-
         edit = bool(self.instance.pk)
 
@@ -159 +158 @@
         We also define the netmask in this routine.
         """
-        #XXX: check if there is a free ip in the subnet
-        #XXX: if not generate a new ip
-        #XXX: Do we get here eventhough a validation error is raised
         node = self.cleaned_data.get('node')
         ip = self.cleaned_data.get('ip')
@@ -168 +164 @@
         edit = bool(self.instance.pk)
 
-        if not link_is_wireless(self):
-            return ip
-
         # if we have an error, we don't calculate new ip addresses.
-        #import pdb; pdb.set_trace() ;
         if self._errors:
-            return ip
-        
-        if ap:
-            try:
-                new_ip = IPCalc(node, AP_SUBNET, link)
-            except Exception:
-                return ip    
-            ip = new_ip.ips[0]
-            if edit:
-                pass        
-            self.data['netmask'] = AP_SUBNET
-            #XXX: distribute ipaddresses
-            #XXX: add ips for links to.
-            
-        # if link is not defined, the link can have it's own ip.
-        #XXX: and not accespoint
-        if not link and not ap:
-            self.data['netmask'] = 32
-            try:
-                new_ip = IPCalc(node, 32)
-            except Exception:
-                return ip    
-            return new_ip.ips[0]
-
-        return ip
-        
+            raise forms.ValidationError(
+                "Please correct the errors in the form.")
+
+        if not link:
+            if not ap:
+                self.data['netmask'] = 32
+                try:
+                    new_ip = IPCalc(node, 32)
+                except Exception:
+                    raise forms.ValidationError(
+                        "Not enough free ips for this node.")
+                return new_ip.ips[0]
+
+            if ap:
+                self.data['netmask'] = AP_NETMASK       
+                try:
+                    new_ip = IPCalc(node, AP_NETMASK)
+                except Exception:
+                    raise forms.ValidationError(
+                        "Not enough free ips for this node.")
+                return new_ip.ips[0]
+
+        else:
+            pk = self.instance.pk
+            # link is managed
+            if link.id != pk:
+                all_links = link.interface_set.all()
+                ip_size = len(all_links)
+                # up ip_size with one if self is not in all_links
+                if not [ i for i in all_links if i.id == pk ]:
+                    ip_size += 1 
+                if link.accesspoint:
+                    netmask = AP_NETMASK
+                else:
+                    netmask = calc_subnet(ip_size)
+
+                try:
+                    new_ip = IPCalc(link.node, netmask, link.id)
+                except Exception:
+                    raise forms.ValidationError(
+                        "Not enough free ips for this node.")
+                new_ip.ips.reverse()
+                link.ip = new_ip.ips.pop()
+                link.netmask = netmask
+                link.save()
+                ip = new_ip.ips.pop()
+                self.data['netmask'] = netmask
+                # filter out own interface
+                for i in (i for i in all_links if not i.id == pk):
+                    i.ip = new_ip.ips.pop()
+                    i.netmask = netmask
+                    i.save()
+                return ip
+
+            # link is master 
+            if link.id == self.instance.pk:
+                all_links = link.interface_set.all()
+                if ap:
+                    netmask = AP_NETMASK
+                else:
+                    ip_size = len(all_links)
+                    # up ip_size with one if self is not in all_links
+                    if not [ x for x in all_links if x.id == pk ]:
+                        ip_size += 1 
+                    netmask = calc_subnet(ip_size)
+
+                try:
+                    new_ip = IPCalc(link.node, netmask, link.id)
+                except Exception:
+                    raise forms.ValidationError(
+                        "Not enough free ips for this node.")
+                import pdb; pdb.set_trace() ;
+                new_ip.ips.reverse()
+                ip = new_ip.ips.pop()
+                self.data['netmask'] = netmask
+                for i in (i for i in all_links if not i.id == pk):
+                    i.ip  = new_ip.ips.pop()
+                    i.netmask = netmask
+                    i.save() 
+                return ip
+
     #XXX: change SSID when iface.name changes    

trunk/exodus/models.py

@@ -97 +97 @@
     link = models.ForeignKey('self', blank=True, null=True)
     ip = models.IPAddressField(unique=True, blank=True)
-    netmask = models.IntegerField(default=30)
+    netmask = models.IntegerField()
     ssid = models.CharField(max_length=50, blank=True, null=True)
     mode = models.CharField(max_length=10, choices=WIFI_MODE_CHOICES,

trunk/exodus/settings.py

@@ -20 +20 @@
 COMPAT = ('11b', '11g')
 # AP subnet size
-AP_SUBNET = 26
+AP_NETMASK = 26
 
 

trunk/exodus/wlipcalc.py

@@ -35 +35 @@
         self.netmask = free_netmask
         if free_netmask == 32:
-            self.broadcast = self.ips = self.network 
+            self.broadcast = self.network 
+            self.ips = [self.network]
         else: 
             self.broadcast = wl.get_broadcast(self.network, self.netmask)

trunk/exodus/wllogic.py

@@ -165 +165 @@
 
 def calc_subnet(number_ifaces):
-        """Returns the subnetmask.
+    #XXX: rename this to calc_netmask
+        """Returns the netmask.
 
         We need the subnet with number_ifaces available in subnet. As such