From 8f23bf641fb2260df1ee40e9d7d45dad9b116e1f Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Fri, 20 Jun 2008 01:09:41 -0300 Subject: [PATCH] Split vpn handler in submodules (refs #2). --- services/vpn/handler.py | 26 +++++--------------------- services/vpn/host.py | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 services/vpn/host.py diff --git a/services/vpn/handler.py b/services/vpn/handler.py index 802e089..0bcf84f 100644 --- a/services/vpn/handler.py +++ b/services/vpn/handler.py @@ -7,30 +7,14 @@ from os import path import logging ; log = logging.getLogger('pymin.services.vpn') from pymin.seqtools import Sequence -from pymin.dispatcher import Handler, handler, HandlerError +from pymin.dispatcher import handler from pymin.service.util import Restorable, ConfigWriter, InitdHandler, \ - TransactionalHandler, DictSubHandler, DictComposedSubHandler, call, ExecutionError + TransactionalHandler, DictSubHandler, \ + call, ExecutionError -__all__ = ('VpnHandler') +from host import HostHandler - -class Host(Sequence): - def __init__(self, vpn_src, ip, vpn_src_net, key): - self.name = vpn_src - self.ip = ip - self.src_net = vpn_src_net - self.pub_key = key - self._delete = False - - def as_tuple(self): - return(self.name, self.ip, self.src_net, self.pub_key) - -class HostHandler(DictComposedSubHandler): - - handler_help = u"Manage hosts for a vpn" - _comp_subhandler_cont = 'vpns' - _comp_subhandler_attr = 'hosts' - _comp_subhandler_class = Host +__all__ = ('VpnHandler',) class Vpn(Sequence): diff --git a/services/vpn/host.py b/services/vpn/host.py new file mode 100644 index 0000000..d22de66 --- /dev/null +++ b/services/vpn/host.py @@ -0,0 +1,26 @@ +# vim: set encoding=utf-8 et sw=4 sts=4 : + +from pymin.seqtools import Sequence +from pymin.service.util import DictComposedSubHandler + +__all__ = ('HostHandler',) + + +class Host(Sequence): + def __init__(self, vpn_src, ip, vpn_src_net, key): + self.name = vpn_src + self.ip = ip + self.src_net = vpn_src_net + self.pub_key = key + self._delete = False + + def as_tuple(self): + return(self.name, self.ip, self.src_net, self.pub_key) + +class HostHandler(DictComposedSubHandler): + + handler_help = u"Manage hosts for a vpn" + _comp_subhandler_cont = 'vpns' + _comp_subhandler_attr = 'hosts' + _comp_subhandler_class = Host + -- 2.43.0