Changeset 6475 for trunk

Timestamp:

Dec 22, 2008, 12:33:35 PM (16 years ago)

Author:

roland

Message:

Fixed bug where self.link.id was called, when self.link was null.
This resulted in an Exception.

Location:

trunk/exodus

Files:

• tests.py (modified) (1 diff)
• wlipcalc.py (modified) (3 diffs)

trunk/exodus/tests.py

@@ -52 +52 @@
                 '172.16.0.6', '172.16.0.7'])
         used_list = self.ipcalc(30)._get_used_ips()
-        self.failUnlessEqual( list, used_list)
+        self.failUnlessEqual(list, used_list)
+
+    def test_ipcalc_get_used_ips_with_link(self):
+        from exodus.models import Interface
+        link_id = Interface.objects.get(pk=1).id
+        list = set(['172.16.0.1', '172.16.0.2']) 
+        from exodus.wlipcalc import IPCalc
+        used_list = IPCalc(self.node, 30, link_id)._get_used_ips()
+        self.failUnlessEqual(list, used_list)
 
     def test_ipcalc_get_free_network_addr(self):

trunk/exodus/wlipcalc.py

@@ -9 +9 @@
     """
 
-    def __init__(self, node, free_netmask, link = None):
+    def __init__(self, node, free_netmask, link_id = None):
         if free_netmask <= MASTERIP_NETMASK or free_netmask > 32:
             raise ValueError, 'Netmask out of bounds.'
@@ -17 +17 @@
         master_netmask = MASTERIP_NETMASK
         self.master_network = wl.get_network(self.master_ip, master_netmask)
-        self.link = link
+        self.link_id = link_id
 
         # calculate the number of ipaddresses in the subnetmask
@@ -57 +57 @@
         for i in self.node.interface_set.all():
             #XXX: rewrite to if i.ip in masterip??
-            # not i.id == self.link.id, don't populate used_list
+            # not i.id == self.link_id, don't populate used_list
             # with ips from it's own netmask
-            if self.link:
-                if i.id == i.link_id and not i.id == self.link.id:
+            #if self.link:
+                if i.id == i.link_id and not i.id == self.link_id:
                     ip_size = self._ip_size(i.netmask)
                     network_addr = wl.network(i.ip, i.netmask)