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 <[email protected]> Signed-off-by: Gurucharan Shetty <[email protected]> Acked-by: Ryan Moats <[email protected]>
leonshaw · Mar 17, 2016 · 429d4ee · 429d4ee
1 parent 938ff6d
commit 429d4ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -318,6 +318,7 @@ Michael Shigorin        [email protected]
 Mihir Gangar            [email protected]
 Mike Bursell            [email protected]
 Mike Kruze              [email protected]
+Mike Qing               [email protected]
 Min Chen                [email protected]
 Mikael Doverhag         [email protected]
 Mrinmoy Das             [email protected]

diff --git a/vtep/ovs-vtep b/vtep/ovs-vtep
@@ -531,8 +531,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)