fix(controller): rename /limit to /limits

Author: Matthew Fisher

client/deis.py

@@ -1373,7 +1373,7 @@ def limits_list(self, args):
         app = args.get('--app')
         if not app:
             app = self._session.app
-        response = self._dispatch('get', "/api/apps/{}/limit".format(app))
+        response = self._dispatch('get', "/api/apps/{}/limits".format(app))
         if response.status_code == requests.codes.ok:  # @UndefinedVariable
             self._print_limits(app, response.json())
         else:
@@ -1426,7 +1426,7 @@ def limits_set(self, args):
         try:
             progress = TextProgress()
             progress.start()
-            response = self._dispatch('post', "/api/apps/{}/limit".format(app), json.dumps(body))
+            response = self._dispatch('post', "/api/apps/{}/limits".format(app), json.dumps(body))
         finally:
             progress.cancel()
             progress.join()
@@ -1472,7 +1472,7 @@ def limits_unset(self, args):
         try:
             progress = TextProgress()
             progress.start()
-            response = self._dispatch('post', "/api/apps/{}/limit".format(app), json.dumps(body))
+            response = self._dispatch('post', "/api/apps/{}/limits".format(app), json.dumps(body))
         finally:
             progress.cancel()
             progress.join()

controller/api/tests/test_limit.py

@@ -50,7 +50,7 @@ def test_limit_memory(self):
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
         app_id = response.data['id']
-        url = '/api/apps/{app_id}/limit'.format(**locals())
+        url = '/api/apps/{app_id}/limits'.format(**locals())
         # check default limit
         response = self.client.get(url, content_type='application/json')
         self.assertEqual(response.status_code, 200)
@@ -114,7 +114,7 @@ def test_limit_cpu(self):
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
         app_id = response.data['id']
-        url = '/api/apps/{app_id}/limit'.format(**locals())
+        url = '/api/apps/{app_id}/limits'.format(**locals())
         # check default limit
         response = self.client.get(url, content_type='application/json')
         self.assertEqual(response.status_code, 200)

controller/api/urls.py

@@ -258,7 +258,7 @@
         views.AppBuildViewSet.as_view({'get': 'retrieve'})),
     url(r'^apps/(?P<id>{})/builds/?'.format(settings.APP_URL_REGEX),
         views.AppBuildViewSet.as_view({'get': 'list', 'post': 'create'})),
-    url(r'^apps/(?P<id>{})/limit/?'.format(settings.APP_URL_REGEX),
+    url(r'^apps/(?P<id>{})/limits/?'.format(settings.APP_URL_REGEX),
         views.AppLimitViewSet.as_view({'get': 'retrieve', 'post': 'create'})),
     url(r'^apps/(?P<id>{})/releases/v(?P<version>[0-9]+)/?'.format(settings.APP_URL_REGEX),
         views.AppReleaseViewSet.as_view({'get': 'retrieve'})),