BUG 6487: Extra routes to IVpnLink endpoint not in FIB

[netvirt.git] / vpnservice / cloud-servicechain / cloud-servicechain-impl / src / main / java / org / opendaylight / netvirt / cloudservicechain / utils / VpnServiceChainUtils.java

diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java
index f6dba1d553d192a6cefc89b316e0fd95946e5c04..a725f94c4e0812ed0637c35bf89185dd038c5782 100644 (file)
--- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java
+++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java
@@ -433,9 +433,16 @@ public class VpnServiceChainUtils {
                 if ( addOrRemove == NwConstants.ADD_FLOW ) {
                     VpnToPseudoPortTag newValue =
                         new VpnToPseudoPortTagBuilder().setKey(key).setVrfId(rd).setLportTag((long) lportTag).build();
+                    logger.debug("Adding lportTag={} to VpnToLportTag map for VPN with rd={}", lportTag, rd);
                     MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION, path, newValue);
                 } else {
-                    MDSALUtil.syncDelete(broker, LogicalDatastoreType.CONFIGURATION, path);
+                    logger.debug("Removing VpnToLportTag map entry for VPN with rd={}", rd);
+                    try {
+                        MDSALUtil.syncDelete(broker, LogicalDatastoreType.CONFIGURATION, path);
+                    } catch ( Exception e ) {
+                        // It may throw Exception if 'path' does not exist, but we dont care
+                        logger.debug("Error when removing {}", path, e);
+                    }
                 }
 
             }