update cpu_bw resource parameter

diff --git a/src/emuvim/api/rest/compute.py b/src/emuvim/api/rest/compute.py
index 2ffa3e8..8d46aa2 100755 (executable)
--- a/src/emuvim/api/rest/compute.py
+++ b/src/emuvim/api/rest/compute.py
@@ -174,16 +174,16 @@ class ComputeResources(Resource):
         # then no data
         if params is None:
             params = {}
-        logging.info("REST CALL: update container resources {0}".format(params))
+        logging.debug("REST CALL: update container resources {0}".format(params))
         #check if container exists
         d = dcs.get(dc_label).net.getNodeByName(compute_name)
 
         # general request of cpu percentage
         # create a mutable copy
         params = params.to_dict()
-        if 'cpu' in params:
+        if 'cpu_bw' in params:
             cpu_period = int(dcs.get(dc_label).net.cpu_period)
-            value = params.get('cpu')
+            value = params.get('cpu_bw')
             cpu_quota = int(cpu_period * float(value))
             #put default values back
             if float(value) <= 0:

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index de96e37..269a7e0 100755 (executable)
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -606,6 +606,7 @@ class DCNetworkMonitor():
             while not started:\r
                 list1 = self.dockercli.containers.list(filters={'status': 'running', 'name': 'prometheus'})\r
                 if len(list1) >= 1:\r
+                    time.sleep(1)\r
                     started = True\r
                 if wait_time > 5:\r
                     return 'skewmon not started'\r

diff --git a/src/emuvim/test/unittests/test_resourcemodel.py b/src/emuvim/test/unittests/test_resourcemodel.py
index b15fed0..5fbd172 100755 (executable)
--- a/src/emuvim/test/unittests/test_resourcemodel.py
+++ b/src/emuvim/test/unittests/test_resourcemodel.py
@@ -96,10 +96,11 @@ def createDummyContainerObject(name, flavor):
     class DummyContainer(object):
 
         def __init__(self):
-            self.cpu_period = -1
+            # take defaukt values from son-emu
+            # self.cpu_period = -1
             self.cpu_quota = -1
-            self.mem_limit = -1
-            self.memswap_limit = -1
+            # self.mem_limit = -1
+            # self.memswap_limit = -1
 
         def updateCpuLimit(self, cpu_period, cpu_quota):
             self.cpu_period = cpu_period