Added route handling capabilities and service restarting

upon device events such as up and down.

diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py
index 82a789e4a4c502f8475d7f0fb61bce88fa5f405b..b1d50b2262378aed9ca20d1c4d144438a89b757c 100644 (file)
--- a/pymin/services/ip/__init__.py
+++ b/pymin/services/ip/__init__.py
@@ -92,19 +92,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"


@@ -141,6 +173,8 @@ class DeviceHandler(SubHandler):
                     ), shell=True)
                 except ExecutionError, e:
                     print e
                     ), shell=True)
                 except ExecutionError, e:
                     print e

+            self.parent._bring_up_no_dev_routes()
+            self.parent._restart_services()

         else:
             raise DeviceNotFoundError(name)
 
         else:
             raise DeviceNotFoundError(name)
 


@@ -148,6 +182,8 @@ class DeviceHandler(SubHandler):
     def down(self, name):
         if name in self.parent.devices:
             call(self.device_template.render(dev=name, action='down'), shell=True)
     def down(self, 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:
             raise DeviceNotFoundError(name)
 
         else:
             raise DeviceNotFoundError(name)
 


@@ -163,11 +199,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',


@@ -185,6 +222,7 @@ 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):
         self.services = list()
 
     def _write_config(self):


@@ -192,8 +230,22 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
         for device in self.devices.values():
             if device.active:
                 self._write_config_for_device(device)
         for device in self.devices.values():
             if device.active:
                 self._write_config_for_device(device)

+        self._bring_up_no_dev_routes()

         self._write_hops()
 
         self._write_hops()
 

+    def _bring_up_no_dev_routes(self):
+        for route in self.no_device_routes:
+            try:
+                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:
+                print e
+

     def _write_hops(self):
         r"_write_hops() -> None :: Execute all hops."
         if self.hops:
     def _write_hops(self):
         r"_write_hops() -> None :: Execute all hops."
         if self.hops:


@@ -269,28 +321,36 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
                 self._write_config_for_device(self.devices[k])
         if go_active:
             self._write_hops()
                 self._write_config_for_device(self.devices[k])
         if go_active:
             self._write_hops()

-            for s in services:
-                if s._running:
-                    try:
-                        s.stop()
-                    except ExecutionError:
-                        pass
-                    try:
-                        s.start()
-                    except ExecutionError:
-                        pass
+            self._bring_up_no_dev_routes()
+            self._restart_services()

 
         #mark inactive devices
         for k in self.devices.keys():
 
         #mark inactive devices
         for k in self.devices.keys():

+            go_down = False

             if k not in devices:
                 self.devices[k].active = False
             if k not in devices:
                 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
 
        #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'):
-                       services.append(serv)
+    def device_up_hook(self, serv):
+        if hasattr(serv, 'stop') and hasattr(serv, 'start'):
+            self.services.append(serv)

 
 
 
 
 
 

diff --git a/pymin/services/ip/templates/route_add b/pymin/services/ip/templates/route_add
index 4b92915ff33222fecd983c38ad036560b62b6621..fdaf1a4e6f52753f9f87adda57fac5f04fdcb798 100644 (file)
--- a/pymin/services/ip/templates/route_add
+++ b/pymin/services/ip/templates/route_add
@@ -1 +1,5 @@
-ip route add dev ${dev} ${net_addr}/${prefix} via ${gateway}
\ No newline at end of file
+%if dev is not None:
+ip route add dev ${dev} ${net_addr}/${prefix} via ${gateway}
+%else:
+ip route add ${net_addr}/${prefix} via ${gateway}
+%endif
\ No newline at end of file