Fixes a typo phys_brs in place of phys_br

Change-Id: I0301952d5f7d4cd78c5d35c38aa5c6caabcc6298
Closes-Bug: #1423774

diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
index 905c8a8e9e8868010b356c9d2504bbd4a7a9d12e..d6e6c24ac5df37f48a8500c0ff20f75444a9fc5f 100644 (file)
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
@@ -614,7 +614,7 @@ class OVSDVRNeutronAgent(object):
                 # ports available on this agent anymore
                 self.local_dvr_map.pop(sub_uuid, None)
             if network_type == p_const.TYPE_VLAN:
-                br = self.phys_br[physical_network]
+                br = self.phys_brs[physical_network]
             if network_type in constants.TUNNEL_NETWORK_TYPES:
                 br = self.tun_br
             if ip_version == 4:
@@ -626,7 +626,7 @@ class OVSDVRNeutronAgent(object):
             ovsport.remove_subnet(sub_uuid)
 
         if lvm.network_type == p_const.TYPE_VLAN:
-            br = self.phys_br[physical_network]
+            br = self.phys_brs[physical_network]
         if lvm.network_type in constants.TUNNEL_NETWORK_TYPES:
             br = self.tun_br
         br.delete_dvr_process(vlan_tag=lvm.vlan, vif_mac=port.vif_mac)

diff --git 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
index 19bcd520d9914bbabde62679e28c8154d081fc82..32e7f246f40b61ccfb750d08c39df2262c1f5d50 100644 (file)
--- 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
@@ -1612,8 +1612,12 @@ class TestOvsDvrNeutronAgent(object):
     def test_treat_devices_removed_for_dvr_interface(self):
         self._test_treat_devices_removed_for_dvr_interface()
         self._test_treat_devices_removed_for_dvr_interface(ip_version=6)
+        self._test_treat_devices_removed_for_dvr_interface(network_type='vlan')
+        self._test_treat_devices_removed_for_dvr_interface(ip_version=6,
+                                                           network_type='vlan')
 
-    def _test_treat_devices_removed_for_dvr_interface(self, ip_version=4):
+    def _test_treat_devices_removed_for_dvr_interface(
+            self, ip_version=4, network_type='vxlan'):
         self._setup_for_dvr_test()
         if ip_version == 4:
             gateway_ip = '1.1.1.1'
@@ -1642,36 +1646,50 @@ class TestOvsDvrNeutronAgent(object):
                 mock.patch.object(self.agent.dvr_agent.int_br,
                                   'get_vif_port_by_id',
                                   return_value=self._port):
-            self.agent.port_bound(
-                self._port, self._net_uuid, 'vxlan',
-                None, None, self._fixed_ips,
-                n_const.DEVICE_OWNER_DVR_INTERFACE,
-                False)
-            lvid = self.agent.local_vlan_map[self._net_uuid].vlan
-            self.assertEqual(self._expected_port_bound(self._port, lvid),
-                             int_br.mock_calls)
-            expected_on_tun_br = [
-                mock.call.provision_local_vlan(network_type='vxlan',
-                    lvid=lvid, segmentation_id=None, distributed=True),
-            ] + self._expected_install_dvr_process(
-                port=self._port,
-                lvid=lvid,
-                ip_version=ip_version,
-                gateway_ip=gateway_ip,
-                gateway_mac=gateway_mac)
-            self.assertEqual(expected_on_tun_br, tun_br.mock_calls)
+            if network_type == 'vlan':
+                self.agent.port_bound(self._port, self._net_uuid,
+                                      network_type, self._physical_network,
+                                      self._segmentation_id,
+                                      self._compute_fixed_ips,
+                                      n_const.DEVICE_OWNER_DVR_INTERFACE,
+                                      False)
+            else:
+                self.agent.port_bound(
+                    self._port, self._net_uuid, 'vxlan',
+                    None, None, self._fixed_ips,
+                    n_const.DEVICE_OWNER_DVR_INTERFACE,
+                    False)
+                lvid = self.agent.local_vlan_map[self._net_uuid].vlan
+                self.assertEqual(self._expected_port_bound(self._port, lvid),
+                                 int_br.mock_calls)
+                expected_on_tun_br = [
+                    mock.call.provision_local_vlan(network_type='vxlan',
+                        lvid=lvid, segmentation_id=None, distributed=True),
+                ] + self._expected_install_dvr_process(
+                    port=self._port,
+                    lvid=lvid,
+                    ip_version=ip_version,
+                    gateway_ip=gateway_ip,
+                    gateway_mac=gateway_mac)
+                self.assertEqual(expected_on_tun_br, tun_br.mock_calls)
 
         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, '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(
@@ -1689,8 +1707,15 @@ class TestOvsDvrNeutronAgent(object):
                     vlan_tag=lvid,
                     vif_mac=self._port.vif_mac),
             ])
-            self.assertEqual([], int_br.mock_calls)
-            self.assertEqual(expected, tun_br.mock_calls)
+            if network_type == 'vlan':
+                self.assertEqual([], int_br.mock_calls)
+                self.assertEqual([], tun_br.mock_calls)
+                self.assertEqual(expected, phys_br.mock_calls)
+                self.assertEqual({}, self.agent.dvr_agent.local_ports)
+            else:
+                self.assertEqual([], int_br.mock_calls)
+                self.assertEqual(expected, tun_br.mock_calls)
+                self.assertEqual([], phys_br.mock_calls)
 
     def _test_treat_devices_removed_for_dvr(self, device_owner, ip_version=4):
         self._setup_for_dvr_test()