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 | f1415796efec4984962f9817639a5ff2cd9ecd41 (patch) | |
| tree | 3ee868d7980695e0fabb4bd44bdc282bbd0974f3 /utils/test | |
| parent | be3512443d1e386fb7d65b8a932a54190bd08da5 (diff) | |
| parent | 0bdfdeb2430aa6d9cb654583cc84ddabcadadd54 (diff) | |
Merge "bugfix: /resources.json and /APIs cannot be accessed"
Diffstat (limited to 'utils/test')
| -rw-r--r-- | utils/test/testapi/opnfv_testapi/tornado_swagger/views.py | 6 | ||||
| -rw-r--r-- | utils/test/testapi/requirements.txt | 2 |
2 files changed, 3 insertions, 5 deletions
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 |