From 9b38263158909c0d20c0f36438071b3c532ec284 Mon Sep 17 00:00:00 2001 From: Yun Huang Date: Wed, 7 Mar 2018 09:16:38 +0800 Subject: Change the code base from newton to share MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And adopt settings，depreciate config Change-Id: Ib467a6e914ae89ab8799d38191dfed8b3cd7b726 Issue-ID: MULTICLOUD-138 Signed-off-by: Yun Huang --- windriver/titanium_cloud/extensions/tests/test_epacaps.py | 2 +- windriver/titanium_cloud/extensions/views/epacaps.py | 6 +++--- windriver/titanium_cloud/extensions/views/extensions.py | 11 +++++------ windriver/titanium_cloud/extensions/views/fcaps.py | 10 +++++----- 4 files changed, 14 insertions(+), 15 deletions(-) (limited to 'windriver/titanium_cloud/extensions') diff --git a/windriver/titanium_cloud/extensions/tests/test_epacaps.py b/windriver/titanium_cloud/extensions/tests/test_epacaps.py index 89fe1b42..6b938da1 100644 --- a/windriver/titanium_cloud/extensions/tests/test_epacaps.py +++ b/windriver/titanium_cloud/extensions/tests/test_epacaps.py @@ -19,7 +19,7 @@ from django.test import Client 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/extensions/views/epacaps.py b/windriver/titanium_cloud/extensions/views/epacaps.py index 69b24c9f..77542b31 100644 --- a/windriver/titanium_cloud/extensions/views/epacaps.py +++ b/windriver/titanium_cloud/extensions/views/epacaps.py @@ -16,10 +16,10 @@ import logging import json import traceback -from titanium_cloud.pub.config import config +from django.conf import settings -from newton.extensions.views import epacaps as newton_epacaps +from newton_base.extensions import epacaps as newton_epacaps logger = logging.getLogger(__name__) @@ -29,5 +29,5 @@ DEBUG=True class EpaCaps(newton_epacaps.EpaCaps): def __init__(self): - self.proxy_prefix = config.MULTICLOUD_PREFIX + self.proxy_prefix = settings.MULTICLOUD_PREFIX self._logger = logger diff --git a/windriver/titanium_cloud/extensions/views/extensions.py b/windriver/titanium_cloud/extensions/views/extensions.py index d6988830..680e2ca6 100644 --- a/windriver/titanium_cloud/extensions/views/extensions.py +++ b/windriver/titanium_cloud/extensions/views/extensions.py @@ -20,11 +20,10 @@ from rest_framework import status from rest_framework.response import Response from rest_framework.views import APIView -from titanium_cloud.pub.config import config -from newton.pub.exceptions import VimDriverNewtonException -from newton.requests.views.util import VimDriverUtils -from newton.extensions.views import extensions as newton_extensions -from newton.pub.msapi import extsys +from django.conf import settings +from common.exceptions import VimDriverNewtonException +from common.msapi import extsys +from newton_base.extensions import extensions as newton_extensions logger = logging.getLogger(__name__) @@ -34,7 +33,7 @@ class Extensions(newton_extensions.Extensions): def __init__(self): self._logger = logger - self.proxy_prefix = config.MULTICLOUD_PREFIX + self.proxy_prefix = settings.MULTICLOUD_PREFIX def get(self, request, vimid=""): diff --git a/windriver/titanium_cloud/extensions/views/fcaps.py b/windriver/titanium_cloud/extensions/views/fcaps.py index 894db367..d5be095f 100644 --- a/windriver/titanium_cloud/extensions/views/fcaps.py +++ b/windriver/titanium_cloud/extensions/views/fcaps.py @@ -24,10 +24,10 @@ from rest_framework import status from rest_framework.response import Response from rest_framework.views import APIView -from titanium_cloud.pub.config import config -from newton.pub.exceptions import VimDriverNewtonException -from newton.requests.views.util import VimDriverUtils -from newton.pub.msapi import extsys +from django.conf import settings +from common.exceptions import VimDriverNewtonException +from newton_base.util import VimDriverUtils +from common.msapi import extsys @@ -126,7 +126,7 @@ class GuestMonitorWorker (threading.Thread): class GuestMonitor(APIView): def __init__(self): - self.proxy_prefix = config.MULTICLOUD_PREFIX + self.proxy_prefix = settings.MULTICLOUD_PREFIX self._logger = logger def post(self, request, vimid="", vserverid=""): -- cgit 1.2.3-korg