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 6cc1687..f0b147f 100644 (file)
--- a/src/emuvim/dcemulator/resourcemodel/upb/simple.py
+++ b/src/emuvim/dcemulator/resourcemodel/upb/simple.py
@@ -33,8 +33,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):
@@ -129,7 +129,7 @@ class UpbSimpleCloudDcRM(BaseResourceModel):
         # calculate cpu time fraction of a single compute unit
         self.single_cu = float(e_cpu) / sum([rm.dc_max_cu for rm in list(self.registrar.resource_models)])
         # calculate cpu time fraction for container with given flavor
-        cpu_time_percentage = self.single_cu * number_cu
+        cpu_time_percentage = single_cu * number_cu
         # calculate cpu period and quota for CFS
         # (see: https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt)
         # Attention minimum cpu_quota is 1ms (micro)
@@ -157,7 +157,7 @@ class UpbSimpleCloudDcRM(BaseResourceModel):
         # calculate amount of memory for a single mu
         self.single_mu = float(e_mem) / sum([rm.dc_max_mu for rm in list(self.registrar.resource_models)])
         # calculate mem for given flavor
-        mem_limit = self.single_mu * number_mu
+        mem_limit = single_mu * number_mu
         # ATTENTION minimum mem_limit per container is 4MB
         if mem_limit < 4:
             mem_limit = 4
@@ -193,8 +193,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