Merge pull request #628 from opdemand/490-formation-without-credentials

raise BuildFormationError on build or delete

Author: Matthew Fisher

api/exceptions.py

@@ -20,3 +20,17 @@ class BuildNodeError(APIException):
 
     def __init__(self, detail=None):
         self.detail = detail
+
+
+class BuildFormationError(APIException):
+    """
+    Indicates a problem in creating a formation.
+
+    This exception is subclassed from rest_framework's APIException so it
+    isn't reported as "500 SERVER ERROR."
+    """
+
+    status_code = status.HTTP_400_BAD_REQUEST
+
+    def __init__(self, detail=None):
+        self.detail = detail

api/tests/test_layer.py

@@ -58,6 +58,12 @@ def test_layer(self):
         self.assertIn('runtime', response.data)
         self.assertIn('config', response.data)
         self.assertIn('key', json.loads(response.data['config']))
+        # test layer build failure
+        url = '/api/formations/{formation_id}/layers'.format(**locals())
+        body = {'id': 'autotest-fail', 'flavor': 'autotest-fail',
+                'config': json.dumps({'key': 'value'})}
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 400)
         url = '/api/formations/{formation_id}/layers'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)

api/views.py

@@ -24,6 +24,7 @@
 from rest_framework.response import Response
 
 from api import docker, models, serializers
+from .exceptions import BuildFormationError
 
 from deis import settings
 
@@ -318,11 +319,17 @@ def create(self, request, **kwargs):
 
     def post_save(self, layer, created=False, **kwargs):
         if created:
-            layer.build()
+            try:
+                layer.build()
+            except EnvironmentError as err:
+                raise BuildFormationError(str(err))
 
     def destroy(self, request, **kwargs):
         layer = self.get_object()
-        layer.destroy()
+        try:
+            layer.destroy()
+        except EnvironmentError as err:
+            raise BuildFormationError(str(err))
         return Response(status=status.HTTP_204_NO_CONTENT)