Possibility to deploy external (as host interface) and internal (as container, defaul...

[osm/vim-emu.git] / src / emuvim / dcemulator / monitoring.py

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index 269a7e0..ce24a40 100755 (executable)
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -34,7 +34,7 @@ import time
 from prometheus_client import start_http_server, Summary, Histogram, Gauge, Counter, REGISTRY, CollectorRegistry, \\r
     pushadd_to_gateway, push_to_gateway, delete_from_gateway\r
 import threading\r
-from subprocess import Popen\r
+from subprocess import Popen, check_call\r
 import os\r
 import docker\r
 import json\r
@@ -535,8 +535,15 @@ class DCNetworkMonitor():
 \r
     def _stop_container(self, name):\r
 \r
-        container = self.dockercli.containers.get(name)\r
-        container.remove(force=True)\r
+        #container = self.dockercli.containers.get(name)\r
+        #container.stop()\r
+        #container.remove(force=True)\r
+\r
+        # the only robust way to stop these containers is via Popen, it seems\r
+        time.sleep(1)\r
+        cmd = ['docker', 'rm', '-f', name]\r
+        Popen(cmd)\r
+\r
 \r
     def update_skewmon(self, vnf_name, resource_name, action):\r
 \r