allow listing of builds/releases

Author: Gabriel Monroy

api/tests/build.py

@@ -48,9 +48,10 @@ def test_build(self):
         self.assertEqual(response.status_code, 201)
         formation_id = response.data['id']
         # check to see that no initial build was created
-        url = "/api/formations/{formation_id}/build".format(**locals())
+        url = "/api/formations/{formation_id}/builds".format(**locals())
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 0)
         # post a first build
         body = {
             'sha': uuid.uuid4().hex,
@@ -61,14 +62,17 @@ def test_build(self):
         }
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
+        build_id = response.data['uuid']
         build1 = response.data
         self.assertEqual(response.data['url'], body['url'])
         # read the build
+        url = "/api/formations/{formation_id}/builds/{build_id}".format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         build2 = response.data
         self.assertEqual(build1, build2)
         # post a new build
+        url = "/api/formations/{formation_id}/builds".format(**locals())
         body = {
             'sha': uuid.uuid4().hex,
             'slug_size': 4096000,

api/tests/release.py

@@ -51,7 +51,11 @@ def test_release(self):
         self.assertEqual(response.status_code, 201)
         formation_id = response.data['id']  # noqa
         # check to see that an initial release was created
-        url = '/api/formations/{formation_id}/release'.format(**locals())
+        url = '/api/formations/{formation_id}/releases'.format(**locals())
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 1)
+        url = '/api/formations/{formation_id}/releases/1'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         release1 = response.data
@@ -67,7 +71,7 @@ def test_release(self):
         self.assertEqual(response.status_code, 201)
         self.assertIn('NEW_URL1', json.loads(response.data['values']))
         # check to see that a new release was created
-        url = '/api/formations/{formation_id}/release'.format(**locals())
+        url = '/api/formations/{formation_id}/releases/2'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         release2 = response.data
@@ -77,7 +81,7 @@ def test_release(self):
         self.assertEqual(release1['build'], release2['build'])
         self.assertEquals(release2['version'], 2)
         # check that updating the build rolls a new release
-        url = '/api/formations/{formation_id}/build'.format(**locals())
+        url = '/api/formations/{formation_id}/builds'.format(**locals())
         build_config = json.dumps({'PATH': 'bin:/usr/local/bin:/usr/bin:/bin'})
         body = {
             'sha': uuid.uuid4().hex,
@@ -92,7 +96,7 @@ def test_release(self):
         self.assertEqual(response.status_code, 201)
         self.assertEqual(response.data['url'], body['url'])
         # check to see that a new release was created
-        url = '/api/formations/{formation_id}/release'.format(**locals())
+        url = '/api/formations/{formation_id}/releases/3'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         release3 = response.data
@@ -110,23 +114,8 @@ def test_release(self):
         self.assertIn('PATH', config3_values)
         self.assertEqual(
             config3_values['PATH'], 'bin:/usr/local/bin:/usr/bin:/bin')
-        # check that updating the image rolls a new release
-        url = '/api/formations/{formation_id}/image'.format(**locals())
-        body = {'image': 'deis/autotest2'}
-        response = self.client.post(
-            url, json.dumps(body), content_type='application/json')
-        self.assertEqual(response.status_code, 201)
-        # check to see that a new release was created
-        url = '/api/formations/{formation_id}/release'.format(**locals())
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        release4 = response.data
-        self.assertNotEqual(release3['uuid'], release4['uuid'])
-        self.assertNotEqual(release3['image'], release4['image'])
-        self.assertEqual(release3['build'], release4['build'])
-        self.assertEqual(release3['config'], release4['config'])
-        self.assertEquals(release4['version'], 4)
         # disallow post/put/patch/delete
+        url = '/api/formations/{formation_id}/releases'.format(**locals())
         self.assertEqual(self.client.post(url).status_code, 405)
         self.assertEqual(self.client.put(url).status_code, 405)
         self.assertEqual(self.client.patch(url).status_code, 405)

api/urls.py

@@ -55,12 +55,14 @@
     # formation release components
     url(r'^formations/(?P<id>[a-z0-9-]+)/config/?',
         views.FormationConfigViewSet.as_view({'post': 'create', 'get': 'retrieve'})),
-    url(r'^formations/(?P<id>[a-z0-9-]+)/image/?',
-        views.FormationImageViewSet.as_view({'post': 'reset_image'})),
-    url(r'^formations/(?P<id>[a-z0-9-]+)/build/?',
-        views.FormationBuildViewSet.as_view({'post': 'create', 'get': 'retrieve'})),
-    url(r'^formations/(?P<id>[a-z0-9-]+)/release/?',
+    url(r'^formations/(?P<id>[a-z0-9-]+)/builds/(?P<uuid>[a-z0-9-]+)/?',
+        views.FormationBuildViewSet.as_view({'get': 'retrieve'})),
+    url(r'^formations/(?P<id>[a-z0-9-]+)/builds/?',
+        views.FormationBuildViewSet.as_view({'post': 'create', 'get': 'list'})),
+    url(r'^formations/(?P<id>[a-z0-9-]+)/releases/(?P<version>[0-9]+)/?',
         views.FormationReleaseViewSet.as_view({'get': 'retrieve'})),
+    url(r'^formations/(?P<id>[a-z0-9-]+)/releases/?',
+        views.FormationReleaseViewSet.as_view({'get': 'list'})),
     # formation actions
     url(r'^formations/(?P<id>[a-z0-9-]+)/scale/layers/?',
         views.FormationViewSet.as_view({'post': 'scale_layers'})),