only delete records from the view, fix chef_id issue

Author: Gabriel Monroy

api/models.py

@@ -447,7 +447,6 @@ def destroy(self):
         # call a celery task to update the formation data bag
         if settings.CHEF_ENABLED:
             controller.destroy_formation.delay(self.id).wait()  # @UndefinedVariable
-        self.delete()
 
 
 @python_2_unicode_compatible
@@ -504,8 +503,6 @@ def destroy(self, async=False):
         # destroy nodes, then the layer
         node_tasks.apply_async().join()
         layer_tasks.apply_async().join()
-        # delete the database record
-        self.delete()
 
 
 @python_2_unicode_compatible

api/views.py

@@ -227,7 +227,8 @@ def converge(self, request, **kwargs):
 
     def destroy(self, request, **kwargs):
         formation = self.get_object()
-        formation.destroy()  # destroy will delete the record
+        formation.destroy()
+        formation.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -264,11 +265,12 @@ def create(self, request, **kwargs):
 
     def post_save(self, layer, created=False, **kwargs):
         if created:
-            layer.build()  # build the layer's infrastructure
+            layer.build()
 
     def destroy(self, request, **kwargs):
         layer = self.get_object()
-        layer.destroy()  # destroy layer infrastructure and delete
+        layer.destroy()
+        layer.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -290,7 +292,8 @@ def get_object(self, *args, **kwargs):
 
     def destroy(self, request, **kwargs):
         node = self.get_object()
-        node.destroy()  # destroy will delete the record
+        node.destroy()
+        node.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

celerytasks/ec2.py

@@ -134,17 +134,12 @@ def terminate_node(node_id, creds, params, provider_id):
         if i.state == "terminated":
             break
     # pull the node from the database
-    try:
-        node = Node.objects.get(uuid=node_id)
-        chef_id = node.id
-        node.provider_id = None
-        node.fqdn = None
-        node.metadata = {}
-        node.save()
-        # delete the node itself from the database
-        node.delete()
-    except Node.DoesNotExist:
-        pass  # ignore node does not exist
+    node = Node.objects.get(uuid=node_id)
+    chef_id = node.id
+    node.provider_id = None
+    node.fqdn = None
+    node.metadata = {}
+    node.save()
     # purge the node & client records from chef server
     client = ChefAPI(settings.CHEF_SERVER_URL,
                      settings.CHEF_CLIENT_NAME,