From: Morgan Richomme <morgan.richomme@orange.com>
Date: Wed, 17 May 2017 06:43:34 +0000 (+0000)
Subject: Merge "bugfix: /resources.json and /APIs cannot be accessed"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f1415796efec4984962f9817639a5ff2cd9ecd41;hp=be3512443d1e386fb7d65b8a932a54190bd08da5;p=releng.git

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

diff --git a/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py b/utils/test/testapi/opnfv_testapi/tornado_swagger/views.py
index ca4f01cfc..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)
 
 
diff --git a/utils/test/testapi/requirements.txt b/utils/test/testapi/requirements.txt
index e1fd9e4cc..ee144d247 100644
--- a/utils/test/testapi/requirements.txt
+++ b/utils/test/testapi/requirements.txt
@@ -4,6 +4,6 @@
 
 pbr>=1.6
 setuptools>=16.0
-tornado>=3.1
+tornado>=3.1,<=4.3
 epydoc>=0.3.1
 motor