openstack/neutron
Code Issues Proposed changes

Merge "Python 3: fix test_ovs_tunnel"

Browse Source
This commit is contained in:
Jenkins 2015-08-04 16:52:00 +00:00 committed by Gerrit Code Review
commit c584417967
2 changed files with 2 additions and 2 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

@ -596,7 +596,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
if network_type in constants.TUNNEL_NETWORK_TYPES: if network_type in constants.TUNNEL_NETWORK_TYPES:
if self.enable_tunneling: if self.enable_tunneling:
# outbound broadcast/multicast # outbound broadcast/multicast
ofports = self.tun_br_ofports[network_type].values() ofports = list(self.tun_br_ofports[network_type].values())
if ofports: if ofports:
self.tun_br.install_flood_to_tun(lvid, self.tun_br.install_flood_to_tun(lvid,
segmentation_id, segmentation_id,

2
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py
View File

@ -294,7 +294,7 @@ class TunnelTest(object):
self._verify_mock_calls() self._verify_mock_calls()
def test_provision_local_vlan(self): def test_provision_local_vlan(self):
ofports = TUN_OFPORTS[p_const.TYPE_GRE].values() ofports = list(TUN_OFPORTS[p_const.TYPE_GRE].values())
self.mock_tun_bridge_expected += [ self.mock_tun_bridge_expected += [
mock.call.install_flood_to_tun(LV_ID, LS_ID, ofports), mock.call.install_flood_to_tun(LV_ID, LS_ID, ofports),
mock.call.provision_local_vlan( mock.call.provision_local_vlan(