X-Git-Url: https://git.llucax.com/software/pymin.git/blobdiff_plain/7c5adb595e720d430734532b5f3c9a337198a047..09ea1d35ebdfec884409a2e567946464822a1cd3:/pymin/services/util.py diff --git a/pymin/services/util.py b/pymin/services/util.py index 739b109..f3bb013 100644 --- a/pymin/services/util.py +++ b/pymin/services/util.py @@ -13,8 +13,8 @@ from pymin.dispatcher import Handler, handler, HandlerError, \ CommandNotFoundError from pymin.seqtools import Sequence -DEBUG = False -#DEBUG = True +#DEBUG = False +DEBUG = True __ALL__ = ('Error', 'ReturnNot0Error', 'ExecutionError', 'ItemError', 'ItemAlreadyExistsError', 'ItemNotFoundError', 'ContainerError', @@ -171,10 +171,11 @@ class Device(Sequence): self.name = name self.mac = mac self.ppp = ppp + self.active = True 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) @@ -216,9 +217,8 @@ def get_network_devices(): d[name].addrs[from_addr] = Address(from_addr,24, peer=to_addr) except IndexError: pass - return d - + def get_peers(): p = subprocess.Popen(('ip', '-o', 'addr'), stdout=subprocess.PIPE, close_fds=True)