small refactoring as preparation for overprovisioning RM

[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..181bc97 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):
@@ -126,10 +126,8 @@ class UpbSimpleCloudDcRM(BaseResourceModel):
         :return:
         """
         number_cu = self._get_flavor(d).get("compute")
-        # get cpu time fraction for entire emulation
-        e_cpu = self.registrar.e_cpu
         # 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)])
+        self.single_cu = self._compute_single_cu()
         # calculate cpu time fraction for container with given flavor
         cpu_time_percentage = self.single_cu * number_cu
         # calculate input values for CFS scheduler bandwidth limitation
@@ -140,6 +138,16 @@ class UpbSimpleCloudDcRM(BaseResourceModel):
                       d.name, cpu_period, cpu_time_percentage, cpu_quota))
             d.updateCpuLimit(cpu_period=int(cpu_period), cpu_quota=int(cpu_quota))
 
+    def _compute_single_cu(self):
+        """
+        Calculate percentage of CPU time of a singe CU unit.
+        :return:
+        """
+        # get cpu time fraction for entire emulation
+        e_cpu = self.registrar.e_cpu
+        # calculate
+        return float(e_cpu) / sum([rm.dc_max_cu for rm in list(self.registrar.resource_models)])
+
     def _calculate_cpu_cfs_values(self, cpu_time_percentage):
         """
         Calculate cpu period and quota for CFS
@@ -153,7 +161,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 +192,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)