From 7c65345926f4e996f9e4616eea82b1e0db0d4779 Mon Sep 17 00:00:00 2001
From: Yun Huang <yun.huang@windriver.com>
Date: Wed, 7 Mar 2018 18:41:01 +0800
Subject: Move testbase and mock to share dir

Remove dependency of newton from windriver

Change-Id: Ida0f123b1a4513aab0198a701ea771bbbfebb7fb
Issue-ID: MULTICLOUD-138
Signed-off-by: Yun Huang <yun.huang@windriver.com>
---
 windriver/assembly.xml                                           | 9 ---------
 windriver/run.sh                                                 | 2 +-
 windriver/titanium_cloud/registration/tests/test_registration.py | 4 ++--
 windriver/tox.ini                                                | 2 +-
 4 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'windriver')

diff --git a/windriver/assembly.xml b/windriver/assembly.xml
index 4d7813c9..518b10da 100644
--- a/windriver/assembly.xml
+++ b/windriver/assembly.xml
@@ -72,14 +72,5 @@
             </includes>
         </fileSet>
     </fileSets>
-    <dependencySets>
-    <dependencySet>
-        <unpack>true</unpack>
-      <outputDirectory>/lib</outputDirectory>
-      <includes>
-        <include>org.onap.multicloud.openstack:multicloud-openstack-newton</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
     <baseDirectory>windriver</baseDirectory>
 </assembly>
diff --git a/windriver/run.sh b/windriver/run.sh
index 95b7b71c..6efd9b3a 100644
--- a/windriver/run.sh
+++ b/windriver/run.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
-export PYTHONPATH=lib/newton:lib/share
+export PYTHONPATH=lib/share
 nohup python manage.py runserver 0.0.0.0:9005 2>&1 &
 
 while [ ! -f logs/runtime_titanium_cloud.log ]; do
diff --git a/windriver/titanium_cloud/registration/tests/test_registration.py b/windriver/titanium_cloud/registration/tests/test_registration.py
index 01a40217..e0df5b1d 100644
--- a/windriver/titanium_cloud/registration/tests/test_registration.py
+++ b/windriver/titanium_cloud/registration/tests/test_registration.py
@@ -17,8 +17,8 @@ import mock
 from rest_framework import status
 
 from common.utils import restcall
-from newton.requests.tests import mock_info
-from newton.requests.tests import test_base
+from newton_base.tests import mock_info
+from newton_base.tests import test_base
 from newton_base.util import VimDriverUtils
 
 MOCK_GET_TENANT_RESPONSE = {
diff --git a/windriver/tox.ini b/windriver/tox.ini
index 29baba1a..0f9b2aee 100644
--- a/windriver/tox.ini
+++ b/windriver/tox.ini
@@ -7,7 +7,7 @@ downloadcache = ~/cache/pip
 
 [testenv]
 setenv =
-    PYTHONPATH = {toxinidir}/../newton:{toxinidir}/../share
+    PYTHONPATH = {toxinidir}/../share
 deps = -r{toxinidir}/requirements.txt
 commands =
     coverage run --branch manage.py test titanium_cloud
-- 
cgit 1.2.3-korg