X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/52d87d11873f1a37b21100700f4798a375361f3f..2da28680c91f616a62596fed596c2e60edcf3b8e:/pymin/services/ip/__init__.py?ds=sidebyside

diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py
index 1f3aeef..7b5eafe 100644
--- a/pymin/services/ip/__init__.py
+++ b/pymin/services/ip/__init__.py
@@ -14,7 +14,7 @@ __ALL__ = ('IpHandler',)
 
 # TODO: convertir HopHandler a ComposedSubHandler
 
-class HopError(Error):
+class HopError(HandlerError):
 
     def __init__(self, hop):
         self.message = u'Hop error : "%s"' % hop
@@ -110,9 +110,6 @@ class Address(Sequence):
         self.ip = ip
         self.netmask = netmask
         self.broadcast = broadcast
-    def update(self, netmask=None, broadcast=None):
-        if netmask is not None: self.netmask = netmask
-        if broadcast is not None: self.broadcast = broadcast
     def as_tuple(self):
         return (self.ip, self.netmask, self.broadcast)
 
@@ -187,6 +184,7 @@ class IpHandler(Restorable, ConfigWriter, TransactionalHandler):
         self._config_writer_cfg_dir = config_dir
         self._config_build_templates()
         self._restore()
+        self._write_config()
         self.addr = AddressHandler(self)
         self.route = RouteHandler(self)
         self.dev = DeviceHandler(self)
@@ -195,49 +193,34 @@ 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)
-            print self._render_config('route_flush', dict(dev=device.name))
-            #call(self._render_config('ip_flush', dict(dev=device.name)), shell=True)
-            print self._render_config('ip_flush', dict(dev=device.name))
+            call(self._render_config('route_flush', dict(dev=device.name)), shell=True)
+            call(self._render_config('ip_flush', dict(dev=device.name)), shell=True)
             for address in device.addrs.values():
-                print self._render_config('ip_add', dict(
+                broadcast = address.broadcast
+                if broadcast is None:
+                    broadcast = '+'
+                call(self._render_config('ip_add', dict(
                         dev = device.name,
                         addr = address.ip,
                         netmask = address.netmask,
-                        broadcast = address.broadcast,
-                    ))
-                #call(self._render_config('ip_add', dict(
-                        #dev = device.name,
-                        #addr = address.ip,
-                        #prefix = address.prefix,
-                        #broadcast = address.broadcast,
-                    #)
-                #), shell=True)
+                        broadcast = broadcast,
+                    )
+                ), shell=True)
             for route in device.routes:
-                print self._render_config('route_add', dict(
+                call(self._render_config('route_add', dict(
                         dev = device.name,
                         net_addr = route.net_addr,
                         prefix = route.prefix,
                         gateway = route.gateway,
-                    ))
-                #call(self._render_config('route_add', dict(
-                        #dev = device.name,
-                        #net_addr = route.net_addr,
-                        #prefix = route.prefix,
-                        #gateway = route.gateway,
-                    #)
-                #), shell=True)
+                    )
+                ), shell=True)
 
         if self.hops:
-            print 'ip route del default'
-            #call('ip route del default', shell=True)
-            print self._render_config('hop', dict(
+            call('ip route del default', shell=True)
+            call(self._render_config('hop', dict(
                         hops = self.hops,
-                    ))
-            #call(self._render_config('hop', dict(
-                        #hops = self.hops,
-                    #)
-                 #), shell=True)
+                    )
+                 ), shell=True)
 
 
 if __name__ == '__main__':