X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/b276cdc94ede3b794301573f61ce9288a51aa432..7c760d8e7832391621b67cabe629f46e6b5959d1:/pymin/services/ip/__init__.py diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py index e626ab7..71354ab 100644 --- a/pymin/services/ip/__init__.py +++ b/pymin/services/ip/__init__.py @@ -2,13 +2,15 @@ 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, \ TransactionalHandler, SubHandler, call, \ get_network_devices, ListComposedSubHandler, \ - DictComposedSubHandler + DictComposedSubHandler, Device, Address, \ + ExecutionError __ALL__ = ('IpHandler',) @@ -105,16 +107,6 @@ class RouteHandler(ListComposedSubHandler): _comp_subhandler_attr = 'routes' _comp_subhandler_class = Route -class Address(Sequence): - def __init__(self, ip, netmask, broadcast=None): - self.ip = ip - self.netmask = netmask - self.broadcast = broadcast - def update(self, netmask=None, broadcast=None): - if netmask is not None: self.netmask = netmask - if broadcast is not None: self.broadcast = broadcast - def as_tuple(self): - return (self.ip, self.netmask, self.broadcast) class AddressHandler(DictComposedSubHandler): handler_help = u"Manage IP addresses" @@ -122,20 +114,13 @@ class AddressHandler(DictComposedSubHandler): _comp_subhandler_attr = 'addrs' _comp_subhandler_class = Address -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(SubHandler): 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 @@ -145,24 +130,30 @@ class DeviceHandler(SubHandler): @handler(u'Bring the device up') def up(self, name): + log.debug(u'DeviceHandler.up(%r)', name) if name in self.parent.devices: call(self.device_template.render(dev=name, action='up'), shell=True) else: + log.debug(u'DeviceHandler.up: device not found') 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: call(self.device_template.render(dev=name, action='down'), shell=True) else: + log.debug(u'DeviceHandler.up: device not found') 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): + log.debug(u'DeviceHandler.show()') return self.parent.devices.items() class IpHandler(Restorable, ConfigWriter, TransactionalHandler): @@ -172,8 +163,7 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler): _persistent_attrs = ('devices','hops') _restorable_defaults = dict( - devices=dict((dev, Device(dev, mac)) - for (dev, mac) in get_network_devices().items()), + devices=get_network_devices(), hops = list() ) @@ -183,10 +173,12 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler): 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._write_config() self.addr = AddressHandler(self) self.route = RouteHandler(self) self.dev = DeviceHandler(self) @@ -194,39 +186,91 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler): def _write_config(self): r"_write_config() -> None :: Execute all commands." + log.debug(u'IpHandler._write_config()') for device in self.devices.values(): - call(self._render_config('route_flush', dict(dev=device.name)), shell=True) - call(self._render_config('ip_flush', dict(dev=device.name)), shell=True) + 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(): broadcast = address.broadcast if broadcast is None: broadcast = '+' - call(self._render_config('ip_add', dict( - dev = device.name, - addr = address.ip, - netmask = address.netmask, - broadcast = broadcast, - ) - ), shell=True) + 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: - call(self._render_config('route_add', dict( - dev = device.name, - net_addr = route.net_addr, - prefix = route.prefix, - gateway = route.gateway, - ) + 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: + 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 self.hops: - call('ip route del default', shell=True) - call(self._render_config('hop', dict( - hops = self.hops, - ) - ), shell=True) 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')