diff options
| author |   Yun Huang <yun.huang@windriver.com> | 2018-03-08 11:03:50 +0800 |
|---|---|---|
| committer | Yun Huang <yun.huang@windriver.com> | 2018-03-08 11:03:50 +0800 |
| commit | c701ab185721e50cca3d432220361aaa723358cc (patch) | |
| tree | d8f7328c47ceca59c4b4d12446582f1699a73a0b | |
| parent | 7c65345926f4e996f9e4616eea82b1e0db0d4779 (diff) | |
Remove dependency of newton from ocata
Change-Id: Id51eca6e96fe0b8349c1dbbf76da3cfa2a7f9f05
Issue-ID: MULTICLOUD-138
Signed-off-by: Yun Huang <yun.huang@windriver.com>
| -rw-r--r-- | ocata/assembly.xml | 9 | ||||
| -rw-r--r-- | ocata/ocata/registration/tests/test_registration.py | 4 | ||||
| -rw-r--r-- | ocata/run.sh | 2 | ||||
| -rw-r--r-- | ocata/tox.ini | 2 |
4 files changed, 4 insertions, 13 deletions
diff --git a/ocata/assembly.xml b/ocata/assembly.xml index ea3c73a8..e934f9f6 100644 --- 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 9e4a8e00..5193d602 100644 --- 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 566dc5f9..a4edae47 100644 --- 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 0df0c4af..671a4f1d 100644 --- 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 |