diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2017-07-26 14:40:56 +0800 |
|---|---|---|
| committer | SerenaFeng <feng.xiaowei@zte.com.cn> | 2017-07-26 14:47:38 +0800 |
| commit | 19ee4c92981562586518310360a8d190877e73fb (patch) | |
| tree | c89a2b05d7545b514c0fe2aad354d264bb09f91a /testapi/opnfv_testapi | |
| parent | 6fbf0fb55e94c7e940dbd2a77c85a149b31a867e (diff) | |
merge swagger_base_url with ui_url
TestAPI used to have only one webpage, which is swagger_ui,
now a new one webportal is added, and the base url is the same
(http://testresults.opnfv.org/test)for them both.
This patch aim to unify the urls.
Change-Id: I15295975fb05f7e8c8d413e12b2b5c0784f0799a
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'testapi/opnfv_testapi')
7 files changed, 12 insertions, 12 deletions
diff --git a/testapi/opnfv_testapi/cmd/server.py b/testapi/opnfv_testapi/cmd/server.py index a5ac5eb..50ac049 100644 --- a/testapi/opnfv_testapi/cmd/server.py +++ b/testapi/opnfv_testapi/cmd/server.py @@ -37,7 +37,7 @@ from opnfv_testapi.tornado_swagger import swagger def make_app(): - swagger.docs(base_url=CONF.swagger_base_url, + swagger.docs(base_url=CONF.ui_url, static_path=CONF.static_path) return swagger.Application( url_mappings.mappings, diff --git a/testapi/opnfv_testapi/tests/unit/common/noparam.ini b/testapi/opnfv_testapi/tests/unit/common/noparam.ini index fda2a09..be7f2b9 100644 --- a/testapi/opnfv_testapi/tests/unit/common/noparam.ini +++ b/testapi/opnfv_testapi/tests/unit/common/noparam.ini @@ -12,5 +12,5 @@ port = 8000 debug = True authenticate = False -[swagger] -base_url = http://localhost:8000 +[ui] +url = http://localhost:8000 diff --git a/testapi/opnfv_testapi/tests/unit/common/normal.ini b/testapi/opnfv_testapi/tests/unit/common/normal.ini index 77cc6c6..c81c6c5 100644 --- a/testapi/opnfv_testapi/tests/unit/common/normal.ini +++ b/testapi/opnfv_testapi/tests/unit/common/normal.ini @@ -13,5 +13,5 @@ port = 8000 debug = True authenticate = False -[swagger] -base_url = http://localhost:8000 +[ui] +url = http://localhost:8000 diff --git a/testapi/opnfv_testapi/tests/unit/common/nosection.ini b/testapi/opnfv_testapi/tests/unit/common/nosection.ini index 9988fc0..a9ed49c 100644 --- a/testapi/opnfv_testapi/tests/unit/common/nosection.ini +++ b/testapi/opnfv_testapi/tests/unit/common/nosection.ini @@ -7,5 +7,5 @@ port = 8000 debug = True authenticate = False -[swagger] -base_url = http://localhost:8000 +[ui] +url = http://localhost:8000 diff --git a/testapi/opnfv_testapi/tests/unit/common/notboolean.ini b/testapi/opnfv_testapi/tests/unit/common/notboolean.ini index b3f3276..3a11f9d 100644 --- a/testapi/opnfv_testapi/tests/unit/common/notboolean.ini +++ b/testapi/opnfv_testapi/tests/unit/common/notboolean.ini @@ -13,5 +13,5 @@ port = 8000 debug = True authenticate = notboolean -[swagger] -base_url = http://localhost:8000 +[ui] +url = http://localhost:8000 diff --git a/testapi/opnfv_testapi/tests/unit/common/notint.ini b/testapi/opnfv_testapi/tests/unit/common/notint.ini index d1b752a..8180719 100644 --- a/testapi/opnfv_testapi/tests/unit/common/notint.ini +++ b/testapi/opnfv_testapi/tests/unit/common/notint.ini @@ -13,5 +13,5 @@ port = notint debug = True authenticate = False -[swagger] -base_url = http://localhost:8000 +[ui] +url = http://localhost:8000 diff --git a/testapi/opnfv_testapi/tests/unit/common/test_config.py b/testapi/opnfv_testapi/tests/unit/common/test_config.py index cc8743c..8cfc513 100644 --- a/testapi/opnfv_testapi/tests/unit/common/test_config.py +++ b/testapi/opnfv_testapi/tests/unit/common/test_config.py @@ -12,4 +12,4 @@ def test_config_normal(mocker, config_normal): assert CONF.api_port == 8000 assert CONF.api_debug is True assert CONF.api_authenticate is False - assert CONF.swagger_base_url == 'http://localhost:8000' + assert CONF.ui_url == 'http://localhost:8000' |