Merge pull request #103 from lostsnow/feature/report-upload-api-version

add report upload api version

Author: lostsnow

dongtai_agent_python/api/openapi.py

@@ -111,7 +111,8 @@ def thread_heart_report(self):
                 'reqCount': self.setting.request_seq,
                 'reportQueue': self.report_queue
             },
-            'type': 1
+            'type': 1,
+            'version': 'v1',
         }
         url = '/api/v1/report/upload'
         heart_resp = self.report(url, system_info)
@@ -208,16 +209,22 @@ def agent_register(self):
 
         return resp
 
-    def report_upload(self, upload_report):
+    def report_upload(self, detail):
         url = '/api/v1/report/upload'
-        resp = self.report(url, upload_report)
+
+        data = {
+            'detail': detail,
+            'type': 36,
+            'version': 'v1',
+        }
+        resp = self.report(url, data)
         self.report_queue = self.report_queue - 1
 
         return resp
 
-    def async_report_upload(self, executor, upload_report):
+    def async_report_upload(self, executor, detail):
         self.report_queue = self.report_queue + 1
-        executor.submit(self.report_upload, upload_report)
+        executor.submit(self.report_upload, detail)
 
     @scope.with_scope(scope.SCOPE_AGENT)
     def packages_report(self):
@@ -230,6 +237,7 @@ def packages_report(self):
                 'packages': packages,
             },
             'type': 18,
+            'version': 'v1',
         }
         url = '/api/v1/report/upload'
         heart_resp = self.report(url, detail)

dongtai_agent_python/middlewares/django_middleware.py

@@ -35,11 +35,7 @@ def process_response(self, context, request):
 
         context = CONTEXT_TRACKER.current()
         context.detail['pool'] = context.pool
-        data = {
-            'detail': context.detail,
-            'type': 36,
-        }
-        self.openapi.async_report_upload(self.executor, data)
+        self.openapi.async_report_upload(self.executor, context.detail)
 
         return response
 

dongtai_agent_python/middlewares/flask_middleware.py

@@ -39,11 +39,7 @@ def process_response_hook(response):
             process_response_data(context, response)
 
             context.detail['pool'] = context.pool
-            data = {
-                'detail': context.detail,
-                'type': 36,
-            }
-            self.openapi.async_report_upload(self.executor, data)
+            self.openapi.async_report_upload(self.executor, context.detail)
 
             return response
 

dongtai_agent_python/middlewares/wsgi_middleware.py

@@ -100,8 +100,4 @@ def process_response(self, context, environ, start_response):
             return response(environ, start_response)
         finally:
             context.detail['pool'] = context.pool
-            data = {
-                'detail': context.detail,
-                'type': 36,
-            }
-            self.openapi.async_report_upload(self.executor, data)
+            self.openapi.async_report_upload(self.executor, context.detail)