Changeset 6398 for branches

Timestamp:

Nov 29, 2008, 3:51:29 PM (16 years ago)

Author:

RIck van der Zwet

Message:

Rough template how it should look like, we havely really on inline forms which are far from perfect yet

Location:

branches/exodus-admin/exodus

Files:

• admin.py (modified) (2 diffs)
• contrib.py (added)
• models.py (modified) (4 diffs)

branches/exodus-admin/exodus/admin.py

@@ -1 +1 @@
 from django.contrib import admin
 from django.contrib import databrowse
+from django import forms
 from exodus.models import *
+
+from exodus.wllogic import free_masterip, newSSIDName, addInterlinkIP, \
+     freeInterlinkIP, freePublicAPIP
+
+from exodus.contrib import ReadOnlyAdminFields
+
+class InterfaceCommon(ReadOnlyAdminFields):
+    readonly = ('ip', )
+    def save_model(self, request, obj, form, change):
+        if obj.link and (obj.type != obj.link.type):
+            raise ValueError,'Type of local and remote interface needs to match'
+        if str(obj.type) != "eth":
+            obj.ssid = newSSIDName(obj.node, obj.iface, 'unused')
+            obj.channel = '1'
+            obj.mode = 1 # set to master
+
+        # Only change IP if changes in interface link/mask or new of course :-)
+        #if change or self.is_changed.has_key('link') or \
+        #        self.is_changed.has_key('netmask'):
+        if not obj.link:
+            obj.ip = freeInterlinkIP(obj)
+        else:
+            obj.ip = addInterlinkIP(obj.link)
+
+        # XXX: Change in netmask requires full range of netmask changes \
+        # on slaves
+        obj.save()
+        #Dirty to hack to get reference to self working
+        if not obj.link:
+            obj.link = obj
+            obj.save()
+
+
+class PublicAPInline(ReadOnlyAdminFields,admin.TabularInline):
+    model = PublicAP
+    extra = 1
+
+class InterfaceAdmin(InterfaceCommon, admin.ModelAdmin):
+    inlines = (PublicAPInline,)
+    pass
+
+class InterfaceInline(InterfaceCommon, admin.TabularInline):
+    model = Interface
+    extra = 1
+
+class DhcpStaticInline(admin.TabularInline):
+    model = DhcpStatic
+    extra = 1
+
+class PublicAPAdmin(ReadOnlyAdminFields,admin.ModelAdmin):
+    inlines = (DhcpStaticInline,)
 
 class NodeAdmin(admin.ModelAdmin):
     exclude = ('masterip',)
+# Inline forms sucks bigtime, editing deleting, making readonly broken or non existing
+# XXX: Every save creates a new interface :-(
+    inlines = (InterfaceInline,)
 
     def save_model(self, request, obj, form, change):
         #XXX: Testing hidden field commits
-        obj.masterip = '172.168.1.1'
+        obj.masterip = free_masterip(obj.network)
         obj.save()
 
@@ -16 +71 @@
 admin.site.register(Network)
 admin.site.register(Node,NodeAdmin)
-admin.site.register(Interface)
-admin.site.register(PublicAP)
+admin.site.register(Interface,InterfaceAdmin)
+admin.site.register(PublicAP, PublicAPAdmin)
 admin.site.register(DhcpStatic)
 

branches/exodus-admin/exodus/models.py

@@ -45 +45 @@
     gain = models.IntegerField(max_length=3)
 
+    class Meta:
+        verbose_name = 'Antenna'
+
     def __str__(self):
         return self.type
@@ -84 +87 @@
 
 
+
+
 class Node(ExtendedModel):
     name = models.CharField(max_length=30, unique=True)
@@ -104 +109 @@
         iface = models.CharField(max_length=10, verbose_name="interface", \
             default='eth0')
-        ip = models.IPAddressField(unique=True)
+        ip = models.IPAddressField(unique=True, blank=True)
         netmask = models.IntegerField(default=30)
         polar = models.CharField(blank=True, max_length=10, choices=POLAR_CHOICES)
         ssid = models.CharField(max_length=30, blank=True, null=True)
-        mode = models.CharField(max_length=10, choices=WIFI_MODE_CHOICES)
+        mode = models.CharField(max_length=10, choices=WIFI_MODE_CHOICES, blank=True)
         channel = models.IntegerField(blank=True, null=True)
         antenna = models.ForeignKey(Antenna, blank=True, null=True)
@@ -116 +121 @@
         
         class Meta:
-                unique_together = ('node', 'iface')
+                #unique_together = ('node', 'iface')
                 verbose_name = 'Interface'