Correcting networking-odl to mitaka/stable + app topology patch

Change-Id: Iddcd8dda2d49fcdd8e0f37a1d052a6fa8a24b035
Signed-off-by: Wojciech Dec <wdec@cisco.com>

1 files changed, 3 insertions, 26 deletions

diff --git a/networking-odl/tox.ini b/networking-odl/tox.ini
index 644dbf3..c31c53d 100644
--- a/networking-odl/tox.ini
+++ b/networking-odl/tox.ini
@@ -1,11 +1,10 @@
 [tox]
-envlist = docs,py35,py34,py27,pep8
+envlist = py27,py34,pep8
 minversion = 1.6
 skipsdist = True
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
-         PYTHONWARNINGS=default::DeprecationWarning
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 usedevelop = True
 install_command = pip install -r requirements.txt -U {opts} {packages}
@@ -20,15 +19,12 @@ commands = bash tools/pretty_tox.sh '{posargs}'
 [testenv:pep8]
 commands =
   flake8
-  doc8 doc/source devstack releasenotes/source rally-jobs
   neutron-db-manage --subproject networking-odl check_migration
 
 [testenv:i18n]
 commands = python ./tools/check_i18n.py ./networking_odl ./tools/i18n_cfg.py
 
 [testenv:venv]
-# NOTE(yamahata): translation job can't use zuul-cloner or upper-constraints
-install_command = pip install -U {opts} {packages}
 commands = {posargs}
 
 [testenv:cover]
@@ -37,21 +33,12 @@ commands =
   coverage report
 
 [testenv:docs]
-commands =
-  doc8 doc/source devstack releasenotes/source rally-jobs
-  python setup.py build_sphinx
-
-[testenv:debug]
-commands = oslo_debug_helper -t networking_odl/tests {posargs}
+commands = python setup.py build_sphinx
 
 [hacking]
 import_exceptions = networking_odl._i18n
 local-check-factory = neutron_lib.hacking.checks.factory
 
-[doc8]
-# File extensions to check
-extensions = .rst
-
 [flake8]
 # H803 skipped on purpose per list discussion.
 # E123, E125 skipped as they are invalid PEP-8.
@@ -59,14 +46,4 @@ extensions = .rst
 # N530 direct neutron imports not allowed
 show-source = True
 ignore = E123,E125,H803,N530
-exclude=./.*,dist,doc,releasenotes,*lib/python*,*egg,build,tools
-
-[testenv:genconfig]
-deps = -r{toxinidir}/requirements.txt
-commands =
-    mkdir -p etc/neutron/plugins/ml2
-    oslo-config-generator --namespace ml2_odl --output-file etc/neutron/plugins/ml2/ml2_conf_odl.ini.sample
-whitelist_externals = mkdir
-
-[testenv:releasenotes]
-commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools