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.
+# TODO: convertir HopHandler a ComposedSubHandler
- All exceptions raised by the IpHandler inherits from this one, so you can
- easily catch any IpHandler exception.
+class HopError(HandlerError):
- message - A descriptive error message.
- """
- pass
+ def __init__(self, hop):
+ self.message = u'Hop error : "%s"' % hop
-class DeviceError(Error):
+class HopNotFoundError(HopError):
- def __init__(self, device):
- self.message = u'Device error : "%s"' % device
+ def __init__(self, hop):
+ self.message = u'Hop not found : "%s"' % hop
-class DeviceNotFoundError(DeviceError):
+class HopAlreadyExistsError(HopError):
- def __init__(self, device):
- self.message = u'Device not found : "%s"' % device
+ def __init__(self, hop):
+ self.message = u'Hop already exists : "%s"' % hop
-class AddressError(Error):
- def __init__(self, addr):
- self.message = u'Address error : "%s"' % addr
+class Hop(Sequence):
-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
-
-
-class Route(Sequence):
-
- def __init__(self, net_addr, prefix, gateway):
- self.net_addr = net_addr
- self.prefix = prefix
+ def __init__(self, gateway, device):
self.gateway = gateway
+ self.device = device
def as_tuple(self):
- return(self.addr, self.prefix, self.gateway)
+ return (self.gateway, self.device)
def __cmp__(self, other):
- if self.net_addr == other.net_addr \
- and self.prefix == other.prefix \
- and self.gateway == other.gateway:
+ if self.gateway == other.gateway \
+ and self.device == other.device:
return 0
return cmp(id(self), id(other))
-class RouteHandler(Handler):
-
- handler_help = u"Manage IP routes"
+class HopHandler(Handler):
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:
+ @handler('Adds a hop : add <gateway> <device>')
+ def add(self, gw, dev):
+ if not dev in self.parent.devices:
raise DeviceNotFoundError(device)
- r = Route(net_addr, prefix, gateway)
+ h = Hop(gw, dev)
try:
- self.parent.devices[device].routes.index(r)
- raise RouteAlreadyExistsError(net_addr + '/' + prefix + '->' + gateway)
+ self.parent.hops.index(h)
+ raise HopAlreadyExistsError(gw + '->' + dev)
except ValueError:
- self.parent.devices[device].routes.append(r)
+ self.parent.hops.append(h)
- @handler(u'Deletes a route from a device')
- def delete(self, device, net_addr, prefix, gateway):
- if not device in self.parent.devices:
+ @handler(u'Deletes a hop : delete <gateway> <device>')
+ def delete(self, gw, dev):
+ if not dev in self.parent.devices:
raise DeviceNotFoundError(device)
- r = Route(net_addr, prefix, gateway)
+ h = Hop(gw, dev)
try:
- self.parent.devices[device].routes.remove(r)
+ self.parent.hops.remove(h)
except ValueError:
- raise RouteNotFoundError(net_addr + '/' + prefix + '->' + gateway)
+ raise HopNotFoundError(gw + '->' + dev)
- @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')
+ @handler(u'Lists hops : list <dev>')
def list(self, device):
try:
- k = self.parent.devices[device].routes.keys()
+ k = self.parent.hops.keys()
except ValueError:
k = list()
return k
- @handler(u'Get information about all routes')
- def show(self):
+ @handler(u'Get information about all hops: show <dev>')
+ def show(self, device):
try:
- k = self.parent.devices[device].routes.values()
+ 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.net_addr, self.prefix, self.gateway)
-class Address(Sequence):
+class RouteHandler(ListComposedSubHandler):
+ handler_help = u"Manage IP routes"
+ _comp_subhandler_cont = 'devices'
+ _comp_subhandler_attr = 'routes'
+ _comp_subhandler_class = Route
- def __init__(self, ip, prefix, broadcast):
+class Address(Sequence):
+ 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"
@handler(u'Bring the device up')
def up(self, name):
- if name in self.devices:
+ if name in self.parent.devices:
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.devices:
+ if name in self.parent.devices:
call(self.device_template.render(dev=name, action='down'), shell=True)
else:
raise DeviceNotFoundError(name)
@handler(u'List all devices')
def list(self):
- return self.devices.keys()
+ return self.parent.devices.keys()
@handler(u'Get information about a device')
def show(self):
- return self.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
+ return self.parent.devices.items()
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=get_devices())
+ _restorable_defaults = dict(
+ 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='.'):
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."
call(self._render_config('route_flush', dict(dev=device.name)), shell=True)
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 = '+'
call(self._render_config('ip_add', dict(
dev = device.name,
addr = address.ip,
- prefix = address.prefix,
- broadcast = address.broadcast,
+ netmask = address.netmask,
+ broadcast = broadcast,
)
), shell=True)
for route in device.routes:
)
), shell=True)
+ if self.hops:
+ call('ip route del default', shell=True)
+ call(self._render_config('hop', dict(
+ hops = self.hops,
+ )
+ ), shell=True)
+
+
+ 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] = Device(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')
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.route.flush('eth0')
+ ip.hop.delete('201.21.32.53','eth0')
+ ip.route.clear('eth0')
ip.commit()
- ip.addr.delete('eth0','192.168.0.23')
- ip.commit()
-
projects / software / pymin.git / blobdiff