Changeset 6325

Timestamp:

Oct 2, 2008, 4:34:21 PM (16 years ago)

Author:

RIck van der Zwet

Message:

Voila, the initial framework is completed, next will be the tweaking and implementing of all logic

Location:

trunk/exodus

Files:

• templates/404.html (deleted)
• templates/500.html (deleted)
• templates/README (deleted)
• templates/addinterlink.html (deleted)
• templates/deleteNode.html (moved) (moved from trunk/exodus/templates/delnode.html ) (2 diffs, 1 prop)
• templates/delomni.html (deleted)
• templates/exodus-template.html (modified) (1 diff)
• templates/freebsd-5.0 (added)
• templates/freebsd-5.0/dhcpd.conf (moved) (moved from trunk/exodus/templates/dhcpd.conf )
• templates/freebsd-5.0/named.conf (moved) (moved from trunk/exodus/templates/named.conf ) (1 prop)
• templates/freebsd-5.0/rc.local (moved) (moved from trunk/exodus/templates/rc-local.txt )
• templates/freebsd-5.0/rc.node.local (moved) (moved from trunk/exodus/templates/rc-node-local.txt )
• templates/freebsd-5.0/resolv.conf (moved) (moved from trunk/exodus/templates/resolv.conf )
• templates/head.html (deleted)
• templates/test.html (deleted)
• templates/viewNode.html (moved) (moved from trunk/exodus/templates/node-detail.html ) (2 diffs)
• templates/viewNodelist.html (moved) (moved from trunk/exodus/templates/node-list.html ) (1 diff, 1 prop)
• urls.py (modified) (3 diffs)
• views.py (modified) (5 diffs)

trunk/exodus/templates/deleteNode.html

@@ -1 @@
-{% extends "exodus-template.html" %}
-
-{% block content %}
-
-<h1>Delete node {{ object.name }}</h1>
-
 Interfaces to be deleted:
 <ol>
@@ -24 +18 @@
 {% endfor %}
 </ol>
-
-<form method="post" action=".">
-<h3>Are you sure you want to <b>DELETE</b> this data <b>PERMANENTLY</b>?</h3>
-<input type="submit" name="cancel" value="NO, cancel">
-<input type="submit" name="proceed" value="OK, proceed">
-</form>
-
-{% endblock %}

trunk/exodus/templates/exodus-template.html

@@ -15 +15 @@
           <img width="130" height="97" alt="foto" src="{% url static path="foto.jpg" %}"/><br>
           &nbsp;&nbsp;<A class="menu" href="{% url root %}">Exodus</a><br>
-          &nbsp;&nbsp;<A class="menu" href="{% url nodelist %}">Node List</a><br>
+          &nbsp;&nbsp;<A class="menu" href="{% url exodus.views.viewNodelist %}">Node List</a><br>
           &nbsp;&nbsp;<A class="menu" href="{% url exodus.views.genericLocation "add" "new" %}">Add Location</a><br>
           &nbsp;&nbsp;<A class="menu" href="{% url exodus.views.genericNode "add" "new" %}">Add Node</a><br>

trunk/exodus/templates/viewNode.html

@@ -2 +2 @@
 
 {% block content %}
-<a href="{% url nodelist %}">Node List</a>
+<a href="{% url exodus.views.viewNodelist %}">Node List</a>
 
 <div style="border:1px solid #000000;">
@@ -47 +47 @@
                 <li>Long description: {{ interlink.desc }} </li> 
                 <li>IP: {{ interlink.ip }}/{{ interlink.netmask }} </li>
-                <li> Link to Node: <a href="{% url node-detail interlink.node %}">
+                <li> Link to Node: <a href="{% url exodus.views.viewNode interlink.node %}">
                         {{ interlink.node }}</a> </li>
                 </ul>

trunk/exodus/templates/viewNodelist.html

@@ -5 +5 @@
 <P class="blue"> Node List </P>
 
-{% if object_list %}
+{% if nodes %}
         <table border="3" cellpadding="1">
-    {% for object in object_list %}
+        {% for node in nodes %}
                 <tr>
-                <td class="list" ><a class="list"href="{% url node-detail object.name %}">{{ object.name }}</a></td>
-            <td><a href="{% url exodus.views.conf_dhcpd_conf object.name %}">dhcpd.conf</a></td>
-            <td><a href="{% url exodus.views.conf_named_conf object.name %}">named.conf</a></td>
-            <td><a href="{% url exodus.views.conf_rc_node_local object.name %}">rc.node.local</a></td>
-            <td><a href="{% url exodus.views.conf_resolv_conf object.name %}">resolv.conf</a></td>
+                        <td class="list" ><a class="list"href="{% url exodus.views.viewNode node.name %}">{{ node.name }}</a></td>
+                        {% for configFile in configFiles %}
+                                <td><a href="{% url exodus.views.configFile "freebsd-5.0" node.name configFile %}">{{ configFile }}</a></td>
+                        {% endfor %}
                 </tr>
 

trunk/exodus/urls.py

@@ -5 +5 @@
 from os import path as os_path
 from django.conf import settings
+from django.views.generic.simple import direct_to_template
 
-## experimental databrowse code
-
+#
+# experimental databrowse code
 from django.contrib import databrowse
 databrowse.site.register(Antenna)
@@ -18 +19 @@
 databrowse.site.register(DhcpStatic)
 
-node_dict  = {
-    'queryset': Node.objects.all(),
-}
-
 urlpatterns = patterns('',
-
-        # databse thingy
-        (r'^databrowse/(.*)', databrowse.site.root),
-
-        # views
-        url(r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'index.html'}, "root") ,
-        url(r'^nodelist/$', 'django.views.generic.list_detail.object_list', dict(node_dict, template_name='node-list.html'), "nodelist"),
-        url(r'^view/node/(?P<node>.+)/$', 'exodus.views.node', {}, "node-detail"),
+        # generic view
+        url(r'^$', 'exodus.urls.direct_to_template', {'template': 'index.html'}, "root"),
+        (r'^view/nodelist/$', 'exodus.views.viewNodelist'),
+        (r'^view/node/(?P<node>.+)/$', 'exodus.views.viewNode'),
 
         # config urls
-        (r'^config/freebsd-5.0/(?P<object_id>.+)/dhcpd.conf$', 'exodus.views.conf_dhcpd_conf'),
-        (r'^config/freebsd-5.0/(?P<object_id>.+)/named.conf$', 'exodus.views.conf_named_conf'),
-        (r'^config/freebsd-5.0/(?P<object_id>.+)/rc.node.local$', 'exodus.views.conf_rc_node_local'),
-        (r'^config/freebsd-5.0/(?P<object_id>.+)/resolv.conf$', 'exodus.views.conf_resolv_conf'),
-
-
-
-        (r'^edit/link/(?P<object_id>.+)/$', 'exodus.views.addLink'),
+        (r'^config/(?P<version>.+)/(?P<node>.+)/(?P<file>.+)$', 'exodus.views.configFile'),
 
         # Generic urls
@@ -48 +34 @@
         (r'^dhcp/(?P<mode>(add|edit|delete))/(?P<node>.+)/(?P<interface>.+)/(?P<publicAP>.+)/$', 'exodus.views.genericPublicAP'),
 
+        # 3th party/embedded databsse thingy
+        (r'^databrowse/(.*)', databrowse.site.root),
 )
 

trunk/exodus/views.py

@@ -15 +15 @@
 
 
-def node(request, node):
-        object = Node.objects.get(name=node)
-        return render_to_response('node-detail.html', {'node': object})
-
-
-class addLinkForm(forms.Form):
-        class Meta:
-                model = Node
-                exclude = ( 'shortdesc', 'desc' )
-
-def addLink(request):
-        if request.POST:
-                form = addLinkForm(request.POST)
-                if form.is_valid():
-                        instance = form.save(commit=False)
-                        # Get this code working and clean it up afterwards
-                        # check if we have two different ifaces from two different nodes
-                        # Should add a error message if they are from the same node
-                        compatibleInterfaces = False
-                        differentNodes = True
-                        errorMessage = ""
-                        
-                        # check if they have the same mode
-                        if instance.iface1.node.id == instance.iface2.node.id:
-                                differentNodes = False
-                        
-                        # Interface check
-                        # XXX: Make sure interfaces type is defined as beeing a certain type instead of hardcoding
-                        if instance.iface1.type == instance.iface2.type:
-                                compatibleInterfaces = True
-                        if str(instance.iface1.type) == '11b' and str(instance.iface2.type) == '11g':
-                                compatibleInterfaces = True
-                        if str(instance.iface1.type) == '11g' and str(instance.iface2.type) == '11b':
-                                compatibleInterfaces = True
-                        
-                        if compatibleInterfaces and differentNodes:
-                                instance.save()
-                                return HttpResponseRedirect(reverse('nodelist'))
-                        else:
-                                form = addLinkForm(instance = instance)
-                                if compatibleInterfaces == False:
-                                        errorMessage = "Please use compatible interfaces"
-                                elif differentNodes == False:
-                                        errorMessage = "No interlink possible between interfaces on the same node"
-                                
-                                return render_to_response('addinterlink.html',{'form': form, 'error_message' : errorMessage })
-                        #XXX :if wifi: check master and managed states for existings NICs/Interlinks
-                        #XXX :check if omni, than Nic must be in master mode
-                        #Generate SSID
-                        # add descriptions
-                        #Generate ips and netmask
-                        #Save form
-        else:
-                #XXX: Autofetch new IP numbers
-                newForm = Link()
-                form = addLinkForm(instance = newForm)
-        return render_to_response('addinterlink.html',{'form': form})
-
-
 class GenericHandler():
         """Conventions used: type has to to the same name as the dependency object, delet template is named delete<type>.html"""
@@ -86 +27 @@
                 
                 if request.POST.has_key('cancel'):
-                        self.response = HttpResponseRedirect(reverse('node-detail', args=[self.node.name]))
+                        self.response = HttpResponseRedirect(reverse('exodus.views.viewNode', args=[self.node.name]))
                 elif request.POST.has_key('proceed'):
                         if mode == 'delete':
                                 self._deleteete()
-                                self.response = HttpResponseRedirect(reverse('node-detail', args=[self.node.name]))
+                                self.response = HttpResponseRedirect(reverse('exodus.views.viewNode', args=[self.node.name]))
                         else:
                                 # First checking whether form is valid, then add/edit actions
@@ -96 +37 @@
                                 if self.form.is_valid():
                                         # Set response on forehand, to allow override in procedure
-                                        self.response = HttpResponseRedirect(reverse('node-detail', args=[self.node.name]))
+                                        self.response = HttpResponseRedirect(reverse('exodus.views.viewNode', args=[self.node.name]))
                                         if mode == 'add':
                                                 self._add()
@@ -266 +207 @@
                 self._saveInterface()
                 # After adding a location, allow adding a Node with this location
-                self.response = HttpResponseRedirect(reverse('exodus.views.genericNode', args=["add", "new"]) + "?location=%i" % self._instance.pk)
+                self.response = HttpResponseRedirect(
+                  reverse('exodus.views.genericNode', args=["add", "new"]) + "?location=%i" % self._instance.pk)
 
         def _delete(self):
@@ -277 +219 @@
 
 
-
-
-def nodename2id(node):
-        """Convert node name to ID if found in the database"""
-        return Node.objects.get(name=node).id
-
-def conf_generator(node, template):
-        object_id = nodename2id(node)
-        object = Node.objects.get(pk=object_id)
-
-        #Some extra values for statictics info
-        object.name = Node.objects.get(pk=object_id).name
-        object.host = gethostname()
-#       object.nic = object.nic_set.all()
+#
+# Views
+def viewNode(request, node):
+        node = Node.objects.get(name=node)
+        return render_to_response('viewNode.html', {'node': node})
+
+def viewNodelist(request):
+        nodes = Node.objects.all()
+        configFiles = (
+                'rc.local',
+                'rc.node.local',
+                'dhcpd.conf',
+                'named.conf',
+                'resolv.conf' )
+        return render_to_response('viewNodelist.html', {'nodes' : nodes, 'configFiles' : configFiles})
+
+def configFile(request, version, node, file):
+        node = Node.objects.get(name=node)
         
-        #Used for named.conf
-        object.domains = Network.objects.all()
-
-        t = loader.get_template(template)
-        c = Context({'object': object})
-        return HttpResponse(t.render(c), mimetype='text/plain')
-
-def conf_dhcpd_conf(request, object_id):
-        """isc-dhcpd-3-server conf generator"""
-        return conf_generator(object_id, 'dhcpd.conf')
-
-def conf_named_conf(request, object_id):
-        """bind conf generator"""
-        return conf_generator(object_id, 'named.conf')
-
-def conf_rc_local(request, object_id):
-    """5.X legacy rc.local conf generator"""
-
-    object_id = nodename2id(object_id)
-    object = Node.objects.get(pk=object_id)
-    object.name = Node.objects.get(pk=object_id).name
-    object.host = gethostname()
-
-    # check if it is a wireless nic, and add wifimode for wicontrol  
-    for nic in object:
-        if nic.ssid:
-            if nic.mode.mode == 'master':
-                nic.wifimode = 6
-                nic.wifidesc = 'master mode'
-            else:
-                nic.wifimode = 1
-                nic.wifidesc = 'managed mode'
-    t = loader.get_template('rc-local.txt')
-    c = Context({'object': object, 
-        })
-    return HttpResponse(t.render(c), mimetype='text/plain')
-
-def conf_rc_node_local5X(request, object_id):
-        """5.X Legacy rc.node.local conf generator"""
-
-        object_id = nodename2id(object_id)
-
-        object.name = Node.objects.get(pk=object_id).name
-        object.host = gethostname()
-
-        t = loader.get_template('rc-node-local.txt')
-        c = Context({'object': object,
-            })
-        return HttpResponse(t.render(c), mimetype='text/plain')
-
-def conf_rc_node_local(request, object_id):
-        """rc.node.local conf generator"""
+        # Extra statictics information for use of generation
+        server = {}
+        server['host'] = gethostname()
         
-        object_id = nodename2id(object_id)
-        
-        object = Node.objects.get(pk=object_id).interface_set.all()
-        object.name = Node.objects.get(pk=object_id).name
-        object.host = gethostname()
-
-        t = loader.get_template('rc-node-local.txt')
-        c = Context({'object': object, })
-
-        print c
-        return HttpResponse(t.render(c), mimetype='text/plain')
-
-
-def conf_resolv_conf(request, object_id):
-        """resolv.conf generator"""
-        return conf_generator(object_id, 'resolv.conf')
-
+        templateFile = version + '/' + file
+        return render_to_response(templateFile, {'node' : node, 'server' : server},
+          mimetype='text/plain')
+