fix bug for 'and' & 'or' mode

Makefile

@@ -1,4 +1,4 @@
-version ?= 0.5.0
+version ?= 0.5.1
 image_name ?= mesosphere/marathon-autoscaler
 full_image_name ?= $(image_name):v$(version)
 

autoscaler/modes/scalebycpuormem.py

@@ -22,8 +22,9 @@ def __init__(self,  api_client=None, agent_stats=None, app=None,
         # Instantiate the CPU/Memory mode classes
         for idx, mode in enumerate(list(self.mode_map.keys())):
             self.mode_map[mode] = self.mode_map[mode](
-                api_client,
-                app,
+                api_client=self.api_client,
+                app=self.app,
+                agent_stats=self.agent_stats,
                 dimension={
                     'min': dimension['min'][idx],
                     'max': dimension['max'][idx]

autoscaler/modes/scalecpuandmem.py

@@ -20,8 +20,9 @@ def __init__(self,  api_client=None, agent_stats=None, app=None,
         # Instantiate the CPU/Memory mode classes
         for idx, mode in enumerate(list(self.mode_map.keys())):
             self.mode_map[mode] = self.mode_map[mode](
-                api_client,
-                app,
+                api_client=self.api_client,
+                app=self.app,
+                agent_stats=self.agent_stats,
                 dimension={
                     'min': dimension['min'][idx],
                     'max': dimension['max'][idx]