ref(scheduler): separate deploy batch / step calculations into functions

Author: helgi

rootfs/api/models/app.py

@@ -457,7 +457,7 @@ def deploy(self, release):
                 'build_type': release.build.type,
                 'healthcheck': release.config.healthcheck,
                 'routable': routable,
-                'batches': batches
+                'deploy_batches': batches
             }
 
         # Sort deploys so routable comes first

rootfs/scheduler/__init__.py

@@ -124,22 +124,10 @@ def deploy(self, namespace, name, image, command, **kwargs):  # noqa
             logger.info('No prior RC could be found for {}-{}'.format(namespace, app_type))
 
         # see if application or global deploy batches are defined
-        if not kwargs.get('batches', None):
-            # figure out how many nodes the application can go on
-            tags = kwargs.get('tags', {})
-            steps = len(self.get_nodes(labels=tags).json()['items'])
-        else:
-            steps = int(kwargs.get('batches'))
-
-        # figure out what kind of batches the deploy is done in - 1 in, 1 out or higher
-        if desired < steps:
-            # do it all in one go
-            batches = [desired]
-        else:
-            # figure out the stepped deploy count and then see if there is a leftover
-            batches = [steps for n in set(range(1, (desired + 1))) if n % steps == 0]
-            if desired - sum(batches) > 0:
-                batches.append(desired - sum(batches))
+        batches = kwargs.get('deploy_batches', None)
+        tags = kwargs.get('tags', {})
+        steps = self._get_deploy_steps(batches, tags)
+        batches = self._get_deploy_batches(steps, desired)
 
         try:
             count = 0
@@ -199,6 +187,29 @@ def cleanup_release(self, namespace, controller):
 
             self.delete_pod(namespace, pod['metadata']['name'])
 
+    def _get_deploy_steps(self, batches, tags):
+        # if there is no batch information available default to available nodes for app
+        if not batches:
+            # figure out how many nodes the application can go on
+            steps = len(self.get_nodes(labels=tags).json()['items'])
+        else:
+            steps = int(batches)
+
+        return steps
+
+    def _get_deploy_batches(self, steps, desired):
+        # figure out what kind of batches the deploy is done in - 1 in, 1 out or higher
+        if desired < steps:
+            # do it all in one go
+            batches = [desired]
+        else:
+            # figure out the stepped deploy count and then see if there is a leftover
+            batches = [steps for n in set(range(1, (desired + 1))) if n % steps == 0]
+            if desired - sum(batches) > 0:
+                batches.append(desired - sum(batches))
+
+        return batches
+
     def _update_application_service(self, namespace, name, app_type, port, routable=False):
         """Update application service with all the various required information"""
         service = self.get_service(namespace, namespace).json()