X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=tox.ini;h=44220840da579303c96cbb0a648073c59c0b77d7;hb=d5d92ec343a9f61485c565c9f2ffb12afb85d67a;hp=35c212bb9be02a8cde8bb06b9c18a7f955d6905e;hpb=a0a3330506aaed3194f3c1c9fdee6319f3a7700d;p=osm%2FRO.git

diff --git a/tox.ini b/tox.ini
index 35c212bb..44220840 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,14 +16,15 @@
 #######################################################################################
 
 [tox]
-envlist = black, flake8, pylint, safety
+envlist = black, cover, flake8, pylint, safety
 
 [tox:jenkins]
 toxworkdir = /tmp/.tox
+setenv = XDG_CACHE_HOME=/tmp/.cache
 
 [testenv]
 usedevelop = True
-basepython = python3
+basepython = python3.10
 setenv = VIRTUAL_ENV={envdir}
          PYTHONDONTWRITEBYTECODE = 1
 deps =  -r{toxinidir}/requirements.txt
@@ -34,8 +35,10 @@ parallel_show_output = true
 [testenv:release_notes]
 deps = reno
 skip_install = true
+allowlist_externals = bash
 commands =
         reno new {posargs:new_feature}
+        bash -c "sed -i -e '1 e head -16 tox.ini' releasenotes/notes/{posargs:new_feature}*.yaml"
 
 
 #######################################################################################
@@ -54,10 +57,9 @@ commands =
         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-SDN-tapi
         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
@@ -71,7 +73,7 @@ deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dev.txt
         -r{toxinidir}/requirements-test.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 commands =
         sh -c 'rm -f nosetests.xml'
         coverage erase
@@ -79,61 +81,59 @@ commands =
         nose2 -C --coverage NG-RO/osm_ng_ro -s NG-RO/osm_ng_ro
         sh -c 'mv .coverage .coverage_ng_ro'
         # RO-plugin
-        nose2 -C --coverage RO-plugin/osm_ro_plugin -s RO-plugin/osm_ro_plugin
-        sh -c 'mv .coverage .coverage_ro_plugin'
+        # nose2 -C --coverage RO-plugin/osm_ro_plugin -s RO-plugin/osm_ro_plugin
+        # sh -c 'mv .coverage .coverage_ro_plugin'
         # RO-SDN-arista_cloudvision
-        nose2 -C --coverage RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision -s RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision
-        sh -c 'mv .coverage .coverage_rosdn_arista_cloudvision'
+        # nose2 -C --coverage RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision -s RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision
+        # sh -c 'mv .coverage .coverage_rosdn_arista_cloudvision'
         # RO-SDN-dpb
-        nose2 -C --coverage RO-SDN-dpb/osm_rosdn_dpb -s RO-SDN-dpb/osm_rosdn_dpb
-        sh -c 'mv .coverage .coverage_rosdn_dpb'
+        # nose2 -C --coverage RO-SDN-dpb/osm_rosdn_dpb -s RO-SDN-dpb/osm_rosdn_dpb
+        # sh -c 'mv .coverage .coverage_rosdn_dpb'
         # RO-SDN-dynpac
-        nose2 -C --coverage RO-SDN-dynpac/osm_rosdn_dynpac -s RO-SDN-dynpac/osm_rosdn_dynpac
-        sh -c 'mv .coverage .coverage_rosdn_dynpac'
+        # nose2 -C --coverage RO-SDN-dynpac/osm_rosdn_dynpac -s RO-SDN-dynpac/osm_rosdn_dynpac
+        # sh -c 'mv .coverage .coverage_rosdn_dynpac'
         # RO-SDN-floodlight_openflow
-        nose2 -C --coverage RO-SDN-floodlight_openflow/osm_rosdn_floodlightof -s RO-SDN-floodlight_openflow/osm_rosdn_floodlightof
-        sh -c 'mv .coverage .coverage_rosdn_floodlightof'
+        # nose2 -C --coverage RO-SDN-floodlight_openflow/osm_rosdn_floodlightof -s RO-SDN-floodlight_openflow/osm_rosdn_floodlightof
+        # sh -c 'mv .coverage .coverage_rosdn_floodlightof'
         # RO-SDN-ietfl2vpn
-        nose2 -C --coverage RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn -s RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn
-        sh -c 'mv .coverage .coverage_rosdn_ietfl2vpn'
+        # nose2 -C --coverage RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn -s RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn
+        # sh -c 'mv .coverage .coverage_rosdn_ietfl2vpn'
         # RO-SDN-juniper_contrail
         nose2 -C --coverage RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail -s RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail
         sh -c 'mv .coverage .coverage_rosdn_juniper_contrail'
         # RO-SDN-odl_openflow
-        nose2 -C --coverage RO-SDN-odl_openflow/osm_rosdn_odlof -s RO-SDN-odl_openflow/osm_rosdn_odlof
-        sh -c 'mv .coverage .coverage_rosdn_odlof'
+        # nose2 -C --coverage RO-SDN-odl_openflow/osm_rosdn_odlof -s RO-SDN-odl_openflow/osm_rosdn_odlof
+        # sh -c 'mv .coverage .coverage_rosdn_odlof'
         # RO-SDN-onos_openflow
-        nose2 -C --coverage RO-SDN-onos_openflow/osm_rosdn_onosof -s RO-SDN-onos_openflow/osm_rosdn_onosof
-        sh -c 'mv .coverage .coverage_rosdn_onosof'
+        # nose2 -C --coverage RO-SDN-onos_openflow/osm_rosdn_onosof -s RO-SDN-onos_openflow/osm_rosdn_onosof
+        # sh -c 'mv .coverage .coverage_rosdn_onosof'
         # RO-SDN-onos_vpls
-        nose2 -C --coverage RO-SDN-onos_vpls/osm_rosdn_onos_vpls -s RO-SDN-onos_vpls/osm_rosdn_onos_vpls
-        sh -c 'mv .coverage .coverage_rosdn_onos_vpls'
+        # nose2 -C --coverage RO-SDN-onos_vpls/osm_rosdn_onos_vpls -s RO-SDN-onos_vpls/osm_rosdn_onos_vpls
+        # sh -c 'mv .coverage .coverage_rosdn_onos_vpls'
+        # RO-SDN-tapi
+        nose2 -C --coverage RO-SDN-tapi/osm_rosdn_tapi -s RO-SDN-tapi/osm_rosdn_tapi
+        sh -c 'mv .coverage .coverage_rosdn_tapi'
         # RO-VIM-aws
-        nose2 -C --coverage RO-VIM-aws/osm_rovim_aws -s RO-VIM-aws/osm_rovim_aws
-        sh -c 'mv .coverage .coverage_rovim_aws'
+        # nose2 -C --coverage RO-VIM-aws/osm_rovim_aws -s RO-VIM-aws/osm_rovim_aws
+        # sh -c 'mv .coverage .coverage_rovim_aws'
         # RO-VIM-azure
-        nose2 -C --coverage RO-VIM-azure/osm_rovim_azure -s 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 -s 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 -s RO-VIM-opennebula/osm_rovim_opennebula
-        sh -c 'mv .coverage .coverage_rovim_opennebula'
+        # nose2 -C --coverage RO-VIM-azure/osm_rovim_azure -s RO-VIM-azure/osm_rovim_azure
+        # sh -c 'mv .coverage .coverage_rovim_azure'
         # 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'
+        nose2 -C --coverage RO-VIM-openstack/osm_rovim_openstack -s RO-VIM-openstack/osm_rovim_openstack
+        sh -c 'mv .coverage .coverage_rovim_openstack'
         # RO-VIM-openvim
-        nose2 -C --coverage RO-VIM-openvim/osm_rovim_openvim -s RO-VIM-openvim/osm_rovim_openvim
-        sh -c 'mv .coverage .coverage_rovim_openvim'
+        # nose2 -C --coverage RO-VIM-openvim/osm_rovim_openvim -s RO-VIM-openvim/osm_rovim_openvim
+        # sh -c 'mv .coverage .coverage_rovim_openvim'
         # RO-VIM-vmware
         # nose2 -C --coverage RO-VIM-vmware/osm_rovim_vmware -s RO-VIM-vmware/osm_rovim_vmware
         # sh -c 'mv .coverage .coverage_rovim_vmware'
         # RO-VIM-gcp
-        nose2 -C --coverage RO-VIM-gcp/osm_rovim_gcp -s RO-VIM-gcp/osm_rovim_gcp
-        sh -c 'mv .coverage .coverage_rovim_gcp'
+        # nose2 -C --coverage RO-VIM-gcp/osm_rovim_gcp -s 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_openvim .coverage_rovim_gcp # .coverage_rovim_openstack .coverage_rovim_vmware 
+        # 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_rosdn_tapi .coverage_rovim_aws .coverage_rovim_azure .coverage_rovim_openvim .coverage_rovim_gcp # .coverage_rovim_openstack .coverage_rovim_vmware
+        coverage combine .coverage_ng_ro .coverage_rovim_openstack .coverage_rosdn_juniper_contrail
         coverage report --omit='*tests*'
         coverage html -d ./cover --omit='*tests*'
         coverage xml -o coverage.xml --omit='*tests*'
@@ -141,29 +141,30 @@ commands =
 
 #######################################################################################
 [testenv:flake8]
-deps = flake8
+deps =
+        flake8==5.0.4
+        flake8-import-order
 skip_install = true
 commands =
-        - flake8 NG-RO/osm_ng_ro/ NG-RO/setup.py
-        - flake8 RO-plugin/osm_ro_plugin/ RO-plugin/setup.py
-        - flake8 RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/ RO-SDN-arista_cloudvision/setup.py
-        - flake8 RO-SDN-dpb/osm_rosdn_dpb/ RO-SDN-dpb/setup.py
-        - flake8 RO-SDN-dynpac/osm_rosdn_dynpac/ RO-SDN-dynpac/setup.py
-        - flake8 RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/ RO-SDN-floodlight_openflow/setup.py
-        - flake8 RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/ RO-SDN-ietfl2vpn/setup.py
-        - flake8 RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/ RO-SDN-juniper_contrail/setup.py
-        - flake8 RO-SDN-odl_openflow/osm_rosdn_odlof/ RO-SDN-odl_openflow/setup.py
-        - flake8 RO-SDN-onos_openflow/osm_rosdn_onosof/ RO-SDN-onos_openflow/setup.py
-        - 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
-        - flake8 RO-VIM-gcp/osm_rovim_gcp/ RO-VIM-gcp/setup.py
-        - flake8 integration-tests/
+        flake8 NG-RO/osm_ng_ro/ NG-RO/setup.py
+        flake8 RO-plugin/osm_ro_plugin/ RO-plugin/setup.py
+        flake8 RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/ RO-SDN-arista_cloudvision/setup.py
+        flake8 RO-SDN-dpb/osm_rosdn_dpb/ RO-SDN-dpb/setup.py
+        flake8 RO-SDN-dynpac/osm_rosdn_dynpac/ RO-SDN-dynpac/setup.py
+        flake8 RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/ RO-SDN-floodlight_openflow/setup.py
+        flake8 RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/ RO-SDN-ietfl2vpn/setup.py
+        flake8 RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/ RO-SDN-juniper_contrail/setup.py
+        flake8 RO-SDN-odl_openflow/osm_rosdn_odlof/ RO-SDN-odl_openflow/setup.py
+        flake8 RO-SDN-onos_openflow/osm_rosdn_onosof/ RO-SDN-onos_openflow/setup.py
+        flake8 RO-SDN-onos_vpls/osm_rosdn_onos_vpls/ RO-SDN-onos_vpls/setup.py
+        flake8 RO-SDN-tapi/osm_rosdn_tapi/ RO-SDN-tapi/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-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
+        flake8 RO-VIM-gcp/osm_rovim_gcp/ RO-VIM-gcp/setup.py
+        flake8 integration-tests/
 
 
 #######################################################################################
@@ -174,25 +175,24 @@ deps =  {[testenv]deps}
         pylint
 skip_install = true
 commands =
-        - pylint -E NG-RO/osm_ng_ro
-        - pylint -E RO-plugin/osm_ro_plugin
-        - pylint -E RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision
-        - pylint -E RO-SDN-dpb/osm_rosdn_dpb
-        - pylint -E RO-SDN-dynpac/osm_rosdn_dynpac
-        - pylint -E RO-SDN-floodlight_openflow/osm_rosdn_floodlightof
-        - pylint -E RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn
-        - pylint -E RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail
-        - pylint -E RO-SDN-odl_openflow/osm_rosdn_odlof
-        - pylint -E RO-SDN-onos_openflow/osm_rosdn_onosof
-        - 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
-        - pylint -E RO-VIM-gcp/osm_rovim_gcp
+        pylint -E NG-RO/osm_ng_ro --disable=E1101
+        pylint -E RO-plugin/osm_ro_plugin --disable=E1101
+        pylint -E RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision --disable=all
+        pylint -E RO-SDN-dpb/osm_rosdn_dpb
+        pylint -E RO-SDN-dynpac/osm_rosdn_dynpac --disable=E1101
+        pylint -E RO-SDN-floodlight_openflow/osm_rosdn_floodlightof
+        pylint -E RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn --disable=E1101
+        pylint -E RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail
+        pylint -E RO-SDN-odl_openflow/osm_rosdn_odlof
+        pylint -E RO-SDN-onos_openflow/osm_rosdn_onosof
+        pylint -E RO-SDN-onos_vpls/osm_rosdn_onos_vpls --disable=E1101
+        pylint -E RO-SDN-tapi/osm_rosdn_tapi
+        pylint -E RO-VIM-aws/osm_rovim_aws
+        pylint -E RO-VIM-azure/osm_rovim_azure --disable=all
+        pylint -E RO-VIM-openstack/osm_rovim_openstack --disable=E1101
+        pylint -E RO-VIM-openvim/osm_rovim_openvim --disable=all
+        pylint -E RO-VIM-vmware/osm_rovim_vmware --disable=all
+        pylint -E RO-VIM-gcp/osm_rovim_gcp --disable=E1101
 
 
 #######################################################################################
@@ -209,14 +209,19 @@ commands =
 
 #######################################################################################
 [testenv:pip-compile]
-deps =  pip-tools==5.5.0
+deps =  pip-tools==6.6.2
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = bash
+        [
 commands =
-        - sh -c "for file in requirements*.in ; do pip-compile -rU --no-header $file ;\
+        - bash -c "for file in requirements*.in ; do \
+        UNSAFE="" ; \
+        if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \
+        pip-compile -rU --no-header $UNSAFE $file ;\
         out=`echo $file | sed 's/.in/.txt/'` ; \
         sed -i -e '1 e head -16 tox.ini' $out ;\
         done"
+        - bash -c "sed -i 's/.*RO-plugin/-e RO-plugin/g' requirements-test.txt"
 
 
 #######################################################################################
@@ -224,7 +229,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/NG-RO
 commands =
         sh -c 'rm -rf osm_ng_ro/requirements.txt deb_dist dist osm_ng_ro.egg-info osm_ng_ro*.tar.gz'
@@ -238,7 +243,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-plugin
 commands =
         sh -c 'rm -rf deb_dist dist osm_ro_plugin.egg-info osm_ro_plugin*.tar.gz'
@@ -251,7 +256,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-SDN-arista_cloudvision
 commands =
         sh -c 'rm -rf deb_dist dist osm_rosdn_arista_cloudvision.egg-info osm_rosdn_arista_cloudvision*.tar.gz'
@@ -264,7 +269,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-SDN-dpb
 commands =
         sh -c 'rm -rf deb_dist dist osm_rosdn_dpb.egg-info osm_rosdn_dpb*.tar.gz'
@@ -277,7 +282,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-SDN-dynpac
 commands =
         sh -c 'rm -rf deb_dist dist osm_rosdn_dynpac.egg-info osm_rosdn_dynpac*.tar.gz'
@@ -290,7 +295,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-SDN-floodlight_openflow
 commands =
         sh -c 'rm -rf deb_dist dist osm_rosdn_floodlightof.egg-info osm_rosdn_floodlightof*.tar.gz'
@@ -303,7 +308,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-SDN-ietfl2vpn
 commands =
         sh -c 'rm -rf deb_dist dist osm_rosdn_ietfl2vpn.egg-info osm_rosdn_ietfl2vpn*.tar.gz'
@@ -316,7 +321,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-SDN-juniper_contrail
 commands =
         sh -c 'rm -rf deb_dist dist osm_rosdn_juniper_contrail.egg-info osm_rosdn_juniper_contrail*.tar.gz'
@@ -329,7 +334,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-SDN-odl_openflow
 commands =
         sh -c 'rm -rf deb_dist dist osm_rosdn_odlof.egg-info osm_rosdn_odlof*.tar.gz'
@@ -342,7 +347,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-SDN-onos_openflow
 commands =
         sh -c 'rm -rf deb_dist dist osm_rosdn_onosof.egg-info osm_rosdn_onosof*.tar.gz'
@@ -355,7 +360,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-SDN-onos_vpls
 commands =
         sh -c 'rm -rf deb_dist dist osm_rosdn_onos_vpls.egg-info osm_rosdn_onos_vpls*.tar.gz'
@@ -364,55 +369,42 @@ commands =
 
 
 #######################################################################################
-[testenv:dist_ro_vim_aws]
-deps =  {[testenv]deps}
-        -r{toxinidir}/requirements-dist.txt
-skip_install = true
-whitelist_externals = sh
-changedir = {toxinidir}/RO-VIM-aws
-commands =
-        sh -c 'rm -rf deb_dist dist osm_rovim_aws.egg-info osm_rovim_aws*.tar.gz'
-        python3 setup.py --command-packages=stdeb.command sdist_dsc
-        sh -c 'cd deb_dist/osm-rovim-aws*/ && dpkg-buildpackage -rfakeroot -uc -us'
-
-
-#######################################################################################
-[testenv:dist_ro_vim_azure]
+[testenv:dist_ro_sdn_tapi]
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
 whitelist_externals = sh
-changedir = {toxinidir}/RO-VIM-azure
+changedir = {toxinidir}/RO-SDN-tapi
 commands =
-        sh -c 'rm -rf deb_dist dist osm_rovim_azure.egg-info osm_rovim_azure*.tar.gz'
+        sh -c 'rm -rf deb_dist dist osm_rosdn_tapi.egg-info osm_rosdn_tapi*.tar.gz'
         python3 setup.py --command-packages=stdeb.command sdist_dsc
-        sh -c 'cd deb_dist/osm-rovim-azure*/ && dpkg-buildpackage -rfakeroot -uc -us'
+        sh -c 'cd deb_dist/osm-rosdn-tapi*/ && dpkg-buildpackage -rfakeroot -uc -us'
 
 
 #######################################################################################
-[testenv:dist_ro_vim_fos]
+[testenv:dist_ro_vim_aws]
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
-changedir = {toxinidir}/RO-VIM-fos
+allowlist_externals = sh
+changedir = {toxinidir}/RO-VIM-aws
 commands =
-        sh -c 'rm -rf deb_dist dist osm_rovim_fos.egg-info osm_rovim_fos*.tar.gz'
+        sh -c 'rm -rf deb_dist dist osm_rovim_aws.egg-info osm_rovim_aws*.tar.gz'
         python3 setup.py --command-packages=stdeb.command sdist_dsc
-        sh -c 'cd deb_dist/osm-rovim-fos*/ && dpkg-buildpackage -rfakeroot -uc -us'
+        sh -c 'cd deb_dist/osm-rovim-aws*/ && dpkg-buildpackage -rfakeroot -uc -us'
 
 
 #######################################################################################
-[testenv:dist_ro_vim_opennebula]
+[testenv:dist_ro_vim_azure]
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
-changedir = {toxinidir}/RO-VIM-opennebula
+allowlist_externals = sh
+changedir = {toxinidir}/RO-VIM-azure
 commands =
-        sh -c 'rm -rf deb_dist dist osm_rovim_opennebula.egg-info osm_rovim_opennebula*.tar.gz'
+        sh -c 'rm -rf deb_dist dist osm_rovim_azure.egg-info osm_rovim_azure*.tar.gz'
         python3 setup.py --command-packages=stdeb.command sdist_dsc
-        sh -c 'cd deb_dist/osm-rovim-opennebula*/ && dpkg-buildpackage -rfakeroot -uc -us'
+        sh -c 'cd deb_dist/osm-rovim-azure*/ && dpkg-buildpackage -rfakeroot -uc -us'
 
 
 #######################################################################################
@@ -420,7 +412,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-VIM-openstack
 commands =
         sh -c 'rm -rf deb_dist dist osm_rovim_openstack.egg-info osm_rovim_openstack*.tar.gz'
@@ -433,7 +425,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-VIM-openvim
 commands =
         sh -c 'rm -rf deb_dist dist osm_rovim_openvim.egg-info osm_rovim_openvim*.tar.gz'
@@ -446,7 +438,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-VIM-vmware
 commands =
         sh -c 'rm -rf deb_dist dist osm_rovim_vmware.egg-info osm_rovim_vmware*.tar.gz'
@@ -459,7 +451,7 @@ commands =
 deps =  {[testenv]deps}
         -r{toxinidir}/requirements-dist.txt
 skip_install = true
-whitelist_externals = sh
+allowlist_externals = sh
 changedir = {toxinidir}/RO-VIM-gcp
 commands =
         sh -c 'rm -rf deb_dist dist osm_rovim_gcp.egg-info osm_rovim_gcp*.tar.gz'
@@ -478,7 +470,8 @@ ignore =
         E125,
         E203,
         E226,
-        E241
+        E241,
+        E501,
 exclude =
         .git,
         __pycache__,
@@ -486,3 +479,4 @@ exclude =
 max-line-length = 120
 show-source = True
 builtins = _
+import-order-style = google