Rebase to starlingx base

so that remove the newton base infraworkload handler

Change-Id: Ic5add7fc4c1ccfafeca183290e510047e933ccdb
Issue-ID: MULTICLOUD-965
Signed-off-by: Bin Yang <bin.yang@windriver.com>

diff --git a/pike/pike/urls.py b/pike/pike/urls.py
index 97fd593..f07d186 100644 (file)
--- a/pike/pike/urls.py
+++ b/pike/pike/urls.py
@@ -20,7 +20,7 @@ from django.conf.urls import include, url
 from pike.registration.views import registration
 from newton_base.openoapi import tenants
 from newton_base.resource import capacity
-from newton_base.resource import infra_workload
+from starlingx_base.resource import infra_workload
 
 urlpatterns = [
     url(r'^', include('pike.swagger.urls')),

diff --git a/pike/tox.ini b/pike/tox.ini
index 2dfb66e..6b2665c 100644 (file)
--- a/pike/tox.ini
+++ b/pike/tox.ini
@@ -37,14 +37,14 @@ deps =
     -r{toxinidir}/test-requirements.txt
 commands =
     coverage run --branch manage.py test pike
-    coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*" --fail-under=30
+    coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*,*starlingx_base*, *site-packages*" --fail-under=30
 
 [testenv:pep8]
 deps=flake8
 commands=python3 -m flake8
 
 [testenv:cov]
-commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*, *starlingx_base*, *site-packages*"
+commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*,*starlingx_base*, *site-packages*"
 
 [testenv:pylint]
 whitelist_externals = bash