Changeset 6458

Timestamp:

Dec 15, 2008, 1:27:43 AM (16 years ago)

Author:

roland

Message:

Refactored code and made more unittests.

Location:

trunk/exodus

Files:

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

trunk/exodus/tests.py

@@ -47 +47 @@
         ip_size = self.ipcalc(netmask)._ip_size(25)
         self.failUnless(ip_size, 128) 
+
+    def test_ipcalc_get_used_ips(self):
+        self.fail("Test not implemented")
+
+    def test_ipcalc_get_free_network_addr(self):
+        self.fail("Test not implemented")
 
     def test_ipcalc_out_of_bounds(self):

trunk/exodus/wlipcalc.py

@@ -13 +13 @@
             raise ValueError, 'Netmask out of bounds.'
 
-        master_ip = node.masterip
+        self.node = node
+        self.master_ip = node.masterip
         master_netmask = MASTERIP_NETMASK
-        master_network = wl.get_network(master_ip, master_netmask)
+        self.master_network = wl.get_network(self.master_ip, master_netmask)
 
         # calculate the number of ipaddresses in the subnetmask
-        master_ip_size = self._ip_size(master_netmask)
-        new_ip_size = self._ip_size(free_netmask)
+        self.master_ip_size = self._ip_size(master_netmask)
+        self.new_ip_size = self._ip_size(free_netmask)
         
-        # generate a list of all used_ipaddresses
-        # we take only the ip addresses of the interfaces that are
-        # linked to itself, because they are 'master' and the slaves
-        # on other nodes fall in their subnet. 
-        used_list = [master_ip] 
-        for i in node.interface_set.all():
-            #XXX: rewrite to if i.ip in masterip??
-            if i.id == i.link_id:
-                ip_size = self._ip_size(i.netmask)
-                network_addr = wl.network(i.ip, i.netmask)
-                for j in range(ip_size):
-                    used_list.append(wl.show_addr(network_addr + j))
+        used_list = self._get_used_ips()
+        network = self._get_free_network_addr(used_list)
 
-        for i in range(master_ip_size/new_ip_size):
-            network_addr = wl.parse_addr(master_network) + (new_ip_size * i)
-            k = 0
-            for j in range(new_ip_size):
-                new_ip = wl.show_addr(network_addr + j) 
-                if new_ip not in used_list:
-                    k += 1 
-            if k == new_ip_size and \
-                    wl.show_addr(network_addr) != master_network:
-                self.network = wl.show_addr(network_addr)
-                break 
-
-        if not self.network:
+        if not network:
             raise Exception, "Not enough space for a /%d subnet" % \
                 (free_netmask)
+        else:
+            self.network = wl.show_addr(network)
   
         # variables for extenal calling
@@ -59 +40 @@
             # broadcast addresses.
             self.ips = []
-            for i in range(1, new_ip_size-1):
-                self.ips.append(wl.show_addr(network_addr + i))                    
+            for i in range(1, self.new_ip_size-1):
+                self.ips.append(wl.show_addr(network + i))                    
     def _ip_size(self, netmask):
         return int(pow(2,32 - netmask))
+    
+    def _get_used_ips(self):
+        """ Generate a list of all used_ipaddresses.
+
+        we take only the ip addresses of the interfaces that are
+        linked to itself, because they are 'master' and the slaves
+        on other nodes fall in their subnet. 
+        """
+        used_list = [self.master_ip] 
+        for i in self.node.interface_set.all():
+            #XXX: rewrite to if i.ip in masterip??
+            if i.id == i.link_id:
+                ip_size = self._ip_size(i.netmask)
+                network_addr = wl.network(i.ip, i.netmask)
+                for j in range(ip_size):
+                    used_list.append(wl.show_addr(network_addr + j))
+        return used_list
+
+    def _get_free_network_addr(self, used_list):
+        """Calculate a new network address with a used_list and given netmask.
+        """
+        for i in range(self.master_ip_size/self.new_ip_size):
+            network_addr = wl.parse_addr(self.master_network) + \
+                    (self.new_ip_size * i)
+            k = 0
+            for j in range(self.new_ip_size):
+                new_ip = wl.show_addr(network_addr + j) 
+                if new_ip not in used_list:
+                    k += 1 
+            if k == self.new_ip_size and \
+                    wl.show_addr(network_addr) != self.master_network:
+                    return  network_addr
+        return None
+