Fix: Fixes broken installation because of third party library update.

Change-Id: If94adb111ae5bf89f977ad857807f89ee61f71d8
Signed-off-by: peusterm <[email protected]>

devops-stages/stage-test.sh

@@ -41,7 +41,7 @@ echo "Tests executed by user: $(whoami)"
 cd /son-emu/
 # trigger pep8 style check
 echo "Doing flake8 style check ..."
-flake8 --exclude=.eggs,devops --ignore=E501 .
+flake8 --exclude=.eggs,devops --ignore=E501,W605,W504 .
 echo "done."
 # trigger the tests
 echo "Running unit tests ..."

pipeline_local.sh

@@ -3,9 +3,13 @@
 set -e
 # trigger pep8 style check
 echo "Doing flake8 style check ..."
-flake8 --exclude=.eggs,devops --ignore=E501 .
+flake8 --exclude=.eggs,devops --ignore=E501,W605,W504 .
 echo "done."
 # trigger the tests
 echo "Running unit tests ..."
 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 .
 echo "done."

setup.py

@@ -51,7 +51,7 @@
           'Flask',
           'flask_restful',
           'docker==2.0.2',
-          'urllib3==1.21.1',
+          'urllib3',
           'requests',
           'prometheus_client',
           'ipaddress',

src/emuvim/dcemulator/monitoring.py

@@ -335,10 +335,10 @@ def stop_metric(self, vnf_name, vnf_interface=None, metric=None):
             return 'Error stopping monitoring metric: {0} on {1}:{2}'.format(
                 metric, vnf_name, vnf_interface)
 
-
-# get all metrics defined in the list and export it to Prometheus
-
     def get_flow_metrics(self):
+        """
+        Get all metrics defined in the list and export it to Prometheus.
+        """
         while self.start_monitoring:
 
             self.monitor_flow_lock.acquire()