Merge "Bug 5092 : Flow incorrectly installed for LLDP mon"

diff --cc itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/confighelpers/ItmInternalTunnelDeleteWorker.java
index fc9a3a72bec9e643941d3a6ba657d219b3e90ae5,7b4e06dfc9ce7a9eae8301aec1ae99fd450fa531..9e113f25b04887fddeb07d938ac43c7afd66dc19
--- 1/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/confighelpers/ItmInternalTunnelDeleteWorker.java
--- 2/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/confighelpers/ItmInternalTunnelDeleteWorker.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/confighelpers/ItmInternalTunnelDeleteWorker.java
@@@ -150,17 -151,9 +153,19 @@@ public class ItmInternalTunnelDeleteWor
                      .child(InternalTunnel.class, new InternalTunnelKey(dstDpnId, srcDpnId));   
          t.delete(LogicalDatastoreType.CONFIGURATION,path) ;
          
-         // Release the Id for the Reverse trunk
-         ItmUtils.releaseId(idManagerService, trunkRevIfName);
+      // Release the Ids for the reverse trunk interface Name
+         ItmUtils.releaseIdForTrunkInterfaceName(idManagerService, dstTep.getInterfaceName(), dstTep.getIpAddress()
+                 .getIpv4Address().getValue(), srcTep.getIpAddress().getIpv4Address()
+                 .getValue());
      }
 +    private static boolean checkIfTrunkExists( BigInteger srcDpnId, BigInteger dstDpnId, DataBroker dataBroker) {
 +        boolean existsFlag = false ;
 +        InstanceIdentifier<InternalTunnel> path = InstanceIdentifier.create(
 +                TunnelList.class)
 +                    .child(InternalTunnel.class, new InternalTunnelKey( srcDpnId, dstDpnId));   
 +        Optional<InternalTunnel> internalTunnels = ItmUtils.read(LogicalDatastoreType.CONFIGURATION,path, dataBroker) ;
 +        if( internalTunnels.isPresent())
 +            existsFlag = true ;
 +           return existsFlag ;
 +    }
  }