Support for inactive devices added in IPHandler.

diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py
index 0c0ea5f1457995d51869f0b4c245168ae15b44a8..965e812ea269ffa87658e07c53e81ac63683b090 100644 (file)
--- a/pymin/services/ip/__init__.py
+++ b/pymin/services/ip/__init__.py
@@ -177,68 +177,89 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
     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(self._render_config('route_flush', dict(dev=device.name)), shell=True)
+                call('ip route del default', shell=True)
             except ExecutionError, e:
                 print e
             try:
-                call(self._render_config('ip_flush', dict(dev=device.name)), shell=True)
+                #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
-            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,
-                        )
-                    ), shell=True)
-                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,
-                            prefix = route.prefix,
-                            gateway = route.gateway,
-                        )
-                     ), shell=True)
-                except ExecutionError, e:
-                    print e
-        if self.hops:
+
+    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)
+        except ExecutionError, e:
+            print e
+        for address in device.addrs.values():
+            broadcast = address.broadcast
+            if broadcast is None:
+                broadcast = '+'
             try:
-                call('ip route del default', shell=True)
+                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:
                 print e
+        for route in device.routes:
             try:
-                call(self._render_config('hop', dict(
-                    hops = self.hops,
-                        )
+                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:
                 print e
 
-
     def handle_timer(self):
         self.refresh_devices()
 
 
     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()
+        #mark inactive devices
         for k in self.devices.keys():
             if k not in devices:
-                del self.devices[k]
+                self.devices[k].active = False
 
 
 

diff --git a/pymin/services/util.py b/pymin/services/util.py
index 867b3b93b7ee1ecab73191c2564ab591cddda442..2d73c774389a3398d0e88765d008a8d21f613c76 100644 (file)
--- a/pymin/services/util.py
+++ b/pymin/services/util.py
@@ -171,10 +171,11 @@ class Device(Sequence):
         self.name = name
         self.mac = mac
         self.ppp = ppp
+        self.active = True
         self.addrs = dict()
         self.routes = list()
     def as_tuple(self):
-        return (self.name, self.mac, self.addrs)
+        return (self.name, self.mac, self.active, self.addrs)