Remove dependency of newton from ocata

Change-Id: Id51eca6e96fe0b8349c1dbbf76da3cfa2a7f9f05
Issue-ID: MULTICLOUD-138
Signed-off-by: Yun Huang <yun.huang@windriver.com>

diff --git a/ocata/assembly.xml b/ocata/assembly.xml
index ea3c73a..e934f9f 100644 (file)
--- a/ocata/assembly.xml
+++ b/ocata/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>ocata</baseDirectory>
 </assembly>

diff --git a/ocata/ocata/registration/tests/test_registration.py b/ocata/ocata/registration/tests/test_registration.py
index 9e4a8e0..5193d60 100644 (file)
--- a/ocata/ocata/registration/tests/test_registration.py
+++ b/ocata/ocata/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/ocata/run.sh b/ocata/run.sh
index 566dc5f..a4edae4 100644 (file)
--- a/ocata/run.sh
+++ b/ocata/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:9006 2>&1 &
 
 while [ ! -f logs/runtime_ocata.log ]; do

diff --git a/ocata/tox.ini b/ocata/tox.ini
index 0df0c4a..671a4f1 100644 (file)
--- a/ocata/tox.ini
+++ b/ocata/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