x/vmware-nsx
Code Issues Proposed changes

Merge "Treat unbound port"

Browse Source
This commit is contained in:
Jenkins 2013-05-03 19:13:56 +00:00 committed by Gerrit Code Review
commit 11799aaa65
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
View File

@ -472,12 +472,13 @@ class OVSQuantumAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin):
net_uuid) net_uuid)
return return
lvm = self.local_vlan_map[net_uuid] lvm = self.local_vlan_map[net_uuid]
if vif_id in lvm.vif_ports:
if lvm.network_type == 'gre' and self.enable_tunneling: vif_port = lvm.vif_ports.pop(vif_id, None)
if vif_port:
if self.enable_tunneling and lvm.network_type == 'gre':
# remove inbound unicast flow # remove inbound unicast flow
self.tun_br.delete_flows(tun_id=lvm.segmentation_id, self.tun_br.delete_flows(tun_id=lvm.segmentation_id,
dl_dst=lvm.vif_ports[vif_id].vif_mac) dl_dst=vif_port.vif_mac)
del lvm.vif_ports[vif_id]
else: else:
LOG.info(_('port_unbound: vif_id %s not in local_vlan_map'), LOG.info(_('port_unbound: vif_id %s not in local_vlan_map'),
vif_id) vif_id)