Merge "Python3: do not use __builtin__"

diff --cc neutron/tests/unit/db/test_db_base_plugin_v2.py
Simple merge

diff --cc tox.ini
index 923af2bd6b5a6726302cd5ceb022f5c8e1066936,296a0cb6efd2820ebe9c94bdb772ac413ce0621b..28184b94482e5bd5cad4fae1c32a5c576f65a279
--- 1/tox.ini
--- 2/tox.ini
+++ b/tox.ini
@@@ -107,11 -98,13 +107,13 @@@ commands = python -m testtools.run 
      neutron.tests.unit.services.metering.drivers.test_iptables \
      neutron.tests.unit.services.l3_router.test_l3_apic \
      neutron.tests.unit.plugins.sriovnicagent.test_sriov_nic_agent \
+     neutron.tests.unit.plugins.sriovnicagent.test_eswitch_manager \
+     neutron.tests.unit.plugins.sriovnicagent.common.test_config \
      neutron.tests.unit.plugins.sriovnicagent.test_pci_lib \
 -    neutron.tests.unit.plugins.openvswitch.agent.ovs_test_base \
 -    neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl.test_br_phys \
 -    neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl.test_br_int \
 -    neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl.test_br_tun \
 +    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.ovs_test_base \
 +    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_phys \
 +    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_int \
 +    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_tun \
      neutron.tests.unit.plugins.brocade.test_brocade_db \
      neutron.tests.unit.plugins.brocade.test_brocade_vlan \
      neutron.tests.unit.plugins.oneconvergence.test_nvsd_agent \
@@@ -122,9 -115,10 +124,10 @@@
      neutron.tests.unit.plugins.ml2.test_driver_context \
      neutron.tests.unit.plugins.ml2.test_rpc \
      neutron.tests.unit.plugins.ml2.drivers.mlnx.test_mech_mlnx \
 -    neutron.tests.unit.plugins.ml2.drivers.test_mech_openvswitch \
 -    neutron.tests.unit.plugins.ml2.drivers.test_mech_linuxbridge \
 +    neutron.tests.unit.plugins.ml2.drivers.openvswitch.mech_driver.test_mech_openvswitch \
 +    neutron.tests.unit.plugins.ml2.drivers.linuxbridge.mech_driver.test_mech_linuxbridge \
      neutron.tests.unit.plugins.ml2.drivers.base_type_tunnel \
+     neutron.tests.unit.plugins.ml2.drivers.opendaylight.test_driver \
      neutron.tests.unit.plugins.ml2.drivers.ext_test \
      neutron.tests.unit.plugins.ml2.drivers.mech_sriov.test_mech_sriov_nic_switch \
      neutron.tests.unit.plugins.ml2.drivers.mech_fake_agent \