7 files changed, 12 insertions, 10 deletions
diff --git a/ocata/ocata/extensions/tests/test_epacaps.py b/ocata/ocata/extensions/tests/test_epacaps.py
index a78e4c25..34a4e8e1 100644
--- a/ocata/ocata/extensions/tests/test_epacaps.py
+++ b/ocata/ocata/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",
@@ -64,4 +64,4 @@ class TestEpaCaps(unittest.TestCase):
         self.assertEquals(cloud_region_id, json_content["cloud-region-id"])
         self.assertEquals(vimid, json_content["vimid"])
         self.assertEquals(json.loads(MOCK_VIM_INFO['cloud_epa_caps']),
-                          json_content["cloud-epa-caps"])
-\ No newline at end of file
+                          json_content["cloud-epa-caps"])
diff --git a/ocata/ocata/proxy/tests/test_identity_proxy.py b/ocata/ocata/proxy/tests/test_identity_proxy.py
index a77592f8..d5fb22ec 100644
--- a/ocata/ocata/proxy/tests/test_identity_proxy.py
+++ b/ocata/ocata/proxy/tests/test_identity_proxy.py
@@ -22,7 +22,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 ocata.proxy.views.identityV3 import Tokens
 
 mock_viminfo = {
diff --git a/ocata/ocata/proxy/tests/test_service_proxy.py b/ocata/ocata/proxy/tests/test_service_proxy.py
index f916e33e..aa461d37 100644
--- a/ocata/ocata/proxy/tests/test_service_proxy.py
+++ b/ocata/ocata/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/ocata/ocata/registration/tests/test_registration.py b/ocata/ocata/registration/tests/test_registration.py
index e3fe352e..694a1437 100644
--- a/ocata/ocata/registration/tests/test_registration.py
+++ b/ocata/ocata/registration/tests/test_registration.py
@@ -16,10 +16,10 @@ import mock
 
 from rest_framework import status
 
-from newton.pub.utils import restcall
+from common.utils import restcall
 from newton.requests.tests import mock_info
 from newton.requests.tests import test_base
-from newton.requests.views.util import VimDriverUtils
+from newton_base.util import VimDriverUtils
 
 MOCK_GET_TENANT_RESPONSE = {
     "projects":[
diff --git a/ocata/ocata/settings.py b/ocata/ocata/settings.py
index 6021aa78..5567a06a 100644
--- a/ocata/ocata/settings.py
+++ b/ocata/ocata/settings.py
@@ -12,6 +12,8 @@
 import os
 import sys
 
+CACHE_EXPIRATION_TIME = 3600
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
diff --git a/ocata/vagrant/test/Dockerfile b/ocata/vagrant/test/Dockerfile
index 2d9eda54..cc7d2b53 100644
--- a/ocata/vagrant/test/Dockerfile
+++ b/ocata/vagrant/test/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update && \
     rm -f multicloud-openstack-ocata.zip && \
     pip install -r /opt/ocata/requirements.txt
 
-ADD extsys.py /opt/ocata/lib/newton/newton/pub/msapi/extsys.py
+ADD extsys.py /opt/ocata/lib/share/common/msapi/extsys.py
 
 WORKDIR /opt/ocata
 CMD /bin/sh -c /opt/ocata/run.sh
diff --git a/ocata/vagrant/test/extsys.py b/ocata/vagrant/test/extsys.py
index 59cf7a7b..83778914 100644
--- a/ocata/vagrant/test/extsys.py
+++ b/ocata/vagrant/test/extsys.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@ import logging
 import re
 
 from rest_framework import status
-from newton.pub.exceptions import VimDriverNewtonException
-from newton.pub.utils.restcall import req_by_msb,req_to_aai
+from common.exceptions import VimDriverNewtonException
+from common.utils.restcall import req_by_msb,req_to_aai
 
 
 logger = logging.getLogger(__name__)