Split dhcp handler in submodules (refs #2).

diff --git a/services/dhcp/handler.py b/services/dhcp/handler.py
index f27f984d66a3d643a717ccd89d7740ae9dc5930f..6cb21a95a1a7b9b311b2f2be9569e5fa5afe61f5 100644 (file)
--- a/services/dhcp/handler.py
+++ b/services/dhcp/handler.py
@@ -3,50 +3,13 @@
 from os import path
 import logging ; log = logging.getLogger('pymin.services.dhcp')
 
-from pymin.seqtools import Sequence
-from pymin.dispatcher import Handler, handler, HandlerError
-from pymin.service.util import Restorable, ConfigWriter, InitdHandler, \
+from pymin.service.util import Restorable, ConfigWriter, ReloadHandler, \
                                TransactionalHandler, ParametersHandler, \
-                               DictSubHandler, ReloadHandler
+                               InitdHandler
 
-__all__ = ('DhcpHandler')
+from host import HostHandler
 
-
-class Host(Sequence):
-    r"""Host(name, ip, mac) -> Host instance :: Class representing a host.
-
-    name - Host name, should be a fully qualified name, but no checks are done.
-    ip - IP assigned to the hostname.
-    mac - MAC address to associate to the hostname.
-    """
-
-    def __init__(self, name, ip, mac):
-        r"Initialize Host object, see class documentation for details."
-        self.name = name
-        self.ip = ip
-        self.mac = mac
-
-    def as_tuple(self):
-        r"Return a tuple representing the host."
-        return (self.name, self.ip, self.mac)
-
-    def update(self, ip=None, mac=None):
-        if ip is not None:
-            self.ip = ip
-        if mac is not None:
-            self.mac = mac
-
-class HostHandler(DictSubHandler):
-    r"""HostHandler(parent) -> HostHandler instance :: Handle a list of hosts.
-
-    This class is a helper for DhcpHandler to do all the work related to hosts
-    administration.
-    """
-
-    handler_help = u"Manage DHCP hosts"
-
-    _cont_subhandler_attr = 'hosts'
-    _cont_subhandler_class = Host
+__all__ = ('DhcpHandler',)
 
 class DhcpHandler(Restorable, ConfigWriter, ReloadHandler, TransactionalHandler,
                   ParametersHandler, InitdHandler):

diff --git a/services/dhcp/host.py b/services/dhcp/host.py
new file mode 100644 (file)
index 0000000..c9f200f
--- /dev/null
+++ b/services/dhcp/host.py
@@ -0,0 +1,47 @@
+# vim: set encoding=utf-8 et sw=4 sts=4 :
+
+from os import path
+import logging ; log = logging.getLogger('pymin.services.dhcp')
+
+from pymin.seqtools import Sequence
+from pymin.service.util import DictSubHandler
+
+__all__ = ('HostHandler',)
+
+
+class Host(Sequence):
+    r"""Host(name, ip, mac) -> Host instance :: Class representing a host.
+
+    name - Host name, should be a fully qualified name, but no checks are done.
+    ip - IP assigned to the hostname.
+    mac - MAC address to associate to the hostname.
+    """
+
+    def __init__(self, name, ip, mac):
+        r"Initialize Host object, see class documentation for details."
+        self.name = name
+        self.ip = ip
+        self.mac = mac
+
+    def as_tuple(self):
+        r"Return a tuple representing the host."
+        return (self.name, self.ip, self.mac)
+
+    def update(self, ip=None, mac=None):
+        if ip is not None:
+            self.ip = ip
+        if mac is not None:
+            self.mac = mac
+
+class HostHandler(DictSubHandler):
+    r"""HostHandler(parent) -> HostHandler instance :: Handle a list of hosts.
+
+    This class is a helper for DhcpHandler to do all the work related to hosts
+    administration.
+    """
+
+    handler_help = u"Manage DHCP hosts"
+
+    _cont_subhandler_attr = 'hosts'
+    _cont_subhandler_class = Host
+