Changeset 6513

Timestamp:

Dec 30, 2008, 12:50:29 AM (16 years ago)

Author:

roland

Message:

added get_direction_choices to get the full name directions from exodus
for use in the generation of ssid's.

Location:

trunk/exodus

Files:

• forms.py (modified) (5 diffs)
• models.py (modified) (1 diff)
• wllogic.py (modified) (3 diffs)

trunk/exodus/forms.py ¶

@@ -3 +3 @@
 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, network, show_addr
+from exodus.wllogic import MASTER, MANAGED, calc_subnet, network, show_addr, \
+        get_direction_choices
 from exodus.settings import AP_NETMASK
 from exodus.wlipcalc import IPCalc
@@ -55 +56 @@
                     i.ip = new_ip.ips.pop()
                     i.ssid = new_ssid(new_network, self.instance, i.iface, 
-                            i.accesspoint, i.direction)
+                            i.accesspoint, i.get_direction_display())
                     for j in (j for j in all_links if not j.id == i.pk):
                         j.ip  = new_ip.ips.pop()
@@ -288 +289 @@
                     i.save()
                 if link.accesspoint:
-                    # Need to reverse because when i.save() happens
-                    # the database might have an old ipaddress and unique==True
-                    static = link.dhcpstatic_set.all()
-                    for i in static.order_by('ipaddress').reverse():
+                    for i in link.dhcpstatic_set.all():
                         i.ipaddress = new_ip.ips.pop()
                         i.save()
@@ -319 +317 @@
                     i.netmask = netmask
                     i.save() 
-                static = link.dhcpstatic_set.all()
-                for i in static.order_by('ipaddress').reverse():
+                for i in link.dhcpstatic_set.all():
                     i.ipaddress = new_ip.ips.pop()
                     i.save()
@@ -358 +355 @@
         iface = self.cleaned_data.get('iface')
         accesspoint = self.cleaned_data.get('accesspoint')
-        direction = self.cleaned_data.get('direction')
+        direction = get_direction_choices(self.cleaned_data.get('direction'))
         link = self.cleaned_data.get('link')
         orig_ssid = self.cleaned_data.get('ssid')

trunk/exodus/models.py ¶

@@ -137 +137 @@
     macaddress = models.CharField(max_length=17)
     accesspoint = models.ForeignKey(Interface)
-    ipaddress = models.IPAddressField(unique=True, blank=True)
+    ipaddress = models.IPAddressField(blank=True)
 
     class Meta:

trunk/exodus/wllogic.py ¶

@@ -1 +1 @@
 # (c) Roland van Laar
 
-from exodus.models import Node, WIFI_MODE_CHOICES
+from exodus.models import Node, WIFI_MODE_CHOICES, DIRECTION_CHOICES
 from exodus.settings import MASTERIP_NETMASK, WIRELESS, COMPAT
 from math import ceil, log
@@ -9 +9 @@
 MANAGED = WIFI_MODE_CHOICES[1][0]
 
+def get_direction_choices(direction):
+    """Return the full direction given an abbreviation."""
+    l = {}
+    for i in DIRECTION_CHOICES:
+        l[i[0]]  = i[1] 
+    return l[direction]
+    
+
 def new_ssid_for_existing_interface(nic):
+    """A parser that can be called in an easier way than new_ssid."""
     return new_ssid(nic.network,nic.node, nic.iface, nic.accesspoint, 
-            nic.direction)
+            nic.get_direction_dislay())
 
 def new_ssid(network, node, iface, accesspoint=False, direction=None):
@@ -32 +41 @@
             return (ssid % (""))
 
-                
         # compensate for the first AP. First AP ssid is: ap.nodename.network
         # second AP is ap2.nodename.network