Fixed bug for proc operation

Author: supermeng

apis/models.py

@@ -547,10 +547,10 @@ 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):
+    def podgroup_operate(self, podgroup_name, instance, optype):
         logger.info("operate podgroup %s of app %s " %
                     (podgroup_name, self.appname))
-        return self.default_deploy.operate_podgroup(podgroup_name)
+        return self.default_deploy.operate_podgroup(podgroup_name, instance, optype)
 
     def dependency_register(self, service_app, service_appname, dependency_pod_name):
         # service may not been deployed yet, so may need force generate the

apis/utils.py

@@ -20,6 +20,8 @@
 from log import logger
 from .calico import (calico_profile_rule_add)
 import pycalico.datastore_datatypes
+from django.utils.dateparse import parse_datetime
+from pytz import timezone
 
 
 def read_from_etcd(key):
@@ -222,8 +224,8 @@ def get_current_time():
 
 
 def convert_time_from_deployd(d_time):
-    c_times = d_time.split("T")
-    if len(c_times) <= 1:
-        return d_time
-    else:
-        return "%s %s" % (c_times[0], c_times[1].split('.')[0])
+    t_time = parse_datetime(d_time)
+    tzchina = timezone('Asia/Shanghai')
+    utc = timezone('UTC')
+    t_time = t_time.replace(tzinfo=utc).astimezone(tzchina)
+    return t_time.strftime('%Y-%m-%d %H:%M:%S')

apis/views.py

@@ -1130,8 +1130,9 @@ def delete_app_proc(cls, appname, procname, options=None):
                     reverse('api_proc', kwargs={'appname': appname, 'procname': procname}))
 
     @classmethod
-    def operate_proc(cls, appname, procname, instance, operation, options=None):
+    def operate_proc(cls, appname, procname, operation, options=None):
         try:
+            instance = int(options.get('instance', 0))
             app = App.get_or_none(appname)
             if not app.is_reachable():
                 return (404, None,
@@ -1143,14 +1144,15 @@ def operate_proc(cls, appname, procname, instance, operation, options=None):
                         'no such proc %s in app %s' % (procname, appname),
                         reverse('api_procs', kwargs={'appname': appname}))
             if pg_status:
-                if instance != 0 {
+                container_name = None
+                if instance != 0:
                     pods = pg_status['Status']['Pods']
                     if instance <= len(pods):
-                        container_name = pods[instance - 1]['Containers'][0]['Runtime']['Name']
+                        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))
@@ -1160,7 +1162,7 @@ def operate_proc(cls, appname, procname, instance, operation, options=None):
 
                 podgroup_name = "%s.%s.%s" % (
                     appname, proc.type.name, proc.name)
-                result = app.podgroup_operate(podgroup_name)
+                result = app.podgroup_operate(podgroup_name, instance, operation)
                 if result.status_code < 400:
                     return (202, ProcApi.render_proc_data(appname, proc),
                             render_op_result_to_msg(result),
@@ -1177,8 +1179,8 @@ def operate_proc(cls, appname, procname, instance, operation, options=None):
         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),
+                    'fatal error when %s app %s proc %s:\n%s\nplease contact with admin of lain\n' % (
+                        operation, appname, procname, e),
                     reverse('api_proc', kwargs={'appname': appname, 'procname': procname}))
 
 '''

console/urls.py

@@ -17,10 +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/$',
+    url(r'^(?:api/)?v1/apps/(?P<appname>[^/]+)/procs/(?P<procname>[^/]+)/instance/(?P<instance>[^/]+)/histories/$',
         'console.views.api_proc_history', name='api_proc_history'),
 
     # authroze service for console ui

console/views.py

@@ -210,13 +210,6 @@ 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)
@@ -244,10 +237,16 @@ def api_proc_high_permit(request, appname, procname):
     elif request.method == 'PATCH':
         try:
             options = json.loads(request.body)
+            operation = options.get('operation', 'schedule')
+            if operation == 'schedule':
+                status_code, view_object, msg, url = ProcApi.update_app_proc(
+                    appname, procname, options)
+            else:
+                status_code, view_object, msg, url = ProcApi.operate_proc(
+                    appname, procname, operation, options)
         except Exception:
             return render_json_response(400, 'proc', None, 'invalid request: should be json body with num_instances(integer) or cpu(integer) or memory(str)', reverse('api_docs'))
-        status_code, view_object, msg, url = ProcApi.update_app_proc(
-            appname, procname, options)
+
         return render_json_response(status_code, 'proc', view_object, msg, url)
 
 
@@ -258,17 +257,6 @@ 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/utils.py

@@ -36,10 +36,10 @@ def remove_podgroup(podgroup_name, apiserver):
 
 
 def operate_podgroup(podgroup_name, instance, operation, apiserver):
-    url = "%s/api/podgroups?name=%s&instance=%s&cmd=operation&optype=%s" % (
+    url = "%s/api/podgroups?name=%s&instance=%d&cmd=operation&optype=%s" % (
         apiserver, podgroup_name, instance, operation
     )
-    return send_request("POST", url, None, None)
+    return send_request("PATCH", url, None, None)
 
 
 def patch_podgroup_instance(podgroup_name, num_instances, apiserver):