Fix so that when a device is brought back up, the routes

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

diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py
index 1c0b64618af64d1990ed863654e9451da55c9006..82a789e4a4c502f8475d7f0fb61bce88fa5f405b 100644 (file)
--- a/pymin/services/ip/__init__.py
+++ b/pymin/services/ip/__init__.py
@@ -129,6 +129,18 @@ class DeviceHandler(SubHandler):
     def up(self, name):
         if name in self.parent.devices:
             call(self.device_template.render(dev=name, action='up'), shell=True)
     def up(self, 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:
+                    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:
+                    print e

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


@@ -173,7 +185,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.services = list()
+        self.services = list()

 
     def _write_config(self):
         r"_write_config() -> None :: Execute all commands."
 
     def _write_config(self):
         r"_write_config() -> None :: Execute all commands."


@@ -194,7 +206,7 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
                 active_hops = dict()
                 for h in self.hops:
                     if h.device in self.devices:
                 active_hops = dict()
                 for h in self.hops:
                     if h.device in self.devices:

-                        if self.devices[h.device].active
+                        if self.devices[h.device].active:

                             active_hops.append(h)
                 call(self._render_config('hop', dict(
                     hops = active_hops,
                             active_hops.append(h)
                 call(self._render_config('hop', dict(
                     hops = active_hops,


@@ -251,22 +263,22 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
         for k,v in devices.items():
             if k not in self.devices:
                 self.devices[k] = v
         for k,v in devices.items():
             if k not in self.devices:
                 self.devices[k] = v

-            else if not self.devices[k].active
+            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.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
+            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():
 
         #mark inactive devices
         for k in self.devices.keys():


@@ -277,7 +289,7 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
        #a device is brought up one can restart the service
        #that need to refresh their device list
        def device_up_hook(self, serv):
        #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')
+               if hasattr(serv, 'stop') and hasattr(serv, 'start'):

                        services.append(serv)
 
 
                        services.append(serv)