From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 1 Aug 2015 11:01:37 +0000 (+0000)
Subject: Merge "Fixes a typo phys_brs in place of phys_br"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=36c43486a1cf5b62fa430479098e1acc2a97ea99;p=openstack-build%2Fneutron-build.git

Merge "Fixes a typo phys_brs in place of phys_br"
---

36c43486a1cf5b62fa430479098e1acc2a97ea99
diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
index 5a07d0d26,32e7f246f..5930fc50a
--- 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
@@@ -1689,18 -1675,21 +1701,24 @@@ class TestOvsDvrNeutronAgent(object)
  
          int_br.reset_mock()
          tun_br.reset_mock()
+         phys_br = mock.create_autospec(self.br_phys_cls('br-phys'))
          with mock.patch.object(self.agent, 'reclaim_local_vlan'),\
 -                mock.patch.object(self.agent.plugin_rpc,
 -                                  'update_device_down',
 -                                  return_value=None),\
 +                mock.patch.object(self.agent.plugin_rpc, 'update_device_list',
 +                                  return_value={
 +                                      'devices_up': [],
 +                                      'devices_down': [self._port.vif_id],
 +                                      'failed_devices_up': [],
 +                                      'failed_devices_down': []}),\
                  mock.patch.object(self.agent, 'int_br', new=int_br),\
                  mock.patch.object(self.agent, 'tun_br', new=tun_br),\
+                 mock.patch.dict(self.agent.phys_brs,
+                                 {self._physical_network: phys_br}),\
                  mock.patch.object(self.agent.dvr_agent, 'int_br', new=int_br),\
-                 mock.patch.object(self.agent.dvr_agent, 'tun_br', new=tun_br):
+                 mock.patch.object(self.agent.dvr_agent, 'tun_br', new=tun_br),\
+                 mock.patch.dict(self.agent.dvr_agent.phys_brs,
+                                 {self._physical_network: phys_br}):
              self.agent.treat_devices_removed([self._port.vif_id])
+             lvid = self.agent.local_vlan_map[self._net_uuid].vlan
              if ip_version == 4:
                  expected = [
                      mock.call.delete_dvr_process_ipv4(