Convert Rule to Item for validation in firewall service handler.

[software/pymin.git] / pymin / services / ip / __init__.py

diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py
index 71354abdbba6983ce20618ec4bed4a17261c01db..98690985575f0f8b7bcd7e5d55e879b97946543d 100644 (file)
--- a/pymin/services/ip/__init__.py
+++ b/pymin/services/ip/__init__.py
@@ -12,7 +12,7 @@ from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
                                 DictComposedSubHandler, Device, Address, \
                                 ExecutionError
 
                                 DictComposedSubHandler, Device, Address, \
                                 ExecutionError
 

-__ALL__ = ('IpHandler',)
+__all__ = ('IpHandler',)

 
 # TODO: convertir HopHandler a ComposedSubHandler
 
 
 # TODO: convertir HopHandler a ComposedSubHandler
 


@@ -94,19 +94,51 @@ class Route(Sequence):
         self.net_addr = net_addr
         self.prefix = prefix
         self.gateway = 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 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)
 
     def as_tuple(self):
         return(self.net_addr, self.prefix, self.gateway)
 

+    def __cmp__(self, other):
+        if self.net_addr == other.net_addr \
+                and self.prefix == other.prefix \
+                and self.gateway == other.gateway:
+            return 0
+        return cmp(id(self), id(other))
+

 class RouteHandler(ListComposedSubHandler):
     handler_help = u"Manage IP routes"
     _comp_subhandler_cont = 'devices'
     _comp_subhandler_attr = 'routes'
     _comp_subhandler_class = Route
 
 class RouteHandler(ListComposedSubHandler):
     handler_help = u"Manage IP routes"
     _comp_subhandler_cont = 'devices'
     _comp_subhandler_attr = 'routes'
     _comp_subhandler_class = Route
 

+    @handler(u'Adds a route to : ip route add <net_addr> <prefix> <gateway> [device]')
+    def add(self, net_addr, prefix, gateway, dev=None):
+        if dev is not None:
+            ListComposedSubHandler.add(self, dev, net_addr, prefix, gateway)
+        else:
+            r = Route(net_addr, prefix, gateway)
+            if not r in self.parent.no_device_routes:
+                self.parent.no_device_routes.append(r)
+
+    @handler("Deletes a route : ip route delete <route_number_in_show> [dev]")
+    def delete(self, index, dev=None):
+        if dev is not None:
+            ListComposedSubHandler.delete(self, dev, index)
+        else:
+            i = int(index)
+            del self.parent.no_device_routes[i]
+
+    @handler("Shows routes : ip route show [dev]")
+    def show(self, dev=None):
+        if dev is not None:
+            return ListComposedSubHandler.show(self, dev)
+        else:
+            return self.parent.no_device_routes

 
 class AddressHandler(DictComposedSubHandler):
     handler_help = u"Manage IP addresses"
 
 class AddressHandler(DictComposedSubHandler):
     handler_help = u"Manage IP addresses"


@@ -133,6 +165,21 @@ class DeviceHandler(SubHandler):
         log.debug(u'DeviceHandler.up(%r)', name)
         if name in self.parent.devices:
             call(self.device_template.render(dev=name, action='up'), shell=True)
         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,
+                            prefix = route.prefix,
+                            gateway = route.gateway,
+                        )
+                    ), shell=True)
+                except ExecutionError, 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)
         else:
             log.debug(u'DeviceHandler.up: device not found')
             raise DeviceNotFoundError(name)


@@ -142,6 +189,8 @@ class DeviceHandler(SubHandler):
         log.debug(u'DeviceHandler.down(%r)', name)
         if name in self.parent.devices:
             call(self.device_template.render(dev=name, action='down'), shell=True)
         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)
         else:
             log.debug(u'DeviceHandler.up: device not found')
             raise DeviceNotFoundError(name)


@@ -160,11 +209,12 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
 
     handler_help = u"Manage IP devices, addresses, routes and hops"
 
 
     handler_help = u"Manage IP devices, addresses, routes and hops"
 

-    _persistent_attrs = ('devices','hops')
+    _persistent_attrs = ('devices','hops','no_device_routes')

 
     _restorable_defaults = dict(
                             devices=get_network_devices(),
 
     _restorable_defaults = dict(
                             devices=get_network_devices(),

-                            hops = list()
+                            hops = list(),
+                            no_device_routes = list(),

                             )
 
     _config_writer_files = ('device', 'ip_add', 'ip_del', 'ip_flush',
                             )
 
     _config_writer_files = ('device', 'ip_add', 'ip_del', 'ip_flush',


@@ -183,65 +233,108 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
         self.route = RouteHandler(self)
         self.dev = DeviceHandler(self)
         self.hop = HopHandler(self)
         self.route = RouteHandler(self)
         self.dev = DeviceHandler(self)
         self.hop = HopHandler(self)

+        self.no_device_routes = list()
+        self.services = list()

 
     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)
 
     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:
             try:

-                log.debug(u'IpHandler._write_config: flushing routes...')
-                call(self._render_config('route_flush', dict(dev=device.name)),
-                        shell=True)
-            except ExecutionError, e:
-                log.debug(u'IpHandler._write_config: error flushing -> %r', e)
-            try:
-                log.debug(u'IpHandler._write_config: flushing addrs...')
-                call(self._render_config('ip_flush', dict(dev=device.name)),
-                        shell=True)
+                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,
+                        prefix = route.prefix,
+                        gateway = route.gateway,
+                    )
+                ), shell=True)

             except ExecutionError, e:
                 log.debug(u'IpHandler._write_config: error flushing -> %r', e)
             except ExecutionError, e:
                 log.debug(u'IpHandler._write_config: error flushing -> %r', e)

-            for address in device.addrs.values():
-                broadcast = address.broadcast
-                if broadcast is None:
-                    broadcast = '+'
-                try:
-                    log.debug(u'IpHandler._write_config: adding %r', address)
-                    call(self._render_config('ip_add', dict(
-                            dev = device.name,
-                            addr = address.ip,
-                            netmask = address.netmask,
-                            peer = address.peer,
-                            broadcast = broadcast,
-                        )), shell=True)
-                except ExecutionError, e:
-                    log.debug(u'IpHandler._write_config: error adding -> %r', e)
-            for route in device.routes:
-                try:
-                    log.debug(u'IpHandler._write_config: adding %r', route)
-                    call(self._render_config('route_add', dict(
-                            dev = device.name,
-                            net_addr = route.net_addr,
-                            prefix = route.prefix,
-                            gateway = route.gateway,
-                        )), shell=True)
-                except ExecutionError, e:
-                    log.debug(u'IpHandler._write_config: error adding -> %r', e)
+
+    def _write_hops(self):
+        r"_write_hops() -> None :: Execute all hops."
+        log.debug(u'IpHandler._write_hops()')

         if self.hops:
         if self.hops:

-            log.debug(u'IpHandler._write_config: we have hops: %r', self.hops)
+            log.debug(u'IpHandler._write_hops: we have hops: %r', self.hops)

             try:
             try:

-                log.debug(u'IpHandler._write_config: flushing default route')
+                log.debug(u'IpHandler._write_hops: flushing default hops')

                 call('ip route del default', shell=True)
             except ExecutionError, e:
                 call('ip route del default', shell=True)
             except ExecutionError, e:

-                log.debug(u'IpHandler._write_config: error adding -> %r', e)
+                log.debug(u'IpHandler._write_hops: error adding -> %r', e)

             try:
             try:

-                log.debug(u'IpHandler._write_config: configuring hops')
+                log.debug(u'IpHandler._write_hops: configuring hops')
+                #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(
                 call(self._render_config('hop', dict(

-                    hops = self.hops,
+                    hops = active_hops,

                         )
                 ), shell=True)
             except ExecutionError, e:
                         )
                 ), shell=True)
             except ExecutionError, e:

-                log.debug(u'IpHandler._write_config: error adding -> %r', 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 commands."
+        log.debug(u'IpHandler._write_config_for_device()')
+        try:
+            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:
+            log.debug(u'IpHandler._write_config_for_device: error flushing '
+                        u'-> %r', e)
+        try:
+            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:
+            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,
+                    netmask = address.netmask,
+                    peer = address.peer,
+                    broadcast = broadcast,
+                    )
+                ), shell=True)
+            except ExecutionError, 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,
+                        prefix = route.prefix,
+                        gateway = route.gateway,
+                    )
+                ), shell=True)
+            except ExecutionError, e:
+                log.debug(u'IpHandler._write_config_for_device: error adding '
+                            u'-> %r', e)

 
     def handle_timer(self):
         log.debug(u'IpHandler.handle_timer()')
 
     def handle_timer(self):
         log.debug(u'IpHandler.handle_timer()')


@@ -250,16 +343,51 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
     def refresh_devices(self):
         log.debug(u'IpHandler.update_devices()')
         devices = get_network_devices()
     def refresh_devices(self):
         log.debug(u'IpHandler.update_devices()')
         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:
                 log.debug(u'IpHandler.update_devices: adding %r', v)
                 self.devices[k] = v
         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

-        #delete dead devices
+            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()
+            self._bring_up_no_dev_routes()
+            self._restart_services()
+
+        #mark inactive devices

         for k in self.devices.keys():
         for k in self.devices.keys():

+            go_down = False

             if k not in devices:
                 log.debug(u'IpHandler.update_devices: removing %s', k)
             if k not in devices:
                 log.debug(u'IpHandler.update_devices: removing %s', k)

-                del self.devices[k]
+                self.devices[k].active = False
+                go_down = True
+            if go_down:
+                self._bring_up_no_dev_routes()
+
+    def _restart_services(self):
+        for s in self.services:
+            if s._service_running:
+                try:
+                     s.stop()
+                except ExecutionError:
+                    pass
+                try:
+                    s.start()
+                except ExecutionError:
+                    pass
+
+       #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'):
+            self.services.append(serv)
+
+