only save updates to formation.layers and formation.containers after successful scale operations #34

Author: Gabriel Monroy

api/models.py

@@ -278,6 +278,8 @@ def scale_layers(self, **kwargs):
         # force-converge nodes if there were changes
         if job or containers_balanced:
             self.converge(databag)
+        # save the formation with updated layers
+        self.save()
         return databag
 
     def scale_containers(self, **kwargs):
@@ -318,6 +320,8 @@ def scale_containers(self, **kwargs):
         databag = self.calculate()
         if changed is True:
             self.converge(databag)
+        # save the formation with updated containers
+        self.save()
         return databag
 
     def balance(self, **kwargs):

api/tests/container.py

@@ -53,6 +53,9 @@ def test_container_scale(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 4)
+        url = '/api/formations/{formation_id}'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
         # should start with zero
         url = '/api/formations/{formation_id}/containers'.format(**locals())
         response = self.client.get(url)
@@ -67,6 +70,10 @@ def test_container_scale(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 6)
+        url = '/api/formations/{formation_id}'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['containers'], json.dumps(body))
         # scale down
         url = '/api/formations/{formation_id}/scale/containers'.format(**locals())
         body = {'web': 2, 'worker': 1}
@@ -75,6 +82,10 @@ def test_container_scale(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 3)
+        url = '/api/formations/{formation_id}'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['containers'], json.dumps(body))
         # scale down to 0
         url = '/api/formations/{formation_id}/scale/containers'.format(**locals())
         body = {'web': 0, 'worker': 0}
@@ -84,6 +95,10 @@ def test_container_scale(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 0)
+        url = '/api/formations/{formation_id}'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['containers'], json.dumps(body))
 
     def test_container_balance(self):
         url = '/api/formations'

api/tests/layer.py

@@ -115,6 +115,10 @@ def test_layer_scale(self):
         self.assertIn('containers', response.data)
         self.assertIn('proxy', response.data)
         self.assertIn('release', response.data)
+        url = '/api/formations/{formation_id}'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['layers'], json.dumps(body))
         url = '/api/formations/{formation_id}/nodes'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -132,6 +136,10 @@ def test_layer_scale(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 3)
+        url = '/api/formations/{formation_id}'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['layers'], json.dumps(body))
         # scale down to 0
         url = '/api/formations/{formation_id}/scale/layers'.format(**locals())
         body = {'proxy': 0, 'runtime': 0}
@@ -144,4 +152,8 @@ def test_layer_scale(self):
         url = '/api/formations/{formation_id}/nodes'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.data['results']), 0)
+        self.assertEqual(len(response.data['results']), 0)
+        url = '/api/formations/{formation_id}'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['layers'], json.dumps(body))

api/views.py

@@ -176,7 +176,6 @@ def scale_layers(self, request, **kwargs):
             return Response('Invalid scaling format', status=HTTP_400_BAD_REQUEST)
         formation = self.get_object()
         formation.layers.update(new_structure)
-        formation.save()
         try:
             databag = formation.scale_layers()
         except models.ScalingError as e:
@@ -195,7 +194,6 @@ def scale_containers(self, request, **kwargs):
             return Response('Invalid scaling format', status=HTTP_400_BAD_REQUEST)
         formation = self.get_object()
         formation.containers.update(new_structure)
-        formation.save()
         try:
             databag = formation.scale_containers()
         except models.ScalingError as e: