BUG 6841: Few Remote flows not deleted on DPNs

[netvirt.git] / vpnservice / vpnmanager / vpnmanager-impl / src / main / java / org / opendaylight / netvirt / vpnmanager / intervpnlink / InterVpnLinkListener.java

diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java
index 9000b28be242e063559e6b64018fddb2e24df7e5..1dd88b7fbe06313c76befde580199a2251acf6b0 100755 (executable)
--- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java
+++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java
@@ -241,13 +241,13 @@ public class InterVpnLinkListener extends AsyncDataTreeChangeListenerBase<InterV
         for ( VrfEntry vrfEntry : srcVpnRemoteVrfEntries ) {
             long label = VpnUtil.getUniqueId(idManager, VpnConstants.VPN_IDPOOL_NAME,
                                              VpnUtil.getNextHopLabelKey(dstVpnRd, vrfEntry.getDestPrefix()));
-            if (label == 0) {
+            if (label == VpnConstants.INVALID_LABEL) {
                 LOG.error("Unable to fetch label from Id Manager. Bailing out of leaking routes for InterVpnLink {} rd {} prefix {}",
-                                vpnLink.getName(), dstVpnRd, vrfEntry.getDestPrefix());
+                        vpnLink.getName(), dstVpnRd, vrfEntry.getDestPrefix());
                 continue;
             }
             InterVpnLinkUtil.leakRoute(dataBroker, bgpManager, vpnLink, srcVpnUuid, dstVpnUuid,
-                                  vrfEntry.getDestPrefix(), label);
+                    vrfEntry.getDestPrefix(), label);
         }
     }
 
@@ -270,10 +270,9 @@ public class InterVpnLinkListener extends AsyncDataTreeChangeListenerBase<InterV
                 // BGP accordingly
                 long label = VpnUtil.getUniqueId(idManager, VpnConstants.VPN_IDPOOL_NAME,
                                                   VpnUtil.getNextHopLabelKey(vpn1Rd, vrfEntry.getDestPrefix()));
-
-                if (label == 0) {
+                if (label == VpnConstants.INVALID_LABEL) {
                     LOG.error("Unable to fetch label from Id Manager. Bailing out of leaking extra routes for InterVpnLink {} rd {} prefix {}",
-                                    vpnLink.getName(), vpn1Rd, vrfEntry.getDestPrefix());
+                            vpnLink.getName(), vpn1Rd, vrfEntry.getDestPrefix());
                     continue;
                 }
                 InterVpnLinkUtil.leakRoute(dataBroker, bgpManager, vpnLink, vpn2Uuid, vpn1Uuid, vrfEntry.getDestPrefix(),