X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ftest%2Fresult_collection_api%2Fresult_collection_api.py;h=652aa58afe681b5f9807a98d15f340b09a0e1a3e;hb=04578f6f8c56ae2585c9aec637812d812919be46;hp=344e0d7b07956c4d9f9a4a582d2f487b0a53ecdb;hpb=1a5bfeacf2743cde6336e0e3f4e5f8be18a6237f;p=releng.git diff --git a/utils/test/result_collection_api/result_collection_api.py b/utils/test/result_collection_api/result_collection_api.py index 344e0d7b0..652aa58af 100644 --- a/utils/test/result_collection_api/result_collection_api.py +++ b/utils/test/result_collection_api/result_collection_api.py @@ -34,10 +34,11 @@ import argparse import tornado.ioloop import motor -from resources.handlers import VersionHandler, \ - TestcaseHandler, TestResultsHandler, DashboardHandler +from resources.handlers import VersionHandler, DashboardHandler +from resources.testcase_handlers import TestcaseCLHandler, TestcaseGURHandler from resources.pod_handlers import PodCLHandler, PodGURHandler from resources.project_handlers import ProjectCLHandler, ProjectGURHandler +from resources.result_handlers import ResultsCLHandler, ResultsGURHandler from common.config import APIConfig from tornado_swagger_ui.tornado_swagger import swagger @@ -73,8 +74,8 @@ def make_app(): # few examples # GET /projects/qtip/cases => Get cases for qtip - (r"/api/v1/projects/([^/]+)/cases", TestcaseHandler), - (r"/api/v1/projects/([^/]+)/cases/([^/]+)", TestcaseHandler), + (r"/api/v1/projects/([^/]+)/cases", TestcaseCLHandler), + (r"/api/v1/projects/([^/]+)/cases/([^/]+)", TestcaseGURHandler), # new path to avoid a long depth # GET /results?project=functest&case=keystone.catalog&pod=1 @@ -82,9 +83,8 @@ def make_app(): # POST /results => # Push results with mandatory request payload parameters # (project, case, and pod) - (r"/api/v1/results", TestResultsHandler), - (r"/api/v1/results([^/]*)", TestResultsHandler), - (r"/api/v1/results/([^/]*)", TestResultsHandler), + (r"/api/v1/results", ResultsCLHandler), + (r"/api/v1/results/([^/]+)", ResultsGURHandler), # Method to manage Dashboard ready results # GET /dashboard?project=functest&case=vPing&pod=opnfv-jump2