Changeset 6230

Timestamp:

Aug 22, 2008, 10:40:57 PM (17 years ago)

Author:

roland

Message:

updated TODO file
And I'm working on addinterlink, moved original to addinterlink_old,
added more comments, to structure the implementation.

Files:

• TODO (modified) (2 diffs)
• exodus/views.py (modified) (1 diff)

TODO

@@ -1 +1 @@
 ** Showstoppers
 -> Document database layout and choices
+        @rick, I think this todo van be closed, because exodusmodels.dot is available
 
 * Input fields validation
@@ -9 +10 @@
 * Add reverse lookup fields for named.conf
 * Fix dhcpd.conf template
+* Add ssh_keys
+* Check urls and response redirects; Make urls depend on urls.py instead of hardcoding them into
+        views.py and the templates. See:
+        http://www.djangoproject.com/documentation/url_dispatch/#reverse
 * Interface cleanups:
 ** option to edit/delete fields

exodus/views.py

@@ -72 +72 @@
                 form = addInterlinkForm(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
+                        
+                        if instance.iface1.node.id != instance.iface2.node.id:
+                                print 'Iface 1 and 2 are on a different node'
+                                # check if they have the same mode
+                                if instance.iface1.type == instance.iface2.type: 
+                                        print '''these ifaces are of the same type'''
+                                        instance.same=True
+                                        print instance.same
+
+                                if str(instance.iface1.type) == '11b' or str(instance.iface1.type) == '11g':
+                                        print '''it's 11b or g'''
+
+                                #if (instance.iface1.type == '11b' | instance.iface2.type == '11b' )  &
+                                #               (instance.iface1.type == '11g' || instance.iface2.type == '11g'):
+                                #               print '''11b and 11g are compatible'''
+                        #if wifi: check master and managed states for existings NICs/Interlinks
+                                #Generate SSID
+                        #Generate ips and netmask
+                        #Save form
+                        #return HttpResponseRedirect("/exodus/")
+        else:
+                newForm = Interlink(ip1='172.16.0.0', ip2='172.16.0.0')
+                form = addInterlinkForm(instance = newForm)
+        return render_to_response('addinterlink.html',{'form': form})
+
+
+def addinterlink_old(request):
+        if request.POST:
+                form = addInterlinkForm(request.POST)
+                if form.is_valid():
                         instance  = form.save(commit=False)
                         if str(instance.iface1.type) != "eth":
+                                print instance.iface.name
                                 instance.ssid = newSSIDName(instance.node,
                                         instance.iface,'il')