Changeset 6411 for branches

Timestamp:

Dec 7, 2008, 9:46:03 PM (16 years ago)

Author:

roland

Message:

A check in with some addons, still code in progress.
Some niceties in admin.

Location:

branches/exodus-roland

Files:

• Makefile (modified) (1 diff)
• exodus/admin.py (modified) (4 diffs)
• exodus/models.py (modified) (4 diffs)
• exodus/tests.py (modified) (1 diff)
• exodus/urls.py (modified) (1 diff)
• initial_data.json (modified) (1 diff)

branches/exodus-roland/Makefile

@@ -30 +30 @@
         @sqlite3 $(SQLDB) < debug.sql
 
+dbdebug:
+#Put debug.sql in database
+        @sqlite3 $(SQLDB) < debug.sql
+
+dbclean: 
+# remove the database
+        @rm -r $(SQLDB)
+
 clean:
 #Remove all created data, development ground, but keep downloaded files

branches/exodus-roland/exodus/admin.py

@@ -6 +6 @@
 from exodus.contrib import ReadOnlyAdminFields
 
+class PublicAPInline(admin.TabularInline):
+    model = PublicAP
+    extra = 1
+
 class InterfaceInline(admin.TabularInline):
     model = Interface
-    extra = 1
+    extra = 2 
     fieldsets = (
         (None, {
@@ -15 +19 @@
         }),
     )
+    #inlines = [ PublicAPInline, ] 
 
 class NodeAdmin(ReadOnlyAdminFields, admin.ModelAdmin):
@@ -27 +32 @@
         }),
     )
+    inlines = [InterfaceInline, ]
+
+class NodeInline(admin.TabularInline):
+    model = Node
+    extra = 2 
 
 class LocationAdmin(admin.ModelAdmin):
     search_fields = ['description'] 
+    inlines = [ NodeInline, ]
 
 admin.site.register(Antenna)
@@ -41 +52 @@
 
 databrowse.site.register(Antenna)
-databrowse.site.register(Location)
+databrowse.site.register(Location, LocationAdmin)
 databrowse.site.register(DnsServer)
 databrowse.site.register(Network)

branches/exodus-roland/exodus/models.py

@@ -5 +5 @@
 from django import forms
 
-# Create your models here.
 
 #No need to formalize it; CHOICES don't change much
@@ -14 +13 @@
                         ('pl', 'planned'),
                         )
-
+        
 POLAR_CHOICES = (
                         ('hr', 'horizontal'),
@@ -79 +78 @@
     name = models.CharField(max_length=30, unique=True)
     location = models.ForeignKey(Location)
-    status = models.CharField(max_length=10, choices=STATUS_CHOICES, default=1)
+    status = models.CharField(max_length=10, choices=STATUS_CHOICES , \
+        default='up')
     masterip = models.IPAddressField(unique=True)
     network = models.ForeignKey(Network,default=1)
@@ -94 +94 @@
         node = models.ForeignKey(Node)
         type = models.CharField(max_length=10, choices=INTERFACE_TYPE_CHOICES, \
-            default=1)
+            default='eth')
         iface = models.CharField(max_length=10, verbose_name="interface", \
             default='eth0')

branches/exodus-roland/exodus/tests.py

@@ -180 +180 @@
         from wllogic import addInterlinkIP
         self.fail('Test not implemented')
+
+class Manager(unittest.TestCase):
+        def test_interface_manager(self):
+                class link(object):
+                        def __init__(self, type):
+                                self.type = type
+                from exodus.manager import InterfaceManager
+                11a_link = 
     
 def suite():

branches/exodus-roland/exodus/urls.py

@@ -9 +9 @@
 from django.contrib import admin
 admin.autodiscover()
-
-#
-# experimental databrowse code
 
 urlpatterns = patterns('',

branches/exodus-roland/initial_data.json

@@ -472 +472 @@
       "groups": [], 
       "user_permissions": [], 
-      "password": "sha1$b2535$dbc48961d155733361f2ad083032bbbd9b125188", 
+      "password": "sha1$4576b$fbd6265a7bac27c85f649446be57169c2627808d", 
       "email": "techniek@lijst.wirelessleiden.nl", 
       "date_joined": "2008-11-28 20:23:55"