From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 2 Jul 2015 11:01:00 +0000 (+0000)
Subject: Merge "Read vif port information in bulk"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=49774afdc111d65cd8c9e73c1c1dee04d9c9f1a8;p=openstack-build%2Fneutron-build.git

Merge "Read vif port information in bulk"
---

49774afdc111d65cd8c9e73c1c1dee04d9c9f1a8
diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
index d54b5b04e,d0a2a3448..9b4cf0110
--- a/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=[]):