Improve logging format.

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

diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py
index a6a0e676debb17b3aecb149e236181c2792daf72..0c0ea5f1457995d51869f0b4c245168ae15b44a8 100644 (file)
--- a/pymin/services/ip/__init__.py
+++ b/pymin/services/ip/__init__.py
@@ -8,7 +8,7 @@ from pymin.dispatcher import handler, HandlerError, Handler
 from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
                                 TransactionalHandler, SubHandler, call, \
                                 get_network_devices, ListComposedSubHandler, \
-                                DictComposedSubHandler
+                                DictComposedSubHandler, Device, Address, ExecutionError
 
 __ALL__ = ('IpHandler',)
 
@@ -105,13 +105,6 @@ class RouteHandler(ListComposedSubHandler):
     _comp_subhandler_attr = 'routes'
     _comp_subhandler_class = Route
 
-class Address(Sequence):
-    def __init__(self, ip, netmask, broadcast=None):
-        self.ip = ip
-        self.netmask = netmask
-        self.broadcast = broadcast
-    def as_tuple(self):
-        return (self.ip, self.netmask, self.broadcast)
 
 class AddressHandler(DictComposedSubHandler):
     handler_help = u"Manage IP addresses"
@@ -119,14 +112,6 @@ class AddressHandler(DictComposedSubHandler):
     _comp_subhandler_attr = 'addrs'
     _comp_subhandler_class = Address
 
-class Device(Sequence):
-    def __init__(self, name, mac):
-        self.name = name
-        self.mac = mac
-        self.addrs = dict()
-        self.routes = list()
-    def as_tuple(self):
-        return (self.name, self.mac)
 
 class DeviceHandler(SubHandler):
 
@@ -169,8 +154,7 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
     _persistent_attrs = ('devices','hops')
 
     _restorable_defaults = dict(
-                            devices=dict((dev, Device(dev, mac))
-                                for (dev, mac) in get_network_devices().items()),
+                            devices=get_network_devices(),
                             hops = list()
                             )
 
@@ -193,34 +177,52 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
     def _write_config(self):
         r"_write_config() -> None :: Execute all commands."
         for device in self.devices.values():
-            call(self._render_config('route_flush', dict(dev=device.name)), shell=True)
-            call(self._render_config('ip_flush', dict(dev=device.name)), shell=True)
+            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 = '+'
-                call(self._render_config('ip_add', dict(
+                try:
+                    call(self._render_config('ip_add', dict(
                         dev = device.name,
                         addr = address.ip,
                         netmask = address.netmask,
+                        peer = address.peer,
                         broadcast = broadcast,
-                    )
-                ), shell=True)
+                        )
+                    ), shell=True)
+                except ExecutionError, e:
+                      print e
             for route in device.routes:
-                call(self._render_config('route_add', dict(
-                        dev = device.name,
-                        net_addr = route.net_addr,
-                        prefix = route.prefix,
-                        gateway = route.gateway,
-                    )
-                ), shell=True)
-
+                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:
-            call('ip route del default', shell=True)
-            call(self._render_config('hop', dict(
-                        hops = self.hops,
-                    )
-                 ), shell=True)
+            try:
+                call('ip route del default', shell=True)
+            except ExecutionError, e:
+                print e
+            try:
+                call(self._render_config('hop', dict(
+                    hops = self.hops,
+                        )
+                ), shell=True)
+            except ExecutionError, e:
+                print e
 
 
     def handle_timer(self):
@@ -232,7 +234,7 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
         #add not registered devices
         for k,v in devices.items():
             if k not in self.devices:
-                self.devices[k] = Device(k,v)
+                self.devices[k] = v
         #delete dead devices
         for k in self.devices.keys():
             if k not in devices: