Changeset 6239

Timestamp:

Sep 3, 2008, 8:23:06 AM (16 years ago)

Author:

RIck van der Zwet

Message:

Rewrote addinterlink to allow better error handling and be more readable

Location:

exodus

Files:

• templates/addinterlink.html (modified) (1 diff)
• views.py (modified) (1 diff)

exodus/templates/addinterlink.html

@@ -4 +4 @@
 
 <h1> add an interlink </h1>
+{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
 
 <form method="post" action=".">

exodus/views.py

@@ -76 +76 @@
                         # 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 = ""
                         
-                        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
-                                if str(instance.iface1.type) == '11b' and str(instance.iface2.type) == '11g':
-                                        instance.same=True
-                                        print '11b + 11g'
-                                if str(instance.iface1.type) == '11g' and str(instance.iface2.type) == '11b':
-                                        instance.same=True
-                                        print '11g + 11b'
-                                #Generate IP addresses
-                                if instance.same == True:
-                                        instance.ip1,instance.ip2 = freeinterlinkip()
-                                        netmask = '30'
-                                        instance.save()
-                                        
-                        #if wifi: check master and managed states for existings NICs/Interlinks
-                                #Generate SSID
+                        # 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("/exodus/")
+                        else:
+                                form = addInterlinkForm(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
+                        #Generate SSID
                         # add descriptions
                         #Generate ips and netmask
                         #Save form
-                        #return HttpResponseRedirect("/exodus/")
-        else:
+        else:
+                #XXX: Autofetch new IP numbers
                 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')
-                                instance.channel = '1'
-                                instance.mode = Mode(pk=1) # set to master
-                        instance.save()
-                        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 })
 
 class addOmniForm(forms.ModelForm):