From: Fede Date: Wed, 17 Oct 2007 22:44:03 +0000 (-0300) Subject: Merge ../t/pymin/ X-Git-Url: https://git.llucax.com/software/pymin.git/commitdiff_plain/52d87d11873f1a37b21100700f4798a375361f3f?ds=sidebyside;hp=-c Merge ../t/pymin/ Conflicts: pymin/services/ip/__init__.py --- 52d87d11873f1a37b21100700f4798a375361f3f diff --combined pymin/services/ip/__init__.py index 46966c6,94d681b..1f3aeef --- a/pymin/services/ip/__init__.py +++ b/pymin/services/ip/__init__.py @@@ -6,274 -6,57 +6,132 @@@ from os import pat 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 - __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. - - 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 ++# TODO: convertir HopHandler a ComposedSubHandler + +class HopError(Error): + + 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 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): - 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" - - 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 - + _comp_subhandler_cont = 'devices' + _comp_subhandler_attr = 'routes' + _comp_subhandler_class = Route class Address(Sequence): - - def __init__(self, ip, prefix, broadcast): + def __init__(self, ip, netmask, broadcast=None): self.ip = ip - self.prefix = prefix + 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.prefix, self.broadcast) - - class AddressHandler(Handler): + return (self.ip, self.netmask, self.broadcast) + class AddressHandler(DictComposedSubHandler): handler_help = u"Manage IP addresses" - - 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 - + _comp_subhandler_cont = 'devices' + _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(Handler): + class DeviceHandler(SubHandler): handler_help = u"Manage network devices" @@@ -288,16 -71,14 +146,14 @@@ @handler(u'Bring the device up') def up(self, name): 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: raise DeviceNotFoundError(name) @handler(u'Bring the device down') def down(self, name): 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: raise DeviceNotFoundError(name) @@@ -309,38 -90,17 +165,20 @@@ def show(self): 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 and routes" + handler_help = u"Manage IP devices, addresses, routes and hops" - _persistent_attrs = 'devices' + _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(devices=dict((dev, Device(dev, mac)) - for (dev, mac) in get_network_devices().items())) + _restorable_defaults = dict( - devices=devs, ++ devices=dict((dev, Device(dev, mac)) ++ for (dev, mac) in get_network_devices().items()), + 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='.'): @@@ -352,63 -112,34 +190,63 @@@ 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) + #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)) for address in device.addrs.values(): - call(self._render_config('ip_add', dict( + print self._render_config('ip_add', dict( dev = device.name, addr = address.ip, - prefix = address.prefix, + netmask = address.netmask, broadcast = address.broadcast, - ) - ), shell=True) + )) + #call(self._render_config('ip_add', dict( + #dev = device.name, + #addr = address.ip, + #prefix = address.prefix, + #broadcast = address.broadcast, + #) + #), shell=True) for route in device.routes: - call(self._render_config('route_add', dict( + print self._render_config('route_add', dict( dev = device.name, net_addr = route.net_addr, prefix = route.prefix, gateway = route.gateway, - ) - ), shell=True) + )) + #call(self._render_config('route_add', dict( + #dev = device.name, + #net_addr = route.net_addr, + #prefix = route.prefix, + #gateway = route.gateway, + #) + #), shell=True) + + 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) if __name__ == '__main__': ip = IpHandler() 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') @@@ -416,8 -147,11 +254,9 @@@ 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() -