From 3bcf0a71300d181ebc8b3ab188eb5a4015468480 Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Sat, 19 Jul 2014 16:06:53 +0200 Subject: [PATCH] Ignoring error on NETNSWrapper when NETNS is not instaled --- src/nepi/execution/ec.py | 10 +++++++++- src/nepi/resources/netns/netnswrapper.py | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/nepi/execution/ec.py b/src/nepi/execution/ec.py index ad698932..a63c40d7 100644 --- a/src/nepi/execution/ec.py +++ b/src/nepi/execution/ec.py @@ -203,7 +203,7 @@ class ExperimentController(object): # The runner is a pool of threads used to parallelize # execution of tasks - nthreads = int(os.environ.get("NEPI_NTHREADS", "3")) + nthreads = int(os.environ.get("NEPI_NTHREADS", "20")) self._runner = ParallelRun(maxthreads = nthreads) # Event processing thread @@ -219,6 +219,14 @@ class ExperimentController(object): """ return self._logger + @property + def failure_level(self): + """ Returns the level of FAILURE of th experiment + + """ + + return self._fm._failure_level + @property def ecstate(self): """ Returns the state of the Experiment Controller diff --git a/src/nepi/resources/netns/netnswrapper.py b/src/nepi/resources/netns/netnswrapper.py index f2e1e7a9..34120af1 100644 --- a/src/nepi/resources/netns/netnswrapper.py +++ b/src/nepi/resources/netns/netnswrapper.py @@ -18,12 +18,16 @@ # Author: Alina Quereilhac import logging -import netns import time import os import sys import uuid +try: + import netns +except ImportError: + pass + class NetNSWrapper(object): def __init__(self, loglevel = logging.INFO, enable_dump = False): super(NetNSWrapper, self).__init__() -- 2.47.0