Merge ../t/pymin/

Conflicts:

	pymin/services/ip/__init__.py

diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py
index 94d681b7ccae135f6d5e6280f58f35ef10acb6c2..1f3aeefaec267790c35ee7958f2b759ccf3ef940 100644 (file)
--- a/pymin/services/ip/__init__.py
+++ b/pymin/services/ip/__init__.py
@@ -12,6 +12,81 @@ from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
 
 __ALL__ = ('IpHandler',)
 
+# 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
@@ -92,15 +167,18 @@ class DeviceHandler(SubHandler):
 
 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=dict((dev, Device(dev, mac))
-                            for (dev, mac) in get_network_devices().items()))
+    _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='.'):
@@ -112,34 +190,63 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
         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,
                         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')
@@ -147,11 +254,9 @@ if __name__ == '__main__':
     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()
-
 
 
 

diff --git a/pymin/services/ip/templates/hop b/pymin/services/ip/templates/hop
new file mode 100644 (file)
index 0000000..2c086dc
--- /dev/null
+++ b/pymin/services/ip/templates/hop
@@ -0,0 +1,5 @@
+ip route add default \
+% for hop in hops:
+nexthop via ${hop.gateway} dev ${hop.device} weight 1 \
+% endfor
+;