chore(controller): remove start/stop api

Author: duanhongyi

rootfs/api/models/app.py

@@ -491,78 +491,6 @@ def scale(self, user, structure):  # noqa
 
         return False
 
-    def stop(self, user, types):  # noqa
-        """scale containers which types contained down """
-        rs_zero = []
-        for _ in types:
-            if not self.structure.get(_, 0):
-                rs_zero.append(_)
-        if rs_zero:
-            raise DryccException("process {} replicas is zero".format(",".join(rs_zero))) # noqa
-
-        if self.release_set.filter(failed=False).latest().build is None:
-            raise DryccException('No build associated with this release')
-
-        release = self.release_set.filter(failed=False).latest()
-        structure = {_: 0 for _ in types}
-
-        # test for available process types
-        available_process_types = release.build.procfile or {}
-        for container_type in types:
-            if container_type == 'cmd':
-                continue  # allow docker cmd types in case we don't have the image source
-
-            if container_type not in available_process_types:
-                raise NotFound(
-                    'Container type {} does not exist in application'.format(container_type))
-
-        # merge current structure and the new items together
-        old_structure = self.structure
-        new_structure = old_structure.copy()
-        new_structure.update(structure)
-
-        if new_structure != self.structure:
-            try:
-                self._scale_pods(structure)
-            except ServiceUnavailable:
-                # scaling failed, go back to old scaling numbers
-                self._scale_pods(old_structure)
-                raise
-
-            msg = '{} stopped pods '.format(user.username) + ' '.join(types)
-            self.log(msg)
-
-            return True
-
-        return False
-
-    def start(self, user, types):  # noqa
-        """scale containers which types contained up."""
-        # use create to make sure minimum resources are created
-        self.create()
-        if self.release_set.filter(failed=False).latest().build is None:
-            raise DryccException('No build associated with this release')
-
-        rs_zero = []
-        for _ in types:
-            if not self.structure.get(_, 0):
-                rs_zero.append(_)
-        if rs_zero:
-            raise DryccException("process {} replicas is zero".format(",".join(rs_zero))) # noqa
-
-        structure = {}
-        for k, v in self.structure.items():
-            if k in types:
-                structure[k] = v
-        try:
-            self._scale_pods(structure)
-        except ServiceUnavailable:
-            # scaling failed, go back to old scaling numbers
-            raise
-        msg = '{} stopped pods '.format(user.username) + ' '.join(types)
-        self.log(msg)
-        return True
-
     def _scale_pods(self, scale_types):
         release = self.release_set.filter(failed=False).latest()
         app_settings = self.appsettings_set.latest()
@@ -910,7 +838,6 @@ def pod_name(size=5, chars=string.ascii_lowercase + string.digits):
 
     def list_pods(self, *args, **kwargs):
         """Used to list basic information about pods running for a given application"""
-        autoscale = self.appsettings_set.latest().autoscale
         try:
             labels = self._scheduler_filter(**kwargs)
 
@@ -947,18 +874,16 @@ def list_pods(self, *args, **kwargs):
                 if 'startTime' in p['status']:
                     started = p['status']['startTime']
                 else:
-                    started = str(datetime.utcnow().strftime(settings.DRYCC_DATETIME_FORMAT))
+                    started = str(datetime.utcnow().strftime(settings.DEIS_DATETIME_FORMAT))
                 item['started'] = started
-                replicas = str(autoscale[labels['type']]['min']) + '-' + str(autoscale[labels['type']]['max']) \
-                    if autoscale.get(labels['type']) is not None else self.structure.get(labels['type'])  # noqa
-                item['replicas'] = str(replicas)
+
                 data.append(item)
 
             # sorting so latest start date is first
             data.sort(key=lambda x: x['started'], reverse=True)
             return data
-        except KubeHTTPException as e:
-            logger.debug(e)
+        except KubeHTTPException:
+            pass
         except Exception as e:
             err = '(list pods): {}'.format(e)
             self.log(err, logging.ERROR)

rootfs/api/serializers.py

@@ -599,7 +599,6 @@ class PodSerializer(serializers.BaseSerializer):
     type = serializers.CharField()
     release = serializers.CharField(required=False)
     started = serializers.DateTimeField(required=False)
-    replicas = serializers.CharField(required=False)
 
     def to_representation(self, obj):
         return obj

rootfs/api/tests/test_pods.py

@@ -100,20 +100,6 @@ def test_container_api_heroku(self, mock_requests):
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 204, response.data)
 
-        # stop
-        url = "/v2/apps/{app_id}/stop".format(**locals())
-        # test setting one proc type at a time
-        body = {"types": ['web']}
-        response = self.client.post(url, body)
-        self.assertEqual(response.status_code, 204, response.data)
-
-        # start
-        url = "/v2/apps/{app_id}/start".format(**locals())
-        # test setting one proc type at a time
-        body = {"types": ['web']}
-        response = self.client.post(url, body)
-        self.assertEqual(response.status_code, 204, response.data)
-
         url = "/v2/apps/{app_id}/pods".format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200, response.data)
@@ -135,7 +121,7 @@ def test_container_api_heroku(self, mock_requests):
         url = "/v2/apps/{app_id}/pods".format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200, response.data)
-        self.assertEqual(len(response.data['results']), 2)
+        self.assertEqual(len(response.data['results']), 0)
 
         url = "/v2/apps/{app_id}".format(**locals())
         response = self.client.get(url)
@@ -205,7 +191,7 @@ def test_container_api_docker(self, mock_requests):
         url = "/v2/apps/{app_id}/pods".format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200, response.data)
-        self.assertEqual(len(response.data['results']), 1)
+        self.assertEqual(len(response.data['results']), 0)
 
         url = "/v2/apps/{app_id}".format(**locals())
         response = self.client.get(url)
@@ -243,7 +229,7 @@ def test_release(self, mock_requests):
         url = "/v2/apps/{app_id}/pods".format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200, response.data)
-        self.assertEqual(len(response.data['results']), 2)
+        self.assertEqual(len(response.data['results']), 1)
         self.assertEqual(response.data['results'][0]['release'], 'v2')
 
         # post a new build
@@ -370,7 +356,7 @@ def test_pod_command_format(self, mock_requests):
 
         # verify that the app._get_command property got formatted
         self.assertEqual(response.status_code, 200, response.data)
-        self.assertEqual(len(response.data['results']), 2)
+        self.assertEqual(len(response.data['results']), 1)
 
         pod = response.data['results'][0]
         self.assertEqual(pod['type'], 'web')

rootfs/api/urls.py

@@ -62,10 +62,6 @@
     # application actions
     url(r"^apps/(?P<id>{})/scale/?$".format(settings.APP_URL_REGEX),
         views.AppViewSet.as_view({'post': 'scale'})),
-    url(r"^apps/(?P<id>{})/stop/?$".format(settings.APP_URL_REGEX),
-        views.AppViewSet.as_view({'post': 'stop'})),
-    url(r"^apps/(?P<id>{})/start/?$".format(settings.APP_URL_REGEX),
-        views.AppViewSet.as_view({'post': 'start'})),
     url(r"^apps/(?P<id>{})/logs/?$".format(settings.APP_URL_REGEX),
         views.AppViewSet.as_view({'get': 'logs'})),
     url(r"^apps/(?P<id>{})/run/?$".format(settings.APP_URL_REGEX),

rootfs/api/views.py

@@ -187,20 +187,6 @@ def scale(self, request, **kwargs):
         scale_app.delay(self.get_object(), request.user, request.data)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
-    def stop(self, request, **kwargs):
-        types = request.data.get("types")
-        if not types:
-            raise DryccException("types is a required field")
-        self.get_object().stop(request.user, types)
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    def start(self, request, **kwargs):
-        types = request.data.get("types")
-        if not types:
-            raise DryccException("types is a required field")
-        self.get_object().start(request.user, types)
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
     def logs(self, request, **kwargs):
         app = self.get_object()
         try:
@@ -289,34 +275,7 @@ class PodViewSet(AppResourceViewSet):
     def list(self, *args, **kwargs):
         pods = self.get_app().list_pods(*args, **kwargs)
         data = self.get_serializer(pods, many=True).data
-
-        if not kwargs.get("type"):
-            autoscale = self.get_app().appsettings_set.latest().autoscale
-            exist_pod_type = list(set([_["type"] for _ in data if _["type"]]))
-            structure = self.get_app().structure
-            procfile_structure = self.get_app().procfile_structure
-            # remove prev release container type
-            if procfile_structure:
-                condition_procfile_structure = list(procfile_structure.keys())
-            else:
-                condition_procfile_structure = ['cmd', 'web']
-            structure = {k: v for k, v in structure.items() if (v != 0 or k in condition_procfile_structure)} # noqa
-            for _ in structure.keys():
-                if _ not in exist_pod_type:
-                    replicas = str(autoscale[_]['min']) + '-' + str(autoscale[_]['max']) \
-                        if (autoscale.get(_) is not None and structure[_] !=0) else structure[_]  # noqa
-                    exist_pod_type.append(_)
-                    data.append({"type": _,
-                                 "replicas": str(replicas),
-                                 "state": "stopped"})
-
-            for _ in procfile_structure:
-                if _ not in exist_pod_type:
-                    data.append({"type": _,
-                                 "replicas": str(0),
-                                 "state": "started"})
-
-        # # fake out pagination for now
+        # fake out pagination for now
         pagination = {'results': data, 'count': len(data)}
         return Response(pagination, status=status.HTTP_200_OK)
 
@@ -953,12 +912,13 @@ class AdmissionWebhook(GenericViewSet):
 
     def scale(self, request,  **kwargs):
         token = kwargs['token']
+        print(request.body.decode("utf8"))
         data = json.loads(request.body.decode("utf8"))["request"]
         if settings.DRYCC_ADMISSION_WEBHOOK_TOKEN == token:
             allowed = True
             app_id = data["object"]["metadata"]["namespace"]
             app = models.App.objects.filter(id=app_id).first()
-            replicas = data["object"]["spec"]["replicas"]
+            replicas = data["object"]["spec"].get("replicas", 0)
             container_type = data["object"]["metadata"]["name"].replace(f"{app_id}-", "", 1)
             if app and app.structure.get(container_type) != replicas:  # sync replicas
                 app.structure[container_type] = replicas