Bug 8882 - With conntrack SNAT communication with PNF fails
[netvirt.git] / vpnservice / vpnmanager / vpnmanager-impl / src / main / java / org / opendaylight / netvirt / vpnmanager / VpnUtil.java
index 03a3a8e1367255755a3e3336516377af25643aba..0cdebf022f3408b71d45b9cbedb2be841c2add2a 100755 (executable)
@@ -15,35 +15,44 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 
 import java.math.BigInteger;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
+import javax.annotation.Nullable;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
+import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
 import org.opendaylight.genius.mdsalutil.FlowEntity;
+import org.opendaylight.genius.mdsalutil.FlowEntityBuilder;
 import org.opendaylight.genius.mdsalutil.InstructionInfo;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.mdsalutil.MatchInfo;
 import org.opendaylight.genius.mdsalutil.MetaDataUtil;
+import org.opendaylight.genius.mdsalutil.NWUtil;
 import org.opendaylight.genius.mdsalutil.NwConstants;
+import org.opendaylight.genius.mdsalutil.actions.ActionRegLoad;
 import org.opendaylight.genius.mdsalutil.instructions.InstructionGotoTable;
+import org.opendaylight.genius.mdsalutil.instructions.InstructionWriteMetadata;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.genius.mdsalutil.matches.MatchEthernetDestination;
 import org.opendaylight.genius.mdsalutil.matches.MatchMetadata;
+import org.opendaylight.genius.utils.ServiceIndex;
 import org.opendaylight.genius.utils.cache.DataStoreCache;
 import org.opendaylight.genius.utils.clustering.ClusteringUtils;
 import org.opendaylight.netvirt.bgpmanager.api.IBgpManager;
 import org.opendaylight.netvirt.fibmanager.api.RouteOrigin;
 import org.opendaylight.netvirt.neutronvpn.interfaces.INeutronVpnManager;
+import org.opendaylight.netvirt.vpnmanager.api.VpnExtraRouteHelper;
 import org.opendaylight.netvirt.vpnmanager.utilities.InterfaceUtils;
 import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.VpnAfConfig;
 import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.VpnInstances;
@@ -60,6 +69,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdOutput;
@@ -72,7 +83,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.IfIndexesInterfaceMap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._if.indexes._interface.map.IfIndexInterface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._if.indexes._interface.map.IfIndexInterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetInterfaceFromIfIndexInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetInterfaceFromIfIndexInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetInterfaceFromIfIndexOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.OdlInterfaceRpcService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServices;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockManagerService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.TimeUnits;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.TryLockInput;
@@ -82,13 +97,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev16041
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanTagNameMap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.tag.name.map.ElanTagName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.tag.name.map.ElanTagNameKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.ExtrarouteRdsMap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.FibEntries;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.extraroute.rds.map.ExtrarouteRds;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.extraroute.rds.map.ExtrarouteRdsKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.extraroute.rds.map.extraroute.rds.DestPrefixes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.extraroute.rds.map.extraroute.rds.DestPrefixesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.extraroute.rds.map.extraroute.rds.DestPrefixesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.VrfEntryBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.extraroute.rds.map.extraroute.rds.dest.prefixes.AllocatedRdsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.extraroute.rds.map.extraroute.rds.dest.prefixes.AllocatedRdsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.fibentries.VrfTables;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.fibentries.VrfTablesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.vrfentries.VrfEntry;
@@ -101,11 +113,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.Adj
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.LearntVpnVipToPortData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.PrefixToInterface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.RouterInterfaces;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.SubnetOpData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.VpnIdToVpnInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.VpnInstanceOpData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.VpnInstanceToVpnId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.VpnToExtraroutes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.adjacency.list.Adjacency;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.adjacency.list.AdjacencyKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPort;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPortBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPortKey;
@@ -118,6 +132,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.pre
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.router.interfaces.RouterInterface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.router.interfaces.RouterInterfaceBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.router.interfaces.RouterInterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.subnet.op.data.SubnetOpDataEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.subnet.op.data.SubnetOpDataEntryKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.op.data.VpnInstanceOpDataEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.op.data.VpnInstanceOpDataEntryKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.op.data.vpn.instance.op.data.entry.VpnToDpnList;
@@ -125,29 +141,35 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id.VpnInstanceBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroutes.Vpn;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroutes.VpnKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroutes.vpn.ExtraRoutes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroutes.vpn.ExtraRoutesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroutes.vpn.extra.routes.Routes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroutes.vpn.extra.routes.RoutesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroutes.vpn.extra.routes.RoutesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ExtRouters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ExternalNetworks;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ExternalSubnets;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.NaptSwitches;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.Routers;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.RoutersKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ext.routers.routers.ExternalIps;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.networks.Networks;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.networks.NetworksKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.subnets.SubnetsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.napt.switches.RouterToNaptSwitch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.napt.switches.RouterToNaptSwitchKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.NetworkMaps;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.NeutronVpnPortipPortData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.RouterInterfacesMap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.Subnetmaps;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.networkmaps.NetworkMap;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.networkmaps.NetworkMapKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.neutron.vpn.portip.port.data.VpnPortipToPort;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.neutron.vpn.portip.port.data.VpnPortipToPortKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.subnetmaps.Subnetmap;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.subnetmaps.SubnetmapKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.IpVersionBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.IpVersionV4;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.ext.rev150712.NetworkL3Extension;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.NetworkKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.Subnets;
@@ -175,6 +197,12 @@ public class VpnUtil {
             .child(VpnInstance.class, new VpnInstanceKey(vpnName)).build();
     }
 
+    static VpnInterface getVpnInterface(DataBroker broker, String vpnInterfaceName) {
+        InstanceIdentifier<VpnInterface> id = getVpnInterfaceIdentifier(vpnInterfaceName);
+        Optional<VpnInterface> vpnInterface = read(broker, LogicalDatastoreType.CONFIGURATION, id);
+        return vpnInterface.isPresent() ? vpnInterface.get() : null;
+    }
+
     static VpnInterface getVpnInterface(String intfName, String vpnName, Adjacencies aug, BigInteger dpnId,
         Boolean isSheduledForRemove) {
         return new VpnInterfaceBuilder().setKey(new VpnInterfaceKey(intfName)).setVpnInstanceName(vpnName).setDpnId(
@@ -189,7 +217,7 @@ public class VpnUtil {
                 new PrefixesKey(ipPrefix)).build();
     }
 
-    static InstanceIdentifier<VpnIds> getPrefixToInterfaceIdentifier(long vpnId) {
+    public static InstanceIdentifier<VpnIds> getPrefixToInterfaceIdentifier(long vpnId) {
         return InstanceIdentifier.builder(PrefixToInterface.class)
             .child(VpnIds.class, new VpnIdsKey(vpnId)).build();
     }
@@ -198,9 +226,10 @@ public class VpnUtil {
         return new VpnIdsBuilder().setKey(new VpnIdsKey(vpnId)).setVpnId(vpnId).build();
     }
 
-    static Prefixes getPrefixToInterface(BigInteger dpId, String vpnInterfaceName, String ipPrefix) {
+    static Prefixes getPrefixToInterface(BigInteger dpId, String vpnInterfaceName, String ipPrefix, Uuid subnetId,
+            boolean isNatPrefix) {
         return new PrefixesBuilder().setDpnId(dpId).setVpnInterfaceName(
-            vpnInterfaceName).setIpAddress(ipPrefix).build();
+            vpnInterfaceName).setIpAddress(ipPrefix).setSubnetId(subnetId).setNatPrefix(isNatPrefix).build();
     }
 
     static Optional<Prefixes> getPrefixToInterface(DataBroker broker, long vpnId, String ipPrefix) {
@@ -208,23 +237,6 @@ public class VpnUtil {
                 getPrefixToInterfaceIdentifier(vpnId, getIpPrefix(ipPrefix)));
     }
 
-    static  InstanceIdentifier<Routes> getVpnToExtrarouteIdentifier(String vpnName, String vrfId, String ipPrefix) {
-        return InstanceIdentifier.builder(VpnToExtraroutes.class)
-                .child(Vpn.class, new VpnKey(vpnName)).child(ExtraRoutes.class,
-                        new ExtraRoutesKey(vrfId)).child(Routes.class, new RoutesKey(ipPrefix)).build();
-    }
-
-    static  InstanceIdentifier<ExtraRoutes> getVpnToExtrarouteIdentifier(String vpnName, String vrfId) {
-        return InstanceIdentifier.builder(VpnToExtraroutes.class)
-                .child(Vpn.class, new VpnKey(vpnName)).child(ExtraRoutes.class,
-                        new ExtraRoutesKey(vrfId)).build();
-    }
-
-    static  InstanceIdentifier<Vpn> getVpnToExtrarouteIdentifier(String vpnName) {
-        return InstanceIdentifier.builder(VpnToExtraroutes.class)
-                .child(Vpn.class, new VpnKey(vpnName)).build();
-    }
-
     /**
      * Get VRF table given a Route Distinguisher.
      *
@@ -268,16 +280,6 @@ public class VpnUtil {
         return new ArrayList<>();
     }
 
-    static List<Routes> getAllExtraRoutes(DataBroker broker, String vpnName, String vrfId) {
-        Optional<ExtraRoutes> extraRoutes = read(broker,LogicalDatastoreType.OPERATIONAL,
-                getVpnToExtrarouteIdentifier(vpnName, vrfId));
-        List<Routes> extraRoutesList = new ArrayList<>();
-        if (extraRoutes.isPresent()) {
-            extraRoutesList = extraRoutes.get().getRoutes();
-        }
-        return extraRoutesList;
-    }
-
     /**
      * Retrieves all the VrfEntries that belong to a given VPN searching by its
      * Route-Distinguisher.
@@ -288,7 +290,7 @@ public class VpnUtil {
      */
     public static List<VrfEntry> getAllVrfEntries(DataBroker broker, String rd) {
         VrfTables vrfTables = VpnUtil.getVrfTable(broker, rd);
-        return (vrfTables != null) ? vrfTables.getVrfEntry() : new ArrayList<>();
+        return vrfTables != null ? vrfTables.getVrfEntry() : new ArrayList<>();
     }
 
     //FIXME: Implement caches for DS reads
@@ -296,17 +298,7 @@ public class VpnUtil {
         InstanceIdentifier<VpnInstance> id = InstanceIdentifier.builder(VpnInstances.class).child(VpnInstance.class,
             new VpnInstanceKey(vpnInstanceName)).build();
         Optional<VpnInstance> vpnInstance = read(broker, LogicalDatastoreType.CONFIGURATION, id);
-        return (vpnInstance.isPresent()) ? vpnInstance.get() : null;
-    }
-
-    static List<VpnInstance> getAllVpnInstances(DataBroker broker) {
-        InstanceIdentifier<VpnInstances> id = InstanceIdentifier.builder(VpnInstances.class).build();
-        Optional<VpnInstances> optVpnInstances = VpnUtil.read(broker, LogicalDatastoreType.CONFIGURATION, id);
-        if (optVpnInstances.isPresent()) {
-            return optVpnInstances.get().getVpnInstance();
-        } else {
-            return Collections.emptyList();
-        }
+        return vpnInstance.isPresent() ? vpnInstance.get() : null;
     }
 
     static List<VpnInstanceOpDataEntry> getAllVpnInstanceOpData(DataBroker broker) {
@@ -368,33 +360,27 @@ public class VpnUtil {
         return new RoutesBuilder().setPrefix(ipPrefix).setNexthopIpList(nextHopList).build();
     }
 
-    public static  List<Routes> getExtraRoutes(DataBroker broker, String vpnName, String vpnRd) {
-        InstanceIdentifier<ExtraRoutes> vpnExtraRoutesId = getVpnToExtrarouteIdentifier(vpnName, vpnRd);
-        Optional<ExtraRoutes> extraRoutes = read(broker, LogicalDatastoreType.OPERATIONAL, vpnExtraRoutesId);
-        return extraRoutes.isPresent() ? extraRoutes.get().getRoutes() : new ArrayList<Routes>();
-    }
-
-    public static Optional<Routes> getExtraRoutes(DataBroker broker, String vpnName,
-                                                     String vpnRd, String destPrefix) {
-        InstanceIdentifier<Routes> vpnExtraRoutesId = getVpnToExtrarouteIdentifier(vpnName, vpnRd, destPrefix);
-        return read(broker, LogicalDatastoreType.OPERATIONAL, vpnExtraRoutesId);
-    }
-
-    static  List<String> getUsedRds(DataBroker broker, long vpnId, String destPrefix) {
-        InstanceIdentifier<DestPrefixes> usedRdsId = getUsedRdsIdentifier(vpnId, destPrefix);
-        Optional<DestPrefixes> usedRds = read(broker, LogicalDatastoreType.OPERATIONAL, usedRdsId);
-        return usedRds.isPresent() ? usedRds.get().getRds() : new ArrayList<String>();
-    }
+    static String getVpnInterfaceName(OdlInterfaceRpcService odlInterfaceRpcService, BigInteger metadata)
+            throws InterruptedException, ExecutionException {
+        GetInterfaceFromIfIndexInputBuilder ifIndexInputBuilder = new GetInterfaceFromIfIndexInputBuilder();
+        BigInteger lportTag = MetaDataUtil.getLportFromMetadata(metadata);
+        ifIndexInputBuilder.setIfIndex(lportTag.intValue());
+        GetInterfaceFromIfIndexInput input = ifIndexInputBuilder.build();
+        Future<RpcResult<GetInterfaceFromIfIndexOutput>> interfaceFromIfIndex =
+                odlInterfaceRpcService.getInterfaceFromIfIndex(input);
+        GetInterfaceFromIfIndexOutput interfaceFromIfIndexOutput;
+        RpcResult<GetInterfaceFromIfIndexOutput> rpcResult = interfaceFromIfIndex.get();
+        if (rpcResult == null) {
+            return null;
+        }
 
-    static  InstanceIdentifier<DestPrefixes> getUsedRdsIdentifier(long vpnId, String destPrefix) {
-        return InstanceIdentifier.builder(ExtrarouteRdsMap.class)
-                .child(ExtrarouteRds.class, new ExtrarouteRdsKey(vpnId))
-                .child(DestPrefixes.class, new DestPrefixesKey(destPrefix)).build();
+        interfaceFromIfIndexOutput = rpcResult.getResult();
+        String interfaceName = interfaceFromIfIndexOutput.getInterfaceName();
+        return interfaceName;
     }
 
-    static DestPrefixesBuilder getDestPrefixesBuilder(String destPrefix, List<String> rd) {
-        return new DestPrefixesBuilder().setKey(new DestPrefixesKey(destPrefix))
-                .setDestPrefix(destPrefix).setRds(rd);
+    static AllocatedRdsBuilder getRdsBuilder(String nexthop, String rd) {
+        return new AllocatedRdsBuilder().setKey(new AllocatedRdsKey(nexthop)).setNexthop(nexthop).setRd(rd);
     }
 
     static Adjacencies getVpnInterfaceAugmentation(List<Adjacency> nextHopList) {
@@ -447,10 +433,11 @@ public class VpnUtil {
             if (rpcResult.isSuccessful()) {
                 return rpcResult.getResult().getIdValue().intValue();
             } else {
-                LOG.warn("RPC Call to Get Unique Id returned with Errors {}", rpcResult.getErrors());
+                LOG.error("getUniqueId: RPC Call to Get Unique Id from pool {} with key {} returned with Errors {}",
+                        poolName, idKey, rpcResult.getErrors());
             }
         } catch (InterruptedException | ExecutionException e) {
-            LOG.warn("Exception when getting Unique Id", e);
+            LOG.error("getUniqueId: Exception when getting Unique Id from pool {} for key {}", poolName, idKey, e);
         }
         return 0;
     }
@@ -461,10 +448,11 @@ public class VpnUtil {
             Future<RpcResult<Void>> result = idManager.releaseId(idInput);
             RpcResult<Void> rpcResult = result.get();
             if (!rpcResult.isSuccessful()) {
-                LOG.warn("RPC Call to Get Unique Id returned with Errors {}", rpcResult.getErrors());
+                LOG.error("releaseId: RPC Call to release Id for key {} from pool {} returned with Errors {}",
+                        idKey, poolName, rpcResult.getErrors());
             }
         } catch (InterruptedException | ExecutionException e) {
-            LOG.warn("Exception when getting Unique Id for key {}", idKey, e);
+            LOG.error("releaseId: Exception when releasing Id for key {} from pool {}", idKey, poolName, e);
         }
     }
 
@@ -482,7 +470,7 @@ public class VpnUtil {
      */
     public static String getVpnNameFromRd(DataBroker broker, String rd) {
         VpnInstanceOpDataEntry vpnInstanceOpData = getVpnInstanceOpData(broker, rd);
-        return (vpnInstanceOpData != null) ? vpnInstanceOpData.getVpnInstanceName() : null;
+        return vpnInstanceOpData != null ? vpnInstanceOpData.getVpnInstanceName() : null;
     }
 
     /**
@@ -495,14 +483,9 @@ public class VpnUtil {
      */
     public static long getVpnId(DataBroker broker, String vpnName) {
 
-        InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn
-            .id.VpnInstance>
-            id
-            = getVpnInstanceToVpnIdIdentifier(vpnName);
         Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id
-            .VpnInstance>
-            vpnInstance
-            = read(broker, LogicalDatastoreType.CONFIGURATION, id);
+                    .VpnInstance> vpnInstance =
+            read(broker, LogicalDatastoreType.CONFIGURATION, VpnOperDsUtils.getVpnInstanceToVpnIdIdentifier(vpnName));
 
         long vpnId = VpnConstants.INVALID_ID;
         if (vpnInstance.isPresent()) {
@@ -511,6 +494,18 @@ public class VpnUtil {
         return vpnId;
     }
 
+    public static InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance
+                        .to.vpn.id.VpnInstance> getVpnInstanceToVpnIdIdentifier(
+            String vpnName) {
+        return InstanceIdentifier.builder(VpnInstanceToVpnId.class)
+                .child(org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id
+                          .VpnInstance.class,
+                        new org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn
+                               .id.VpnInstanceKey(
+                                vpnName))
+                .build();
+    }
+
     /**
      * Retrieves the VPN Route Distinguisher searching by its Vpn instance name.
      *
@@ -519,14 +514,10 @@ public class VpnUtil {
      * @return the route-distinguisher of the VPN
      */
     public static String getVpnRd(DataBroker broker, String vpnName) {
-        InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn
-            .id.VpnInstance>
-            id
-            = getVpnInstanceToVpnIdIdentifier(vpnName);
         Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id
             .VpnInstance>
             vpnInstance
-            = read(broker, LogicalDatastoreType.CONFIGURATION, id);
+            = read(broker, LogicalDatastoreType.CONFIGURATION, VpnOperDsUtils.getVpnInstanceToVpnIdIdentifier(vpnName));
 
         String rd = null;
         if (vpnInstance.isPresent()) {
@@ -539,7 +530,7 @@ public class VpnUtil {
         InstanceIdentifier<VpnInstance> id = InstanceIdentifier.builder(VpnInstances.class)
             .child(VpnInstance.class, new VpnInstanceKey(vpnName)).build();
         Optional<VpnInstance> vpnInstance = VpnUtil.read(broker, LogicalDatastoreType.CONFIGURATION, id);
-        return vpnInstance.isPresent() ? getListOfRdsFromVpnInstance(vpnInstance.get()) : new ArrayList<String>();
+        return vpnInstance.isPresent() ? getListOfRdsFromVpnInstance(vpnInstance.get()) : new ArrayList<>();
     }
 
     /**
@@ -601,7 +592,7 @@ public class VpnUtil {
             try {
                 bgpManager.withdrawPrefix(rd, vrfEntry.getDestPrefix());
             } catch (Exception e) {
-                LOG.error("Could not withdraw route to {} with route-paths {} in VpnRd {}",
+                LOG.error("withdrawRoutes: Could not withdraw route to {} with route-paths {} in VpnRd {}",
                           vrfEntry.getDestPrefix(), vrfEntry.getRoutePaths(), rd);
             }
         });
@@ -613,18 +604,6 @@ public class VpnUtil {
 
     }
 
-    static InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to
-        .vpn.id.VpnInstance>
-        getVpnInstanceToVpnIdIdentifier(String vpnName) {
-        return InstanceIdentifier.builder(VpnInstanceToVpnId.class)
-            .child(
-                org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id
-                    .VpnInstance.class,
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id
-                    .VpnInstanceKey(
-                    vpnName)).build();
-    }
-
     static RouterInterface getConfiguredRouterInterface(DataBroker broker, String interfaceName) {
         Optional<RouterInterface> optRouterInterface =
             read(broker, LogicalDatastoreType.CONFIGURATION, VpnUtil.getRouterInterfaceId(interfaceName));
@@ -754,18 +733,15 @@ public class VpnUtil {
         return read(broker, LogicalDatastoreType.CONFIGURATION, interfaceId).isPresent();
     }
 
-    static boolean isInterfaceAssociatedWithVpn(DataBroker broker, String vpnName, String interfaceName) {
+    static Optional<String> getVpnAssociatedWithInterface(DataBroker broker, String interfaceName) {
         InstanceIdentifier<VpnInterface> interfaceId = getVpnInterfaceIdentifier(interfaceName);
-        Optional<VpnInterface> optConfiguredVpnInterface =
-            read(broker, LogicalDatastoreType.CONFIGURATION, interfaceId);
-
+        Optional<String> vpnOptional = Optional.absent();
+        Optional<VpnInterface> optConfiguredVpnInterface = read(broker, LogicalDatastoreType.CONFIGURATION,
+                interfaceId);
         if (optConfiguredVpnInterface.isPresent()) {
-            String configuredVpnName = optConfiguredVpnInterface.get().getVpnInstanceName();
-            if ((configuredVpnName != null) && (configuredVpnName.equalsIgnoreCase(vpnName))) {
-                return true;
-            }
+            vpnOptional = Optional.of(optConfiguredVpnInterface.get().getVpnInstanceName());
         }
-        return false;
+        return vpnOptional;
     }
 
     public static String getIpPrefix(String prefix) {
@@ -788,7 +764,6 @@ public class VpnUtil {
                 LOG.error("Error in Datastore operation", error);
             }
 
-            ;
         };
 
     public static <T extends DataObject> Optional<T> read(DataBroker broker, LogicalDatastoreType datastoreType,
@@ -820,7 +795,7 @@ public class VpnUtil {
     public static <T extends DataObject> void asyncWrite(DataBroker broker, LogicalDatastoreType datastoreType,
         InstanceIdentifier<T> path, T data, FutureCallback<Void> callback) {
         WriteTransaction tx = broker.newWriteOnlyTransaction();
-        tx.put(datastoreType, path, data, true);
+        tx.put(datastoreType, path, data, WriteTransaction.CREATE_MISSING_PARENTS);
         Futures.addCallback(tx.submit(), callback);
     }
 
@@ -831,9 +806,9 @@ public class VpnUtil {
         try {
             delete(broker, datastoreType, path, DEFAULT_CALLBACK);
         } catch (SchemaValidationFailedException sve) {
-            LOG.info("Could not delete {}. SchemaValidationFailedException: {}", path, sve.getMessage());
+            LOG.info("tryDelete: Could not delete {}. SchemaValidationFailedException: {}", path, sve.getMessage());
         } catch (Exception e) {
-            LOG.info("Could not delete {}. Unhandled error: {}", path, e.getMessage());
+            LOG.info("tryDelete: Could not delete {}. Unhandled error: {}", path, e.getMessage());
         }
     }
 
@@ -853,12 +828,12 @@ public class VpnUtil {
     public static <T extends DataObject> void syncWrite(DataBroker broker, LogicalDatastoreType datastoreType,
         InstanceIdentifier<T> path, T data) {
         WriteTransaction tx = broker.newWriteOnlyTransaction();
-        tx.put(datastoreType, path, data, true);
+        tx.put(datastoreType, path, data, WriteTransaction.CREATE_MISSING_PARENTS);
         CheckedFuture<Void, TransactionCommitFailedException> futures = tx.submit();
         try {
             futures.get();
         } catch (InterruptedException | ExecutionException e) {
-            LOG.error("Error writing to datastore (path, data) : ({}, {})", path, data);
+            LOG.error("syncWrite: Error writing to datastore (path, data) : ({}, {})", path, data);
             throw new RuntimeException(e.getMessage());
         }
     }
@@ -871,13 +846,13 @@ public class VpnUtil {
         try {
             futures.get();
         } catch (InterruptedException | ExecutionException e) {
-            LOG.error("Error writing to datastore (path, data) : ({}, {})", path, data);
+            LOG.error("syncUpdate: Error writing to datastore (path, data) : ({}, {})", path, data);
             throw new RuntimeException(e.getMessage());
         }
     }
 
     public static long getRemoteBCGroup(long elanTag) {
-        return VpnConstants.ELAN_GID_MIN + ((elanTag % VpnConstants.ELAN_GID_MIN) * 2);
+        return VpnConstants.ELAN_GID_MIN + elanTag % VpnConstants.ELAN_GID_MIN * 2;
     }
 
     // interface-index-tag operational container
@@ -949,7 +924,8 @@ public class VpnUtil {
                     DEFAULT_CALLBACK);
             }
         } catch (Exception e) {
-            LOG.error("Exception during cleanup of PrefixToInterface for VPN ID {}", vpnId, e);
+            LOG.error("removePrefixToInterfaceForVpnId: Exception during cleanup of PrefixToInterface for VPN ID {}",
+                    vpnId, e);
         }
     }
 
@@ -969,7 +945,8 @@ public class VpnUtil {
                         DEFAULT_CALLBACK);
             }
         } catch (Exception e) {
-            LOG.error("Exception during cleanup of VPNToExtraRoute for VPN {}", vpnName, e);
+            LOG.error("removeVpnExtraRouteForVpna: Exception during cleanup of VPNToExtraRoute for VPN {}",
+                    vpnName, e);
         }
     }
 
@@ -985,7 +962,8 @@ public class VpnUtil {
                     DEFAULT_CALLBACK);
             }
         } catch (Exception e) {
-            LOG.error("Exception during cleanup of VPNInstanceOpDataEntry for VPN {}", vpnName, e);
+            LOG.error("removeVpnOpInstance: Exception during cleanup of VPNInstanceOpDataEntry for VPN {}",
+                    vpnName, e);
         }
     }
 
@@ -994,13 +972,16 @@ public class VpnUtil {
     public static void removeVpnInstanceToVpnId(DataBroker broker, String vpnName, WriteTransaction writeTxn) {
         try {
             if (writeTxn != null) {
-                writeTxn.delete(LogicalDatastoreType.CONFIGURATION, getVpnInstanceToVpnIdIdentifier(vpnName));
+                writeTxn.delete(LogicalDatastoreType.CONFIGURATION,
+                                VpnOperDsUtils.getVpnInstanceToVpnIdIdentifier(vpnName));
             } else {
-                delete(broker, LogicalDatastoreType.CONFIGURATION, getVpnInstanceToVpnIdIdentifier(vpnName),
+                delete(broker, LogicalDatastoreType.CONFIGURATION,
+                       VpnOperDsUtils.getVpnInstanceToVpnIdIdentifier(vpnName),
                     DEFAULT_CALLBACK);
             }
         } catch (Exception e) {
-            LOG.error("Exception during clean up of VpnInstanceToVpnId for VPN {}", vpnName, e);
+            LOG.error("removeVpnInstanceToVpnId: Exception during clean up of VpnInstanceToVpnId for VPN {}",
+                    vpnName, e);
         }
     }
 
@@ -1015,7 +996,8 @@ public class VpnUtil {
                     DEFAULT_CALLBACK);
             }
         } catch (Exception e) {
-            LOG.error("Exception during clean up of VpnIdToVpnInstance for VPNID {}", vpnId, e);
+            LOG.error("removeVpnIdToVpnInstance: Exception during clean up of VpnIdToVpnInstance for VPNID {}",
+                    vpnId, e);
         }
     }
 
@@ -1035,7 +1017,8 @@ public class VpnUtil {
                     DEFAULT_CALLBACK);
             }
         } catch (Exception e) {
-            LOG.error("Exception during clean up of VrfTable from FIB for VPN {}", vpnName, e);
+            LOG.error("removeVrfTableForVpn: Exception during clean up of VrfTable from FIB for VPN {}",
+                    vpnName, e);
         }
     }
 
@@ -1055,7 +1038,7 @@ public class VpnUtil {
                     DEFAULT_CALLBACK);
             }
         } catch (Exception e) {
-            LOG.error("Exception during cleanup of L3NextHop for VPN ID {}", vpnId, e);
+            LOG.error("removeL3nexthopForVpnId: Exception during cleanup of L3NextHop for VPN ID {}", vpnId, e);
         }
     }
 
@@ -1079,11 +1062,12 @@ public class VpnUtil {
             InstanceIdentifier<LearntVpnVipToPort> id = buildLearntVpnVipToPortIdentifier(vpnName, fixedIp);
             LearntVpnVipToPortBuilder builder =
                     new LearntVpnVipToPortBuilder().setKey(new LearntVpnVipToPortKey(fixedIp, vpnName)).setVpnName(
-                            vpnName).setPortFixedip(fixedIp).setPortName(portName).setMacAddress(
-                            macAddress.toLowerCase());
+                            vpnName).setPortFixedip(fixedIp).setPortName(portName)
+                            .setMacAddress(macAddress.toLowerCase())
+                            .setCreationTime(new SimpleDateFormat("MM/dd/yyyy h:mm:ss a").format(new Date()));
             MDSALUtil.syncWrite(broker, LogicalDatastoreType.OPERATIONAL, id, builder.build());
-            LOG.debug("ARP learned for fixedIp: {}, vpn {}, interface {}, mac {}, isSubnetIp {} added to "
-                    + "VpnPortipToPort DS", fixedIp, vpnName, portName, macAddress);
+            LOG.debug("createLearntVpnVipToPort: ARP learned for fixedIp: {}, vpn {}, interface {}, mac {},"
+                    + " isSubnetIp {} added to VpnPortipToPort DS", fixedIp, vpnName, portName, macAddress);
         }
     }
 
@@ -1099,10 +1083,23 @@ public class VpnUtil {
         synchronized ((vpnName + fixedIp).intern()) {
             InstanceIdentifier<LearntVpnVipToPort> id = buildLearntVpnVipToPortIdentifier(vpnName, fixedIp);
             MDSALUtil.syncDelete(broker, LogicalDatastoreType.OPERATIONAL, id);
-            LOG.debug("Delete learned ARP for fixedIp: {}, vpn {} removed from VpnPortipToPort DS", fixedIp, vpnName);
+            LOG.debug("removeLearntVpnVipToPort: Delete learned ARP for fixedIp: {}, vpn {} removed from"
+                    + " VpnPortipToPort DS", fixedIp, vpnName);
         }
     }
 
+    static InstanceIdentifier<NetworkMap> buildNetworkMapIdentifier(Uuid networkId) {
+        InstanceIdentifier<NetworkMap> id = InstanceIdentifier.builder(NetworkMaps.class).child(NetworkMap.class, new
+                NetworkMapKey(networkId)).build();
+        return id;
+    }
+
+    static InstanceIdentifier<SubnetOpDataEntry> buildSubnetOpDataEntryInstanceIdentifier(Uuid subnetId) {
+        InstanceIdentifier<SubnetOpDataEntry> subOpIdentifier = InstanceIdentifier.builder(SubnetOpData.class)
+                .child(SubnetOpDataEntry.class, new SubnetOpDataEntryKey(subnetId)).build();
+        return subOpIdentifier;
+    }
+
     static InstanceIdentifier<VpnPortipToPort> buildVpnPortipToPortIdentifier(String vpnName, String fixedIp) {
         InstanceIdentifier<VpnPortipToPort> id =
             InstanceIdentifier.builder(NeutronVpnPortipPortData.class).child(VpnPortipToPort.class,
@@ -1110,11 +1107,11 @@ public class VpnUtil {
         return id;
     }
 
-    static VpnPortipToPort getNeutronPortFromVpnPortFixedIp(DataBroker broker, String vpnName, String fixedIp) {
+    public static VpnPortipToPort getNeutronPortFromVpnPortFixedIp(DataBroker broker, String vpnName, String fixedIp) {
         InstanceIdentifier id = buildVpnPortipToPortIdentifier(vpnName, fixedIp);
         Optional<VpnPortipToPort> vpnPortipToPortData = read(broker, LogicalDatastoreType.CONFIGURATION, id);
         if (vpnPortipToPortData.isPresent()) {
-            return (vpnPortipToPortData.get());
+            return vpnPortipToPortData.get();
         }
         return null;
     }
@@ -1123,7 +1120,7 @@ public class VpnUtil {
         InstanceIdentifier id = buildLearntVpnVipToPortIdentifier(vpnName, fixedIp);
         Optional<LearntVpnVipToPort> learntVpnVipToPort = read(broker, LogicalDatastoreType.OPERATIONAL, id);
         if (learntVpnVipToPort.isPresent()) {
-            return (learntVpnVipToPort.get());
+            return learntVpnVipToPort.get();
         }
         return null;
     }
@@ -1132,19 +1129,19 @@ public class VpnUtil {
         List<BigInteger> result = new ArrayList<>();
         String rd = getVpnRd(dataBroker, vpnInstanceName);
         if (rd == null) {
-            LOG.debug("Could not find Route-Distinguisher for VpnName={}", vpnInstanceName);
+            LOG.debug("getDpnsOnVpn: Could not find Route-Distinguisher for VpnName={}", vpnInstanceName);
             return result;
         }
 
         VpnInstanceOpDataEntry vpnInstanceOpData = getVpnInstanceOpData(dataBroker, rd);
         if (vpnInstanceOpData == null) {
-            LOG.debug("Could not find OpState for VpnName={}", vpnInstanceName);
+            LOG.debug("getDpnsOnVpn: Could not find OpState for VpnName={}", vpnInstanceName);
             return result;
         }
 
         List<VpnToDpnList> vpnToDpnList = vpnInstanceOpData.getVpnToDpnList();
         if (vpnToDpnList == null) {
-            LOG.debug("Could not find DPN footprint for VpnName={}", vpnInstanceName);
+            LOG.debug("getDpnsOnVpn: Could not find DPN footprint for VpnName={}", vpnInstanceName);
             return result;
         }
         for (VpnToDpnList vpnToDpn : vpnToDpnList) {
@@ -1165,6 +1162,24 @@ public class VpnUtil {
         return null;
     }
 
+    public static String getAssociatedExternalRouter(DataBroker dataBroker, String extIp) {
+        InstanceIdentifier<ExtRouters> extRouterInstanceIndentifier =
+                InstanceIdentifier.builder(ExtRouters.class).build();
+        Optional<ExtRouters> extRouterData = read(dataBroker, LogicalDatastoreType.CONFIGURATION,
+                extRouterInstanceIndentifier);
+        if (extRouterData.isPresent()) {
+            for (Routers routerData : extRouterData.get().getRouters()) {
+                List<ExternalIps> externalIps = routerData.getExternalIps();
+                for (ExternalIps externalIp : externalIps) {
+                    if (externalIp.getIpAddress().equals(extIp)) {
+                        return routerData.getRouterName();
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
     static InstanceIdentifier<Routers> buildRouterIdentifier(String routerId) {
         InstanceIdentifier<Routers> routerInstanceIndentifier =
             InstanceIdentifier.builder(ExtRouters.class).child(Routers.class, new RoutersKey(routerId)).build();
@@ -1185,7 +1200,7 @@ public class VpnUtil {
 
     static List<Uuid> getExternalNetworkRouterIds(DataBroker dataBroker, Uuid networkId) {
         Networks extNetwork = getExternalNetwork(dataBroker, networkId);
-        return extNetwork != null ? extNetwork.getRouterIds() : null;
+        return extNetwork != null ? extNetwork.getRouterIds() : Collections.emptyList();
     }
 
     static Routers getExternalRouter(DataBroker dataBroker, String routerId) {
@@ -1219,9 +1234,14 @@ public class VpnUtil {
         return InstanceIdentifier.create(Subnetmaps.class);
     }
 
-    static void setupSubnetMacIntoVpnInstance(DataBroker dataBroker, IMdsalApiManager mdsalManager,
-        String vpnName, String srcMacAddress, BigInteger dpnId, WriteTransaction writeTx, int addOrRemove) {
+    static void setupSubnetMacIntoVpnInstance(DataBroker dataBroker, IMdsalApiManager mdsalManager, String vpnName,
+            String subnetVpnName, String srcMacAddress, BigInteger dpnId, WriteTransaction writeTx, int addOrRemove) {
         long vpnId = getVpnId(dataBroker, vpnName);
+        long subnetVpnId = VpnConstants.INVALID_ID;
+        if (subnetVpnName != null) {
+            subnetVpnId = getVpnId(dataBroker,subnetVpnName);
+        }
+
         if (dpnId.equals(BigInteger.ZERO)) {
             /* Apply the MAC on all DPNs in a VPN */
             List<BigInteger> dpIds = getDpnsOnVpn(dataBroker, vpnName);
@@ -1229,16 +1249,16 @@ public class VpnUtil {
                 return;
             }
             for (BigInteger dpId : dpIds) {
-                addGwMacIntoTx(mdsalManager, srcMacAddress, writeTx, addOrRemove, vpnId, dpId);
+                addGwMacIntoTx(mdsalManager, srcMacAddress, writeTx, addOrRemove, vpnId, dpId, subnetVpnId);
             }
         } else {
-            addGwMacIntoTx(mdsalManager, srcMacAddress, writeTx, addOrRemove, vpnId, dpnId);
+            addGwMacIntoTx(mdsalManager, srcMacAddress, writeTx, addOrRemove, vpnId, dpnId, subnetVpnId);
         }
     }
 
     static void addGwMacIntoTx(IMdsalApiManager mdsalManager, String srcMacAddress, WriteTransaction writeTx,
-        int addOrRemove, long vpnId, BigInteger dpId) {
-        FlowEntity flowEntity = buildL3vpnGatewayFlow(dpId, srcMacAddress, vpnId);
+        int addOrRemove, long vpnId, BigInteger dpId, long subnetVpnId) {
+        FlowEntity flowEntity = buildL3vpnGatewayFlow(dpId, srcMacAddress, vpnId, subnetVpnId);
         if (addOrRemove == NwConstants.ADD_FLOW) {
             mdsalManager.addFlowToTx(flowEntity, writeTx);
         } else {
@@ -1246,12 +1266,18 @@ public class VpnUtil {
         }
     }
 
-    public static FlowEntity buildL3vpnGatewayFlow(BigInteger dpId, String gwMacAddress, long vpnId) {
+    public static FlowEntity buildL3vpnGatewayFlow(BigInteger dpId, String gwMacAddress, long vpnId,
+            long subnetVpnId) {
         List<MatchInfo> mkMatches = new ArrayList<>();
         mkMatches.add(new MatchMetadata(MetaDataUtil.getVpnIdMetadata(vpnId), MetaDataUtil.METADATA_MASK_VRFID));
         mkMatches.add(new MatchEthernetDestination(new MacAddress(gwMacAddress)));
         List<InstructionInfo> mkInstructions = new ArrayList<>();
         mkInstructions.add(new InstructionGotoTable(NwConstants.L3_FIB_TABLE));
+        if (subnetVpnId != VpnConstants.INVALID_ID) {
+            BigInteger subnetIdMetaData = MetaDataUtil.getVpnIdMetadata(subnetVpnId);
+            mkInstructions.add(new InstructionWriteMetadata(subnetIdMetaData, MetaDataUtil.METADATA_MASK_VRFID));
+        }
+
         String flowId = getL3VpnGatewayFlowRef(NwConstants.L3_GW_MAC_TABLE, dpId, vpnId, gwMacAddress);
         FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.L3_GW_MAC_TABLE,
             flowId, 20, flowId, 0, 0, NwConstants.COOKIE_L3_GW_MAC_TABLE, mkMatches, mkInstructions);
@@ -1269,8 +1295,8 @@ public class VpnUtil {
         Future<RpcResult<Void>> result = lockManager.tryLock(input);
         String errMsg = "Unable to getLock for subnet " + subnetId;
         try {
-            if ((result != null) && (result.get().isSuccessful())) {
-                LOG.debug("Acquired lock for {}", subnetId);
+            if (result != null && result.get().isSuccessful()) {
+                LOG.debug("lockSubnet: Acquired lock for {}", subnetId);
             } else {
                 throw new RuntimeException(errMsg);
             }
@@ -1284,13 +1310,13 @@ public class VpnUtil {
         UnlockInput input = new UnlockInputBuilder().setLockName(subnetId).build();
         Future<RpcResult<Void>> result = lockManager.unlock(input);
         try {
-            if ((result != null) && (result.get().isSuccessful())) {
-                LOG.debug("Unlocked {}", subnetId);
+            if (result != null && result.get().isSuccessful()) {
+                LOG.debug("unlockSubnet: Unlocked {}", subnetId);
             } else {
-                LOG.debug("Unable to unlock subnet {}", subnetId);
+                LOG.debug("unlockSubnet: Unable to unlock subnet {}", subnetId);
             }
         } catch (InterruptedException | ExecutionException e) {
-            LOG.error("Unable to unlock subnet {}", subnetId);
+            LOG.error("unlockSubnet: Unable to unlock subnet {}", subnetId);
             throw new RuntimeException(String.format("Unable to unlock subnetId %s", subnetId), e.getCause());
         }
     }
@@ -1307,7 +1333,8 @@ public class VpnUtil {
                     neutronVpnService.getNeutronSubnet(port.getFixedIps().get(0).getSubnetId()).getGatewayIp());
             }
         } else {
-            LOG.debug("neutron vpn service is not configured");
+            LOG.error("getGatewayIpAddressFromInterface: neutron vpn service is not configured."
+                    + " Failed for interface {}.", srcInterface);
         }
         return gatewayIp;
     }
@@ -1323,7 +1350,7 @@ public class VpnUtil {
             vpnIdsOptional
             = VpnUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION, vpnIdsInstanceIdentifier);
         if (!vpnIdsOptional.isPresent()) {
-            LOG.trace("VPN {} not configured", vpnId);
+            LOG.error("getGWMacAddressFromInterface: VPN {} not configured", vpnId);
             return gatewayMac;
         }
         VpnPortipToPort vpnTargetIpToPort = VpnUtil.getNeutronPortFromVpnPortFixedIp(dataBroker,
@@ -1355,13 +1382,14 @@ public class VpnUtil {
                 if (isOwner) {
                     job.run();
                 } else {
-                    LOG.trace("job is not run as i m not cluster owner desc :{} ", jobDescription);
+                    LOG.trace("runOnlyInLeaderNode: job is not run as i m not cluster owner desc :{} ",
+                            jobDescription);
                 }
             }
 
             @Override
             public void onFailure(Throwable error) {
-                LOG.error("Failed to identity cluster owner ", error);
+                LOG.error("runOnlyInLeaderNode: Failed to identity cluster owner ", error);
             }
         });
     }
@@ -1369,14 +1397,19 @@ public class VpnUtil {
     public static boolean isVpnIntfPresentInVpnToDpnList(DataBroker broker, VpnInterface vpnInterface) {
         BigInteger dpnId = vpnInterface.getDpnId();
         String rd = VpnUtil.getVpnRd(broker, vpnInterface.getVpnInstanceName());
+        LOG.trace("isVpnIntfPresentInVpnToDpnList: GOT rd {} for VpnInterface {}  VpnInstance {} ", rd ,
+                vpnInterface.getName(), vpnInterface.getVpnInstanceName());
         VpnInstanceOpDataEntry vpnInstanceOpData = VpnUtil.getVpnInstanceOpDataFromCache(broker, rd);
         if (vpnInstanceOpData != null) {
+            LOG.trace("isVpnIntfPresentInVpnToDpnList: GOT VpnInstanceOp {} for rd {} ", vpnInstanceOpData, rd);
             List<VpnToDpnList> dpnToVpns = vpnInstanceOpData.getVpnToDpnList();
             if (dpnToVpns != null) {
                 for (VpnToDpnList dpn : dpnToVpns) {
                     if (dpn.getDpnId().equals(dpnId)) {
                         return dpn.getVpnInterfaces().contains(vpnInterface.getName());
                     }
+                    LOG.info("isVpnIntfPresentInVpnToDpnList: VpnInterface {} not present in DpnId {} vpn {}",
+                            vpnInterface.getName(), dpn.getDpnId(), vpnInterface.getVpnInstanceName());
                 }
             }
         }
@@ -1394,11 +1427,13 @@ public class VpnUtil {
         if (vpnIdsOptional.isPresent() && vpnIdsOptional.get().isExternalVpn()) {
             PhysAddress gwMacAddress = interfaceState.getPhysAddress();
             if (gwMacAddress == null) {
-                LOG.error("Failed to get gwMacAddress for interface {}", interfaceName);
+                LOG.error("setupGwMacIfExternalVpn: Failed to get gwMacAddress for interface {} on dpn {} vpn {}",
+                        interfaceName, dpnId.toString(), vpnIdsOptional.get().getVpnInstanceName());
                 return;
             }
+
             String gwMac = gwMacAddress.getValue();
-            FlowEntity flowEntity = VpnUtil.buildL3vpnGatewayFlow(dpnId, gwMac, vpnId);
+            FlowEntity flowEntity = VpnUtil.buildL3vpnGatewayFlow(dpnId, gwMac, vpnId, VpnConstants.INVALID_ID);
             if (addOrRemove == NwConstants.ADD_FLOW) {
                 mdsalManager.addFlowToTx(flowEntity, writeInvTxn);
             } else if (addOrRemove == NwConstants.DEL_FLOW) {
@@ -1407,7 +1442,6 @@ public class VpnUtil {
         }
     }
 
-
     public static Optional<VpnPortipToPort> getRouterInterfaceForVpnInterface(DataBroker dataBroker,
                                                                               String interfaceName,
                                                                               String vpnName,
@@ -1433,7 +1467,8 @@ public class VpnUtil {
         if (subnet.isPresent()) {
             Class<? extends IpVersionBase> ipVersionBase = subnet.get().getIpVersion();
             if (ipVersionBase.equals(IpVersionV4.class)) {
-                LOG.trace("Obtained subnet {} for vpn interface", subnet.get().getUuid().getValue());
+                LOG.trace("getVpnSubnetGatewayIp: Obtained subnet {} for vpn interface",
+                        subnet.get().getUuid().getValue());
                 gwIpAddress = Optional.of(subnet.get().getGatewayIp().getIpv4Address().getValue());
                 return gwIpAddress;
             }
@@ -1448,22 +1483,23 @@ public class VpnUtil {
         return routerToNaptSwitchData.isPresent() ? routerToNaptSwitchData.get() : null;
     }
 
+    static InstanceIdentifier<Subnetmap> buildSubnetmapIdentifier(Uuid subnetId) {
+        return InstanceIdentifier.builder(Subnetmaps.class)
+        .child(Subnetmap.class, new SubnetmapKey(subnetId)).build();
+
+    }
+
     public static BigInteger getPrimarySwitchForRouter(DataBroker dataBroker, String routerName) {
         RouterToNaptSwitch routerToNaptSwitch = getRouterToNaptSwitch(dataBroker, routerName);
         return routerToNaptSwitch != null ? routerToNaptSwitch.getPrimarySwitchId() : null;
     }
 
     static boolean isL3VpnOverVxLan(Long l3Vni) {
-        return (l3Vni != null && l3Vni != 0);
+        return l3Vni != null && l3Vni != 0;
     }
 
     static boolean isEvpnOverVxLan(Long l2Vni) { //To be used by RT2
-        return (l2Vni != null && l2Vni != 0);
-    }
-
-    static   String getGatewayMac(String interfaceName) {
-        //OUI based MAC creation and use
-        return VpnConstants.DEFAULT_GATEWAY_MAC_ADDRESS;
+        return l2Vni != null && l2Vni != 0;
     }
 
     /**
@@ -1477,6 +1513,11 @@ public class VpnUtil {
      * @return the primary rd of the VPN
      */
     public static String getPrimaryRd(DataBroker dataBroker, String vpnName) {
+        // Retrieves the VPN Route Distinguisher by its Vpn instance name
+        String rd = getVpnRd(dataBroker, vpnName);
+        if (rd != null) {
+            return rd;
+        }
         InstanceIdentifier<VpnInstance> id  = getVpnInstanceIdentifier(vpnName);
         Optional<VpnInstance> vpnInstance = VpnUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION, id);
         if (vpnInstance.isPresent()) {
@@ -1507,45 +1548,55 @@ public class VpnUtil {
     }
 
     static java.util.Optional<String> allocateRdForExtraRouteAndUpdateUsedRdsMap(
-            DataBroker dataBroker, long vpnId, String prefix, String vpnName,
-            BigInteger dpnId, Adjacency adjacency, WriteTransaction writeOperTxn) {
-        List<String> usedRds = getUsedRds(dataBroker, vpnId, prefix);
-        //Check if rd is already allocated for the same prefix. Use same rd if extra route is behind same CSS.
-        java.util.Optional<String> rdToAllocate = usedRds.stream()
-                .map(usedRd -> {
-                    Optional<Routes> vpnExtraRoutes = getExtraRoutes(dataBroker, vpnName, usedRd, prefix);
-                    return vpnExtraRoutes.isPresent() ? new ImmutablePair<String, String>(
-                            vpnExtraRoutes.get().getNexthopIpList().get(0),
-                            usedRd) : new ImmutablePair<String, String>("", "");
-                })
-                .filter(pair -> {
-                    if (pair.getLeft().isEmpty()) {
-                        return false;
-                    }
-                    Optional<Prefixes> prefixToInterface = getPrefixToInterface(dataBroker, vpnId, pair.getLeft());
-                    return prefixToInterface.isPresent() ? dpnId.equals(prefixToInterface.get().getDpnId()) : false;
-                }).map(pair -> pair.getRight()).findFirst();
-        if (rdToAllocate.isPresent()) {
-            return rdToAllocate;
+            DataBroker dataBroker, long vpnId, @Nullable Long parentVpnId, String prefix, String vpnName,
+            String nextHop, BigInteger dpnId, WriteTransaction writeOperTxn) {
+        //Check if rd is already allocated for this extraroute behind the same VM. If yes, reuse it.
+        //This is particularly useful during reboot scenarios.
+        java.util.Optional<String> allocatedRd = VpnExtraRouteHelper
+                .getRdAllocatedForExtraRoute(dataBroker, vpnId, prefix, nextHop);
+        if (allocatedRd.isPresent()) {
+            return java.util.Optional.of(allocatedRd.get());
+        }
+
+        //Check if rd is already allocated for this extraroute behind the same CSS. If yes, reuse it
+        List<String> usedRds = VpnExtraRouteHelper.getUsedRds(dataBroker, vpnId, prefix);
+        for (String usedRd : usedRds) {
+            Optional<Routes> vpnExtraRoutes = VpnExtraRouteHelper.getVpnExtraroutes(dataBroker,
+                    vpnName, usedRd, prefix);
+            if (vpnExtraRoutes.isPresent()) {
+                String nextHopIp = vpnExtraRoutes.get().getNexthopIpList().get(0);
+                // In case of VPN importing the routes, the interface is not present in the VPN
+                // and has to be fetched from the VPN from which it imports
+                Optional<Prefixes> prefixToInterface =
+                        getPrefixToInterface(dataBroker, parentVpnId != null ? parentVpnId : vpnId, nextHopIp);
+                if (prefixToInterface.isPresent() && dpnId.equals(prefixToInterface.get().getDpnId())) {
+                    syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION,
+                            VpnExtraRouteHelper.getUsedRdsIdentifier(vpnId, prefix, nextHop),
+                            getRdsBuilder(nextHop, usedRd).build());
+                    return java.util.Optional.of(usedRd);
+                }
+            }
         }
         List<String> availableRds = getVpnRdsFromVpnInstanceConfig(dataBroker, vpnName);
+        String rd;
         if (availableRds.isEmpty()) {
-            LOG.debug("Internal vpn. Returning vpn name {} as rd", vpnName);
-            return java.util.Optional.ofNullable(vpnName);
+            rd = dpnId.toString();
+            LOG.debug("Internal vpn {} Returning DpnId {} as rd", vpnName, rd);
+        } else {
+            LOG.trace(
+                    "Removing used rds {} from available rds {} vpnid {} . prefix is {} , vpname- {}, dpnId- {},"
+                    + " adj - {}", usedRds, availableRds, vpnId, prefix, vpnName, dpnId);
+            availableRds.removeAll(usedRds);
+            if (availableRds.isEmpty()) {
+                LOG.error("No rd available from VpnInstance to allocate for prefix {}", prefix);
+                return java.util.Optional.empty();
+            }
+            // If rd is not allocated for this prefix or if extra route is behind different OVS, select a new rd.
+            rd = availableRds.get(0);
         }
-        LOG.trace(
-                "Removing used rds {} from available rds {} vpnid {} . prefix is {} , vpname- {}, dpnId- {}, adj - {}",
-                usedRds, availableRds, vpnId, prefix, vpnName, dpnId, adjacency);
-        availableRds.removeAll(usedRds);
-        if (availableRds.isEmpty()) {
-            LOG.error("No rd available from VpnInstance to allocate for new adjacency{}", adjacency);
-            return java.util.Optional.empty();
-        }
-        // If rd is not allocated for this prefix or if extra route is behind different CSS, select a new rd.
-        String rd = availableRds.get(0);
-        usedRds.add(rd);
-        syncUpdate(dataBroker, LogicalDatastoreType.OPERATIONAL, getUsedRdsIdentifier(vpnId, prefix),
-                getDestPrefixesBuilder(prefix, usedRds).build());
+        syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION,
+                VpnExtraRouteHelper.getUsedRdsIdentifier(vpnId, prefix, nextHop),
+                getRdsBuilder(nextHop, rd).build());
         return java.util.Optional.ofNullable(rd);
     }
 
@@ -1553,11 +1604,185 @@ public class VpnUtil {
         return vpnName + VpnConstants.SEPARATOR + prefix;
     }
 
+    static InstanceIdentifier<Adjacency> getAdjacencyIdentifier(String vpnInterfaceName, String ipAddress) {
+        return InstanceIdentifier.builder(VpnInterfaces.class)
+                .child(VpnInterface.class, new VpnInterfaceKey(vpnInterfaceName))
+                .augmentation(Adjacencies.class).child(Adjacency.class, new AdjacencyKey(ipAddress)).build();
+    }
+
     public static List<String> getIpsListFromExternalIps(List<ExternalIps> externalIps) {
         if (externalIps == null) {
             return Collections.emptyList();
         }
 
-        return externalIps.stream().map(externalIp -> externalIp.getIpAddress()).collect(Collectors.toList());
+        return externalIps.stream().map(ExternalIps::getIpAddress).collect(Collectors.toList());
+    }
+
+    static void bindService(final String vpnInstanceName, final String interfaceName, DataBroker dataBroker,
+                            boolean isTunnelInterface) {
+        DataStoreJobCoordinator dataStoreCoordinator = DataStoreJobCoordinator.getInstance();
+        dataStoreCoordinator.enqueueJob(interfaceName,
+            () -> {
+                WriteTransaction writeTxn = dataBroker.newWriteOnlyTransaction();
+                BoundServices serviceInfo = isTunnelInterface
+                        ? VpnUtil.getBoundServicesForTunnelInterface(vpnInstanceName, interfaceName)
+                        : getBoundServicesForVpnInterface(dataBroker, vpnInstanceName, interfaceName);
+                writeTxn.put(LogicalDatastoreType.CONFIGURATION, InterfaceUtils.buildServiceId(interfaceName,
+                        ServiceIndex.getIndex(NwConstants.L3VPN_SERVICE_NAME, NwConstants.L3VPN_SERVICE_INDEX)),
+                        serviceInfo, WriteTransaction.CREATE_MISSING_PARENTS);
+                return Collections.singletonList(writeTxn.submit());
+            });
+    }
+
+    static BoundServices getBoundServicesForVpnInterface(DataBroker broker, String vpnName, String interfaceName) {
+        List<Instruction> instructions = new ArrayList<>();
+        int instructionKey = 0;
+        final long vpnId = VpnUtil.getVpnId(broker, vpnName);
+        List<Action> actions = Collections.singletonList(
+                new ActionRegLoad(0, VpnConstants.VPN_REG_ID, 0, VpnConstants.VPN_ID_LENGTH, vpnId).buildAction());
+        instructions.add(MDSALUtil.buildApplyActionsInstruction(actions, ++instructionKey));
+        instructions.add(
+                MDSALUtil.buildAndGetWriteMetadaInstruction(MetaDataUtil.getVpnIdMetadata(vpnId),
+                        MetaDataUtil.METADATA_MASK_VRFID, ++instructionKey));
+        instructions.add(MDSALUtil.buildAndGetGotoTableInstruction(NwConstants.L3_GW_MAC_TABLE,
+                ++instructionKey));
+        BoundServices serviceInfo = InterfaceUtils.getBoundServices(
+                String.format("%s.%s.%s", "vpn", vpnName, interfaceName),
+                ServiceIndex.getIndex(NwConstants.L3VPN_SERVICE_NAME, NwConstants.L3VPN_SERVICE_INDEX),
+                VpnConstants.DEFAULT_FLOW_PRIORITY, NwConstants.COOKIE_VM_INGRESS_TABLE, instructions);
+        return serviceInfo;
+    }
+
+    static BoundServices getBoundServicesForTunnelInterface(String vpnName, String interfaceName) {
+        int instructionKey = 0;
+        List<Instruction> instructions = new ArrayList<>();
+        instructions.add(MDSALUtil.buildAndGetGotoTableInstruction(
+                NwConstants.L3VNI_EXTERNAL_TUNNEL_DEMUX_TABLE, ++instructionKey));
+        BoundServices serviceInfo = InterfaceUtils.getBoundServices(String.format("%s.%s.%s", "vpn",
+                vpnName, interfaceName),
+                ServiceIndex.getIndex(NwConstants.L3VPN_SERVICE_NAME,
+                        NwConstants.L3VNI_EXTERNAL_TUNNEL_DEMUX_TABLE), VpnConstants.DEFAULT_FLOW_PRIORITY,
+                NwConstants.COOKIE_VM_INGRESS_TABLE, instructions);
+        return serviceInfo;
+    }
+
+    static void unbindService(DataBroker dataBroker, final String vpnInterfaceName, boolean isInterfaceStateDown) {
+        if (!isInterfaceStateDown) {
+            DataStoreJobCoordinator dataStoreCoordinator = DataStoreJobCoordinator.getInstance();
+            dataStoreCoordinator.enqueueJob(vpnInterfaceName,
+                () -> {
+                    WriteTransaction writeTxn = dataBroker.newWriteOnlyTransaction();
+                    writeTxn.delete(LogicalDatastoreType.CONFIGURATION,
+                            InterfaceUtils.buildServiceId(vpnInterfaceName,
+                                    ServiceIndex.getIndex(NwConstants.L3VPN_SERVICE_NAME,
+                                            NwConstants.L3VPN_SERVICE_INDEX)));
+
+                    List<ListenableFuture<Void>> futures = new ArrayList<>();
+                    futures.add(writeTxn.submit());
+                    return futures;
+                });
+        }
+    }
+
+    static FlowEntity buildFlowEntity(BigInteger dpnId, short tableId, String flowId) {
+        return new FlowEntityBuilder()
+            .setDpnId(dpnId)
+            .setTableId(tableId)
+            .setFlowId(flowId)
+            .build();
+    }
+
+    static VrfEntryBase.EncapType getEncapType(boolean isVxLan) {
+        return isVxLan ? VrfEntryBase.EncapType.Vxlan : VrfEntryBase.EncapType.Mplsgre;
     }
+
+    static org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.subnets
+        .Subnets getExternalSubnet(DataBroker dataBroker, Uuid subnetId) {
+        InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.subnets
+            .Subnets> subnetsIdentifier = InstanceIdentifier.builder(ExternalSubnets.class)
+                .child(org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.subnets
+                        .Subnets.class, new SubnetsKey(subnetId)).build();
+        Optional<org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.external.subnets.Subnets>
+            optionalSubnets = VpnUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION, subnetsIdentifier);
+        return optionalSubnets.isPresent() ? optionalSubnets.get() : null;
+    }
+
+    static Uuid getSubnetFromExternalRouterByIp(DataBroker dataBroker, Uuid routerId, String ip) {
+        Routers externalRouter = VpnUtil.getExternalRouter(dataBroker, routerId.getValue());
+        if (externalRouter != null && externalRouter.getExternalIps() != null) {
+            for (ExternalIps externalIp : externalRouter.getExternalIps()) {
+                if (externalIp.getIpAddress().equals(ip)) {
+                    return externalIp.getSubnetId();
+                }
+            }
+        }
+        return null;
+    }
+
+    static boolean isExternalSubnetVpn(String vpnName, String subnetId) {
+        return vpnName.equals(subnetId);
+    }
+
+    static Boolean getIsExternal(Network network) {
+        return network.getAugmentation(NetworkL3Extension.class) != null
+                && network.getAugmentation(NetworkL3Extension.class).isExternal();
+    }
+
+    @SuppressWarnings("checkstyle:linelength")
+    static Network getNeutronNetwork(DataBroker broker, Uuid networkId) {
+        Network network = null;
+        LOG.debug("getNeutronNetwork for {}", networkId.getValue());
+        InstanceIdentifier<Network> inst = InstanceIdentifier.create(Neutron.class).child(
+                org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.Networks.class).child(
+                Network.class, new NetworkKey(networkId));
+        Optional<Network> net = read(broker, LogicalDatastoreType.CONFIGURATION, inst);
+        if (net.isPresent()) {
+            network = net.get();
+        }
+        return network;
+    }
+
+    public static boolean isEligibleForBgp(String rd, String vpnName, BigInteger dpnId, String networkName) {
+        if (rd != null) {
+            if ((vpnName != null) && (rd.equals(vpnName))) {
+                return false;
+            }
+            if ((dpnId != null) && (rd.equals(dpnId.toString()))) {
+                return false;
+            }
+            if ((networkName != null) && (rd.equals(networkName))) {
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    static String getFibFlowRef(BigInteger dpnId, short tableId, String vpnName, int priority) {
+        return VpnConstants.FLOWID_PREFIX + dpnId + NwConstants.FLOWID_SEPARATOR + tableId
+                + NwConstants.FLOWID_SEPARATOR + vpnName + NwConstants.FLOWID_SEPARATOR + priority;
+    }
+
+    static void removeExternalTunnelDemuxFlows(String vpnName, DataBroker broker, IMdsalApiManager mdsalManager) {
+        LOG.info("Removing external tunnel flows for vpn {}", vpnName);
+        for (BigInteger dpnId: NWUtil.getOperativeDPNs(broker)) {
+            LOG.debug("Removing external tunnel flows for vpn {} from dpn {}", vpnName, dpnId);
+            String flowRef = getFibFlowRef(dpnId, NwConstants.L3VNI_EXTERNAL_TUNNEL_DEMUX_TABLE,
+                    vpnName, VpnConstants.DEFAULT_FLOW_PRIORITY);
+            FlowEntity flowEntity = VpnUtil.buildFlowEntity(dpnId,
+                    NwConstants.L3VNI_EXTERNAL_TUNNEL_DEMUX_TABLE, flowRef);
+            mdsalManager.removeFlow(flowEntity);
+        }
+    }
+
+    public static boolean isVpnPendingDelete(DataBroker broker, String rd) {
+        VpnInstanceOpDataEntry vpnInstanceOpData = getVpnInstanceOpData(broker, rd);
+        boolean isVpnPendingDelete = false;
+        if (vpnInstanceOpData == null
+                || vpnInstanceOpData.getVpnState() == VpnInstanceOpDataEntry.VpnState.PendingDelete) {
+            isVpnPendingDelete = true;
+        }
+        return isVpnPendingDelete;
+    }
+
 }