From 7dddca7ebd04d400436c3124220c0602a9a13482 Mon Sep 17 00:00:00 2001 From: Eugene Nikanorov Date: Sat, 27 Apr 2013 20:43:13 +0400 Subject: [PATCH] Fix logic issue in OVSQuantumAgent.port_unbound method Fixes bug 1173463 Change-Id: If2978fc4c38304667f6910085cb220491d236a11 --- quantum/plugins/openvswitch/agent/ovs_quantum_agent.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py index e36993455..91dcda1f6 100644 --- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py +++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py @@ -472,13 +472,11 @@ class OVSQuantumAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin): net_uuid) return lvm = self.local_vlan_map[net_uuid] - if lvm.network_type == 'gre': - if self.enable_tunneling: + if vif_id in lvm.vif_ports: + if lvm.network_type == 'gre' and self.enable_tunneling: # remove inbound unicast flow self.tun_br.delete_flows(tun_id=lvm.segmentation_id, dl_dst=lvm.vif_ports[vif_id].vif_mac) - - if vif_id in lvm.vif_ports: del lvm.vif_ports[vif_id] else: LOG.info(_('port_unbound: vif_id %s not in local_vlan_map'), -- 2.45.2