X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ftest%2Ftestapi%2Fopnfv_testapi%2Ftornado_swagger%2Fviews.py;h=42b37483b56eb2af16dff72589a80cc77606c68f;hb=f1415796efec4984962f9817639a5ff2cd9ecd41;hp=ee9cf04873ab2251d19663a6b4b44c3029c18e01;hpb=a1655f1109920f83d12333ba8e0f6c8f6609535d;p=releng.git diff --git a/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py b/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py index ee9cf0487..42b37483b 100644 --- a/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py +++ b/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py @@ -8,7 +8,6 @@ ############################################################################## import inspect import json -import os.path import tornado.template import tornado.web @@ -32,9 +31,8 @@ class SwaggerUIHandler(tornado.web.RequestHandler): return self.static_path def get(self): - discovery_url = os.path.join( - self.base_url, - self.reverse_url(settings.RESOURCE_LISTING_NAME)) + resource_url = self.reverse_url(settings.RESOURCE_LISTING_NAME) + discovery_url = self.base_url + resource_url self.render('index.html', discovery_url=discovery_url) @@ -51,11 +49,9 @@ class SwaggerResourcesHandler(tornado.web.RequestHandler): 'apiVersion': self.api_version, 'swaggerVersion': self.swagger_version, 'basePath': self.base_url, - 'produces': ["application/json"], - 'description': 'Test Api Spec', 'apis': [{ 'path': self.reverse_url(settings.API_DECLARATION_NAME), - 'description': 'Test Api Spec' + 'description': 'Restful APIs Specification' }] } @@ -78,6 +74,8 @@ class SwaggerApiHandler(tornado.web.RequestHandler): 'apiVersion': self.api_version, 'swaggerVersion': self.swagger_version, 'basePath': self.base_url, + 'resourcePath': '/', + 'produces': ["application/json"], 'apis': [self.__get_api_spec__(path, spec, operations) for path, spec, operations in apis], 'models': self.__get_models_spec(settings.models)