Merge branch 'master' of git.llucax.com.ar:/var/lib/git/software/pymin

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

diff --git a/pymin/services/util.py b/pymin/services/util.py
index b8a2ace83a66f1f05c1da64ee5168c3730b5b5fd..cb97815e2b1bf9892bbf7b1803de06240859350f 100644 (file)
--- a/pymin/services/util.py
+++ b/pymin/services/util.py
@@ -16,13 +16,13 @@ from pymin.seqtools import Sequence
 #DEBUG = False
 DEBUG = True
 
 #DEBUG = False
 DEBUG = True
 

-__ALL__ = ('Error', 'ReturnNot0Error', 'ExecutionError', 'ItemError',
-            'ItemAlreadyExistsError', 'ItemNotFoundError', 'ContainerError',
-            'ContainerNotFoundError', 'call', 'get_network_devices',
-            'Persistent', 'Restorable', 'ConfigWriter', 'ServiceHandler',
-            'RestartHandler', 'ReloadHandler', 'InitdHandler', 'SubHandler',
-            'DictSubHandler', 'ListSubHandler', 'ComposedSubHandler',
-            'ListComposedSubHandler', 'DictComposedSubHandler', 'Device','Address')
+__ALL__ = ('Error', 'ExecutionError', 'ItemError', 'ItemAlreadyExistsError',
+           'ItemNotFoundError', 'ContainerError', 'ContainerNotFoundError',
+           'call', 'get_network_devices', 'Persistent', 'Restorable',
+           'ConfigWriter', 'ServiceHandler', 'RestartHandler',
+           'ReloadHandler', 'InitdHandler', 'SubHandler', 'DictSubHandler',
+           'ListSubHandler', 'ComposedSubHandler', 'ListComposedSubHandler',
+           'DictComposedSubHandler', 'Device','Address')

 
 class Error(HandlerError):
     r"""
 
 class Error(HandlerError):
     r"""


@@ -35,22 +35,6 @@ class Error(HandlerError):
     """
     pass
 
     """
     pass
 

-class ReturnNot0Error(Error):
-    r"""
-    ReturnNot0Error(return_value) -> ReturnNot0Error instance.
-
-    A command didn't returned the expected 0 return value.
-
-    return_value - Return value returned by the command.
-    """
-
-    def __init__(self, return_value):
-        r"Initialize the object. See class documentation for more info."
-        self.return_value = return_value
-
-    def __unicode__(self):
-        return 'The command returned %d' % self.return_value
-

 class ExecutionError(Error):
     r"""
     ExecutionError(command, error) -> ExecutionError instance.
 class ExecutionError(Error):
     r"""
     ExecutionError(command, error) -> ExecutionError instance.


@@ -171,10 +155,11 @@ class Device(Sequence):
         self.name = name
         self.mac = mac
         self.ppp = ppp
         self.name = name
         self.mac = mac
         self.ppp = ppp

+        self.active = True

         self.addrs = dict()
         self.routes = list()
     def as_tuple(self):
         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)

 
 
 
 
 
 


@@ -232,13 +217,11 @@ def call(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
         return
     try:
         print 'Executing command:', command
         return
     try:
         print 'Executing command:', command

-        r = subprocess.call(command, stdin=stdin, stdout=stdout, stderr=stderr,
-                                universal_newlines=universal_newlines,
-                                close_fds=close_fds, **kw)
+        r = subprocess.check_call(command, stdin=stdin, stdout=stdout,
+                    stderr=stderr, close_fds=close_fds,
+                    universal_newlines=universal_newlines, **kw)

     except Exception, e:
         raise ExecutionError(command, e)
     except Exception, e:
         raise ExecutionError(command, e)

-    if r is not 0:
-        raise ExecutionError(command, ReturnNot0Error(r))

 
 class Persistent:
     r"""Persistent([attrs[, dir[, ext]]]) -> Persistent.
 
 class Persistent:
     r"""Persistent([attrs[, dir[, ext]]]) -> Persistent.