diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-06-01 17:36:45 +0800 |
|---|---|---|
| committer | Serena Feng <feng.xiaowei@zte.com.cn> | 2016-06-01 13:42:01 +0000 |
| commit | 5a70780d9bb105f8aef312d67cf1ec2e3751f0c3 (patch) | |
| tree | da9c1863330375074509c2a61223fdb5de917534 /result_collection_api/opnfv_testapi/resources | |
| parent | 2d2a12935a39aa8fc7dc615da9058085a1661876 (diff) | |
change the usage of tornado_swagger package
changes:
move tornado_swagger package out of tornado_swagger_ui
remove tornado_swagger_ui
modify files that import tornado_swagger
originally: opnfv_testapi.tornado_swagger_ui.tornado_swagger
to: opnfv_testapi.tornado_swagger
modify setup.cfg to delete tornado_swagger_ui prefix
JIRA: FUNCTEST-286
Change-Id: I1e8972e4fbe26ad3a5d945f3aed6783d0b666a5f
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'result_collection_api/opnfv_testapi/resources')
11 files changed, 11 insertions, 11 deletions
diff --git a/result_collection_api/opnfv_testapi/resources/dashboard_handlers.py b/result_collection_api/opnfv_testapi/resources/dashboard_handlers.py index 00abbb9..82bf8d2 100644 --- a/result_collection_api/opnfv_testapi/resources/dashboard_handlers.py +++ b/result_collection_api/opnfv_testapi/resources/dashboard_handlers.py @@ -6,7 +6,7 @@ from opnfv_testapi.dashboard.dashboard_utils import \ check_dashboard_ready_case, get_dashboard_result from opnfv_testapi.resources.result_handlers import GenericResultHandler from opnfv_testapi.resources.result_models import TestResult -from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger +from opnfv_testapi.tornado_swagger import swagger class GenericDashboardHandler(GenericResultHandler): diff --git a/result_collection_api/opnfv_testapi/resources/handlers.py b/result_collection_api/opnfv_testapi/resources/handlers.py index 4b39b24..3d39502 100644 --- a/result_collection_api/opnfv_testapi/resources/handlers.py +++ b/result_collection_api/opnfv_testapi/resources/handlers.py @@ -29,7 +29,7 @@ from tornado import gen from models import CreateResponse from opnfv_testapi.common.constants import DEFAULT_REPRESENTATION, \ HTTP_BAD_REQUEST, HTTP_NOT_FOUND, HTTP_FORBIDDEN -from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger +from opnfv_testapi.tornado_swagger import swagger class GenericApiHandler(RequestHandler): diff --git a/result_collection_api/opnfv_testapi/resources/models.py b/result_collection_api/opnfv_testapi/resources/models.py index 881f65d..290a7f3 100644 --- a/result_collection_api/opnfv_testapi/resources/models.py +++ b/result_collection_api/opnfv_testapi/resources/models.py @@ -13,7 +13,7 @@ # feng.xiaowei@zte.com.cn mv TestCase to testcase_models.py 5-20-2016
# feng.xiaowei@zte.com.cn mv TestResut to result_models.py 5-23-2016
##############################################################################
-from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger
+from opnfv_testapi.tornado_swagger import swagger
class CreateResponse(object):
diff --git a/result_collection_api/opnfv_testapi/resources/pod_handlers.py b/result_collection_api/opnfv_testapi/resources/pod_handlers.py index 5a4b555..d9e6686 100644 --- a/result_collection_api/opnfv_testapi/resources/pod_handlers.py +++ b/result_collection_api/opnfv_testapi/resources/pod_handlers.py @@ -1,4 +1,4 @@ -from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger +from opnfv_testapi.tornado_swagger import swagger from handlers import GenericApiHandler from pod_models import Pod from opnfv_testapi.common.constants import HTTP_FORBIDDEN diff --git a/result_collection_api/opnfv_testapi/resources/pod_models.py b/result_collection_api/opnfv_testapi/resources/pod_models.py index 2e64503..3e6f5a8 100644 --- a/result_collection_api/opnfv_testapi/resources/pod_models.py +++ b/result_collection_api/opnfv_testapi/resources/pod_models.py @@ -1,4 +1,4 @@ -from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger +from opnfv_testapi.tornado_swagger import swagger __author__ = '__serena__' diff --git a/result_collection_api/opnfv_testapi/resources/project_handlers.py b/result_collection_api/opnfv_testapi/resources/project_handlers.py index 191a933..30fb402 100644 --- a/result_collection_api/opnfv_testapi/resources/project_handlers.py +++ b/result_collection_api/opnfv_testapi/resources/project_handlers.py @@ -1,4 +1,4 @@ -from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger +from opnfv_testapi.tornado_swagger import swagger from handlers import GenericApiHandler from opnfv_testapi.common.constants import HTTP_FORBIDDEN from project_models import Project diff --git a/result_collection_api/opnfv_testapi/resources/project_models.py b/result_collection_api/opnfv_testapi/resources/project_models.py index fbb6beb..1014254 100644 --- a/result_collection_api/opnfv_testapi/resources/project_models.py +++ b/result_collection_api/opnfv_testapi/resources/project_models.py @@ -1,4 +1,4 @@ -from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger +from opnfv_testapi.tornado_swagger import swagger __author__ = '__serena__' diff --git a/result_collection_api/opnfv_testapi/resources/result_handlers.py b/result_collection_api/opnfv_testapi/resources/result_handlers.py index a9aa17b..9358c71 100644 --- a/result_collection_api/opnfv_testapi/resources/result_handlers.py +++ b/result_collection_api/opnfv_testapi/resources/result_handlers.py @@ -6,7 +6,7 @@ from tornado.web import HTTPError from opnfv_testapi.common.constants import HTTP_BAD_REQUEST, HTTP_NOT_FOUND from opnfv_testapi.resources.handlers import GenericApiHandler from opnfv_testapi.resources.result_models import TestResult -from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger +from opnfv_testapi.tornado_swagger import swagger class GenericResultHandler(GenericApiHandler): diff --git a/result_collection_api/opnfv_testapi/resources/result_models.py b/result_collection_api/opnfv_testapi/resources/result_models.py index cf89673..b3bb95b 100644 --- a/result_collection_api/opnfv_testapi/resources/result_models.py +++ b/result_collection_api/opnfv_testapi/resources/result_models.py @@ -1,4 +1,4 @@ -from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger +from opnfv_testapi.tornado_swagger import swagger @swagger.model() diff --git a/result_collection_api/opnfv_testapi/resources/testcase_handlers.py b/result_collection_api/opnfv_testapi/resources/testcase_handlers.py index dbeebeb..4b825f2 100644 --- a/result_collection_api/opnfv_testapi/resources/testcase_handlers.py +++ b/result_collection_api/opnfv_testapi/resources/testcase_handlers.py @@ -1,7 +1,7 @@ from opnfv_testapi.common.constants import HTTP_FORBIDDEN from opnfv_testapi.resources.handlers import GenericApiHandler from opnfv_testapi.resources.testcase_models import Testcase -from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger +from opnfv_testapi.tornado_swagger import swagger class GenericTestcaseHandler(GenericApiHandler): diff --git a/result_collection_api/opnfv_testapi/resources/testcase_models.py b/result_collection_api/opnfv_testapi/resources/testcase_models.py index aa5789e..e3718a6 100644 --- a/result_collection_api/opnfv_testapi/resources/testcase_models.py +++ b/result_collection_api/opnfv_testapi/resources/testcase_models.py @@ -1,4 +1,4 @@ -from opnfv_testapi.tornado_swagger_ui.tornado_swagger import swagger +from opnfv_testapi.tornado_swagger import swagger __author__ = '__serena__' |