Changeset 6322 for trunk

Timestamp:

Oct 1, 2008, 10:49:53 PM (17 years ago)

Author:

RIck van der Zwet

Message:

Rewrote code to match the DRY principel, which should be a framework for all
the additions as well. Might even need to think of creating a Class for it to
make it even more generic. But first have a look wether this is gonna work well

Location:

trunk/exodus

Files:

• models.py (modified) (10 diffs)
• templates/addomni.html (modified) (1 diff)
• templates/deletePublicAP.html (added)
• templates/genericForm.html (copied) (copied from trunk/exodus/templates/addnode.html ) (1 diff)
• templates/node-detail.html (modified) (2 diffs)
• urls.py (modified) (2 diffs)
• views.py (modified) (2 diffs)

trunk/exodus/models.py ¶

@@ -1 +1 @@
 # (c) Roland van Laar 2006
-#
+# vi:et:ts=4
 from django.db import models
 from django.contrib import admin
@@ -30 +30 @@
                         )
 
-class Antenna(models.Model):
+class ExtendedModel(models.Model):
+    class Meta:
+        abstract = True
+
+    def as_list(self):
+        meta = self._meta
+        values = [(f.verbose_name, getattr(self, f.attname)) for f in meta.local_fields if f.verbose_name not in ( 'ID')]
+        return values
+
+class Antenna(ExtendedModel):
     type = models.CharField(max_length=20, unique=True)
     gain = models.IntegerField(max_length=3)
@@ -37 +46 @@
         return self.type
 
-class Location(models.Model):
+class Location(ExtendedModel):
     description = models.CharField(max_length=200, unique=True)
     Longitude = models.DecimalField(max_digits=8,decimal_places=6)
@@ -47 +56 @@
 
 #XXX: Name Domain perhaps?
-class DnsServer(models.Model):
+class DnsServer(ExtendedModel):
         ipaddress = models.IPAddressField()
         domainname = models.CharField(max_length=50, unique=True)
@@ -54 +63 @@
                 return self.ipaddress
 
-class Network(models.Model):
+class Network(ExtendedModel):
         name = models.CharField(max_length=50, unique=True)
         ipspacestart = models.IPAddressField()
@@ -63 +72 @@
 
 
-class Node(models.Model):
+class Node(ExtendedModel):
     name = models.CharField(max_length=30, unique=True)
     location = models.ForeignKey(Location)
@@ -76 +85 @@
         return self.name
 
-class Interface(models.Model):
+class Interface(ExtendedModel):
         node = models.ForeignKey(Node)
         type = models.CharField(max_length=10, choices=INTERFACE_TYPE_CHOICES, default=1)
@@ -95 +104 @@
         
         def __str__(self):
-                return "%s:%s" % (self.node.name, self.iface)
+                return "%s/%s" % (self.node, self.iface)
 
-class InterfaceAlias(models.Model):
+class InterfaceAlias(ExtendedModel):
         iface = models.ForeignKey(Interface,related_name='child')
         ip = models.IPAddressField(unique=True)
@@ -113 +122 @@
 # 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')
+
+class PublicAP(ExtendedModel):
+    iface = models.ForeignKey(Interface,related_name='ap', verbose_name="interface")
     ip = models.IPAddressField(unique=True)
     netmask = models.IntegerField(default=28)
@@ -125 +135 @@
         return "%s:%s" % (self.iface,self.pk)
 
-class DhcpStatic(models.Model):
+class DhcpStatic(ExtendedModel):
     hostname = models.CharField(max_length=10,unique=True)
     macaddress = models.CharField(max_length=17)

trunk/exodus/templates/addomni.html ¶

@@ -6 +6 @@
 <form method="post" action=".">
 <table>{{ form.as_table }}</table>
-<input type="submit" value="submit">
+<input type="submit" name="cancel" value="NO, cancel">
+<input type="submit" name="proceed" value="OK, proceed">
 </form>
 

trunk/exodus/templates/genericForm.html ¶

@@ -3 +3 @@
 {% block content %}
 
-<h1>Create a Node</h1>
+<h1>{{ title }} - {{ mode }}</h1>
+{% ifnotequal mode "delete" %}
 <h2><em> {{ message }} </em></h2>
+{% endifnotequal %}
 
 <form method="post" action=".">
+{# On delete, make sure not to enable editing #}
+{% ifequal mode "delete" %}
+{% include delInclude %}
+
+<h3>Are you sure you want to <b>DELETE</b> this data <b>PERMANENTLY</b>?</h3>
+{% else %}
 <table>{{ form.as_table }}</table>
-<input type="submit" value="submit">
+{% endifequal %}
+<input type="submit" name="cancel" value="NO, cancel">
+<input type="submit" name="proceed" value="OK, proceed">
 </form>
 

trunk/exodus/templates/node-detail.html ¶

@@ -23 +23 @@
         <div style="border:1px solid #000000;">
         <h3>iface: {{ nic.iface }} </h3>
-        <a href="{% url exodus.views.addPublicAP %}?iface={{ nic }}">Add new public access point</a><p />
+        <a href="{% url exodus.views.genericPublicAP "add" node nic.iface "new" %}">Add new public access point</a><p />
         type: {{ nic.type }} <br>
         description: {{ nic.shortdesc }} <br>
@@ -57 +57 @@
                 <p />
                 <li>Public Access Point: {{ accessPoint.ip}}/{{accessPoint.netmask }}
-                <a href="{% url exodus.views.editPublicAP node.name nic.iface accessPoint.pk %}">EDIT</a>
-                <a href="{% url exodus.views.delPublicAP accessPoint %}">DELETE</a>
+                <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>

trunk/exodus/urls.py ¶

@@ -43 +43 @@
         (r'^add/node/$', 'exodus.views.addNode'),
         (r'^add/nic/$', 'exodus.views.addInterface'),
-        (r'^add/dhcp/$', 'exodus.views.addPublicAP'),
 
         # add urls
@@ -50 +49 @@
         (r'^edit/nic/(?P<objectId>.+)/$', 'exodus.views.editInterface'),
         (r'^edit/link/(?P<object_id>.+)/$', 'exodus.views.addLink'),
-        (r'^edit/dhcp/(?P<node>.+)/(?P<interface>.+)/(?P<publicAP>.+)/$', 'exodus.views.editPublicAP'),
+        (r'^(?P<mode>(add|edit|delete))/dhcp/(?P<node>.+)/(?P<interface>.+)/(?P<publicAP>.+)/$', 'exodus.views.genericPublicAP'),
 
         # delete/remove urls
-        (r'^delete/node/(?P<objectId>.+)/$', 'exodus.views.delNode'),
-        (r'^delete/nic/(?P<objectId>.+)/$', 'exodus.views.delInterface'),
-        (r'^delete/dhcp/(?P<objectId>.+)/$', 'exodus.views.delPublicAP'),
+        (r'^del/node/(?P<objectId>.+)/$', 'exodus.views.delNode'),
+        (r'^del/nic/(?P<objectId>.+)/$', 'exodus.views.delInterface'),
 )
 

trunk/exodus/views.py ¶

@@ -204 +204 @@
         return render_to_response('addinterlink.html',{'form': form})
 
-class AddPublicAPForm(forms.ModelForm):
+class PublicAPForm(forms.ModelForm):
         class Meta:
                 model = PublicAP
                 exclude = ('shortdesc', 'desc', 'ip', 'dhcpstart', 'dhcpstop')
 
-def addPublicAP(request):
-        if request.POST:
-                form = AddPublicAPForm(request.POST)
-                if form.is_valid():
-                        instance = 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()
-                        nodeName = instance.iface.node
-                        return HttpResponseRedirect(reverse('node-detail', args=[nodeName]))
-        else:
-                #XXX: Link, master interfaces only
-                if 'iface' in request.GET:
-                        nodeName, interfaceName = request.GET['iface'].split(':')
-                        newPublicAP = PublicAP()
-                        newPublicAP.iface = Interface.objects.get(iface=interfaceName, node=nodename2id(nodeName))
-                        form = AddPublicAPForm(instance=newPublicAP)
-                else:
-                        form = AddPublicAPForm()
-        return render_to_response('addomni.html', {'form': form })
-
-def editPublicAP(request, node, interface, publicAP):
-        nodeID = Node.objects.get(name=node)
-        iface = Interface.objects.get(node=nodeID, iface=interface)
-        publicAP = PublicAP.objects.get(iface=iface, pk=publicAP)
-        if request.POST:
-                form = AddPublicAPForm(request.POST, instance=publicAP)
-                if form.is_valid():
-                        form.save()
-                        #Properly redirect to view/<Node> needed
-                        message = 'Node Updated succesfully'
-                        node = publicAP.iface.node
+def genericPublicAP(request, node, interface, publicAP, mode):
+        # Find dependencies
+        node = Node.objects.get(name=node)
+        iface = Interface.objects.get(node=node, iface=interface)
+        publicAP = PublicAP(iface=iface) if mode == 'add' else PublicAP.objects.get(iface=iface, pk=publicAP)
+        
+        title = 'Public access point'
+        delInclude = 'deletePublicAP.html'
+        
+        if request.POST.has_key('cancel'):
+                return HttpResponseRedirect(reverse('node-detail', args=[node]))
+        elif request.POST.has_key('proceed'):
+                if mode == 'delete':
+                        publicAP.delete()
+                        return HttpResponseRedirect(reverse('node-detail', args=[node]))
+        
+                # First checking whether form is valid, then add/edit actions
+                form = PublicAPForm(request.POST, instance=publicAP)
+                if form.is_valid():
+                        if mode == 'add':
+                                instance = 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()
+                        elif mode == 'edit':
+                                form.save()
                         return HttpResponseRedirect(reverse('node-detail', args=[node]))
                 else:
@@ -250 +244 @@
         else:
                 message = 'Please edit and submit'
-                form = AddPublicAPForm(instance=publicAP)
-        return render_to_response('addnode.html', {'form': form, 'message' : message })
-
-def delPublicAP(request, objectId):
-        publicAP = PublicAP.objects.get(name=objectId)
-        node = publicAP.iface.node
-        if request.POST.has_key('cancel'):
-                return HttpResponseRedirect(reverse('node-detail', args=[node]))
-        elif request.POST.has_key('proceed'):
-                publicAP.delete()
-                return HttpResponseRedirect(reverse('node-detail', args=[node]))
-        else:
-                return render_to_response('delomni.html', {'object': publicAP })
+                form = PublicAPForm(instance=publicAP)
+        
+        return render_to_response('genericForm.html', {'form': form,
+                'message' : message, 'title' : title, 'mode' : mode,
+                'delInclude' : delInclude, 'object': publicAP })
 
 def nodename2id(node):