aboutsummaryrefslogtreecommitdiffstats
path: root/functest/api/server.py
diff options
context:
space:
mode:
Diffstat (limited to 'functest/api/server.py')
-rw-r--r--functest/api/server.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/functest/api/server.py b/functest/api/server.py
index 2a6b228ff..b27929a3e 100644
--- a/functest/api/server.py
+++ b/functest/api/server.py
@@ -15,12 +15,12 @@ Used to launch Functest RestApi
import inspect
import logging
import socket
-from urlparse import urljoin
import pkg_resources
from flask import Flask
from flask_restful import Api
from flasgger import Swagger
+import six
from functest.api.base import ApiResource
from functest.api.common import api_utils
@@ -57,7 +57,8 @@ def get_resource(resource_name):
def get_endpoint(url):
""" Obtain the endpoint of url """
address = socket.gethostbyname(socket.gethostname())
- return urljoin('http://{}:5000'.format(address), url)
+ return six.moves.urllib.parse.urljoin(
+ 'http://{}:5000'.format(address), url)
def api_add_resource():