When router is associated to VPN or dis-associated , VpnInterface update is triggered which will remove vpninterface from old VPN and add it into new VPN after waiting for FIB to remove VpnInterface from Operational DS. If config and operational shard are on different PL , the java notification mechanism used to notify will not work . Hence VpnInterface update thread will wait for maximum time before adding vpn interface.

To solve it , VpnInterface Op DS and VpnInstance Op DS cache manager is introduced. Also timer task will not wait on java notification. It will poll periodically to check whether vpnInterface is removed from old VPN.