diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-05-17 06:43:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-17 06:43:34 +0000 |
| commit | de3ac5fcdb1259df876df53d93b4166011fae79b (patch) | |
| tree | e35fa2947391fa5cc3a7896f0f5760ba6c6ef59d /testapi | |
| parent | e401fd7efbf74c7cdc5334c380c79b45ad9271e0 (diff) | |
| parent | 274438a3b7a60f1512981182bbf4808b2a4986ac (diff) | |
Merge "bugfix: /resources.json and /APIs cannot be accessed"
Diffstat (limited to 'testapi')
| -rw-r--r-- | testapi/opnfv_testapi/tornado_swagger/views.py | 6 | ||||
| -rw-r--r-- | testapi/requirements.txt | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/testapi/opnfv_testapi/tornado_swagger/views.py b/testapi/opnfv_testapi/tornado_swagger/views.py index ca4f01c..42b3748 100644 --- a/testapi/opnfv_testapi/tornado_swagger/views.py +++ b/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/testapi/requirements.txt b/testapi/requirements.txt index e1fd9e4..ee144d2 100644 --- a/testapi/requirements.txt +++ b/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 |