Changeset 6354

Timestamp:

Oct 29, 2008, 11:44:41 AM (16 years ago)

Author:

roland

Message:

Worked on unittests
Made Exception error for netmask2subnet in wllogic

Location:

trunk/exodus

Files:

• tests.py (modified) (1 diff)
• wllogic.py (modified) (1 diff)

trunk/exodus/tests.py

@@ -38 +38 @@
         #XXX figure out node.name = 'testnode' and node.network.name='iets'
 
-    def test_parse_addr(self):
-        ip = '192.168.3.4'
+    def test_parse_show_addr(self):
+        ip = '172.16.2.0'
         from exodus.wllogic import parseaddr
         parsed = parseaddr(ip)
+        self.failUnlessEqual(str(parsed), '2886730240')
+
         from exodus.wllogic import showaddr
         o_ip = showaddr(parsed)
         self.failUnlessEqual(o_ip, ip)
-         
+
+        # when using an address larger then 256, move 1 address up.
+        ip = '172.16.2.256'
+        o_ip = showaddr(parseaddr(ip))
+        self.failUnlessEqual(o_ip, '172.16.3.0')
+
+    def test_netmask2subnet(self):
+        from wllogic import netmask2subnet
+
+        self.failUnlessRaises(ValueError, netmask2subnet, 33)
+        self.failUnlessRaises(ValueError, netmask2subnet, -1)
+
+        valid_subnet = netmask2subnet(30)
+        self.failUnlessEqual(str(valid_subnet), '17179869180')
+
 def suite():
     s = unittest.TestSuite()

trunk/exodus/wllogic.py

@@ -25 +25 @@
 
 def netmask2subnet(s):
-        """IPv4 netmask to subnet"""
-        return (0xffffffff << (32 - s))
+    """IPv4 netmask to subnet"""
+    if s < 0 :
+        raise ValueError, 'subnet is too small'
+    return (0xffffffff << (32 - s))
 
 def getSubnet(netmask):