From: SerenaFeng <feng.xiaowei@zte.com.cn>
Date: Tue, 16 May 2017 09:52:44 +0000 (+0800)
Subject: bugfix: /resources.json and /APIs cannot be accessed
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0bdfdeb2430aa6d9cb654583cc84ddabcadadd54;p=releng.git

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

1. change the join way of discover_url
2. limit tornado version not to use latest 4.5

Change-Id: I39dfd3b32bf232a7c144087bc9d5f88fb6798ee7
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
---

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