chore(ps): restart types (#130)

Author: jianxiaoguo

rootfs/api/models/app.py

@@ -192,17 +192,10 @@ def restart(self, **kwargs):  # noqa
         """
         deployments = []
         app_settings = self.appsettings_set.latest()
-        if 'type' in kwargs and kwargs['type'] in self.structure:
-            if self.structure[kwargs['type']] > 0:
-                if kwargs['type'] in app_settings.canaries:
-                    deployments.append(self._get_job_id(kwargs['type'], True))
-                deployments.append(self._get_job_id(kwargs['type'], False))
-        else:
-            for scale_type, count in self.structure.items():
-                if count > 0:
-                    if scale_type in app_settings.canaries:
-                        deployments.append(self._get_job_id(kwargs['type'], True))
-                    deployments.append(self._get_job_id(scale_type, False))
+        if self.structure[kwargs['type']] > 0:
+            if kwargs['type'] in app_settings.canaries:
+                deployments.append(self._get_job_id(kwargs['type'], True))
+            deployments.append(self._get_job_id(kwargs['type'], False))
         try:
             tasks = [
                 functools.partial(

rootfs/api/tests/test_pods.py

@@ -773,13 +773,15 @@ def test_restart_pods(self, mock_requests):
         response = self.client.post('/v2/apps/{}/pods/restart'.format(app_id))
         self.assertEqual(response.status_code, 204, response.data)
 
-        # restart only the workers
-        response = self.client.post('/v2/apps/{}/pods/worker/restart'.format(app_id))
+        # restart web and workers pods
+        body = {"types": "web,worker"}
+        response = self.client.post('/v2/apps/{}/pods/restart'.format(app_id), body)
         self.assertEqual(response.status_code, 204, response.data)
 
-        # restart only the web
-        response = self.client.post('/v2/apps/{}/pods/web/restart'.format(app_id))
-        self.assertEqual(response.status_code, 204, response.data)
+        # restart invalid ptypes
+        body = {"types": "web1"}
+        response = self.client.post('/v2/apps/{}/pods/restart'.format(app_id), body)
+        self.assertEqual(response.status_code, 400, response.data)
 
         # restart only one of the web pods
         pods = application.list_pods(type='web')

rootfs/api/urls.py

@@ -49,9 +49,6 @@
     re_path(
         r"^apps/(?P<id>{})/pods/restart/?$".format(settings.APP_URL_REGEX),
         views.PodViewSet.as_view({'post': 'restart'})),
-    re_path(
-        r"^apps/(?P<id>{})/pods/(?P<type>[-_\w.]+)/restart/?$".format(settings.APP_URL_REGEX),
-        views.PodViewSet.as_view({'post': 'restart'})),
     # list pods
     re_path(
         r"^apps/(?P<id>{})/pods/?$".format(settings.APP_URL_REGEX),

rootfs/api/views.py

@@ -437,8 +437,22 @@ def list(self, *args, **kwargs):
         pagination = {'results': data, 'count': len(data)}
         return Response(pagination, status=status.HTTP_200_OK)
 
-    def restart(self, *args, **kwargs):
-        restart_app.delay(self.get_app(), **kwargs)
+    def restart(self, request, *args, **kwargs):
+        app = self.get_app()
+        ptypes = []
+        types = request.data.get("types", "").split(",")
+        types = [ptype for ptype in set(types) if ptype != ""]
+        if not types:
+            # all ptypes need to restart
+            ptypes = app.structure.keys()
+        else:
+            ptypes = [ptype for ptype in types if ptype in app.structure]
+            invalid_ptypes = set(types) - set(ptypes)
+            if len(invalid_ptypes) != 0:
+                raise DryccException("process type {} is not included in procfile".
+                                     format(','.join(invalid_ptypes)))
+        for ptype in set(ptypes):
+            restart_app.delay(self.get_app(), **{"type": ptype})
         return Response(status=status.HTTP_204_NO_CONTENT)
 
     def describe(self, *args, **kwargs):
@@ -831,7 +845,7 @@ def path(self, request, *args, **kwargs):
         container_types = [_ for _ in path.keys()
                            if _ not in volume.app.procfile_types]
         if container_types:
-            raise DryccException("process type {} is not included in profile".
+            raise DryccException("process type {} is not included in procfile".
                                  format(','.join(container_types)))
         if set(path.items()).issubset(set(volume.path.items())):
             raise DryccException("mount path not changed")