openstack
/
neutron
Code Issues Proposed changes

OVS: don't throw KeyError when duplicate VLAN tags exist 

In _restore_local_vlan_map() we can have two ports with the
same VLAN tag, but trying to remove the second will throw
a KeyError, causing the agent to not start.  Use discard()
instead so we only remove an entry if it's there.

Closes-bug: #1526974
Change-Id: I479c693f490c704c5b6c1462e9ab236684e9c259
This commit is contained in:
Brian Haley 2016-06-03 11:34:35 -04:00
parent 6ce631a970
commit d2508163cf
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -358,7 +358,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
net_uuid = local_vlan_map.get('net_uuid')
if (net_uuid and net_uuid not in self._local_vlan_hints
and local_vlan != constants.DEAD_VLAN_TAG):
self.available_local_vlans.remove(local_vlan)
self.available_local_vlans.discard(local_vlan)
self._local_vlan_hints[local_vlan_map['net_uuid']] = \
local_vlan

54
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
View File

@ -232,38 +232,54 @@ class TestOvsNeutronAgent(object):
self.assertEqual(expected,
self.agent.agent_state['agent_type'])
def _test_restore_local_vlan_maps(self, tag, segmentation_id='1'):
port = mock.Mock()
port.port_name = 'fake_port'
net_uuid = 'fake_network_id'
local_vlan_map = {'net_uuid': net_uuid,
'network_type': 'vlan',
'physical_network': 'fake_network'}
def _test_restore_local_vlan_maps(self, tag1, tag2, segmentation_id='1'):
port1 = mock.Mock()
port2 = mock.Mock()
port1.port_name = 'fake_port1'
port2.port_name = 'fake_port2'
net_uuid1 = 'fake_network_id1'
net_uuid2 = 'fake_network_id2'
local_vlan_map1 = {'net_uuid': net_uuid1,
'network_type': 'vlan',
'physical_network': 'fake_network'}
local_vlan_map2 = {'net_uuid': net_uuid2,
'network_type': 'vlan',
'physical_network': 'fake_network'}
port1_attrib = {'name': port1.port_name,
'other_config': local_vlan_map1,
'tag': tag1}
port2_attrib = {'name': port2.port_name,
'other_config': local_vlan_map2,
'tag': tag2}
if segmentation_id is not None:
local_vlan_map['segmentation_id'] = segmentation_id
local_vlan_map1['segmentation_id'] = segmentation_id
local_vlan_map2['segmentation_id'] = segmentation_id
with mock.patch.object(self.agent, 'int_br') as int_br:
int_br.get_vif_ports.return_value = [port]
int_br.get_ports_attributes.return_value = [{
'name': port.port_name, 'other_config': local_vlan_map,
'tag': tag
}]
int_br.get_vif_ports.return_value = [port1, port2]
int_br.get_ports_attributes.return_value = [port1_attrib,
port2_attrib]
self.agent._restore_local_vlan_map()
expected_hints = {}
if tag:
expected_hints[net_uuid] = tag
if tag1:
expected_hints[net_uuid1] = tag1
if tag2:
expected_hints[net_uuid2] = tag2
self.assertEqual(expected_hints, self.agent._local_vlan_hints)
def test_restore_local_vlan_map_with_device_has_tag(self):
self._test_restore_local_vlan_maps(2)
self._test_restore_local_vlan_maps(2, 3)
def test_restore_local_vlan_map_with_device_has_tag_dup(self):
self._test_restore_local_vlan_maps(2, 2)
def test_restore_local_vlan_map_with_device_no_tag(self):
self._test_restore_local_vlan_maps([])
self._test_restore_local_vlan_maps([], [])
def test_restore_local_vlan_map_no_segmentation_id(self):
self._test_restore_local_vlan_maps(2, segmentation_id=None)
self._test_restore_local_vlan_maps(2, 2, segmentation_id=None)
def test_restore_local_vlan_map_segmentation_id_compat(self):
self._test_restore_local_vlan_maps(2, segmentation_id='None')
self._test_restore_local_vlan_maps(2, 2, segmentation_id='None')
def test_check_agent_configurations_for_dvr_raises(self):
self.agent.enable_distributed_routing = True