Fix: Finally fixing the gevent issues for the tng-sdk-benchmark intergration

Change-Id: I0b7b6b7f6efa8218ed4c9133a024f116599235eb
Signed-off-by: peusterm <manuel.peuster@uni-paderborn.de>

diff --git a/pipeline_local.sh b/pipeline_local.sh
index 1af9336..620d23b 100755 (executable)
--- a/pipeline_local.sh
+++ b/pipeline_local.sh
@@ -3,7 +3,7 @@
 set -e
 # trigger pep8 style check
 echo "Doing flake8 style check ..."
-flake8 --exclude=.eggs,devops --ignore=E501,W605,W504 .
+flake8 --exclude=.eggs,devops,examples/charms --ignore=E501,W605,W504 .
 echo "done."
 # trigger the tests
 echo "Running unit tests ..."
@@ -11,5 +11,5 @@ sudo pytest -v
 # do everything in Docker, like it is done by Jenkins
 docker build -t vim-emu-loc-test .
 docker run --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock vim-emu-loc-test pytest -v
-docker run --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock vim-emu-loc-test flake8 --exclude=.eggs,devops --ignore=E501,W605,W504 .
+docker run --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock vim-emu-loc-test flake8 --exclude=.eggs,devops,examples/charms --ignore=E501,W605,W504 .
 echo "done."

diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py
index 58c2bff..64c173b 100755 (executable)
--- a/src/emuvim/dcemulator/net.py
+++ b/src/emuvim/dcemulator/net.py
@@ -42,7 +42,7 @@ from emuvim.dcemulator.node import Datacenter, EmulatorCompute
 from emuvim.dcemulator.resourcemodel import ResourceModelRegistrar
 
 # ensure correct functionality of all gevent based REST servers
-monkey.patch_all(sys=True)
+monkey.patch_all()
 
 # setup logging
 LOG = logging.getLogger("dcemulator.net")

diff --git a/src/emuvim/test/base.py b/src/emuvim/test/base.py
index 9271f56..6221765 100755 (executable)
--- a/src/emuvim/test/base.py
+++ b/src/emuvim/test/base.py
@@ -23,10 +23,6 @@
 # the Horizon 2020 and 5G-PPP programmes. The authors would like to
 # acknowledge the contributions of their colleagues of the SONATA
 # partner consortium (www.sonata-nfv.eu).
-
-from gevent import monkey
-monkey.patch_all()  # noqa: because otherwise pep complains about code before imports
-
 import unittest
 import os
 import subprocess