Added support to hook services to IPHandler.

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

diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py
index 881f6958acc98564a4c2b23c3f547e9f30da2dd2..1c0b64618af64d1990ed863654e9451da55c9006 100644 (file)
--- a/pymin/services/ip/__init__.py
+++ b/pymin/services/ip/__init__.py
@@ -173,25 +173,63 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
         self.route = RouteHandler(self)
         self.dev = DeviceHandler(self)
         self.hop = HopHandler(self)
+               self.services = list()
 
     def _write_config(self):
         r"_write_config() -> None :: Execute all commands."
         for device in self.devices.values():
+            if device.active:
+                self._write_config_for_device(device)
+        self._write_hops()
+
+    def _write_hops(self):
+        r"_write_hops() -> None :: Execute all hops."
+        if self.hops:
+            try:
+                call('ip route del default', shell=True)
+            except ExecutionError, e:
+                print e
+            try:
+                #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(
+                    hops = active_hops,
+                        )
+                ), shell=True)
+            except ExecutionError, e:
+                print e
+
+    def _write_config_for_device(self, device):
+        r"_write_config_for_device(self, device) -> None :: Execute all commands for a device."
+        try:
             call(self._render_config('route_flush', dict(dev=device.name)), shell=True)
+        except ExecutionError, e:
+            print e
+        try:
             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 = '+'
+        except ExecutionError, e:
+            print e
+        for address in device.addrs.values():
+            broadcast = address.broadcast
+            if broadcast is None:
+                broadcast = '+'
+            try:
                 call(self._render_config('ip_add', dict(
-                        dev = device.name,
-                        addr = address.ip,
-                        netmask = address.netmask,
-                        peer = address.peer,
-                        broadcast = broadcast,
+                    dev = device.name,
+                    addr = address.ip,
+                    netmask = address.netmask,
+                    peer = address.peer,
+                    broadcast = broadcast,
                     )
                 ), shell=True)
-            for route in device.routes:
+            except ExecutionError, e:
+                print e
+        for route in device.routes:
+            try:
                 call(self._render_config('route_add', dict(
                         dev = device.name,
                         net_addr = route.net_addr,
@@ -199,14 +237,8 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
                         gateway = route.gateway,
                     )
                 ), shell=True)
-
-        if self.hops:
-            call('ip route del default', shell=True)
-            call(self._render_config('hop', dict(
-                        hops = self.hops,
-                    )
-                 ), shell=True)
-
+            except ExecutionError, e:
+                print e
 
     def handle_timer(self):
         self.refresh_devices()
@@ -214,14 +246,41 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
 
     def refresh_devices(self):
         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:
                 self.devices[k] = v
-        #delete dead devices
+            else if 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()
+                       for s in services:
+                               if s._running:
+                                       try:
+                                               s.stop()
+                                       except ExecutionError:
+                                               pass
+                                       try:
+                                               s.start()
+                                       except ExecutionError:
+                                               pass
+
+        #mark inactive devices
         for k in self.devices.keys():
             if k not in devices:
-                del self.devices[k]
+                self.devices[k].active = False
+
+       #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)
+
+