diff options
| author |   Yun Huang <yun.huang@windriver.com> | 2018-03-07 09:16:38 +0800 |
|---|---|---|
| committer | Yun Huang <yun.huang@windriver.com> | 2018-03-07 09:23:18 +0800 |
| commit | 9b38263158909c0d20c0f36438071b3c532ec284 (patch) | |
| tree | 05cebf5569f401ddeb095ea6282e2203e6c3eec0 /windriver/titanium_cloud/proxy | |
| parent | 8ff2e0716d126a9d47dc98f933bb0bc046faa05d (diff) | |
Change the code base from newton to share
And adopt settings，depreciate config
Change-Id: Ib467a6e914ae89ab8799d38191dfed8b3cd7b726
Issue-ID: MULTICLOUD-138
Signed-off-by: Yun Huang <yun.huang@windriver.com>
Diffstat (limited to 'windriver/titanium_cloud/proxy')
5 files changed, 9 insertions, 9 deletions
diff --git a/windriver/titanium_cloud/proxy/tests/test_identity_proxy.py b/windriver/titanium_cloud/proxy/tests/test_identity_proxy.py index fd80c182..5dc061fa 100644 --- a/windriver/titanium_cloud/proxy/tests/test_identity_proxy.py +++ b/windriver/titanium_cloud/proxy/tests/test_identity_proxy.py @@ -23,7 +23,7 @@ from rest_framework import status from keystoneauth1 import session from keystoneauth1.exceptions import HttpError -from newton.requests.views.util import VimDriverUtils +from newton_base.util import VimDriverUtils from titanium_cloud.proxy.views.identityV3 import Tokens mock_viminfo = { diff --git a/windriver/titanium_cloud/proxy/tests/test_service_proxy.py b/windriver/titanium_cloud/proxy/tests/test_service_proxy.py index e373168b..f9a9af40 100644 --- a/windriver/titanium_cloud/proxy/tests/test_service_proxy.py +++ b/windriver/titanium_cloud/proxy/tests/test_service_proxy.py @@ -21,7 +21,7 @@ from rest_framework import status import unittest -from newton.requests.views.util import VimDriverUtils +from newton_base.util import VimDriverUtils MOCK_VIM_INFO = { "createTime": "2017-04-01 02:22:27", diff --git a/windriver/titanium_cloud/proxy/urls.py b/windriver/titanium_cloud/proxy/urls.py index f1709e3f..22f714d1 100644 --- a/windriver/titanium_cloud/proxy/urls.py +++ b/windriver/titanium_cloud/proxy/urls.py @@ -17,7 +17,7 @@ from rest_framework.urlpatterns import format_suffix_patterns from titanium_cloud.proxy.views import identityV3 from titanium_cloud.proxy.views import services -from newton.proxy.views import dnsaasdelegate +from newton_base.proxy import dnsaasdelegate urlpatterns = [ # url(r'^identity/v2)$', diff --git a/windriver/titanium_cloud/proxy/views/identityV3.py b/windriver/titanium_cloud/proxy/views/identityV3.py index 29b37d76..dd280314 100644 --- a/windriver/titanium_cloud/proxy/views/identityV3.py +++ b/windriver/titanium_cloud/proxy/views/identityV3.py @@ -14,8 +14,8 @@ import logging -from titanium_cloud.pub.config import config -from newton.proxy.views import identityV3 as newton_identityV3 +from django.conf import settings +from newton_base.proxy import identityV3 as newton_identityV3 logger = logging.getLogger(__name__) @@ -24,11 +24,11 @@ DEBUG=True class Tokens(newton_identityV3.Tokens): def __init__(self): - self.proxy_prefix = config.MULTICLOUD_PREFIX + self.proxy_prefix = settings.MULTICLOUD_PREFIX self._logger = logger class TokensV2(newton_identityV3.TokensV2): def __init__(self): - self.proxy_prefix = config.MULTICLOUD_PREFIX + self.proxy_prefix = settings.MULTICLOUD_PREFIX self._logger = logger diff --git a/windriver/titanium_cloud/proxy/views/services.py b/windriver/titanium_cloud/proxy/views/services.py index 47210205..4bfecdbc 100644 --- a/windriver/titanium_cloud/proxy/views/services.py +++ b/windriver/titanium_cloud/proxy/views/services.py @@ -16,8 +16,8 @@ import logging from rest_framework import status -from titanium_cloud.pub.config import config -from newton.proxy.views import services as newton_services +from django.conf import settings +from newton_base.proxy import services as newton_services logger = logging.getLogger(__name__) |