[svn] commit: r3072 - in /branches/trac353/src/bin/bind10: bind10.py.in tests/bind10_test.py

[BIND 10 source code commits]

Author: vorner
Date: Wed Sep 29 17:37:42 2010
New Revision: 3072

Log:
Let BoB use the IPAddr from isc.net.addr

Modified:
    branches/trac353/src/bin/bind10/bind10.py.in
    branches/trac353/src/bin/bind10/tests/bind10_test.py

Modified: branches/trac353/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac353/src/bin/bind10/bind10.py.in (original)
+++ branches/trac353/src/bin/bind10/bind10.py.in Wed Sep 29 17:37:42 2010
@@ -63,6 +63,7 @@
 import posix
 
 import isc.cc
+from isc.net.addr import IPAddr
 import isc.utils.process
 
 # Assign this process some longer name
@@ -179,31 +180,6 @@
 
     def respawn(self):
         self._spawn()
-
-class IPAddr:
-    """Stores an IPv4 or IPv6 address."""
-    family = None
-    addr = None
-
-    def __init__(self, addr):
-        try:
-            a = socket.inet_pton(socket.AF_INET, addr)
-            self.family = socket.AF_INET
-            self.addr = a
-            return
-        except:
-            pass
-
-        try:
-            a = socket.inet_pton(socket.AF_INET6, addr)
-            self.family = socket.AF_INET6
-            self.addr = a
-            return
-        except Exception as e:
-            raise e
-    
-    def __str__(self):
-        return socket.inet_ntop(self.family, self.addr)
 
 class BoB:
     """Boss of BIND class."""

Modified: branches/trac353/src/bin/bind10/tests/bind10_test.py
==============================================================================
--- branches/trac353/src/bin/bind10/tests/bind10_test.py (original)
+++ branches/trac353/src/bin/bind10/tests/bind10_test.py Wed Sep 29 17:37:42 2010
@@ -1,4 +1,4 @@
-from bind10 import ProcessInfo, BoB, IPAddr
+from bind10 import ProcessInfo, BoB
 
 # XXX: environment tests are currently disabled, due to the preprocessor
 #      setup that we have now complicating the environment
@@ -72,28 +72,6 @@
         self.assertTrue(type(pi.pid) is int)
         self.assertNotEqual(pi.pid, old_pid)
 
-class TestIPAddr(unittest.TestCase):
-    def test_v6ok(self):
-        addr = IPAddr('2001:4f8::1')
-        self.assertEqual(addr.family, socket.AF_INET6)
-        self.assertEqual(addr.addr, socket.inet_pton(socket.AF_INET6, '2001:4f8::1'))
-
-    def test_v4ok(self):
-        addr = IPAddr('127.127.127.127')
-        self.assertEqual(addr.family, socket.AF_INET)
-        self.assertEqual(addr.addr, socket.inet_aton('127.127.127.127'))
-
-    def test_badaddr(self):
-        self.assertRaises(socket.error, IPAddr, 'foobar')
-        self.assertRaises(socket.error, IPAddr, 'foo::bar')
-        self.assertRaises(socket.error, IPAddr, '123')
-        self.assertRaises(socket.error, IPAddr, '123.456.789.0')
-        self.assertRaises(socket.error, IPAddr, '127/8')
-        self.assertRaises(socket.error, IPAddr, '0/0')
-        self.assertRaises(socket.error, IPAddr, '1.2.3.4/32')
-        self.assertRaises(socket.error, IPAddr, '0')
-        self.assertRaises(socket.error, IPAddr, '')
-
 class TestBoB(unittest.TestCase):
     def test_init(self):
         bob = BoB()