Merge or3st3s@azazel:/home/luca/repos/pymin

[software/pymin.git] / pymin / services / dhcp / __init__.py

diff --git a/pymin/services/dhcp/__init__.py b/pymin/services/dhcp/__init__.py
index 8f42e1ac013db09d6739720e8537285505b4023c..927f801d45ae9f47ac8a884e43d6d39eb7a40c6f 100644 (file)
--- a/pymin/services/dhcp/__init__.py
+++ b/pymin/services/dhcp/__init__.py
@@ -19,13 +19,7 @@ class Error(HandlerError):
 
     message - A descriptive error message.
     """
 
     message - A descriptive error message.
     """

-
-    def __init__(self, message):
-        r"Initialize the Error object. See class documentation for more info."
-        self.message = message
-
-    def __str__(self):
-        return self.message
+    pass

 
 class HostError(Error, KeyError):
     r"""
 
 class HostError(Error, KeyError):
     r"""


@@ -36,7 +30,7 @@ class HostError(Error, KeyError):
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."

-        self.message = 'Host error: "%s"' % hostname
+        self.message = u'Host error: "%s"' % hostname

 
 class HostAlreadyExistsError(HostError):
     r"""
 
 class HostAlreadyExistsError(HostError):
     r"""


@@ -47,7 +41,7 @@ class HostAlreadyExistsError(HostError):
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."

-        self.message = 'Host already exists: "%s"' % hostname
+        self.message = u'Host already exists: "%s"' % hostname

 
 class HostNotFoundError(HostError):
     r"""
 
 class HostNotFoundError(HostError):
     r"""


@@ -59,7 +53,7 @@ class HostNotFoundError(HostError):
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."
 
     def __init__(self, hostname):
         r"Initialize the object. See class documentation for more info."

-        self.message = 'Host not found: "%s"' % hostname
+        self.message = u'Host not found: "%s"' % hostname

 
 
 class Host(Sequence):
 
 
 class Host(Sequence):


@@ -89,50 +83,52 @@ class HostHandler(Handler):
     hosts - A dictionary with string keys (hostnames) and Host instances values.
     """
 
     hosts - A dictionary with string keys (hostnames) and Host instances values.
     """
 

-    def __init__(self, hosts):
+    handler_help = u"Manage DHCP hosts"
+
+    def __init__(self, parent):

         r"Initialize HostHandler object, see class documentation for details."
         r"Initialize HostHandler object, see class documentation for details."

-        self.hosts = hosts
+        self.parent = parent

 
 

-    @handler(u'Add a new host.')
+    @handler(u'Add a new host')

     def add(self, name, ip, mac):
         r"add(name, ip, mac) -> None :: Add a host to the hosts list."
     def add(self, name, ip, mac):
         r"add(name, ip, mac) -> None :: Add a host to the hosts list."

-        if name in self.hosts:
+        if name in self.parent.hosts:

             raise HostAlreadyExistsError(name)
             raise HostAlreadyExistsError(name)

-        self.hosts[name] = Host(name, ip, mac)
+        self.parent.hosts[name] = Host(name, ip, mac)

 
 

-    @handler(u'Update a host.')
+    @handler(u'Update a host')

     def update(self, name, ip=None, mac=None):
         r"update(name[, ip[, mac]]) -> None :: Update a host of the hosts list."
     def update(self, name, ip=None, mac=None):
         r"update(name[, ip[, mac]]) -> None :: Update a host of the hosts list."

-        if not name in self.hosts:
+        if not name in self.parent.hosts:

             raise HostNotFoundError(name)
         if ip is not None:
             raise HostNotFoundError(name)
         if ip is not None:

-            self.hosts[name].ip = ip
+            self.parent.hosts[name].ip = ip

         if mac is not None:
         if mac is not None:

-            self.hosts[name].mac = mac
+            self.parent.hosts[name].mac = mac

 
 

-    @handler(u'Delete a host.')
+    @handler(u'Delete a host')

     def delete(self, name):
         r"delete(name) -> None :: Delete a host of the hosts list."
     def delete(self, name):
         r"delete(name) -> None :: Delete a host of the hosts list."

-        if not name in self.hosts:
+        if not name in self.parent.hosts:

             raise HostNotFoundError(name)
             raise HostNotFoundError(name)

-        del self.hosts[name]
+        del self.parent.hosts[name]

 
 

-    @handler(u'Get information about a host.')
+    @handler(u'Get information about a host')

     def get(self, name):
         r"get(name) -> Host :: List all the information of a host."
     def get(self, name):
         r"get(name) -> Host :: List all the information of a host."

-        if not name in self.hosts:
+        if not name in self.parent.hosts:

             raise HostNotFoundError(name)
             raise HostNotFoundError(name)

-        return self.hosts[name]
+        return self.parent.hosts[name]

 
 

-    @handler(u'List hosts.')
+    @handler(u'List hosts')

     def list(self):
         r"list() -> tuple :: List all the hostnames."
     def list(self):
         r"list() -> tuple :: List all the hostnames."

-        return self.hosts.keys()
+        return self.parent.hosts.keys()

 
 

-    @handler(u'Get information about all hosts.')
+    @handler(u'Get information about all hosts')

     def show(self):
         r"show() -> list of Hosts :: List all the complete hosts information."
     def show(self):
         r"show() -> list of Hosts :: List all the complete hosts information."

-        return self.hosts.values()
+        return self.parent.hosts.values()

 
 
 class DhcpHandler(Restorable, ConfigWriter, InitdHandler, TransactionalHandler,
 
 
 class DhcpHandler(Restorable, ConfigWriter, InitdHandler, TransactionalHandler,


@@ -148,6 +144,8 @@ class DhcpHandler(Restorable, ConfigWriter, InitdHandler, TransactionalHandler,
     Both defaults to the current working directory.
     """
 
     Both defaults to the current working directory.
     """
 

+    handler_help = u"Manage DHCP service"
+

     _initd_name = 'dhcpd'
 
     _persistent_attrs = ('params', 'hosts')
     _initd_name = 'dhcpd'
 
     _persistent_attrs = ('params', 'hosts')


@@ -175,7 +173,7 @@ class DhcpHandler(Restorable, ConfigWriter, InitdHandler, TransactionalHandler,
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()
         self._restore()
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()
         self._restore()

-        self.host = HostHandler(self.hosts)
+        self.host = HostHandler(self)

 
     def _get_config_vars(self, config_file):
         return dict(hosts=self.hosts.values(), **self.params)
 
     def _get_config_vars(self, config_file):
         return dict(hosts=self.hosts.values(), **self.params)