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 <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)
+
+ @handler(u'Deletes a hop : delete <gateway> <device>')
+ 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 <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):
self.net_addr = net_addr
self.prefix = prefix
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='.'):
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,
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()
-
projects / software / pymin.git / commitdiff