Merge "BUG-5813: Vxlan ports should not be removed in table 110 flow entry unless...

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/SouthboundHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/SouthboundHandler.java
index f37cdc058266f7eb5e01b843a49a333750da46c2..80b4f04f727227bb8a5398125acf689d808c47e6 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/SouthboundHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/SouthboundHandler.java
@@ -173,9 +173,15 @@ public class SouthboundHandler extends AbstractHandler
                                 continue;
                             }
                             NeutronNetwork neutronNetwork = tenantNetworkManager.getTenantNetwork(tpAugmentation);
-                            if (neutronNetwork != null && neutronNetwork.equals(network)) {
-                                isLastInstanceOnNode = false;
-                                break;
+                            if (neutronNetwork != null) {
+                                String neutronNetworkSegId = neutronNetwork.getProviderSegmentationID();
+                                String networkSegId = network.getProviderSegmentationID();
+                                // vxlan ports should not be removed in table 110 flow entry
+                                // unless last VM instance removed from the openstack node(Bug# 5813)
+                                if (neutronNetworkSegId.equals(networkSegId)) {
+                                    isLastInstanceOnNode = false;
+                                    break;
+                                }
                             }
                         }
                         this.handleInterfaceDelete(node, ovsdbTerminationPointAugmentation,