Add logging to pymin.services.vrrp module.

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

diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py
index 46966c630c01fe10f0ea7c9b540a42afc2bb39eb..71354abdbba6983ce20618ec4bed4a17261c01db 100644 (file)
--- a/pymin/services/ip/__init__.py
+++ b/pymin/services/ip/__init__.py
@@ -2,68 +2,21 @@
 
 from subprocess import Popen, PIPE
 from os import path
 
 from subprocess import Popen, PIPE
 from os import path

+import logging ; log = logging.getLogger('pymin.services.ip')

 
 from pymin.seqtools import Sequence
 from pymin.dispatcher import handler, HandlerError, Handler
 from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
 
 from pymin.seqtools import Sequence
 from pymin.dispatcher import handler, HandlerError, Handler
 from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \

-                                TransactionalHandler, call
+                                TransactionalHandler, SubHandler, call, \
+                                get_network_devices, ListComposedSubHandler, \
+                                DictComposedSubHandler, Device, Address, \
+                                ExecutionError

 
 

-__ALL__ = ('IpHandler', 'Error','DeviceError', 'DeviceNotFoundError',
-           'RouteError', 'RouteNotFoundError', 'RouteAlreadyExistsError',
-           'AddressError', 'AddressNotFoundError', 'AddressAlreadyExistsError')
+__ALL__ = ('IpHandler',)

 
 

-class Error(HandlerError):
-    r"""
-    Error(command) -> Error instance :: Base IpHandler exception class.
+# TODO: convertir HopHandler a ComposedSubHandler

 
 

-    All exceptions raised by the IpHandler inherits from this one, so you can
-    easily catch any IpHandler exception.
-
-    message - A descriptive error message.
-    """
-    pass
-
-class DeviceError(Error):
-
-    def __init__(self, device):
-        self.message = u'Device error : "%s"' % device
-
-class DeviceNotFoundError(DeviceError):
-
-    def __init__(self, device):
-        self.message = u'Device not found : "%s"' % device
-
-class AddressError(Error):
-
-    def __init__(self, addr):
-        self.message = u'Address error : "%s"' % addr
-
-class AddressNotFoundError(AddressError):
-
-    def __init__(self, address):
-        self.message = u'Address not found : "%s"' % address
-
-class AddressAlreadyExistsError(AddressError):
-
-    def __init__(self, address):
-        self.message = u'Address already exists : "%s"' % address
-
-class RouteError(Error):
-
-    def __init__(self, route):
-        self.message = u'Route error : "%s"' % route
-
-class RouteNotFoundError(RouteError):
-
-    def __init__(self, route):
-        self.message = u'Route not found : "%s"' % route
-
-class RouteAlreadyExistsError(RouteError):
-
-    def __init__(self, route):
-        self.message = u'Route already exists : "%s"' % route
-
-class HopError(Error):
+class HopError(HandlerError):

 
     def __init__(self, hop):
         self.message = u'Hop error : "%s"' % hop
 
     def __init__(self, hop):
         self.message = u'Hop error : "%s"' % hop


@@ -136,148 +89,38 @@ class HopHandler(Handler):
             k = list()
         return k
 
             k = list()
         return k
 

-

 class Route(Sequence):
 class Route(Sequence):

-

     def __init__(self, net_addr, prefix, gateway):
         self.net_addr = net_addr
         self.prefix = prefix
         self.gateway = gateway
     def __init__(self, net_addr, prefix, gateway):
         self.net_addr = net_addr
         self.prefix = prefix
         self.gateway = gateway

-
+    def update(self, net_addr=None, prefix=None, gateway=None):
+        if net_addr is not None: self.net_addr = net_addr
+        if prefix is not None: self.prefix = prefix
+        if gateway is not None: self.gateway = gateway

     def as_tuple(self):
     def as_tuple(self):

-        return(self.addr, self.prefix, self.gateway)
-
-    def __cmp__(self, other):
-        if self.net_addr == other.net_addr \
-                and self.prefix == other.prefix \
-                and self.gateway == other.gateway:
-            return 0
-        return cmp(id(self), id(other))
-
-class RouteHandler(Handler):
+        return(self.net_addr, self.prefix, self.gateway)

 
 

+class RouteHandler(ListComposedSubHandler):

     handler_help = u"Manage IP routes"
     handler_help = u"Manage IP routes"

+    _comp_subhandler_cont = 'devices'
+    _comp_subhandler_attr = 'routes'
+    _comp_subhandler_class = Route

 
 

-    def __init__(self, parent):
-        self.parent = parent
-
-    @handler(u'Adds a route to a device')
-    def add(self, device, net_addr, prefix, gateway):
-        if not device in self.parent.devices:
-            raise DeviceNotFoundError(device)
-        r = Route(net_addr, prefix, gateway)
-        try:
-            self.parent.devices[device].routes.index(r)
-            raise RouteAlreadyExistsError(net_addr + '/' + prefix + '->' + gateway)
-        except ValueError:
-            self.parent.devices[device].routes.append(r)
-
-    @handler(u'Deletes a route from a device')
-    def delete(self, device, net_addr, prefix, gateway):
-        if not device in self.parent.devices:
-            raise DeviceNotFoundError(device)
-        r = Route(net_addr, prefix, gateway)
-        try:
-            self.parent.devices[device].routes.remove(r)
-        except ValueError:
-            raise RouteNotFoundError(net_addr + '/' + prefix + '->' + gateway)
-
-    @handler(u'Flushes routes from a device')
-    def flush(self, device):
-        if not device in self.parent.devices:
-            raise DeviceNotFoundError(device)
-        self.parent.devices[device].routes = list()
-
-
-    @handler(u'List routes')
-    def list(self, device):
-        try:
-            k = self.parent.devices[device].routes.keys()
-        except ValueError:
-            k = list()
-        return k
-
-    @handler(u'Get information about all routes')
-    def show(self, device):
-        try:
-            k = self.parent.devices[device].routes.values()
-        except ValueError:
-            k = list()
-        return k
-
-
-class Address(Sequence):
-
-    def __init__(self, ip, prefix, broadcast):
-        self.ip = ip
-        self.prefix = prefix
-        self.broadcast = broadcast
-
-    def as_tuple(self):
-        return (self.ip, self.prefix, self.broadcast)
-
-class AddressHandler(Handler):

 
 

+class AddressHandler(DictComposedSubHandler):

     handler_help = u"Manage IP addresses"
     handler_help = u"Manage IP addresses"

+    _comp_subhandler_cont = 'devices'
+    _comp_subhandler_attr = 'addrs'
+    _comp_subhandler_class = Address

 
 

-    def __init__(self, parent):
-        self.parent = parent
-
-    @handler(u'Adds an address to a device')
-    def add(self, device, ip, prefix, broadcast='+'):
-        if not device in self.parent.devices:
-            raise DeviceNotFoundError(device)
-        if ip in self.parent.devices[device].addrs:
-            raise AddressAlreadyExistsError(ip)
-        self.parent.devices[device].addrs[ip] = Address(ip, prefix, broadcast)
-
-    @handler(u'Deletes an address from a device')
-    def delete(self, device, ip):
-        if not device in self.parent.devices:
-            raise DeviceNotFoundError(device)
-        if not ip in self.parent.devices[device].addrs:
-            raise AddressNotFoundError(ip)
-        del self.parent.devices[device].addrs[ip]
-
-    @handler(u'Flushes addresses from a device')
-    def flush(self, device):
-        if not device in self.parent.devices:
-            raise DeviceNotFoundError(device)
-        self.parent.devices[device].addrs = dict()
-
-    @handler(u'List all addresses from a device')
-    def list(self, device):
-        try:
-            k = self.parent.devices[device].addrs.keys()
-        except ValueError:
-            k = list()
-        return k
-
-    @handler(u'Get information about addresses from a device')
-    def show(self, device):
-        try:
-            k = self.parent.devices[device].addrs.values()
-        except ValueError:
-            k = list()
-        return k

 
 

-
-class Device(Sequence):
-
-    def __init__(self, name, mac):
-        self.name = name
-        self.mac = mac
-        self.addrs = dict()
-        self.routes = list()
-
-    def as_tuple(self):
-        return (self.name, self.mac)
-
-class DeviceHandler(Handler):
+class DeviceHandler(SubHandler):

 
     handler_help = u"Manage network devices"
 
     def __init__(self, parent):
 
     handler_help = u"Manage network devices"
 
     def __init__(self, parent):

+        log.debug(u'DeviceHandler(%r)', parent)

         # FIXME remove templates to execute commands
         from mako.template import Template
         self.parent = parent
         # FIXME remove templates to execute commands
         from mako.template import Template
         self.parent = parent


@@ -287,55 +130,40 @@ class DeviceHandler(Handler):
 
     @handler(u'Bring the device up')
     def up(self, name):
 
     @handler(u'Bring the device up')
     def up(self, name):

+        log.debug(u'DeviceHandler.up(%r)', name)

         if name in self.parent.devices:
         if name in self.parent.devices:

-            #call(self.device_template.render(dev=name, action='up'), shell=True)
-            print self.device_template.render(dev=name, action='up')
+            call(self.device_template.render(dev=name, action='up'), shell=True)

         else:
         else:

+            log.debug(u'DeviceHandler.up: device not found')

             raise DeviceNotFoundError(name)
 
     @handler(u'Bring the device down')
     def down(self, name):
             raise DeviceNotFoundError(name)
 
     @handler(u'Bring the device down')
     def down(self, name):

+        log.debug(u'DeviceHandler.down(%r)', name)

         if name in self.parent.devices:
         if name in self.parent.devices:

-            #call(self.device_template.render(dev=name, action='down'), shell=True)
-            print self.device_template.render(dev=name, action='down')
+            call(self.device_template.render(dev=name, action='down'), shell=True)

         else:
         else:

+            log.debug(u'DeviceHandler.up: device not found')

             raise DeviceNotFoundError(name)
 
     @handler(u'List all devices')
     def list(self):
             raise DeviceNotFoundError(name)
 
     @handler(u'List all devices')
     def list(self):

+        log.debug(u'DeviceHandler.list()')

         return self.parent.devices.keys()
 
     @handler(u'Get information about a device')
     def show(self):
         return self.parent.devices.keys()
 
     @handler(u'Get information about a device')
     def show(self):

+        log.debug(u'DeviceHandler.show()')

         return self.parent.devices.items()
 
         return self.parent.devices.items()
 

-
-def get_devices():
-    p = Popen(('ip', 'link', 'list'), stdout=PIPE, close_fds=True)
-    string = p.stdout.read()
-    p.wait()
-    d = dict()
-    i = string.find('eth')
-    while i != -1:
-        eth = string[i:i+4]
-        m = string.find('link/ether', i+4)
-        mac = string[ m+11 : m+11+17]
-        d[eth] = Device(eth, mac)
-        i = string.find('eth', m+11+17)
-    return d
-

 class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
 
     handler_help = u"Manage IP devices, addresses, routes and hops"
 
     _persistent_attrs = ('devices','hops')
 
 class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
 
     handler_help = u"Manage IP devices, addresses, routes and hops"
 
     _persistent_attrs = ('devices','hops')
 

-    devs = dict();
-    devs['eth0'] = Device('eth0','00:00:00:00')
-    devs['eth1'] = Device('eth1','00:00:00:00')
-

     _restorable_defaults = dict(
     _restorable_defaults = dict(

-                            devices=devs,
+                            devices=get_network_devices(),

                             hops = list()
                             )
 
                             hops = list()
                             )
 


@@ -345,10 +173,12 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
 
     def __init__(self, pickle_dir='.', config_dir='.'):
         r"Initialize DhcpHandler object, see class documentation for details."
 
     def __init__(self, pickle_dir='.', config_dir='.'):
         r"Initialize DhcpHandler object, see class documentation for details."

+        log.debug(u'IpHandler(%r, %r)', pickle_dir, config_dir)

         self._persistent_dir = pickle_dir
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()
         self._restore()
         self._persistent_dir = pickle_dir
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()
         self._restore()

+        self._write_config()

         self.addr = AddressHandler(self)
         self.route = RouteHandler(self)
         self.dev = DeviceHandler(self)
         self.addr = AddressHandler(self)
         self.route = RouteHandler(self)
         self.dev = DeviceHandler(self)


@@ -356,54 +186,91 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
 
     def _write_config(self):
         r"_write_config() -> None :: Execute all commands."
 
     def _write_config(self):
         r"_write_config() -> None :: Execute all commands."

+        log.debug(u'IpHandler._write_config()')

         for device in self.devices.values():
         for device in self.devices.values():

-            #call(self._render_config('route_flush', dict(dev=device.name)), shell=True)
-            print self._render_config('route_flush', dict(dev=device.name))
-            #call(self._render_config('ip_flush', dict(dev=device.name)), shell=True)
-            print self._render_config('ip_flush', dict(dev=device.name))
+            log.debug(u'IpHandler._write_config: processing device %s', device)
+            try:
+                log.debug(u'IpHandler._write_config: flushing routes...')
+                call(self._render_config('route_flush', dict(dev=device.name)),
+                        shell=True)
+            except ExecutionError, e:
+                log.debug(u'IpHandler._write_config: error flushing -> %r', e)
+            try:
+                log.debug(u'IpHandler._write_config: flushing addrs...')
+                call(self._render_config('ip_flush', dict(dev=device.name)),
+                        shell=True)
+            except ExecutionError, e:
+                log.debug(u'IpHandler._write_config: error flushing -> %r', e)

             for address in device.addrs.values():
             for address in device.addrs.values():

-                print self._render_config('ip_add', dict(
-                        dev = device.name,
-                        addr = address.ip,
-                        prefix = address.prefix,
-                        broadcast = address.broadcast,
-                    ))
-                #call(self._render_config('ip_add', dict(
-                        #dev = device.name,
-                        #addr = address.ip,
-                        #prefix = address.prefix,
-                        #broadcast = address.broadcast,
-                    #)
-                #), shell=True)
+                broadcast = address.broadcast
+                if broadcast is None:
+                    broadcast = '+'
+                try:
+                    log.debug(u'IpHandler._write_config: adding %r', address)
+                    call(self._render_config('ip_add', dict(
+                            dev = device.name,
+                            addr = address.ip,
+                            netmask = address.netmask,
+                            peer = address.peer,
+                            broadcast = broadcast,
+                        )), shell=True)
+                except ExecutionError, e:
+                    log.debug(u'IpHandler._write_config: error adding -> %r', e)

             for route in device.routes:
             for route in device.routes:

-                print self._render_config('route_add', dict(
-                        dev = device.name,
-                        net_addr = route.net_addr,
-                        prefix = route.prefix,
-                        gateway = route.gateway,
-                    ))
-                #call(self._render_config('route_add', dict(
-                        #dev = device.name,
-                        #net_addr = route.net_addr,
-                        #prefix = route.prefix,
-                        #gateway = route.gateway,
-                    #)
-                #), shell=True)
-
+                try:
+                    log.debug(u'IpHandler._write_config: adding %r', route)
+                    call(self._render_config('route_add', dict(
+                            dev = device.name,
+                            net_addr = route.net_addr,
+                            prefix = route.prefix,
+                            gateway = route.gateway,
+                        )), shell=True)
+                except ExecutionError, e:
+                    log.debug(u'IpHandler._write_config: error adding -> %r', e)

         if self.hops:
         if self.hops:

-            print 'ip route del default'
-            #call('ip route del default', shell=True)
-            print self._render_config('hop', dict(
-                        hops = self.hops,
-                    ))
-            #call(self._render_config('hop', dict(
-                        #hops = self.hops,
-                    #)
-                 #), shell=True)
+            log.debug(u'IpHandler._write_config: we have hops: %r', self.hops)
+            try:
+                log.debug(u'IpHandler._write_config: flushing default route')
+                call('ip route del default', shell=True)
+            except ExecutionError, e:
+                log.debug(u'IpHandler._write_config: error adding -> %r', e)
+            try:
+                log.debug(u'IpHandler._write_config: configuring hops')
+                call(self._render_config('hop', dict(
+                    hops = self.hops,
+                        )
+                ), shell=True)
+            except ExecutionError, e:
+                log.debug(u'IpHandler._write_config: error adding -> %r', e)
+
+    def handle_timer(self):
+        log.debug(u'IpHandler.handle_timer()')
+        self.refresh_devices()
+
+    def refresh_devices(self):
+        log.debug(u'IpHandler.update_devices()')
+        devices = get_network_devices()
+        #add not registered devices
+        for k,v in devices.items():
+            if k not in self.devices:
+                log.debug(u'IpHandler.update_devices: adding %r', v)
+                self.devices[k] = v
+        #delete dead devices
+        for k in self.devices.keys():
+            if k not in devices:
+                log.debug(u'IpHandler.update_devices: removing %s', k)
+                del self.devices[k]
+

 
 
 if __name__ == '__main__':
 
 
 
 if __name__ == '__main__':
 

+    logging.basicConfig(
+        level   = logging.DEBUG,
+        format  = '%(asctime)s %(levelname)-8s %(message)s',
+        datefmt = '%H:%M:%S',
+    )
+

     ip = IpHandler()
     print '----------------------'
     ip.hop.add('201.21.32.53','eth0')
     ip = IpHandler()
     print '----------------------'
     ip.hop.add('201.21.32.53','eth0')


@@ -417,6 +284,7 @@ if __name__ == '__main__':
     ip.route.add('eth0','192.168.0.5','24','192.168.0.1')
     ip.commit()
     ip.hop.delete('201.21.32.53','eth0')
     ip.route.add('eth0','192.168.0.5','24','192.168.0.1')
     ip.commit()
     ip.hop.delete('201.21.32.53','eth0')

+    ip.route.clear('eth0')

     ip.commit()
 
 
     ip.commit()