Merge "bugfix: /resources.json and /APIs cannot be accessed"

[releng.git] / utils / test / testapi / opnfv_testapi / tornado_swagger / views.py

diff --git a/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py b/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py
index ee9cf04..42b3748 100644 (file)
--- 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)