Added container && proc operation

Author: supermeng

apis/models.py

@@ -125,7 +125,7 @@ def podgroup_status_history(self, procname, instance):
                     for history in status_histories:
                         image, node = history['from'].split(' ')
                         history['image'] = image.split('/')[1]
-                        history['node'] = node[5:] # len('node:')
+                        history['node'] = node[5:]  # len('node:')
                         del history['from']
                     status_histories.reverse()
                     return {
@@ -134,7 +134,8 @@ def podgroup_status_history(self, procname, instance):
                         'StatusHistory': status_histories
                     }
                 else:
-                    logger.warning("fail getting PodGroup status history: %s" % r.content)
+                    logger.warning(
+                        "fail getting PodGroup status history: %s" % r.content)
                     return None
         return None
 
@@ -546,6 +547,11 @@ def podgroup_remove(self, podgroup_name):
                     (podgroup_name, self.appname))
         return self.default_deploy.remove_podgroup(podgroup_name)
 
+    def podgroup_operate(self, podgroup_name, optype, instance):
+        logger.info("operate podgroup %s of app %s " %
+                    (podgroup_name, self.appname))
+        return self.default_deploy.operate_podgroup(podgroup_name)
+
     def dependency_register(self, service_app, service_appname, dependency_pod_name):
         # service may not been deployed yet, so may need force generate the
         # calico profile of service_profile

apis/views.py

@@ -1129,6 +1129,57 @@ def delete_app_proc(cls, appname, procname, options=None):
                         appname, procname, e),
                     reverse('api_proc', kwargs={'appname': appname, 'procname': procname}))
 
+    @classmethod
+    def operate_proc(cls, appname, procname, instance, operation, options=None):
+        try:
+            app = App.get_or_none(appname)
+            if not app.is_reachable():
+                return (404, None,
+                        'app with appname %s has not been deployd\n' % appname,
+                        reverse('api_apps'))
+            proc, pg_status = app.proc_and_pg_status(procname)
+            if proc is None:
+                return (404, None,
+                        'no such proc %s in app %s' % (procname, appname),
+                        reverse('api_procs', kwargs={'appname': appname}))
+            if pg_status:
+                if instance != 0 {
+                    pods = pg_status['Status']['Pods']
+                    if instance <= len(pods):
+                        container_name = pods[instance - 1]['Containers'][0]['Runtime']['Name']
+                    else:
+                        return (404, None, 'no such proc %s instance %d, in app %s' % (procname, instance, appname),
+                                reverse('api_procs', kwargs={'appname': appname}))
+                }
+                if container_name:
+                    add_oplog(AuthApi.operater, operation.upper(), appname, "",
+                              "%s container %s" % (operation, container_name))
+                else:
+                    add_oplog(AuthApi.operater, operation.upper(), appname, "",
+                              "%s proc %s" % (operation, procname))
+
+                podgroup_name = "%s.%s.%s" % (
+                    appname, proc.type.name, proc.name)
+                result = app.podgroup_operate(podgroup_name)
+                if result.status_code < 400:
+                    return (202, ProcApi.render_proc_data(appname, proc),
+                            render_op_result_to_msg(result),
+                            reverse('api_procs', kwargs={'appname': appname}))
+                else:
+                    return (500, ProcApi.render_proc_data(appname, proc),
+                            render_op_result_to_msg(result),
+                            reverse('api_proc', kwargs={'appname': appname, 'procname': procname}))
+            else:
+                return (400, ProcApi.render_proc_data(appname, proc),
+                        'proc %s exists but not deployed\nplease deploy it first\n' % (
+                            procname),
+                        reverse('api_proc', kwargs={'appname': appname, 'procname': procname}))
+        except Exception, e:
+            client.captureException()
+            return (500, None,
+                    'fatal error when delete app %s proc %s:\n%s\nplease contact with admin of lain\n' % (
+                        appname, procname, e),
+                    reverse('api_proc', kwargs={'appname': appname, 'procname': procname}))
 
 '''
 这个类响应 console.views 关于 maintainer 的所有调用

console/urls.py

@@ -17,6 +17,8 @@
         'console.views.api_procs', name='api_procs'),
     url(r'^(?:api/)?v1/apps/(?P<appname>[^/]+)/procs/(?P<procname>[^/]+)/$',
         'console.views.api_proc', name='api_proc'),
+    url(r'^(?:api/)?v1/apps/(?P<appname>[^/]+)/procs/(?P<procname>[^/]+)/(?P<operation>[^/]+)/$',
+        'console.views.api_proc_op', name='api_proc_op'),
 
     url(r'^(?:api/)?v1/apps/(?P<appname>[^/]+)/proc/(?P<procname>[^/]+)/instance/(?P<instance>[^/]+)/histories/$',
         'console.views.api_proc_history', name='api_proc_history'),

console/views.py

@@ -210,6 +210,13 @@ def api_proc(request, appname, procname):
         _invalid_request_method('proc', request.method)
 
 
+def api_proc_op(request, appname, procname, operation):
+    if request.method == 'POST':
+        return api_proc_operate(request, appname, procname, operation)
+    else:
+        _invalid_request_method('proc', request.method)
+
+
 def api_proc_history(request, appname, procname, instance):
     if request.method == 'GET':
         return api_proc_history_get(request, appname, procname, instance)
@@ -251,6 +258,17 @@ def api_proc_get(request, appname, procname):
     return render_json_response(status_code, 'proc', view_object, msg, url)
 
 
+@permission_required('maintain')
+@deployd_required
+def api_proc_operate(request, appname, procname, operation):
+    try:
+        options = json.loads(request.body)
+        instance = int(options.get('instance', 0))
+        status_code, view_object, msg, url = ProcApi.operate_proc(appname, procname, operation, instance)
+        return render_json_response(status_code, 'proc', view_object, msg, url)
+    except Exception:
+        return render_json_response(400, 'proc', None, 'invalid request: instance should be integer', reverse('api_docs'))
+
 def api_repos(request):
     if request.method == 'POST':
         return api_repos_post(request)

deploys/models.py

@@ -34,6 +34,9 @@ def get_podhistory(self, podgroup_name, instance):
     def remove_podgroup(self, podgroup_name):
         return deploys.utils.remove_podgroup(podgroup_name, self.apiserver)
 
+    def operate_podgroup(self, podgroup_name, instance, operation):
+        return deploys.utils.operate_podgroup(podgroup_name, instance, operation, self.apiserver)
+
     def patch_podgroup_instance(self, podgroup_name, num_instances):
         return deploys.utils.patch_podgroup_instance(podgroup_name, num_instances, self.apiserver)
 

deploys/utils.py

@@ -23,16 +23,25 @@ def get_podgroup(podgroup_name, apiserver):
         apiserver, podgroup_name)
     return send_request("GET", url, None, None)
 
+
 def get_podhistory(podgroup_name, instance, apiserver):
     url = "%s/api/cntstatushistory?name=%s&instance=%d" % (
         apiserver, podgroup_name, instance)
     return send_request("GET", url, None, None)
 
+
 def remove_podgroup(podgroup_name, apiserver):
     url = "%s/api/podgroups?name=%s" % (apiserver, podgroup_name)
     return send_request("DELETE", url, None, None)
 
 
+def operate_podgroup(podgroup_name, instance, operation, apiserver):
+    url = "%s/api/podgroups?name=%s&instance=%s&cmd=operation&optype=%s" % (
+        apiserver, podgroup_name, instance, operation
+    )
+    return send_request("POST", url, None, None)
+
+
 def patch_podgroup_instance(podgroup_name, num_instances, apiserver):
     url = "%s/api/podgroups?name=%s&num_instances=%s&cmd=replica" % (
         apiserver, podgroup_name, num_instances