Changeset 6257 for exodus/views.py

Timestamp:

Sep 11, 2008, 10:00:16 PM (17 years ago)

Author:

RIck van der Zwet

Message:

Got basic interface version working and seems to work well on all locations, editing however is still a big issue and makes it hard to actually debug fast using a webbrowser. Also missing logic needs to be tough of pretty soon. Conclusion backend seems to be running, frontend needs working on

File:

• exodus/views.py (modified) (7 diffs)

exodus/views.py

@@ -1 +1 @@
 # (c) Roland van Laar 2006
 
+from django.db import models
 from django.http import HttpResponse, HttpResponseRedirect
 from django.template import loader, Context 
 from django.shortcuts import render_to_response
+from django.core.urlresolvers import reverse
+from django.forms.formsets import formset_factory
 from django import forms
 from socket import gethostname 
@@ -19 +22 @@
                 if form.is_valid():
                         form.save()
-                        return HttpResponseRedirect("/addnode/")
+                        return HttpResponseRedirect(reverse('exodus.views.addNode'))
         else:
                 form = AddLocationForm()
@@ -45 +48 @@
                         form = AddNodeForm(instance=node)
                 except Node.DoesNotExist:
+#                       newForm = Node(location=Location(pk=1))
+#                       form = AddNodeForm(instance = newForm)
+#                       Also possible
+#                       AddNodeFormSet = formset_factory(AddNodeForm,extra=0)
+#                       formset = AddNodeFormSet(initial=[{'location' : '1'}])
                         form = AddNodeForm()
         return render_to_response('addnode.html', {'form': form })
@@ -74 +82 @@
                                 instance.ssid = newSSIDName(instance.node, instance.iface, 'unused')
                                 instance.channel = '1'
-                                instance.mode = Mode(pk=1) # set to master
-                        instance.save()
-                        return HttpResponseRedirect("/exodus/")
-        else:
-                form = addInterfaceForm()
+                                instance.mode = 1 # set to master
+                        instance.save()
+                        if instance.link == None:
+                                instance.link = instance
+                                instance.save()
+                        return HttpResponseRedirect("/exodus/")
+        else:
+                #XXX: Link, master interfaces only
+                newForm = Interface(shortdesc='boe')
+                form = addInterfaceForm(instance = newForm)
         return render_to_response('addnic.html', {'form': form })
 
@@ -166 +179 @@
         object.name = Node.objects.get(pk=object_id).name
         object.host = gethostname()
-        object.nic = object.nic_set.all()
+#       object.nic = object.nic_set.all()
         
         #Used for named.conf
@@ -223 +236 @@
         object_id = nodename_to_id(object_id)
         
-        object = Node.objects.get(pk=object_id).nic_set.all()
+        object = Node.objects.get(pk=object_id).interface_set.all()
         object.name = Node.objects.get(pk=object_id).name
         object.host = gethostname()
@@ -233 +246 @@
         return HttpResponse(t.render(c), mimetype='text/plain')
 
-def conf_rc_node_localorig(request, object_id):
-        """rc.node.local conf generator"""
-                
-        object_id = nodename_to_id(object_id)
-        
-        object = Node.objects.get(pk=object_id).nic_set.all()
-        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'
-
-        print "boek"
-        t = loader.get_template('rc-node-local.txt')
-        c = Context({'object': object, 
-                })
-        return HttpResponse(t.render(c), mimetype='text/plain')
 
 def conf_resolv_conf(request, object_id):