Changeset 6491 for trunk

Timestamp:

Dec 28, 2008, 9:18:32 PM (16 years ago)

Author:

roland

Message:

Made a fix in models.py:
sdesc and desc were removed from the interface.
Added a direction option for wifilinks.

Added collapse option to wireless stuff in the interface admin.
Removed unnesessary eggs from base.cfg
Updated inititial_data.json to new database structure

Location:

trunk

Files:

• base.cfg (modified) (1 diff)
• exodus/admin.py (modified) (2 diffs)
• exodus/forms.py (modified) (3 diffs)
• exodus/models.py (modified) (3 diffs)
• initial_data.json (modified) (10 diffs)

trunk/base.cfg

@@ -38 +38 @@
 eggs =
   Werkzeug
-  ipcalc
-#  IPv4_Utils
-  netaddr
-  ipaddr
 pythonpath = 
   ${extras:location}/django-command-extensions/

trunk/exodus/admin.py

@@ -23 +23 @@
 
 class InterfaceAdmin(ReadOnlyAdminFields, admin.ModelAdmin):
-    readonly = ('ip', 'netmask', 'mode', 'ssid', 'shortdesc', 'desc')
+    readonly = ('ip', 'netmask', 'mode', 'ssid', )
     form = InterfaceForm
     list_display = ('node', 'iface', 'type', 'ip', 'channel', 'polar', 
-        'shortdesc', 'link')
+        'link')
     search_fields = ('node__name','iface')
     list_filter = ('type', 'accesspoint', 'polar', 'node', 'antenna')
@@ -34 +34 @@
             'fields' : ('node', 'iface', 'type', ('ip', 'netmask'), 'link')}),
         ('Wireless', {
+            'classes' : ('collapse', ),
             'fields' : ('ssid', 'channel', 'antenna', 'polar', 'mode')}),
-        ('Description', {
-            'fields' : (('shortdesc', 'desc'))}
-        ))
+        )
 
 advanced_admin.register(Antenna)

trunk/exodus/forms.py

@@ -52 +52 @@
                     "An ethernet interface can't have an antenna.")
         return antenna
+
+    def clean_direction(self):
+        self.type = self.cleaned_data.get('type')
+        direction = self.cleaned_data.get('direction')
+        if direction and not link_is_wireless(self):
+            raise forms.ValidationError(
+                    "An ethernet interface can't have a direction.")
+        return direction
+        
 
     def clean_link(self):
@@ -153 +162 @@
 
     def clean_ip(self):
-        """Cleans the ip.
+        """Cleans the ip and netmask.
 
         We calculate the ipaddresses of this link and the ones linked to it.
@@ -247 +256 @@
                 return ip
 
-    #XXX: change SSID when iface.name changes    
+    def clean_netmask(self):
+        """Cleaning happens in clean_ip."""
+        return self.cleaned_data.get('netmask')
+
+    def clean_ssid(self):
+        self.type = self.cleaned_data.get('type')
+        if not link_is_wireless(self):
+            return None
+
+

trunk/exodus/models.py

@@ -26 +26 @@
          ('mn', 'managed'),
          )
+
+DIRECTION_CHOICES = (
+        ('n', 'north'),
+        ('nw', 'north-west'),
+        ('w', 'west'),
+        ('sw', 'south-west'),
+        ('s', 'south'),
+        ('se', 'south-east'),
+        ('e', 'east'),
+        ('ne', 'north-east'),
+        ('omni', 'omnidirectional'),
+        )
+
 
 class Antenna(models.Model):
@@ -95 +108 @@
     polar = models.CharField(blank=True, max_length=10, choices=POLAR_CHOICES)
     antenna = models.ForeignKey(Antenna, blank=True, null=True)
+    direction = models.CharField(max_length=10, blank=True, null=True, 
+            choices=DIRECTION_CHOICES)
     link = models.ForeignKey('self', blank=True, null=True)
     ip = models.IPAddressField(unique=True, blank=True)
@@ -100 +115 @@
     ssid = models.CharField(max_length=50, blank=True, null=True)
     mode = models.CharField(max_length=10, choices=WIFI_MODE_CHOICES,
-            blank=True)
+            blank=True, null=True)
     channel = models.IntegerField(blank=True, null=True)
-    shortdesc = models.CharField(blank=True, max_length=10)
-    desc = models.CharField(blank=True, max_length=100)
    
     class Meta:

trunk/initial_data.json

@@ -669 +669 @@
    "link": 1, 
    "mode": "", 
-   "shortdesc": "2Rick2", 
    "type": "eth", 
    "channel": null, 
-   "desc": "Ethernet naar Rick2"
+   "direction": ""
   }
  }, 
@@ -689 +688 @@
    "link": 1, 
    "mode": "", 
-   "shortdesc": "2Rick1", 
+   "direction": "",
    "type": "eth", 
-   "channel": null, 
-   "desc": "Ethernet naar Rick1"
+   "channel": null 
   }
  }, 
@@ -709 +707 @@
    "link": 3, 
    "mode": "ms", 
-   "shortdesc": "11b", 
+   "direction": "",
    "type": "11b", 
-   "channel": 1, 
-   "desc": "11b"
+   "channel": 1 
   }
  }, 
@@ -729 +726 @@
    "link": 5, 
    "mode": "mn", 
-   "shortdesc": "2 nwkerk", 
+   "direction": "",
    "type": "11a", 
-   "channel": 5, 
-   "desc": "11a naar nieuwe kerk"
+   "channel": 5 
   }
  }, 
@@ -749 +745 @@
    "link": 5, 
    "mode": "ms", 
-   "shortdesc": "2 ick1", 
+   "direction": "",
    "type": "11a", 
-   "channel": 5, 
-   "desc": "11a naar Rick1"
+   "channel": 5 
   }
  }, 
@@ -769 +764 @@
    "link": 6, 
    "mode": "ms", 
-   "shortdesc": "ap nwkerk", 
+   "direction": "",
    "type": "11b", 
-   "channel": 8, 
-   "desc": "Ap voor de nieuwe kerk"
+   "channel": 8
   }
  }, 
@@ -789 +783 @@
    "link": 7, 
    "mode": "ms", 
-   "shortdesc": "2rick1", 
+   "direction": "",
    "type": "11b", 
-   "channel": 1, 
-   "desc": "wi0 naar nieuwe kerk en rick2"
+   "channel": 1 
   }
  }, 
@@ -809 +802 @@
    "link": 7, 
    "mode": "mn", 
-   "shortdesc": "2cope", 
+   "direction": "",
    "type": "11g", 
-   "channel": 1, 
-   "desc": "Link naar Cope"
+   "channel": 1 
   }
  }, 
@@ -829 +821 @@
    "link": 7, 
    "mode": "mn", 
-   "shortdesc": "2cope", 
+   "direction": "",
    "type": "11g", 
-   "channel": 1, 
-   "desc": "ath0 naar cope"
+   "channel": 1 
   }
  }, 
@@ -849 +840 @@
    "link": 10, 
    "mode": "ms", 
-   "shortdesc": "omni cope", 
+   "direction": "",
    "type": "11g", 
-   "channel": 7, 
-   "desc": "omni van cope"
+   "channel": 7 
   }
  }