Changeset 6441

Timestamp:

Dec 11, 2008, 9:05:17 PM (16 years ago)

Author:

roland

Message:

Almost complete add interlink code, and a small update to the website
so that we can have some valuable user input.

Location:

trunk/exodus

Files:

• forms.py (modified) (3 diffs)
• models.py (modified) (1 diff)
• settings.py (modified) (1 diff)
• templates/exodus-template.html (modified) (1 diff)
• tests.py (modified) (2 diffs)
• urls.py (modified) (1 diff)
• wllogic.py (modified) (4 diffs)

trunk/exodus/forms.py

@@ -1 +1 @@
 from django import forms
 from exodus.models import Node, Interface
-from exodus.wllogic import free_master_ip, link_has_compat_type
+from exodus.wllogic import free_master_ip, link_has_compat_type, \
+        link_is_wireless, new_ssid
+from exodus.wllogic import MASTER, MANAGED
 
 class NodeForm(forms.ModelForm):
@@ -20 +22 @@
             else:
                 #XXX: Need to update ipconfigurations for depending interfaces
-                #XXX: Need to set netmask
+                #XXX: Need to set netmask for interfaces
                 masterip = free_master_ip(new_network) 
         return masterip        
@@ -31 +33 @@
         import pdb; pdb.set_trace() ;
         link = self.cleaned_data.get('link')
-    
+        # the type of the interface, eth, 11a, 11b, 11g.
+        type = self.cleaned_data.get('type')
+
+        try:
+            # self.instance.pk only exists when this interface has been saved
+            # before. Primary Keys's always start at 1.
+            if self.instance.pk:
+                edit = True 
+                # save self.instance for further reference, so that we
+                # don't have to try, except instance everytime.
+                instance_pk = self.instance.pk
+                instance_node_id = self.instance.node_id
+        except Interface.DoesNotExist:
+            edit = instance_pk = instance_node_id = None
+            
         if link:
-            try:
-                # if link is to self we don't need to check anything else
-                if self.instance.pk == link.pk:
-                    return link
-                # Link can't be to same node.
-                if self.instance.node_id == link.node_id:
-                    raise forms.ValidationError(
-                        "A link can't be to another interface on the same node")
-            except Interface.DoesNotExist:
-                pass
-            if self.cleaned_data.get('accesspoint') and \
+            # if link is to self we don't need to check anything else
+            if instance_pk == link.pk:
+                return link
+            # Link can't be to same node, unless link is to self, 
+            # which we checked above.
+            elif instance_node_id == link.node_id:
+                raise forms.ValidationError(
+                    "A link can't be to another interface on the same node")
+
+            elif self.cleaned_data.get('accesspoint') and \
                     self.instance.pk != link.pk:
                 raise forms.ValidationError( "A link can't be made to another interface when this interface has an accesspoint.")
 
+            # check if the two links are compatible
+            elif not link_has_compat_type(link.type, type):
+                raise forms.ValidationError( 
+                    'Link type %s is not compatible with %s' 
+                    %(link.type, type))
+
             # if link is referenced to itself, link is master and linkable
-            if link.link.pk == link.pk:
+            elif link.link.pk == link.pk:
                 return link
 
-            # if we get at this elif, it means that link is in managed mode
-            # but masterlink and managed can be switched
+            # if link is ethernet, don't worry about master and managed.
+            elif not link_is_wireless(link):
+                return link
+
+            # if this elif is True, it means that 'link' is in managed 
+            # mode but the link of link can change modes (master/managed).
             # And check if that master has only 2, including himself, links
             # and is not an accesspoint himself.
+            # We don't update the netmasks because 2 links should
+            # already have a /30, and the number of links doesn't change
+            # here.
             elif len(link.link.interface_set.all()) == 2 and not \
                     link.link.accesspoint:
-                import pdb; pdb.set_trace() 
-                # convert master to slave
-                #XXX: update mode
-                #XXX: update ssids
-                old_slave = link
-                old_master = old_slave.link
-                old_master.link = old_slave
-                old_slave.link = old_slave
 
+                # Define the new master and the new slave
+                new_master = link
+                new_slave = new_master.link
+                # set both links to the new master
+                new_master.link = new_master
+                new_slave.link = new_master
+                #update mode(manage/master) when an interface is wireless
+                if not link_is_wireless(new_master):
+                    new_master.type = MASTER
+                    new_slave.type = MANAGED 
+                # update ssids
+                ssid = new_ssid(new_master)
+                new_master.ssid = ssid
+                new_slave.ssid = ssid
                 #XXX: do ip address switch stuff
                 # 
                 # Save 
-                old_slave.save()
-                old_master.save()
+                new_master.save()
+                new_slave.save()
                 return link
 
-            # check if the two links are compatible
-            type = self.cleaned_data.get('type')
-            if not link_has_compat_type(link.type, type):
-                raise forms.ValidationError( 
-                    'Link type %s is not compatible with %s' 
-                    %(link.type, type))
-                
-        return link
-
+            elif len(link.link.interface_set.all()) > 2 or \
+                    link.link.accesspoint:
+                raise forms.ValidationError(
+                    "The other interface is in managed mode, and can't be changed to master.") 
+            # We shouldn't come here, because all link possibilities are 
+            # accounted for.
+            else:
+                raise forms.ValidationError(
+                    "This error should never come up, please report this bug.")
+        # If this is an edit and link is not defined, we let link reference 
+        # to itself.
+        elif edit:
+            link = Interface.objects.get(pk=instance_pk)
+            return link
+        # This is a new interface, can't be linked to itself because it hasn't 
+        # been saved.
+        else:
+            return link

trunk/exodus/models.py

@@ -39 +39 @@
 class Location(models.Model):
     description = models.CharField(max_length=200, unique=True)
+    latitude = models.DecimalField(max_digits=8,decimal_places=6)
     longitude = models.DecimalField(max_digits=8,decimal_places=6)
-    latitude = models.DecimalField(max_digits=8,decimal_places=6)
 
     class Meta:

trunk/exodus/settings.py

@@ -12 +12 @@
 MANAGERS = ADMINS
 
+# WL specific settings
 # Nodes get a /24
 MASTERIP_NETMASK = 24
+# these are wirelesstypes
+WIRELESS = ('11a', '11b', '11g')
+# Theses types are compatibale
+COMPAT = ('11b', '11g')
 
 

trunk/exodus/templates/exodus-template.html

@@ -14 +14 @@
           <A name="top"><img width="130" height="82" alt="logo" src="{% url static path="logo.png" %}" border=0></A><br>
           <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 advanced_admin exodus %}">Admin</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.genericModel "add" "location" "new" %}">Add Location</a><br>
-          &nbsp;&nbsp;<A class="menu" href="{% url exodus.views.genericNode "add" "new" %}">Add Node</a><br>
-          <center>--- Admin ---</center>
-          &nbsp;&nbsp;<A class="menu" href="{% url exodus.views.viewList "location" %}">Location List</a><br>
-          &nbsp;&nbsp;<A class="menu" href="{% url exodus.views.viewList "network" %}">Network List</a><br>
-          &nbsp;&nbsp;<A class="menu" href="{% url exodus.views.viewList "dnsServer" %}">DNS List</a><br>
           </div>
         </td>

trunk/exodus/tests.py

@@ -41 +41 @@
 
     def test_new_ssid(self):
-        class node(object):
-            name = 'CeTIM'
-            class network(object):
-                name = 'wleiden.net'
-        nic = 'ath0'
-        desc = '2cope'
+        class nic(object):
+            iface = 'ath0'     
+            class node(object):
+                name = 'CeTIM'
+                class network(object):
+                    name = 'wleiden.net'
         from exodus.wllogic import new_ssid
-        ssid = new_ssid(node(), nic, desc)        
-        
-        self.failUnless(ssid, '2cope-ath0.CeTIM.wleiden.net')
+        ssid = new_ssid(nic())        
+        
+        self.failUnlessEqual(ssid, 'ath0.CeTIM.wleiden.net')
 
     def test_parse_show_addr(self):
@@ -142 +142 @@
         n = [128, 64, 32, 16, 8, 4, 1, 0, 1]
         self.failUnlessEqual(k,n)
+
+    def test_CHOICES(self):
+        from wllogic import MASTER, MANAGED
+        self.failUnlessEqual(MASTER, 'ms')
+        self.failUnlessEqual(MANAGED, 'mn')
         
 class Link(unittest.TestCase):

trunk/exodus/urls.py

@@ -28 +28 @@
         (r'^databrowse/(.*)', databrowse.site.root),
 
-    (r'^admin/(.*)', advanced_admin.root),
+    url(r'^admin/(.*)', advanced_admin.root, name="advanced_admin"),
     (r'^plain-admin/(.*)', plain_admin.root),
 )

trunk/exodus/wllogic.py

@@ -1 +1 @@
 # (c) Roland van Laar
 
-from exodus.models import Node, Interface
-from exodus.settings import MASTERIP_NETMASK
+from exodus.models import Node, Interface, WIFI_MODE_CHOICES
+from exodus.settings import MASTERIP_NETMASK, WIRELESS, COMPAT
 from math import ceil, log
 
-def new_ssid(node, nic, desc):
+# define variables taken from CHOICES in models.py
+MASTER = WIFI_MODE_CHOICES[0][0]
+MANAGED = WIFI_MODE_CHOICES[1][0]
+
+def new_ssid(nic):
         """Generates a new ssid name for a new wifi NIC"""
 
@@ -11 +15 @@
         # instead of object nic.
 
-        return "%s-%s.%s.%s" % (desc, nic, node.name, node.network.name)
+        return "%s.%s.%s" % (nic.iface, nic.node.name, nic.node.network.name)
 
 #
@@ -144 +148 @@
         return show_addr(i)
 
-def link_is_valid(link1, link2):
-        if not link_has_compat_type(link1, link2):
-                return False
-
-def link_is_wireless(link1):
-        wireless = ('11a', '11b', '11g')
-        if link1.type in wireless:
-                return True
+def link_is_wireless(iface):
+        """Check if the interface is wireless"""
+        return iface.type in WIRELESS
 
 def link_has_compat_type(type1, type2):
@@ -158 +157 @@
                 return True
         # or link types must be compatible
-        compat = ('11b', '11g')
-        if type1 in compat and type2 in compat:
+        if type1 in COMPAT and type2 in COMPAT:
                 return True