Fixed merge problems.

[osm/vim-emu.git] / src / emuvim / dcemulator / resourcemodel / upb / simple.py

diff --git a/src/emuvim/dcemulator/resourcemodel/upb/simple.py b/src/emuvim/dcemulator/resourcemodel/upb/simple.py
index 1b2f4a3..1610b6a 100644 (file)
--- a/src/emuvim/dcemulator/resourcemodel/upb/simple.py
+++ b/src/emuvim/dcemulator/resourcemodel/upb/simple.py
@@ -35,8 +35,8 @@ class UpbSimpleCloudDcRM(BaseResourceModel):
         self.dc_alloc_mu = 0
         self.deactivate_cpu_limit = deactivate_cpu_limit
         self.deactivate_mem_limit = deactivate_mem_limit
-        self.single_cu = 0  # current value for a single cu
-        self.single_mu = 0  # current value for a single mu
+        self.single_cu = 0
+        self.single_mu = 0
         super(self.__class__, self).__init__()
 
     def allocate(self, d):
@@ -153,7 +153,7 @@ class UpbSimpleCloudDcRM(BaseResourceModel):
         # ATTENTION >= 1000 to avoid a invalid argument system error ... no idea why
         if cpu_quota < 1000:
             cpu_quota = 1000
-            LOG.warning("Increased CPU quota for %r to avoid system error." % d.name)
+            LOG.warning("Increased CPU quota to avoid system error.")
         return cpu_period, cpu_quota
 
     def _apply_mem_limits(self, d):
@@ -184,7 +184,7 @@ class UpbSimpleCloudDcRM(BaseResourceModel):
         # ATTENTION minimum mem_limit per container is 4MB
         if mem_limit < 4:
             mem_limit = 4
-            LOG.warning("Increased MEM limit for %r because it was less than 4.0 MB." % d.name)
+            LOG.warning("Increased MEM limit because it was less than 4.0 MB.")
         # to byte!
         return int(mem_limit*1024*1024)
 
@@ -212,8 +212,6 @@ class UpbSimpleCloudDcRM(BaseResourceModel):
         r["dc_max_mu"] = self.dc_max_mu
         r["dc_alloc_cu"] = self.dc_alloc_cu
         r["dc_alloc_mu"] = self.dc_alloc_mu
-        r["single_cu_percentage"] = self.single_cu
-        r["single_mu_percentage"] = self.single_mu
         r["allocation_state"] = allocation_state
         return r