add node deletion

Author: Gabriel Monroy

api/tests/node.py

@@ -58,4 +58,10 @@ def test_node(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(len(response.data['results']), 1)
-        # TODO: add node deletion
+        node = response.data['results'][0]['id']
+        url = '/api/formations/{formation_id}/nodes/{node}'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertIn('fqdn', response.data)
+        response = self.client.delete(url)
+        self.assertEqual(response.status_code, 204)

api/urls.py

@@ -45,6 +45,9 @@
             'get': 'retrieve', 'patch': 'partial_update', 'delete': 'destroy'})),
     url(r'^formations/(?P<id>[a-z0-9-]+)/layers/?',
         views.FormationLayerViewSet.as_view({'post': 'create', 'get': 'list'})),
+    url(r'^formations/(?P<id>[a-z0-9-]+)/nodes/(?P<node>[a-z0-9-]+)/?',
+        views.FormationNodeViewSet.as_view({
+            'get': 'retrieve', 'delete': 'destroy'})),
     url(r'^formations/(?P<id>[a-z0-9-]+)/nodes/?',
         views.FormationNodeViewSet.as_view({'get': 'list'})),
     url(r'^formations/(?P<id>[a-z0-9-]+)/containers/?',

api/views.py

@@ -283,7 +283,7 @@ def get_queryset(self, **kwargs):
 
     def get_object(self, *args, **kwargs):
         qs = self.get_queryset(**kwargs)
-        obj = qs.get(id=self.kwargs['id'])
+        obj = get_object_or_404(qs, id=self.kwargs['node'])
         return obj