Fix Bug 1782 RO does not create management networks where appropriate

[osm/RO.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 316575f..310db7a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@
 #######################################################################################
 
 [tox]
-envlist = black, flake8, pylint, safety
+envlist = black, flake8, safety
 
 [tox:jenkins]
 toxworkdir = /tmp/.tox
@@ -43,25 +43,24 @@ commands =
 deps = black
 skip_install = true
 commands =
-        - black --check --diff NG-RO
-        - black --check --diff RO-plugin
-        - black --check --diff RO-SDN-arista_cloudvision
-        - black --check --diff RO-SDN-dpb
-        - black --check --diff RO-SDN-dynpac
-        - black --check --diff RO-SDN-floodlight_openflow
-        - black --check --diff RO-SDN-ietfl2vpn
-        - black --check --diff RO-SDN-juniper_contrail
-        - black --check --diff RO-SDN-odl_openflow
-        - black --check --diff RO-SDN-onos_openflow
-        - black --check --diff RO-SDN-onos_vpls
-        - black --check --diff RO-VIM-aws
-        - black --check --diff RO-VIM-azure
-        - black --check --diff RO-VIM-fos
-        - black --check --diff RO-VIM-opennebula
-        - black --check --diff RO-VIM-openstack
-        - black --check --diff RO-VIM-openvim
-        - black --check --diff RO-VIM-vmware
-        - black --check --diff RO-VIM-gcp
+        black --check --diff NG-RO
+        black --check --diff RO-plugin
+        black --check --diff RO-SDN-arista_cloudvision
+        black --check --diff RO-SDN-dpb
+        black --check --diff RO-SDN-dynpac
+        black --check --diff RO-SDN-floodlight_openflow
+        black --check --diff RO-SDN-ietfl2vpn
+        black --check --diff RO-SDN-juniper_contrail
+        black --check --diff RO-SDN-odl_openflow
+        black --check --diff RO-SDN-onos_openflow
+        black --check --diff RO-SDN-onos_vpls
+        black --check --diff RO-VIM-aws
+        black --check --diff RO-VIM-azure
+        black --check --diff RO-VIM-openstack
+        black --check --diff RO-VIM-openvim
+        black --check --diff RO-VIM-vmware
+        black --check --diff RO-VIM-gcp
+        black --check --diff integration-tests
 
 
 #######################################################################################
@@ -112,12 +111,6 @@ commands =
         # RO-VIM-azure
         - nose2 -C --coverage RO-VIM-azure/osm_rovim_azure
         sh -c 'mv .coverage .coverage_rovim_azure'
-        # RO-VIM-fos
-        - nose2 -C --coverage RO-VIM-fos/osm_rovim_fos
-        sh -c 'mv .coverage .coverage_rovim_fos'
-        # RO-VIM-opennebula
-        - nose2 -C --coverage RO-VIM-opennebula/osm_rovim_opennebula
-        sh -c 'mv .coverage .coverage_rovim_opennebula'
         # RO-VIM-openstack
         - nose2 -C --coverage RO-VIM-openstack/osm_rovim_openstack -s RO-VIM-openstack/osm_rovim_openstack
         sh -c 'mv .coverage .coverage_rovim_openstack'
@@ -131,7 +124,7 @@ commands =
         - nose2 -C --coverage RO-VIM-gcp/osm_rovim_gcp
         sh -c 'mv .coverage .coverage_rovim_gcp'
         # Combine results and generate reports
-        coverage combine .coverage_ng_ro .coverage_ro_plugin .coverage_rosdn_arista_cloudvision .coverage_rosdn_dpb .coverage_rosdn_dynpac .coverage_rosdn_floodlightof .coverage_rosdn_ietfl2vpn .coverage_rosdn_juniper_contrail .coverage_rosdn_odlof .coverage_rosdn_onos_vpls .coverage_rosdn_onosof .coverage_rovim_aws .coverage_rovim_azure .coverage_rovim_fos .coverage_rovim_opennebula .coverage_rovim_openstack .coverage_rovim_openvim .coverage_rovim_vmware .coverage_rovim_gcp
+        coverage combine .coverage_ng_ro .coverage_ro_plugin .coverage_rosdn_arista_cloudvision .coverage_rosdn_dpb .coverage_rosdn_dynpac .coverage_rosdn_floodlightof .coverage_rosdn_ietfl2vpn .coverage_rosdn_juniper_contrail .coverage_rosdn_odlof .coverage_rosdn_onos_vpls .coverage_rosdn_onosof .coverage_rovim_aws .coverage_rovim_azure .coverage_rovim_openvim .coverage_rovim_gcp # .coverage_rovim_openstack .coverage_rovim_vmware
         coverage report --omit='*tests*'
         coverage html -d ./cover --omit='*tests*'
         coverage xml -o coverage.xml --omit='*tests*'
@@ -156,8 +149,6 @@ commands =
         - flake8 RO-SDN-onos_vpls/osm_rosdn_onos_vpls/ RO-SDN-onos_vpls/setup.py
         - flake8 RO-VIM-aws/osm_rovim_aws/ RO-VIM-aws/setup.py
         - flake8 RO-VIM-azure/osm_rovim_azure/ RO-VIM-azure/setup.py
-        - flake8 RO-VIM-fos/osm_rovim_fos/ RO-VIM-fos/setup.py
-        - flake8 RO-VIM-opennebula/osm_rovim_opennebula/ RO-VIM-opennebula/setup.py
         - flake8 RO-VIM-openstack/osm_rovim_openstack/ RO-VIM-openstack/setup.py
         - flake8 RO-VIM-openvim/osm_rovim_openvim/ RO-VIM-openvim/setup.py
         - flake8 RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py RO-VIM-vmware/setup.py
@@ -186,8 +177,6 @@ commands =
         - pylint -E RO-SDN-onos_vpls/osm_rosdn_onos_vpls
         - pylint -E RO-VIM-aws/osm_rovim_aws
         - pylint -E RO-VIM-azure/osm_rovim_azure
-        - pylint -E RO-VIM-fos/osm_rovim_fos
-        - pylint -E RO-VIM-opennebula/osm_rovim_opennebula
         - pylint -E RO-VIM-openstack/osm_rovim_openstack
         - pylint -E RO-VIM-openvim/osm_rovim_openvim
         - pylint -E RO-VIM-vmware/osm_rovim_vmware
@@ -215,6 +204,7 @@ commands =
         out=`echo $file | sed 's/.in/.txt/'` ; \
         sed -i -e '1 e head -16 tox.ini' $out ;\
         done"
+        - sh -c "sed -i 's/.*RO-plugin/-e RO-plugin/g' requirements-test.txt"
 whitelist_externals = sh
 
 
@@ -375,30 +365,6 @@ commands =
         sh -c 'cd deb_dist/osm-rovim-azure*/ && dpkg-buildpackage -rfakeroot -uc -us'
 whitelist_externals = sh
 
-#######################################################################################
-[testenv:dist_ro_vim_fos]
-deps =  {[testenv]deps}
-        -r{toxinidir}/requirements-dist.txt
-skip_install = true
-changedir = {toxinidir}/RO-VIM-fos
-commands =
-        sh -c 'rm -rf deb_dist dist osm_rovim_fos.egg-info osm_rovim_fos*.tar.gz'
-        python3 setup.py --command-packages=stdeb.command sdist_dsc
-        sh -c 'cd deb_dist/osm-rovim-fos*/ && dpkg-buildpackage -rfakeroot -uc -us'
-whitelist_externals = sh
-
-#######################################################################################
-[testenv:dist_ro_vim_opennebula]
-deps =  {[testenv]deps}
-        -r{toxinidir}/requirements-dist.txt
-skip_install = true
-changedir = {toxinidir}/RO-VIM-opennebula
-commands =
-        sh -c 'rm -rf deb_dist dist osm_rovim_opennebula.egg-info osm_rovim_opennebula*.tar.gz'
-        python3 setup.py --command-packages=stdeb.command sdist_dsc
-        sh -c 'cd deb_dist/osm-rovim-opennebula*/ && dpkg-buildpackage -rfakeroot -uc -us'
-whitelist_externals = sh
-
 #######################################################################################
 [testenv:dist_ro_vim_openstack]
 deps =  {[testenv]deps}