Add validation to vpn service (refs #20)

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

diff --git a/services/dhcp/host.py b/services/dhcp/host.py
index c9f200f2d4d4d04a4d289e8713b2c6a2ab24d371..59a7b1a07e0ab9dcb9a7ec9ea5f61e9e5d9930d4 100644 (file)
--- a/services/dhcp/host.py
+++ b/services/dhcp/host.py
@@ -3,35 +3,24 @@
 from os import path
 import logging ; log = logging.getLogger('pymin.services.dhcp')
 
 from os import path
 import logging ; log = logging.getLogger('pymin.services.dhcp')
 

-from pymin.seqtools import Sequence
+from pymin.validation import Item, Field, Any, IPAddress, MACAddress, \
+                             HostName, FullyQualifiedHostName

 from pymin.service.util import DictSubHandler
 
 __all__ = ('HostHandler',)
 
 
 from pymin.service.util import DictSubHandler
 
 __all__ = ('HostHandler',)
 
 

-class Host(Sequence):
+class Host(Item):

     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.
     """
     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
+    name = Field(Any(HostName(not_empty=True),
+                     FullyQualifiedHostName(not_empty=True)))
+    ip = Field(IPAddress(not_empty=True))
+    mac = Field(MACAddress(add_colons=True, not_empty=True))

 
 class HostHandler(DictSubHandler):
     r"""HostHandler(parent) -> HostHandler instance :: Handle a list of hosts.
 
 class HostHandler(DictSubHandler):
     r"""HostHandler(parent) -> HostHandler instance :: Handle a list of hosts.