Changeset 6479 for trunk

Timestamp:

Dec 23, 2008, 12:53:26 AM (16 years ago)

Author:

roland

Message:

Code cleanup, modified admin to be nicer when showing an interface.

Location:

trunk/exodus

Files:

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

trunk/exodus/admin.py

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

trunk/exodus/forms.py

@@ -238 +238 @@
                     raise forms.ValidationError(
                         "Not enough free ips for this node.")
-                import pdb; pdb.set_trace() ;
                 new_ip.ips.reverse()
                 ip = new_ip.ips.pop()

trunk/exodus/models.py

@@ -106 +106 @@
    
     class Meta:
-        #unique_together = ('node', 'iface')
+        unique_together = ('node', 'iface')
         verbose_name = 'Interface'
    
@@ -115 +115 @@
         super(Interface, self).save(force_insert, force_update)
         # If link is not defined we link to self.
-        #XXX: need to assign an IP address in forms.
         if not self.link:
             self.link = self
             super(Interface, self).save(False, True)
         
-
-#
-# XXX: Currently not used, require rethinking wether we _really_ still needs
-# this feature as we going to use a new interlink IP naming model
-#class InterfaceAlias(models.Model):
-#    iface = models.ForeignKey(Interface,related_name='child')
-#    ip = models.IPAddressField(unique=True)
-#    netmask = models.IntegerField(default=30)
-#    shortdesc = models.CharField(blank=True, max_length=10)
-#    desc = models.CharField(blank=True, max_length=100)
-#    linkAlias = models.ForeignKey('self', blank=True, null=True)
-#    link = models.ForeignKey(Interface, blank=True, null=True)
-#   
-#    def __unicode__(self):
-#        return "Alias %s" % (self.iface)
-#
-#
-# XXX: Needs rethinking, dhcp[start|stop] could be removed if whole publicAP is
-# going to be activated as DHCP range, or only number of fixed clients needs to
-# be defined, all other could be calculated on the fly if needed
-
-#class PublicAP(models.Model):
-#     iface = models.ForeignKey(Interface,related_name='ap', verbose_name="interface")
-#     ip = models.IPAddressField(unique=True)
-#     netmask = models.IntegerField(default=28)
-#     dhcpstart = models.IPAddressField()
-#     dhcpstop = models.IPAddressField()
-#     shortdesc = models.CharField(max_length=10)
-#     desc = models.CharField(max_length=100)
-#
-#     class Meta:
-#         verbose_name = "Public Access Point"
-#
-#     def __unicode__(self):
-#         return "%s:%s" % (self.iface,self.pk)
 
 class DhcpStatic(models.Model):
@@ -162 +126 @@
     public_accesspoint = models.ForeignKey(Interface)
 
-
     class Meta:
         verbose_name = "Static host"