1 files changed, 29 insertions, 22 deletions
diff --git a/api/views.py b/api/views.py
index e78389f5a..ee13b47a9 100644
--- a/api/views.py
+++ b/api/views.py
@@ -7,36 +7,43 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 import logging
+import os
 
-from flask import request
-from flask_restful import Resource
+from flasgger.utils import swag_from
 
-from api.utils import common as common_utils
-from api.actions import test as test_action
-from api.actions import result as result_action
+from api.base import ApiResource
+from api.swagger import models
 
 logger = logging.getLogger(__name__)
+logger.setLevel(logging.DEBUG)
 
 
-class Test(Resource):
+TestCaseActionModel = models.TestCaseActionModel
+TestCaseActionArgsModel = models.TestCaseActionArgsModel
+TestCaseActionArgsOptsModel = models.TestCaseActionArgsOptsModel
+TestCaseActionArgsOptsTaskArgModel = models.TestCaseActionArgsOptsTaskArgModel
+
+
+class ReleaseAction(ApiResource):
+    @swag_from(os.getcwd() + '/swagger/docs/testcases.yaml')
+    def post(self):
+        return self._dispatch_post()
+
+
+class SamplesAction(ApiResource):
     def post(self):
-        action = common_utils.translate_to_str(request.json.get('action', ''))
-        args = common_utils.translate_to_str(request.json.get('args', {}))
-        logger.debug('Input args is: action: %s, args: %s', action, args)
+        return self._dispatch_post()
 
-        try:
-            return getattr(test_action, action)(args)
-        except AttributeError:
-            return common_utils.error_handler('Wrong action')
 
+ResultModel = models.ResultModel
 
-class Result(Resource):
+
+class Results(ApiResource):
+    @swag_from(os.getcwd() + '/swagger/docs/results.yaml')
     def get(self):
-        args = common_utils.translate_to_str(request.args)
-        action = args.get('action', '')
-        logger.debug('Input args is: action: %s, args: %s', action, args)
-
-        try:
-            return getattr(result_action, action)(args)
-        except AttributeError:
-            return common_utils.error_handler('Wrong action')
+        return self._dispatch_get()
+
+
+class EnvAction(ApiResource):
+    def post(self):
+        return self._dispatch_post()