Merge "Read vif port information in bulk"

diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
Simple merge

diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
index d54b5b04ecf08f42bf9fe5c0133bfa6fffc04d4b,d0a2a344811478132ff38f812e829d4fd70fe87f..9b4cf01103890e36c227da9e0bac9de433fa8cea
--- 1/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
--- 2/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
@@@ -1264,9 -1275,12 +1274,12 @@@ class TestOvsDvrNeutronAgent(object)
                             return_value='00:00:00:00:00:01'),\
                  mock.patch(
                      'neutron.agent.common.ovs_lib.BaseOVS.get_bridges'),\
 -                mock.patch('neutron.openstack.common.loopingcall.'
 +                mock.patch('oslo_service.loopingcall.'
                             'FixedIntervalLoopingCall',
                             new=MockFixedIntervalLoopingCall),\
+                 mock.patch(
+                     'neutron.agent.common.ovs_lib.OVSBridge.' 'db_list',
+                     return_value=[]),\
                  mock.patch(
                      'neutron.agent.common.ovs_lib.OVSBridge.' 'get_vif_ports',
                      return_value=[]):