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, Device, Address, ExecutionError
+ DictComposedSubHandler, ListSubHandler, \
+ 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
+__all__ = ('IpHandler',)
class Hop(Sequence):
return 0
return cmp(id(self), id(other))
-class HopHandler(Handler):
-
- def __init__(self, parent):
- self.parent = parent
-
- @handler('Adds a hop : add <gateway> <device>')
- 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)
+class HopHandler(ListSubHandler):
+ handler_help = u"Manage IP hops"
+ _cont_subhandler_attr = 'hops'
+ _cont_subhandler_class = Hop
- @handler(u'Deletes a hop : delete <gateway> <device>')
- def delete(self, gw, dev):
+ @handler('Add a hop: add <device> <gateway>')
+ def add(self, dev, gw):
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)
+ return ListSubHandler.add(self, dev, gw)
- @handler(u'Lists hops : list <dev>')
- def list(self, device):
- try:
- k = self.parent.hops.keys()
- except ValueError:
- k = list()
- return k
-
- @handler(u'Get information about all hops: show <dev>')
- 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):
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
@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)
#bring up all the route asocitaed to the device
for route in self.parent.devices[name].routes:
try:
+ log.debug(u'IpHandler.up: adding %r', route)
call(self.parent._render_config('route_add', dict(
dev = name,
net_addr = route.net_addr,
)
), shell=True)
except ExecutionError, e:
- print e
+ log.debug(u'IpHandler.up: error adding %r -> %r', route, e)
self.parent._bring_up_no_dev_routes()
self.parent._restart_services()
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)
self.parent._bring_up_no_dev_routes()
self.parent._restart_services()
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):
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()
def _write_config(self):
r"_write_config() -> None :: Execute all commands."
+ log.debug(u'IpHandler._write_config()')
for device in self.devices.values():
+ log.debug(u'IpHandler._write_config: processing device %s', device)
if device.active:
self._write_config_for_device(device)
self._bring_up_no_dev_routes()
self._write_hops()
def _bring_up_no_dev_routes(self):
+ log.debug(u'IpHandler._bring_up_no_dev_routes()')
for route in self.no_device_routes:
try:
+ log.debug(u'IpHandler._bring_up_no_dev_routes: add %r', route)
call(self._render_config('route_add', dict(
dev = None,
net_addr = route.net_addr,
)
), shell=True)
except ExecutionError, e:
- print e
+ log.debug(u'IpHandler._write_config: error flushing -> %r', e)
def _write_hops(self):
r"_write_hops() -> None :: Execute all hops."
+ log.debug(u'IpHandler._write_hops()')
if self.hops:
+ log.debug(u'IpHandler._write_hops: we have hops: %r', self.hops)
try:
+ log.debug(u'IpHandler._write_hops: flushing default hops')
call('ip route del default', shell=True)
except ExecutionError, e:
- print e
+ log.debug(u'IpHandler._write_hops: error adding -> %r', e)
try:
+ log.debug(u'IpHandler._write_hops: configuring hops')
#get hops for active devices
active_hops = dict()
for h in self.hops:
)
), shell=True)
except ExecutionError, e:
- print e
+ log.debug(u'IpHandler._write_hops: error adding -> %r', e)
def _write_config_for_device(self, device):
- r"_write_config_for_device(self, device) -> None :: Execute all commands for a device."
+ r"_write_config_for_device(self, device) -> None :: Execute commands."
+ log.debug(u'IpHandler._write_config_for_device()')
try:
- call(self._render_config('route_flush', dict(dev=device.name)), shell=True)
+ log.debug(u'IpHandler._write_config_for_device: flushing routes...')
+ call(self._render_config('route_flush', dict(dev=device.name)),
+ shell=True)
except ExecutionError, e:
- print e
+ log.debug(u'IpHandler._write_config_for_device: error flushing '
+ u'-> %r', e)
try:
- call(self._render_config('ip_flush', dict(dev=device.name)), shell=True)
+ log.debug(u'IpHandler._write_config_for_device: flushing addrs...')
+ call(self._render_config('ip_flush', dict(dev=device.name)),
+ shell=True)
except ExecutionError, e:
- print e
+ log.debug(u'IpHandler._write_config_for_device: error flushing '
+ u'-> %r', e)
for address in device.addrs.values():
broadcast = address.broadcast
if broadcast is None:
broadcast = '+'
try:
+ log.debug(u'IpHandler._write_config_for_device: adding %r',
+ address)
call(self._render_config('ip_add', dict(
dev = device.name,
addr = address.ip,
)
), shell=True)
except ExecutionError, e:
- print e
+ log.debug(u'IpHandler._write_config_for_device: error adding '
+ u'-> %r', e)
for route in device.routes:
try:
+ log.debug(u'IpHandler._write_config_for_device: adding %r',
+ route)
call(self._render_config('route_add', dict(
dev = device.name,
net_addr = route.net_addr,
)
), shell=True)
except ExecutionError, e:
- print e
+ log.debug(u'IpHandler._write_config_for_device: error adding '
+ u'-> %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 and active devices
go_active = False
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
elif not self.devices[k].active:
self.active = True
for k in self.devices.keys():
go_down = False
if k not in devices:
+ log.debug(u'IpHandler.update_devices: removing %s', k)
self.devices[k].active = False
go_down = True
if go_down:
if __name__ == '__main__':
- ip = IpHanlder()
+ 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.hop.add('205.65.65.25','eth1')
projects / software / pymin.git / blobdiff