X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/a649c1cfd693f916ad7e57cc07f71f4a687ee2c9..9c443d159056e112ed23af07afa38022882583b3:/pymin/services/ip/__init__.py?ds=inline diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py index 94d681b..0c0ea5f 100644 --- a/pymin/services/ip/__init__.py +++ b/pymin/services/ip/__init__.py @@ -8,10 +8,85 @@ 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',) +# TODO: convertir HopHandler a ComposedSubHandler + +class HopError(HandlerError): + + def __init__(self, hop): + self.message = u'Hop error : "%s"' % hop + +class HopNotFoundError(HopError): + + def __init__(self, hop): + self.message = u'Hop not found : "%s"' % hop + +class HopAlreadyExistsError(HopError): + + def __init__(self, hop): + self.message = u'Hop already exists : "%s"' % hop + + +class Hop(Sequence): + + def __init__(self, gateway, device): + self.gateway = gateway + self.device = device + + def as_tuple(self): + return (self.gateway, self.device) + + def __cmp__(self, other): + if self.gateway == other.gateway \ + and self.device == other.device: + return 0 + return cmp(id(self), id(other)) + +class HopHandler(Handler): + + def __init__(self, parent): + self.parent = parent + + @handler('Adds a hop : add ') + def add(self, gw, dev): + if not dev in self.parent.devices: + raise DeviceNotFoundError(device) + h = Hop(gw, dev) + try: + self.parent.hops.index(h) + raise HopAlreadyExistsError(gw + '->' + dev) + except ValueError: + self.parent.hops.append(h) + + @handler(u'Deletes a hop : delete ') + def delete(self, gw, dev): + if not dev in self.parent.devices: + raise DeviceNotFoundError(device) + h = Hop(gw, dev) + try: + self.parent.hops.remove(h) + except ValueError: + raise HopNotFoundError(gw + '->' + dev) + + @handler(u'Lists hops : list ') + def list(self, device): + try: + k = self.parent.hops.keys() + except ValueError: + k = list() + return k + + @handler(u'Get information about all hops: show ') + def show(self, device): + try: + k = self.parent.hops.values() + except ValueError: + k = list() + return k + class Route(Sequence): def __init__(self, net_addr, prefix, gateway): self.net_addr = net_addr @@ -30,16 +105,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" @@ -47,14 +112,6 @@ 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): @@ -92,15 +149,17 @@ class DeviceHandler(SubHandler): class IpHandler(Restorable, ConfigWriter, TransactionalHandler): - handler_help = u"Manage IP devices, addresses and routes" + handler_help = u"Manage IP devices, addresses, routes and hops" - _persistent_attrs = 'devices' + _persistent_attrs = ('devices','hops') - _restorable_defaults = dict(devices=dict((dev, Device(dev, mac)) - for (dev, mac) in get_network_devices().items())) + _restorable_defaults = dict( + devices=get_network_devices(), + hops = list() + ) _config_writer_files = ('device', 'ip_add', 'ip_del', 'ip_flush', - 'route_add', 'route_del', 'route_flush') + 'route_add', 'route_del', 'route_flush', 'hop') _config_writer_tpl_dir = path.join(path.dirname(__file__), 'templates') def __init__(self, pickle_dir='.', config_dir='.'): @@ -109,37 +168,87 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler): 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.hop = HopHandler(self) def _write_config(self): r"_write_config() -> None :: Execute all commands." 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) + try: + call(self._render_config('route_flush', dict(dev=device.name)), shell=True) + except ExecutionError, e: + print e + try: + call(self._render_config('ip_flush', dict(dev=device.name)), shell=True) + except ExecutionError, e: + print e for address in device.addrs.values(): - call(self._render_config('ip_add', dict( + broadcast = address.broadcast + if broadcast is None: + broadcast = '+' + try: + call(self._render_config('ip_add', dict( dev = device.name, addr = address.ip, netmask = address.netmask, - broadcast = address.broadcast, - ) - ), shell=True) + peer = address.peer, + broadcast = broadcast, + ) + ), shell=True) + except ExecutionError, e: + print 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: + 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: + print e + if self.hops: + try: + call('ip route del default', shell=True) + except ExecutionError, e: + print e + try: + call(self._render_config('hop', dict( + hops = self.hops, + ) ), shell=True) + except ExecutionError, e: + print e + + + def handle_timer(self): + self.refresh_devices() + + + def refresh_devices(self): + devices = get_network_devices() + #add not registered devices + for k,v in devices.items(): + if k not in self.devices: + self.devices[k] = v + #delete dead devices + for k in self.devices.keys(): + if k not in devices: + del self.devices[k] + if __name__ == '__main__': - ip = IpHandler() + ip = IpHanlder() print '----------------------' + ip.hop.add('201.21.32.53','eth0') + ip.hop.add('205.65.65.25','eth1') + ip.commit() ip.dev.up('eth0') ip.addr.add('eth0','192.168.0.23','24','192.168.255.255') ip.addr.add('eth0','192.168.0.26','24') @@ -147,11 +256,9 @@ if __name__ == '__main__': ip.route.add('eth0','192.168.0.0','24','192.168.0.1') 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.addr.delete('eth0','192.168.0.23') - ip.commit() -