chore(controller): modify clean ptype check

Author: jianxiaoguo

rootfs/api/tests/test_build.py

@@ -351,7 +351,17 @@ def test_build_no_remove_process(self, mock_requests):
         self.assertEqual(response.status_code, 200, response.data)
         self.assertEqual(response.json()['structure'], {'web': 1, 'task': 1, 'worker': 1})
 
-        # clean worker
+        # clean worker, repicas 1 not allow
+        response = self.client.post('/v2/apps/{}/ptypes/clean'.format(app_id), {"ptypes": "task"})
+        self.assertEqual(response.status_code, 400, response.data)
+
+        # scale task
+        url = f"/v2/apps/{app_id}/ptypes/scale"
+        body = {'task': 0}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 204, response.data)
+
+        # clean worker, repicas 0 allow
         response = self.client.post('/v2/apps/{}/ptypes/clean'.format(app_id), {"ptypes": "task"})
         self.assertEqual(response.status_code, 204, response.data)
 
@@ -361,8 +371,19 @@ def test_build_no_remove_process(self, mock_requests):
         self.assertEqual(response.status_code, 200, response.data)
         self.assertEqual(response.json()['structure'], {'web': 1, 'worker': 1})
 
-        # clean all worker
+        # ptypes is a required field
         response = self.client.post('/v2/apps/{}/ptypes/clean'.format(app_id))
+        self.assertEqual(response.status_code, 400, response.data)
+
+        url = f"/v2/apps/{app_id}/ptypes/scale"
+        body = {'worker': 0}
+        response = self.client.post(url, body)
+        self.assertEqual(response.status_code, 204, response.data)
+
+        # clean worker
+        response = self.client.post(
+            '/v2/apps/{}/ptypes/clean'.format(app_id),
+            {"ptypes": "worker"})
         self.assertEqual(response.status_code, 204, response.data)
 
         # look at the app structure

rootfs/api/views.py

@@ -491,7 +491,12 @@ def clean(self, request, *args, **kwargs):
         app = self.get_app()
         ptypes = set(
             [ptype for ptype in request.data.get("ptypes", "").split(",") if ptype])
-        ptypes = app.check_ptypes(ptypes)
+        if not ptypes:
+            raise DryccException("ptypes is a required field")
+        latest_ptypes = [k for k, v in app.structure.items() if v != 0]
+        not_allow = [ptype for ptype in ptypes if ptype in latest_ptypes]
+        if not_allow:
+            raise DryccException(f'ptype {",".join(not_allow)} should not garbage.')
         app.clean(ptypes=ptypes)
         return Response(status=status.HTTP_204_NO_CONTENT)