X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/28ba753ea84e470b67de6601b15ebeb39ba0b97f..0d0a841a914de6afa47c6d3e96c833c65c653a52:/pymin/services/ip/__init__.py diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py index a6a0e67..82a789e 100644 --- a/pymin/services/ip/__init__.py +++ b/pymin/services/ip/__init__.py @@ -8,7 +8,7 @@ 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,13 +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 as_tuple(self): - return (self.ip, self.netmask, self.broadcast) class AddressHandler(DictComposedSubHandler): handler_help = u"Manage IP addresses" @@ -119,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): @@ -144,6 +129,18 @@ class DeviceHandler(SubHandler): def up(self, name): if name in self.parent.devices: call(self.device_template.render(dev=name, action='up'), shell=True) + #bring up all the route asocitaed to the device + for route in self.parent.devices[name].routes: + try: + call(self.parent._render_config('route_add', dict( + dev = name, + net_addr = route.net_addr, + prefix = route.prefix, + gateway = route.gateway, + ) + ), shell=True) + except ExecutionError, e: + print e else: raise DeviceNotFoundError(name) @@ -169,8 +166,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() ) @@ -189,24 +185,63 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler): self.route = RouteHandler(self) self.dev = DeviceHandler(self) self.hop = HopHandler(self) + self.services = list() def _write_config(self): r"_write_config() -> None :: Execute all commands." for device in self.devices.values(): + if device.active: + self._write_config_for_device(device) + self._write_hops() + + def _write_hops(self): + r"_write_hops() -> None :: Execute all hops." + if self.hops: + try: + call('ip route del default', shell=True) + except ExecutionError, e: + print e + try: + #get hops for active devices + active_hops = dict() + for h in self.hops: + if h.device in self.devices: + if self.devices[h.device].active: + active_hops.append(h) + call(self._render_config('hop', dict( + hops = active_hops, + ) + ), shell=True) + except ExecutionError, e: + print e + + def _write_config_for_device(self, device): + r"_write_config_for_device(self, device) -> None :: Execute all commands for a device." + 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) - for address in device.addrs.values(): - broadcast = address.broadcast - if broadcast is None: - broadcast = '+' + except ExecutionError, e: + print e + for address in device.addrs.values(): + 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 = broadcast, + dev = device.name, + addr = address.ip, + netmask = address.netmask, + peer = address.peer, + broadcast = broadcast, ) ), shell=True) - for route in device.routes: + except ExecutionError, e: + print e + for route in device.routes: + try: call(self._render_config('route_add', dict( dev = device.name, net_addr = route.net_addr, @@ -214,14 +249,8 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler): gateway = route.gateway, ) ), shell=True) - - if self.hops: - call('ip route del default', shell=True) - call(self._render_config('hop', dict( - hops = self.hops, - ) - ), shell=True) - + except ExecutionError, e: + print e def handle_timer(self): self.refresh_devices() @@ -229,14 +258,41 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler): def refresh_devices(self): devices = get_network_devices() - #add not registered devices + #add not registered and active devices + go_active = False for k,v in devices.items(): if k not in self.devices: - self.devices[k] = Device(k,v) - #delete dead devices + self.devices[k] = v + elif not self.devices[k].active: + self.active = True + go_active = True + self._write_config_for_device(self.devices[k]) + if go_active: + self._write_hops() + for s in services: + if s._running: + try: + s.stop() + except ExecutionError: + pass + try: + s.start() + except ExecutionError: + pass + + #mark inactive devices for k in self.devices.keys(): if k not in devices: - del self.devices[k] + self.devices[k].active = False + + #hooks a service to the ip handler, so when + #a device is brought up one can restart the service + #that need to refresh their device list + def device_up_hook(self, serv): + if hasattr(serv, 'stop') and hasattr(serv, 'start'): + services.append(serv) + +