qos implementation fixes

[software/pymin.git] / pymin / services / util.py

diff --git a/pymin/services/util.py b/pymin/services/util.py
index f5f6b520fc1bf48f0ad8e227635970c0dfe8df50..6e09148f864f471157a11de5bbf225945ffbce21 100644 (file)
--- a/pymin/services/util.py
+++ b/pymin/services/util.py
@@ -154,18 +154,26 @@ class ContainerNotFoundError(ContainerError):
 
 
 def get_network_devices():
 
 
 def get_network_devices():

-    p = subprocess.Popen(('ip', 'link', 'list'), stdout=subprocess.PIPE,
+    p = subprocess.Popen(('ip', '-o', 'link'), stdout=subprocess.PIPE,

                                                     close_fds=True)
     string = p.stdout.read()
     p.wait()
     d = dict()
                                                     close_fds=True)
     string = p.stdout.read()
     p.wait()
     d = dict()

-    i = string.find('eth')
-    while i != -1:
-        eth = string[i:i+4]
-        m = string.find('link/ether', i+4)
-        mac = string[ m+11 : m+11+17]
-        d[eth] = mac
-        i = string.find('eth', m+11+17)
+    devices = string.splitlines()
+    for dev in devices:
+        mac = ''
+        if dev.find('link/ether') != -1:
+            i = dev.find('link/ether')
+            mac = dev[i+11 : i+11+17]
+            i = dev.find(':',2)
+            name = dev[3: i]
+            d[name] = mac
+        elif dev.find('link/ppp') != -1:
+            i = dev.find('link/ppp')
+            mac =  '00:00:00:00:00:00'
+            i = dev.find(':',2)
+            name = dev[3 : i]
+            d[name] = mac

     return d
 
 def call(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
     return d
 
 def call(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE,


@@ -293,9 +301,6 @@ class Restorable(Persistent):
         r"_restore() -> bool :: Restore persistent data or create a default."
         try:
             self._load()
         r"_restore() -> bool :: Restore persistent data or create a default."
         try:
             self._load()

-            # TODO tener en cuenta servicios que hay que levantar y los que no
-            if hasattr(self, 'commit'): # TODO deberia ser reload y/o algo para comandos
-                self.commit()

             return True
         except IOError:
             for (k, v) in self._restorable_defaults.items():
             return True
         except IOError:
             for (k, v) in self._restorable_defaults.items():


@@ -307,8 +312,6 @@ class Restorable(Persistent):
             self._dump()
             if hasattr(self, '_write_config'):
                 self._write_config()
             self._dump()
             if hasattr(self, '_write_config'):
                 self._write_config()

-            if hasattr(self, 'reload'):
-                self.reload()

             return False
 
 class ConfigWriter:
             return False
 
 class ConfigWriter:


@@ -436,7 +439,7 @@ class ConfigWriter:
             self._write_single_config(t)
 
 
             self._write_single_config(t)
 
 

-class ServiceHandler(Handler):
+class ServiceHandler(Handler, Restorable):

     r"""ServiceHandler([start[, stop[, restart[, reload]]]]) -> ServiceHandler.
 
     This is a helper class to inherit from to automatically handle services
     r"""ServiceHandler([start[, stop[, restart[, reload]]]]) -> ServiceHandler.
 
     This is a helper class to inherit from to automatically handle services


@@ -467,26 +470,63 @@ class ServiceHandler(Handler):
                                                     reload=reload).items():
             if action is not None:
                 setattr(self, '_service_%s' % name, action)
                                                     reload=reload).items():
             if action is not None:
                 setattr(self, '_service_%s' % name, action)

+        self._persistent_attrs = list(self._persistent_attrs)
+        self._persistent_attrs.append('_service_running')
+        if '_service_running' not in self._restorable_defaults:
+            self._restorable_defaults['_service_running'] = False
+        self._restore()
+        if self._service_running:
+            self._service_running = False
+            self.start()

 
     @handler(u'Start the service.')
     def start(self):
         r"start() -> None :: Start the service."
 
     @handler(u'Start the service.')
     def start(self):
         r"start() -> None :: Start the service."

-        call(self._service_start)
+        if not self._service_running:
+            if callable(self._service_start):
+                self._service_start()
+            else:
+                call(self._service_start)
+            self._service_running = True
+            self._dump_attr('_service_running')

 
     @handler(u'Stop the service.')
     def stop(self):
         r"stop() -> None :: Stop the service."
 
     @handler(u'Stop the service.')
     def stop(self):
         r"stop() -> None :: Stop the service."

-        call(self._service_stop)
+        if self._service_running:
+            if callable(self._service_stop):
+                self._service_stop()
+            else:
+                call(self._service_stop)
+            self._service_running = False
+            self._dump_attr('_service_running')

 
     @handler(u'Restart the service.')
     def restart(self):
         r"restart() -> None :: Restart the service."
 
     @handler(u'Restart the service.')
     def restart(self):
         r"restart() -> None :: Restart the service."

-        call(self._service_restart)
+        if callable(self._service_restart):
+            self._service_restart()
+        else:
+            call(self._service_restart)
+        self._service_running = True
+        self._dump_attr('_service_running')

 
     @handler(u'Reload the service config (without restarting, if possible).')
     def reload(self):
         r"reload() -> None :: Reload the configuration of the service."
 
     @handler(u'Reload the service config (without restarting, if possible).')
     def reload(self):
         r"reload() -> None :: Reload the configuration of the service."

-        call(self._service_reload)
+        if self._service_running:
+            if callable(self._service_reload):
+                self._service_reload()
+            else:
+                call(self._service_reload)
+
+    @handler(u'Tell if the service is running.')
+    def running(self):
+        r"reload() -> None :: Reload the configuration of the service."
+        if self._service_running:
+            return 1
+        else:
+            return 0

 
 class RestartHandler(Handler):
     r"""RestartHandler() -> RestartHandler :: Provides generic restart command.
 
 class RestartHandler(Handler):
     r"""RestartHandler() -> RestartHandler :: Provides generic restart command.


@@ -512,9 +552,11 @@ class ReloadHandler(Handler):
     @handler(u'Reload the service config (alias to restart).')
     def reload(self):
         r"reload() -> None :: Reload the configuration of the service."
     @handler(u'Reload the service config (alias to restart).')
     def reload(self):
         r"reload() -> None :: Reload the configuration of the service."

-        self.restart()
+        if hasattr(self, '_service_running') and self._service_running:
+            self.restart()

 
 

-class InitdHandler(Handler):
+class InitdHandler(ServiceHandler):
+    # TODO update docs, declarative style is depracated

     r"""InitdHandler([initd_name[, initd_dir]]) -> InitdHandler.
 
     This is a helper class to inherit from to automatically handle services
     r"""InitdHandler([initd_name[, initd_dir]]) -> InitdHandler.
 
     This is a helper class to inherit from to automatically handle services


@@ -543,26 +585,11 @@ class InitdHandler(Handler):
             self._initd_name = initd_name
         if initd_dir is not None:
             self._initd_dir = initd_dir
             self._initd_name = initd_name
         if initd_dir is not None:
             self._initd_dir = initd_dir

-
-    @handler(u'Start the service.')
-    def start(self):
-        r"start() -> None :: Start the service."
-        call((path.join(self._initd_dir, self._initd_name), 'start'))
-
-    @handler(u'Stop the service.')
-    def stop(self):
-        r"stop() -> None :: Stop the service."
-        call((path.join(self._initd_dir, self._initd_name), 'stop'))
-
-    @handler(u'Restart the service.')
-    def restart(self):
-        r"restart() -> None :: Restart the service."
-        call((path.join(self._initd_dir, self._initd_name), 'restart'))
-
-    @handler(u'Reload the service config (without restarting, if possible).')
-    def reload(self):
-        r"reload() -> None :: Reload the configuration of the service."
-        call((path.join(self._initd_dir, self._initd_name), 'reload'))
+        actions = dict()
+        for action in ('start', 'stop', 'restart', 'reload'):
+            actions[action] = (path.join(self._initd_dir, self._initd_name),
+                                action)
+        ServiceHandler.__init__(self, **actions)

 
 class TransactionalHandler(Handler):
     r"""Handle command transactions providing a commit and rollback commands.
 
 class TransactionalHandler(Handler):
     r"""Handle command transactions providing a commit and rollback commands.


@@ -585,9 +612,10 @@ class TransactionalHandler(Handler):
         r"commit() -> None :: Commit the changes and reload the service."
         if hasattr(self, '_dump'):
             self._dump()
         r"commit() -> None :: Commit the changes and reload the service."
         if hasattr(self, '_dump'):
             self._dump()

+        unchanged = False

         if hasattr(self, '_write_config'):
         if hasattr(self, '_write_config'):

-            self._write_config()
-        if hasattr(self, 'reload'):
+            unchanged = self._write_config()
+        if not unchanged and hasattr(self, 'reload'):

             self.reload()
 
     @handler(u'Discard all the uncommited changes.')
             self.reload()
 
     @handler(u'Discard all the uncommited changes.')