Changeset 6638

Timestamp:

Jan 24, 2009, 1:48:43 PM (16 years ago)

Author:

roland

Message:

-Added masterip check.
-renamed variables that were called list.

Location:

trunk/exodus

Files:

• tests/test_wlipcalc.py (modified) (3 diffs)
• wlipcalc.py (modified) (2 diffs)

trunk/exodus/tests/test_wlipcalc.py

@@ -20 +20 @@
         return IPCalc(node, a)
 
+    def test_ipcalc_master_ip(self):
+        from exodus.wlipcalc import IPCalc
+        ip_list = IPCalc(self.nod1, 30, self.iface2.id, masterip='172.16.2.1')
+
+        self.failUnlessEqual(ip_list.network, '172.16.2.4') 
+        self.failUnlessEqual(ip_list.ips, ['172.16.2.5', '172.16.2.6']) 
+        self.failUnlessEqual(ip_list.broadcast, '172.16.2.7') 
+        self.failUnlessEqual(ip_list.netmask, 30)
+        
+
     def test_ipcalc_ip_size(self):
         netmask = 25
@@ -26 +36 @@
 
     def test_ipcalc_get_used_ips(self):
-        list = set(['172.16.0.1', '172.16.0.2', '172.16.0.4', '172.16.0.5', 
+        ip_list = set(['172.16.0.1', '172.16.0.2', '172.16.0.4', '172.16.0.5', 
                 '172.16.0.6', '172.16.0.7'])
         used_list = self.ipcalc(30)._get_used_ips()
-        self.failUnlessEqual(list, used_list)
+        self.failUnlessEqual(ip_list, used_list)
 
     def test_ipcalc_get_used_ips_with_link(self):
@@ -40 +50 @@
     def test_ipcalc_get_free_network_addr(self):
         from exodus.wllogic import show_addr
-        list = ['172.16.0.1', '172.16.0.2', '172.16.0.4', '172.16.0.5', 
+        ip_list = ['172.16.0.1', '172.16.0.2', '172.16.0.4', '172.16.0.5', 
                 '172.16.0.6', '172.16.0.7']
-        network_addr = show_addr(self.ipcalc(30)._get_free_network_addr(list))
+        network_addr = show_addr(self.ipcalc(30)._get_free_network_addr(
+                ip_list))
         self.failUnlessEqual(network_addr, '172.16.0.8')
 

trunk/exodus/wlipcalc.py

@@ -7 +7 @@
     Given a netmask, this class calculates what the network, broadcast
     and list of ipaddresses is.
+    A masterip might be given when a node changes networks.
     """
 
@@ -14 +15 @@
 
         self.node = node
-        #XXX: unittest masterip
         if masterip == None:
             self.master_ip = node.masterip