Changeset 6431

Timestamp:

Dec 10, 2008, 3:32:29 PM (16 years ago)

Author:

roland

Message:

Modified model so that public ap is now accespoint and a boolean in the
interface model. Further, commented out references to PublicAp.

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• exodus/admin.py (modified) (4 diffs)
• exodus/models.py (modified) (4 diffs)
• exodus/settings.py (modified) (2 diffs)
• exodus/sql (deleted)
• exodus/templates/viewNode.html (modified) (2 diffs)
• exodus/urls.py (modified) (1 diff)
• exodus/views.py (modified) (2 diffs)
• exodus/wllogic.py (modified) (2 diffs)
• initial_data.json (modified) (1 diff)

trunk/Makefile

@@ -10 +10 @@
 #Setup environment database
         @./bin/buildout
+        @echo "no" | ./bin/django syncdb
+
+syncdb:
+# syncdatabase
         @echo "no" | ./bin/django syncdb
 

trunk/exodus/admin.py

@@ -1 +1 @@
 from django.contrib.admin.sites import AdminSite
+from django.contrib import admin
 from django.contrib import databrowse
 from django import forms
@@ -9 +10 @@
 plain_admin = AdminSite()
 
-class PublicAPInline(admin.TabularInline):
-    model = PublicAP
-    extra = 1
+#class PublicAPInline(admin.TabularInline):
+#    model = PublicAP
+#    extra = 1
 
 class InterfaceInline(admin.TabularInline):
@@ -52 +53 @@
 advanced_admin.register(Node, NodeAdmin)
 advanced_admin.register(Interface)
-advanced_admin.register(PublicAP)
+#advanced_admin.register(PublicAP)
 advanced_admin.register(DhcpStatic)
 
@@ -61 +62 @@
 plain_admin.register(Node)
 plain_admin.register(Interface)
-plain_admin.register(PublicAP)
+#plain_admin.register(PublicAP)
 plain_admin.register(DhcpStatic)
 
 databrowse.site.register(Antenna)
-databrowse.site.register(Location, LocationAdmin)
+databrowse.site.register(Location)
 databrowse.site.register(DnsServer)
 databrowse.site.register(Network)
 databrowse.site.register(Node)
 databrowse.site.register(Interface)
-databrowse.site.register(PublicAP)
+#databrowse.site.register(PublicAP)
 databrowse.site.register(DhcpStatic)

trunk/exodus/models.py

@@ -101 +101 @@
 
 class Interface(models.Model):
-   node = models.ForeignKey(Node)
-   type = models.CharField(max_length=10, choices=INTERFACE_TYPE_CHOICES, \
+    node = models.ForeignKey(Node)
+    type = models.CharField(max_length=10, choices=INTERFACE_TYPE_CHOICES, 
             default='eth')
-   iface = models.CharField(max_length=10, verbose_name="interface", \
+    iface = models.CharField(max_length=10, verbose_name="interface", 
             default='eth0')
-   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=50, blank=True, null=True)
-   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)
-   shortdesc = models.CharField(blank=True, max_length=10)
-   desc = models.CharField(blank=True, max_length=100)
-   link = models.ForeignKey('self', blank=True, null=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=50, blank=True, null=True)
+    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)
+    shortdesc = models.CharField(blank=True, max_length=10)
+    desc = models.CharField(blank=True, max_length=100)
+    link = models.ForeignKey('self', blank=True, null=True)
+    accesspoint = models.BooleanField()
    
-   class Meta:
-      #unique_together = ('node', 'iface')
-      verbose_name = 'Interface'
+    class Meta:
+        #unique_together = ('node', 'iface')
+        verbose_name = 'Interface'
    
-   def __unicode__(self):
-      return "%s/%s" % (self.node, self.iface)
+    def __unicode__(self):
+        return "%s/%s" % (self.node, self.iface)
 
 #
@@ -128 +130 @@
 # 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)
+    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)
+    def __unicode__(self):
+        return "Alias %s" % (self.iface)
 
 #
@@ -144 +146 @@
 # 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 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):
@@ -163 +165 @@
     macaddress = models.CharField(max_length=17)
     address = models.IPAddressField()
-    PublicAP = models.ForeignKey(PublicAP)
+    PublicAP = models.ForeignKey(Interface)
 
     class Meta:

trunk/exodus/settings.py

@@ -38 +38 @@
 LANGUAGE_CODE = 'en-us'
 
-SITE_ID = 1
-
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'l+plhHJKNIkiasdfh12lsk0Lkf,.=+-asdjdknmnaladfasdmnm,90934jknmnsdaf09'
@@ -68 +66 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
-    'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.databrowse',

trunk/exodus/templates/viewNode.html

@@ -23 +23 @@
         <div style="border:1px solid #000000;">
         <h3>iface: {{ nic.iface }} </h3>
-        <a href="{% url exodus.views.genericPublicAP "add" node.name nic.iface "new" %}">Add new public access point</a><p />
         Description: {{ nic.shortdesc }} <br>
         IP: {{ nic.ip }}/{{ nic.netmask }}<br />
@@ -50 +49 @@
         {% endfor %}
         <ol>
-        {% for accessPoint in nic.ap.all %}
-                <div style="border:1px solid #000000;">
-                <p />
-                <li>Public Access Point: {{ accessPoint.ip}}/{{accessPoint.netmask }}
-                <a href="{% url exodus.views.genericPublicAP "edit" node.name nic.iface accessPoint.pk %}">EDIT</a>
-                <a href="{% url exodus.views.genericPublicAP "delete" node.name nic.iface accessPoint.pk %}">DELETE</a>
-                {% for dhcp in accessPoint.dhcpstatic.all %}
-                        <ul>
-                            <li>Hostname: {{ dhcp.hostname }} </li>
-                            <li>MacAddress: {{ dhcp.macaddress }} </li>
-                        </ul>
-                {% endfor %}
-        </li>
-                <p />
-                </div>
-        {% endfor %}
         </ol>
         </div>

trunk/exodus/urls.py

@@ -22 +22 @@
         (r'^(?P<mode>(add|edit|delete))/node/(?P<node>.+)/$', 'exodus.views.genericNode'),
         (r'^(?P<mode>(add|edit|delete))/nic/(?P<node>.+)/(?P<interface>.+)/$', 'exodus.views.genericInterface'),
-        (r'^(?P<mode>(add|edit|delete))/dhcp/(?P<node>.+)/(?P<interface>.+)/(?P<publicAP>.+)/$', 'exodus.views.genericPublicAP'),
+        #(r'^(?P<mode>(add|edit|delete))/dhcp/(?P<node>.+)/(?P<interface>.+)/(?P<publicAP>.+)/$', 'exodus.views.genericPublicAP'),
         (r'^(?P<mode>(add|edit|delete))/(?P<model>.+)/(?P<object>.+)/$', 'exodus.views.genericModel'),
 

trunk/exodus/views.py

@@ -9 +9 @@
 from exodus.models import *
 from exodus.wllogic import free_masterip, newSSIDName, addInterlinkIP, \
-        freeInterlinkIP, freePublicAPIP
+        freeInterlinkIP
 
 from exodus.utils import pdebug
@@ -128 +128 @@
 #
 # PublicAP
-class PublicAPForm(forms.ModelForm):
-    class Meta:
-        model = PublicAP
-        exclude = ('shortdesc', 'desc', 'ip', 'dhcpstart', 'dhcpstop')
-
-class PublicAPHandler(GenericHandler):
-
-    def __init__(self, request, node, interface, publicAP, mode):
-        pdebug(100, "Function: PublicAPHandler.__init__")
-        self.node = Node.objects.get(name=node)
-        self.interface = Interface.objects.get(node=self.node, iface=interface)
-        if mode == 'add':
-            self.publicAP = PublicAP(iface=self.interface)
-        else:
-            self.publicAP =  PublicAP.objects.get(iface=self.interface, \
-                    pk=publicAP)
-        super(PublicAPHandler, self).__init__(request, mode)
-
-    def _add(self):
-        pdebug(100, "Function: PublicAPHandler._add")
-        _instance = self.form.save(commit=False)
-        # Find IP range inside interface range with disired size/subnet
-        _instance.ip = freePublicAPIP(_instance.iface, _instance.netmask)
-        _instance.dhcpstart = 1
-        _instance.dhcpstop = 2
-        # If wireless generate ssid name
-        _instance.ssid = newSSIDName(_instance.iface.node, _instance.iface, \
-                'omni')
-        _instance.save()
-
-def genericPublicAP(request, node, interface, publicAP, mode):
-    pdebug(100, "Function: genericPublicAP")
-    handler = PublicAPHandler(request, node, interface, publicAP, mode)
-    return handler.render_to_response()
-
+#class PublicAPForm(forms.ModelForm):
+#    class Meta:
+#        model = PublicAP
+#        exclude = ('shortdesc', 'desc', 'ip', 'dhcpstart', 'dhcpstop')
+#
+#class PublicAPHandler(GenericHandler):
+#
+#    def __init__(self, request, node, interface, publicAP, mode):
+#        pdebug(100, "Function: PublicAPHandler.__init__")
+#        self.node = Node.objects.get(name=node)
+#        self.interface = Interface.objects.get(node=self.node, iface=interface)
+#        if mode == 'add':
+#            self.publicAP = PublicAP(iface=self.interface)
+#        else:
+#            self.publicAP =  PublicAP.objects.get(iface=self.interface, \
+#                    pk=publicAP)
+#        super(PublicAPHandler, self).__init__(request, mode)
+#
+#    def _add(self):
+#        pdebug(100, "Function: PublicAPHandler._add")
+#        _instance = self.form.save(commit=False)
+#        # Find IP range inside interface range with disired size/subnet
+#        _instance.ip = freePublicAPIP(_instance.iface, _instance.netmask)
+#        _instance.dhcpstart = 1
+#        _instance.dhcpstop = 2
+#        # If wireless generate ssid name
+#        _instance.ssid = newSSIDName(_instance.iface.node, _instance.iface, \
+#                'omni')
+#        _instance.save()
+#
+#def genericPublicAP(request, node, interface, publicAP, mode):
+#    pdebug(100, "Function: genericPublicAP")
+#    handler = PublicAPHandler(request, node, interface, publicAP, mode)
+#    return handler.render_to_response()
+#
 #
 # Interface 

trunk/exodus/wllogic.py

@@ -1 +1 @@
 # (c) Roland van Laar
 
-from exodus.models import Node, Interface, PublicAP
+from exodus.models import Node, Interface
 from exodus.settings import MASTERIP_NETMASK
 
@@ -84 +84 @@
 # XXX: Needs merging with freeInterlinkIP as interface could have both AP, 
 # interlink defined on one link
-def freePublicAPIP(masterLink, netmask):
-        taken = {}
-
-        for interface in Interface.objects.filter(link=masterLink):
-                #Grr, needs all interfaces which are master requires a bit of a hack
-                addr = network(interface.ip, interface.netmask)
-                addrMax = broadcast(interface.ip, interface.netmask)
-                while addr < addrMax:
-                        taken[addr] = 1
-                        addr = addr + 1
-
-        for accessPoint in PublicAP.objects.filter(iface=masterLink):
-                #Grr, needs all interfaces which are master requires a bit of a hack
-                addr = network(accessPoint.ip, accessPoint.netmask)
-                addrMax = broadcast(accessPoint.ip, accessPoint.netmask)
-                while addr < addrMax:
-                        taken[addr] = 1
-                        addr = addr + 1
-
-        #Should be dynamic based on the number of hosts in here
-        size = netmask
-        numaddrs = 1 << (32 - size)
-        i = network(masterLink.ip,masterLink.netmask)
-        while taken.has_key(i):
-                i = i + numaddrs
-        
-        return show_addr(i)
-
+#def freePublicAPIP(masterLink, netmask):
+#       taken = {}
+#
+#       for interface in Interface.objects.filter(link=masterLink):
+#               #Grr, needs all interfaces which are master requires a bit of a hack
+#               addr = network(interface.ip, interface.netmask)
+#               addrMax = broadcast(interface.ip, interface.netmask)
+#               while addr < addrMax:
+#                       taken[addr] = 1
+#                       addr = addr + 1
+#
+#       for accessPoint in PublicAP.objects.filter(iface=masterLink):
+#               #Grr, needs all interfaces which are master requires a bit of a hack
+#               addr = network(accessPoint.ip, accessPoint.netmask)
+#               addrMax = broadcast(accessPoint.ip, accessPoint.netmask)
+#               while addr < addrMax:
+#                       taken[addr] = 1
+#                       addr = addr + 1
+#
+#       #Should be dynamic based on the number of hosts in here
+#       size = netmask
+#       numaddrs = 1 << (32 - size)
+#       i = network(masterLink.ip,masterLink.netmask)
+#       while taken.has_key(i):
+#               i = i + numaddrs
+#       
+#       return show_addr(i)
+#
 def freeInterlinkIP(masterLink):
         taken = {}

trunk/initial_data.json

@@ -484 +484 @@
       "session_data": "gAJ9cQEoVRJfYXV0aF91c2VyX2JhY2tlbmRxAlUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5k\ncy5Nb2RlbEJhY2tlbmRxA1UNX2F1dGhfdXNlcl9pZHEESwF1LmQ2ZjkxZjcxZTMwYmVjYzcyNDk1\nYTk5MjRlNWYxNTJm\n"
     }
-  }
+  },
+ {
+  "pk": 1, 
+  "model": "exodus.antenna", 
+  "fields": {
+   "type": "Omni", 
+   "gain": 6
+  }
+ }, 
+ {
+  "pk": 2, 
+  "model": "exodus.antenna", 
+  "fields": {
+   "type": "SD9", 
+   "gain": 9
+  }
+ }, 
+ {
+  "pk": 3, 
+  "model": "exodus.antenna", 
+  "fields": {
+   "type": "SD15", 
+   "gain": 15
+  }
+ }, 
+ {
+  "pk": 4, 
+  "model": "exodus.antenna", 
+  "fields": {
+   "type": "SD19", 
+   "gain": 19
+  }
+ }, 
+ {
+  "pk": 5, 
+  "model": "exodus.antenna", 
+  "fields": {
+   "type": "2020", 
+   "gain": 20
+  }
+ }, 
+ {
+  "pk": 6, 
+  "model": "exodus.antenna", 
+  "fields": {
+   "type": "4040", 
+   "gain": 20
+  }
+ }, 
+ {
+  "pk": 7, 
+  "model": "exodus.antenna", 
+  "fields": {
+   "type": "8080", 
+   "gain": 80
+  }
+ }, 
+ {
+  "pk": 1, 
+  "model": "exodus.location", 
+  "fields": {
+   "latitude": "54.55", 
+   "description": "Joost kantoor", 
+   "longitude": "33.44"
+  }
+ }, 
+ {
+  "pk": 2, 
+  "model": "exodus.location", 
+  "fields": {
+   "latitude": "46.77", 
+   "description": "Rapenburg", 
+   "longitude": "45.55"
+  }
+ }, 
+ {
+  "pk": 3, 
+  "model": "exodus.location", 
+  "fields": {
+   "latitude": "34.55", 
+   "description": "kerk", 
+   "longitude": "44.55"
+  }
+ }, 
+ {
+  "pk": 1, 
+  "model": "exodus.dnsserver", 
+  "fields": {
+   "ipaddress": "172.17.8.68", 
+   "domainname": "wleiden.net"
+  }
+ }, 
+ {
+  "pk": 2, 
+  "model": "exodus.dnsserver", 
+  "fields": {
+   "ipaddress": "172.17.143.4", 
+   "domainname": "wzoeterwoude.net"
+  }
+ }, 
+ {
+  "pk": 1, 
+  "model": "exodus.network", 
+  "fields": {
+   "netmask": 16, 
+   "name": "wleiden.net", 
+   "ipspacestart": "172.16.0.0"
+  }
+ }, 
+ {
+  "pk": 2, 
+  "model": "exodus.network", 
+  "fields": {
+   "netmask": 16, 
+   "name": "walphen.net", 
+   "ipspacestart": "172.18.0.0"
+  }
+ }, 
+ {
+  "pk": 3, 
+  "model": "exodus.network", 
+  "fields": {
+   "netmask": 16, 
+   "name": "wzoeterwoude.net", 
+   "ipspacestart": "172.27.0.0"
+  }
+ }, 
+ {
+  "pk": 3, 
+  "model": "exodus.node", 
+  "fields": {
+   "status": "up", 
+   "network": 1, 
+   "name": "Cope", 
+   "masterip": "172.16.3.1", 
+   "location": 2
+  }
+ }, 
+ {
+  "pk": 1, 
+  "model": "exodus.node", 
+  "fields": {
+   "status": "up", 
+   "network": 1, 
+   "name": "Rick1", 
+   "masterip": "172.16.0.1", 
+   "location": 1
+  }
+ }, 
+ {
+  "pk": 2, 
+  "model": "exodus.node", 
+  "fields": {
+   "status": "up", 
+   "network": 1, 
+   "name": "Rick2", 
+   "masterip": "172.16.1.1", 
+   "location": 1
+  }
+ }, 
+ {
+  "pk": 4, 
+  "model": "exodus.node", 
+  "fields": {
+   "status": "up", 
+   "network": 3, 
+   "name": "nieuwe Kerk", 
+   "masterip": "172.27.0.1", 
+   "location": 3
+  }
+ }, 
+ {
+  "pk": 1, 
+  "model": "exodus.interface", 
+  "fields": {
+   "node": 1, 
+   "polar": "", 
+   "iface": "eth0", 
+   "ssid": "", 
+   "antenna": null, 
+   "accesspoint": false, 
+   "ip": "172.16.0.6", 
+   "netmask": 30, 
+   "link": 1, 
+   "mode": "", 
+   "shortdesc": "2Rick2", 
+   "type": "eth", 
+   "channel": null, 
+   "desc": "Ethernet naar Rick2"
+  }
+ }, 
+ {
+  "pk": 2, 
+  "model": "exodus.interface", 
+  "fields": {
+   "node": 2, 
+   "polar": "", 
+   "iface": "eth0", 
+   "ssid": "", 
+   "antenna": null, 
+   "accesspoint": false, 
+   "ip": "172.16.0.7", 
+   "netmask": 30, 
+   "link": 1, 
+   "mode": "", 
+   "shortdesc": "2Rick1", 
+   "type": "eth", 
+   "channel": null, 
+   "desc": "Ethernet naar Rick1"
+  }
+ }, 
+ {
+  "pk": 3, 
+  "model": "exodus.interface", 
+  "fields": {
+   "node": 1, 
+   "polar": "hr", 
+   "iface": "wi0", 
+   "ssid": "AP.Rick2.wleiden.net", 
+   "antenna": 3, 
+   "accesspoint": true, 
+   "ip": "172.16.0.2", 
+   "netmask": 32, 
+   "link": 3, 
+   "mode": "ms", 
+   "shortdesc": "11b", 
+   "type": "11b", 
+   "channel": 1, 
+   "desc": "11b"
+  }
+ }, 
+ {
+  "pk": 4, 
+  "model": "exodus.interface", 
+  "fields": {
+   "node": 1, 
+   "polar": "hr", 
+   "iface": "ath0", 
+   "ssid": "ath0.nwKerk.wzoeterwoude.net", 
+   "antenna": 3, 
+   "accesspoint": false, 
+   "ip": "172.27.0.6", 
+   "netmask": 30, 
+   "link": 5, 
+   "mode": "mn", 
+   "shortdesc": "2 nwkerk", 
+   "type": "11a", 
+   "channel": 5, 
+   "desc": "11a naar nieuwe kerk"
+  }
+ }, 
+ {
+  "pk": 5, 
+  "model": "exodus.interface", 
+  "fields": {
+   "node": 4, 
+   "polar": "hr", 
+   "iface": "ath0", 
+   "ssid": "ath0.nwKerk.wzoeterwoude.net", 
+   "antenna": 4, 
+   "accesspoint": false, 
+   "ip": "172.27.0.5", 
+   "netmask": 30, 
+   "link": 5, 
+   "mode": "ms", 
+   "shortdesc": "2 ick1", 
+   "type": "11a", 
+   "channel": 5, 
+   "desc": "11a naar Rick1"
+  }
+ }, 
+ {
+  "pk": 6, 
+  "model": "exodus.interface", 
+  "fields": {
+   "node": 4, 
+   "polar": "hr", 
+   "iface": "wi0", 
+   "ssid": "AP.nieuwekerk.wzoeterwoude.net", 
+   "antenna": 1, 
+   "accesspoint": true, 
+   "ip": "172.27.0.17", 
+   "netmask": 28, 
+   "link": 6, 
+   "mode": "ms", 
+   "shortdesc": "ap nwkerk", 
+   "type": "11b", 
+   "channel": 8, 
+   "desc": "Ap voor de nieuwe kerk"
+  }
+ }, 
+ {
+  "pk": 7, 
+  "model": "exodus.interface", 
+  "fields": {
+   "node": 3, 
+   "polar": "vr", 
+   "iface": "wi0", 
+   "ssid": "wi0.cope.wleiden.net", 
+   "antenna": 3, 
+   "accesspoint": false, 
+   "ip": "172.16.3.9", 
+   "netmask": 29, 
+   "link": 7, 
+   "mode": "ms", 
+   "shortdesc": "2rick1", 
+   "type": "11b", 
+   "channel": 1, 
+   "desc": "wi0 naar nieuwe kerk en rick2"
+  }
+ }, 
+ {
+  "pk": 8, 
+  "model": "exodus.interface", 
+  "fields": {
+   "node": 2, 
+   "polar": "hr", 
+   "iface": "ath0", 
+   "ssid": "wi0.cope.wleiden.net", 
+   "antenna": 3, 
+   "accesspoint": false, 
+   "ip": "172.16.3.10", 
+   "netmask": 29, 
+   "link": 7, 
+   "mode": "mn", 
+   "shortdesc": "2cope", 
+   "type": "11g", 
+   "channel": 1, 
+   "desc": "Link naar Cope"
+  }
+ }, 
+ {
+  "pk": 9, 
+  "model": "exodus.interface", 
+  "fields": {
+   "node": 4, 
+   "polar": "vr", 
+   "iface": "ath1", 
+   "ssid": "wi0.cope.wleiden.net", 
+   "antenna": 5, 
+   "accesspoint": false, 
+   "ip": "172.16.3.11", 
+   "netmask": 29, 
+   "link": 7, 
+   "mode": "mn", 
+   "shortdesc": "2cope", 
+   "type": "11g", 
+   "channel": 1, 
+   "desc": "ath0 naar cope"
+  }
+ }, 
+ {
+  "pk": 10, 
+  "model": "exodus.interface", 
+  "fields": {
+   "node": 3, 
+   "polar": "hr", 
+   "iface": "wi1", 
+   "ssid": "ap.cope.wleiden.net", 
+   "antenna": 5, 
+   "accesspoint": true, 
+   "ip": "172.16.3.17", 
+   "netmask": 28, 
+   "link": 10, 
+   "mode": "ms", 
+   "shortdesc": "omni cope", 
+   "type": "11g", 
+   "channel": 7, 
+   "desc": "omni van cope"
+  }
+ }
 ]