From 6d1c67619440ecf30f99a805ef1076b8560d39e2 Mon Sep 17 00:00:00 2001 From: Gurucharan Shetty Date: Tue, 1 Mar 2016 15:14:14 -0800 Subject: [PATCH] ovs-vtep: Delete flows with untagged vlan carefully. A (physical port + vlan) or (physical port + no tag) can be bound to a logical switch. When one unbinds (physical port + no tag) from a logical switch, the emulator inadvertantly deletes flows for (physical port + vlan) too. This commit fixes it. VMware-BZ: #1609938 Reported-by: Mike Qing Signed-off-by: Gurucharan Shetty Acked-by: Ryan Moats --- AUTHORS | 1 + vtep/ovs-vtep | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6b8d259a2..bad9d7b00 100644 --- a/AUTHORS +++ b/AUTHORS @@ -357,6 +357,7 @@ Michael Shigorin mike@osdn.org.ua Mihir Gangar gangarm@vmware.com Mike Bursell mike.bursell@citrix.com Mike Kruze mkruze@nicira.com +Mike Qing mqing@vmware.com Min Chen ustcer.tonychan@gmail.com Mikael Doverhag mdoverhag@nicira.com Mrinmoy Das mrdas@ixiacom.com diff --git a/vtep/ovs-vtep b/vtep/ovs-vtep index 97397b0ca..31ff15928 100755 --- a/vtep/ovs-vtep +++ b/vtep/ovs-vtep @@ -545,8 +545,8 @@ def del_binding(binding, ls): % (ps_name, port_no, vlan_)) ovs_ofctl("del-flows %s in_port=%s" % (ps_name, patch_no)) else: - ovs_ofctl("del-flows %s in_port=%s" % (ps_name, port_no)) - ovs_ofctl("del-flows %s in_port=%s" % (ps_name, patch_no)) + ovs_ofctl("--strict del-flows %s in_port=%s" % (ps_name, port_no)) + ovs_ofctl("--strict del-flows %s in_port=%s" % (ps_name, patch_no)) ls.del_lbinding(lbinding) -- 2.20.1