Changeset 6420 for branches

Timestamp:

Dec 8, 2008, 4:57:03 PM (16 years ago)

Author:

roland

Message:

Fixed str to unicode on models.
Made save Node better.
Added some unittests.
Added link checks in wllogic.

Location:

branches/exodus-roland/exodus

Files:

• admin.py (modified) (1 diff)
• forms.py (modified) (1 diff)
• models.py (modified) (9 diffs)
• tests.py (modified) (1 diff)
• wllogic.py (modified) (1 diff)

branches/exodus-roland/exodus/admin.py

@@ -29 +29 @@
     fieldsets = (
         (None, {
-            'fields' : (('name', 'status') , 'location', 'network', 'masterip')
+            'fields' : ('name', 'status', 'location', 'network', 'masterip')
         }),
     )
-    inlines = [InterfaceInline, ]
+
+    #inlines = [InterfaceInline, ]
 
 class NodeInline(admin.TabularInline):

branches/exodus-roland/exodus/forms.py

@@ -5 +5 @@
 
 class NodeForm(forms.ModelForm):
-    masterip = forms.IPAddressField()
     class Meta:
        model = Node
-    #def clean(self):
-    #    self.data['masterip'] = \
-    #            self.cleaned_data['masterip'] = \
-    #            free_masterip(self.cleaned_data['network'])
-    #    return super(NodeForm, self).clean()
-

branches/exodus-roland/exodus/models.py

@@ -37 +37 @@
         verbose_name = 'Antenna'
 
-    def __str__(self):
+    def __unicode__(self):
         return self.type
 
@@ -48 +48 @@
         verbose_name = 'Location'
 
-    def __str__(self):
+    def __unicode__(self):
         return self.description
 
@@ -60 +60 @@
         verbose_name = 'Dns Server'
     
-    def __str__(self):
+    def __unicode__(self):
         return "%s, %s"% (self.domainname, self.ipaddress )
-
 
 class Network(models.Model):
@@ -72 +71 @@
         verbose_name = 'Network'
 
-        def __str__(self):
+        def __unicode__(self):
                 return self.name
 
@@ -87 +86 @@
         verbose_name = 'Node'
 
-    def __str__(self):
+    def __unicode__(self):
         return self.name
 
+    def save(self, force_insert=False, force_update=False):
+        #XXX: Maybe move this to a model form, 
+        from wllogic import free_masterip
+        # check if there is a masterip, if not generate one.
+        # check if there is a network change, if so, generate a new masterip.
+        if self.masterip:
+            old = Node.objects.get(pk=self.pk)
+            if old.network != self.network:
+                self.masterip = free_masterip(self.network)
+        else:
+            self.masterip = free_masterip(self.network)
+        super(Node, self).save(force_insert, force_update)
 
 class Interface(models.Model):
@@ -112 +123 @@
                 verbose_name = 'Interface'
         
-        def __str__(self):
+        def __unicode__(self):
                 return "%s/%s" % (self.node, self.iface)
 
@@ -124 +135 @@
         link = models.ForeignKey(Interface, blank=True, null=True)
         
-        def __str__(self):
+        def __unicode__(self):
                 return "Alias %s" % (self.iface)
 
@@ -144 +155 @@
         verbose_name = "Public Access Point"
 
-    def __str__(self):
+    def __unicode__(self):
         return "%s:%s" % (self.iface,self.pk)
 
@@ -156 +167 @@
         verbose_name = "Static host"
 
-    def __str__(self):
+    def __unicode__(self):
         return self.hostname

branches/exodus-roland/exodus/tests.py

@@ -181 +181 @@
         self.fail('Test not implemented')
 
-class Manager(unittest.TestCase):
-        def test_interface_manager(self):
-                class link(object):
-                        def __init__(self, type):
-                                self.type = type
-                from exodus.manager import InterfaceManager
-                11a_link = 
-    
+class Link(unittest.TestCase):
+    def setUp(self):
+        class link(object):
+            def __init__(self, type, node):
+                self.type = type
+                self.node = node
+
+        self.link00 = link('eth', 1)
+        self.link01 = link('eth', 2)
+        self.link10 = link('11a', 1)
+        self.link11 = link('11a', 2)
+        self.link20 = link('11b', 1)
+        self.link21 = link('11b', 2)
+        self.link30 = link('11g', 1)            
+        self.link31 = link('11g', 2)
+
+    def test_link_has_compat_type(self):
+        from wllogic import link_has_compat_type
+       
+        # test link to self
+        self.failUnless(link_has_compat_type(self.link00, self.link00))
+        # test eth
+        self.failUnless(link_has_compat_type(self.link00, self.link01))
+        # test 11a
+        self.failUnless(link_has_compat_type(self.link10, self.link11))
+        # test 11b
+        self.failUnless(link_has_compat_type(self.link20, self.link21))
+        # test 11g
+        self.failUnless(link_has_compat_type(self.link30, self.link31))
+        # test 11b vs 11g
+        self.failUnless(link_has_compat_type(self.link20, self.link30))
+        self.failUnless(link_has_compat_type(self.link30, self.link20))
+
+        # test fail eth vs 11a
+        self.failIf(link_has_compat_type(self.link00, self.link10))
+        # test fail eth vs 11b
+        self.failIf(link_has_compat_type(self.link00, self.link20))
+        # test fail eth vs 11g
+        self.failIf(link_has_compat_type(self.link00, self.link30))
+        # test fail 11a vs 11b
+        self.failIf(link_has_compat_type(self.link10, self.link20))
+        # test fail 11a vs 11g
+        self.failIf(link_has_compat_type(self.link10, self.link30))
+    
+    def test_link_not_same_node(self):
+        from wllogic import link_is_not_to_itself
+        self.failUnless(link_is_not_to_itself(self.link00, self.link01))
+        self.failIf(link_is_not_to_itself(self.link20, self.link30))
+    
+    def test_link_is_wireless(self):
+        from wllogic import link_is_wireless
+        self.failIf(link_is_wireless(self.link00))
+        self.failUnless(link_is_wireless(self.link10))
+        self.failUnless(link_is_wireless(self.link20))
+        self.failUnless(link_is_wireless(self.link30))
+                
 def suite():
     s = unittest.TestSuite()
     s.addTest(unittest.makeSuite(AddTest))
     s.addTest(unittest.makeSuite(wllogic))
+    s.addTest(unittest.makeSuite(Link))
 
     return s

branches/exodus-roland/exodus/wllogic.py

@@ -144 +144 @@
         
         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_has_compat_type(link1, link2):
+        # if this is a link to self, the link is always valid
+        if link1 == link2:
+                return True
+        # link types must the same
+        if link1.type == link2.type:
+                return True
+        # or link types must be compatible
+        compat = ('11b', '11g')
+        if link1.type in compat and link2.type in compat:
+                return True
+
+def link_is_not_to_itself(link1, link2):
+        # check if a link is not going itself
+        if link1.node != link2.node:
+                return True
+