Changeset 6507

Timestamp:

Dec 29, 2008, 10:09:18 PM (16 years ago)

Author:

roland

Message:

Mayor work on dhcpstatic.
Need to update static ipaddresses when changing ipaddresses on an interlink.

Location:

trunk/exodus

Files:

• admin.py (modified) (3 diffs)
• forms.py (modified) (14 diffs)
• models.py (modified) (2 diffs)

trunk/exodus/admin.py ¶

@@ -4 +4 @@
 from exodus.models import Location, Node, Network, Interface, Antenna, \
         DnsServer, DhcpStatic        
-from exodus.forms import NodeForm, InterfaceForm
+from exodus.forms import NodeForm, InterfaceForm, DhcpStaticForm
 from exodus.contrib import ReadOnlyAdminFields
 
@@ -42 +42 @@
         js = ("/exodus/media/js/admin/CollapsedFieldsets.js", 
                 "/static/showandhide.js", )        
+
+class DhcpStaticAdmin(ReadOnlyAdminFields, admin.ModelAdmin):
+    readonly = ('ipaddress',)
+    form = DhcpStaticForm
+    ordering = ('accesspoint__node', 'accesspoint')
+    search_fields = ('hostname', 'macaddress')
         
 
@@ -50 +56 @@
 advanced_admin.register(Node, NodeAdmin)
 advanced_admin.register(Interface, InterfaceAdmin)
-advanced_admin.register(DhcpStatic)
+advanced_admin.register(DhcpStatic, DhcpStaticAdmin)
 
 plain_admin.register(Antenna)

trunk/exodus/forms.py ¶

@@ -1 +1 @@
 from django import forms
-from exodus.models import Location, Node, Interface
+from exodus.models import Location, Node, Interface, DhcpStatic
 from exodus.wllogic import free_master_ip, link_has_compat_type, \
         link_is_wireless, new_ssid, new_ssid_for_existing_interface
-from exodus.wllogic import MASTER, MANAGED, calc_subnet
+from exodus.wllogic import MASTER, MANAGED, calc_subnet, network, show_addr
 from exodus.settings import AP_NETMASK
 from exodus.wlipcalc import IPCalc
+import re
 
 class LocationForm(forms.ModelForm):
@@ -14 +15 @@
     class Meta:
        model = Node
+
+    def clean_name(self):
+        name = self.cleaned_data.get('name')
+        re_name = re.compile('[0-9a-zA-Z-]+')
+        if not name == re_name.match(name).group():
+            raise forms.ValidationError(
+                    'Not a valid name. Use letters, digits and -.')
+        return name
 
     def clean_masterip(self):
@@ -25 +34 @@
                 masterip = self.cleaned_data.get('masterip')
             else:
-                #XXX: Need to update ipconfigurations for depending interfaces
-                #XXX: Need to set netmask for interfaces
                 masterip = free_master_ip(new_network) 
                 masterlinks = ( i for i in self.instance.interface_set.all()
@@ -55 +62 @@
                         j.save() 
                     i.save()
+                    # update the static hosts on this interface
+                    for j in i.dhcpstatic_set.all(): 
+                        ip_size = int(pow(2,32-netmask))
+                        networkaddrL = network(i.ip, i.netmask)
+                        # 1, -1 compensate for network and broadcast addr. 
+                        iplist = [show_addr(networkaddrL + k) for k in 
+                                xrange(1, ip_size-1)]
+                        import pdb; pdb.set_trace() ;
+                        for k in i.interface_set.all():
+                            iplist.remove(k.ip)
+                        #remove used dhcpstatic ips, beware that interfaces
+                        #that haven't been updated yet have ipaddress that 
+                        #are not in iplist.
+                        for k in i.dhcpstatic_set.all():
+                            try:
+                                iplist.remove(k.ipaddress)
+                            except ValueError:
+                                pass
+                        iplist.reverse()
+                        j.ipaddress = iplist.pop()
+                        j.save()
         return masterip        
 
@@ -60 +88 @@
     class Meta:
         model = Interface
+
+    def clean_iface(self):
+        iface = self.cleaned_data.get('iface')
+        re_iface = re.compile('[a-z]+[0-9]+')
+        if not re_iface.match(iface) or \
+                re_iface.match(iface).group() != iface:
+            raise forms.ValidationError("Please enter a valid interface name")
+        return iface
 
     def clean_polar(self):
@@ -116 +152 @@
             elif self.cleaned_data.get('accesspoint') and \
                     self.instance.pk != link.pk:
-                raise forms.ValidationError( "A link can't be made to another interface when this interface has an accesspoint.")
+                raise forms.ValidationError( "A link can't be made to another"
+                        " interface when this interface has an accesspoint.")
 
             # if link is referenced to itself, link is master and linkable
@@ -170 +207 @@
             elif len(link.link.interface_set.all()) > 2 or \
                     link.link.accesspoint:
-                raise forms.ValidationError(
-                    "The other interface is in managed mode, and can't be changed to master.") 
+                raise forms.ValidationError( "The other interface is in"
+                        " managed mode, and can't be changed to master.") 
             # We shouldn't come here, because all link possibilities are 
             # accounted for.
@@ -206 +243 @@
         if not link:
             if not ap:
-                self.data['netmask'] = 32
                 try:
                     new_ip = IPCalc(node, 32)
@@ -215 +251 @@
 
             if ap:
-                self.data['netmask'] = AP_NETMASK       
                 try:
                     new_ip = IPCalc(node, AP_NETMASK)
@@ -248 +283 @@
                 link.save()
                 ip = new_ip.ips.pop()
-                self.data['netmask'] = netmask
                 # filter out own and master interface
                 for i in (i for i in all_links if not i.id in (pk, link.id)):
@@ -275 +309 @@
                 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()
@@ -324 +357 @@
         # iface is saved for the first time
         if not edit and not link: 
-            return new_ssid(node, iface, accesspoint, direction)
+            return new_ssid(node.network, node, iface, accesspoint, direction)
 
         # iface is in managed mode
@@ -336 +369 @@
         if self.instance.link_id != link.id or \
                 self.instance.accesspoint != accesspoint:
-            return new_ssid(node, iface, accesspoint, direction)
+            return new_ssid(node.network, node, iface, accesspoint, direction)
         
         # else, don't change ssid and return original
@@ -355 +388 @@
         
         return MANAGED
+
+class DhcpStaticForm(forms.ModelForm):
+    class Meta:
+        model = DhcpStatic
+
+    def clean_hostname(self):
+        hostname = self.cleaned_data.get('hostname')
+        re_hostname = re.compile('[0-9a-zA-Z-]+')
+        if not hostname == re_hostname.match(hostname).group():
+            raise forms.ValidationError(
+                    'Not a valid hostname. Use letters, digits and -.')
+        return hostname
+
+    def clean_macaddress(self):
+        macaddress = self.cleaned_data.get('macaddress')
+        re_mac = re.compile('([0-9a-fA-F]{2}[:]){5}[0-9a-fA-F]{2}') 
+        if not re_mac.match(macaddress):
+            raise forms.ValidationError( "Please enter a valid macaddress in"
+                    " the form of : XX:XX:XX:XX:XX:XX")
+        return macaddress
+
+    def clean_accesspoint(self):
+        accesspoint = self.cleaned_data.get('accesspoint')
+        if not accesspoint.accesspoint:
+            raise forms.ValidationError("Please choose an accesspoint that is" 
+                    " enabled as an accesspoint")
+        return accesspoint
+
+    def clean_ipaddress(self):
+        # XXX: don't forget to update this address when changing ips.
+        accesspoint = self.cleaned_data.get('accesspoint')
+        ip = accesspoint.ip
+        netmask = accesspoint.netmask
+        ip_size = int(pow(2,32-netmask))
+        networkaddrL = network(ip, netmask)
+        # 1, -1 compensate for network and broadcast addr. 
+        iplist = [show_addr(networkaddrL + i) for i in xrange(1, ip_size-1)]
+        for i in accesspoint.interface_set.all():
+            iplist.remove(i.ip)
+        [iplist.remove(i.ipaddress) for i in 
+                accesspoint.dhcpstatic_set.all() if not 
+                i.pk == self.instance.pk]
+        iplist.reverse()
+        return iplist.pop()

trunk/exodus/models.py ¶

@@ -136 +136 @@
     hostname = models.CharField(max_length=10,unique=True)
     macaddress = models.CharField(max_length=17)
-    address = models.IPAddressField()
-    public_accesspoint = models.ForeignKey(Interface)
+    accesspoint = models.ForeignKey(Interface)
+    ipaddress = models.IPAddressField(unique=True, blank=True)
 
     class Meta:
@@ -143 +143 @@
 
     def __unicode__(self):
-        return self.hostname
+        return "%s.%s.%s %s" % (self.hostname, self.accesspoint.node.name, 
+                self.accesspoint.node.network.name, self.macaddress)