Merge "chain resolution improved in ios-xe renderer"
[groupbasedpolicy.git] / renderers / vpp / src / main / java / org / opendaylight / groupbasedpolicy / renderer / vpp / iface / InterfaceManager.java
index c4940e2162c277129b4e012955c463201257bb58..12feb37765bd1619ca2716eaf65f35b21a9a3dd2 100644 (file)
@@ -8,21 +8,41 @@
 
 package org.opendaylight.groupbasedpolicy.renderer.vpp.iface;
 
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.groupbasedpolicy.renderer.vpp.commands.ConfigCommand;
+import org.opendaylight.groupbasedpolicy.renderer.vpp.commands.TapPortCommand;
 import org.opendaylight.groupbasedpolicy.renderer.vpp.commands.VhostUserCommand;
 import org.opendaylight.groupbasedpolicy.renderer.vpp.commands.VhostUserCommand.VhostUserCommandBuilder;
 import org.opendaylight.groupbasedpolicy.renderer.vpp.event.NodeOperEvent;
 import org.opendaylight.groupbasedpolicy.renderer.vpp.event.VppEndpointConfEvent;
 import org.opendaylight.groupbasedpolicy.renderer.vpp.util.General.Operations;
 import org.opendaylight.groupbasedpolicy.renderer.vpp.util.MountedDataBrokerProvider;
+import org.opendaylight.groupbasedpolicy.util.DataStoreHelper;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.has.absolute.location.absolute.location.LocationType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.has.absolute.location.absolute.location.location.type.ExternalLocationCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.has.absolute.location.absolute.location.location.type.ExternalLocationCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.endpoints.AddressEndpointWithLocation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.config.VppEndpoint;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.config.vpp.endpoint.InterfaceTypeChoice;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.config.vpp.endpoint._interface.type.choice.TapCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.config.vpp.endpoint._interface.type.choice.VhostUserCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VhostUserRole;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.L2;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.L2Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.base.attributes.Interconnection;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.base.attributes.interconnection.BridgeBased;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.base.attributes.interconnection.BridgeBasedBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,112 +51,126 @@ import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.eventbus.Subscribe;
-import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.AsyncFunction;
+import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 
 public class InterfaceManager implements AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(InterfaceManager.class);
     private final MountedDataBrokerProvider mountDataProvider;
     private final VppEndpointLocationProvider vppEndpointLocationProvider;
+    private final ExecutorService netconfWorker;
 
-    public InterfaceManager(@Nonnull MountedDataBrokerProvider mountDataProvider, @Nonnull DataBroker dataProvider) {
+    public InterfaceManager(@Nonnull MountedDataBrokerProvider mountDataProvider, @Nonnull DataBroker dataProvider,
+            @Nonnull ExecutorService netconfWorker) {
         this.mountDataProvider = Preconditions.checkNotNull(mountDataProvider);
+        this.netconfWorker = Preconditions.checkNotNull(netconfWorker);
         this.vppEndpointLocationProvider = new VppEndpointLocationProvider(dataProvider);
     }
 
     @Subscribe
-    public void vppEndpointChanged(VppEndpointConfEvent event) {
-        switch (event.getDtoModificationType()) {
-            case CREATED:
-                vppEndpointCreated(event.getAfter().get());
-                break;
-            case UPDATED:
-                vppEndpointDeleted(event.getBefore().get());
-                vppEndpointCreated(event.getAfter().get());
-                break;
-            case DELETED:
-                vppEndpointDeleted(event.getBefore().get());
-                break;
+    public synchronized void vppEndpointChanged(VppEndpointConfEvent event) {
+        try {
+            switch (event.getDtoModificationType()) {
+                case CREATED:
+                    vppEndpointCreated(event.getAfter().get()).get();
+                    break;
+                case UPDATED:
+                    vppEndpointDeleted(event.getBefore().get()).get();
+                    vppEndpointCreated(event.getAfter().get()).get();
+                    break;
+                case DELETED:
+                    vppEndpointDeleted(event.getBefore().get()).get();
+                    break;
+            }
+        } catch (InterruptedException | ExecutionException e) {
+            LOG.error("Failed to update Vpp Endpoint. {}", event, e);
         }
     }
 
-    private void vppEndpointCreated(VppEndpoint vppEndpoint) {
-        Optional<ConfigCommand> potentialIfaceCommand = createInterfaceWithoutBdCommand(vppEndpoint, Operations.PUT);
+    private ListenableFuture<Void> vppEndpointCreated(VppEndpoint vppEndpoint) {
+        InterfaceTypeChoice interfaceTypeChoice = vppEndpoint.getInterfaceTypeChoice();
+        Optional<ConfigCommand> potentialIfaceCommand = Optional.absent();
+        if (interfaceTypeChoice instanceof VhostUserCase) {
+            potentialIfaceCommand = createInterfaceWithoutBdCommand(vppEndpoint, Operations.PUT);
+        } else if (interfaceTypeChoice instanceof TapCase) {
+            potentialIfaceCommand = createTapInterfaceWithoutBdCommand(vppEndpoint, Operations.PUT);
+        }
+
         if (!potentialIfaceCommand.isPresent()) {
-            return;
+            LOG.debug("Interface/PUT command was not created for VppEndpoint point {}", vppEndpoint);
+            return Futures.immediateFuture(null);
         }
         ConfigCommand ifaceWithoutBdCommand = potentialIfaceCommand.get();
         InstanceIdentifier<?> vppNodeIid = vppEndpoint.getVppNodePath();
         Optional<DataBroker> potentialVppDataProvider = mountDataProvider.getDataBrokerForMountPoint(vppNodeIid);
         if (!potentialVppDataProvider.isPresent()) {
             LOG.debug("Cannot get data broker for mount point {}", vppNodeIid);
-            return;
+            return Futures.immediateFuture(null);
         }
         DataBroker vppDataBroker = potentialVppDataProvider.get();
-        createIfaceOnVpp(ifaceWithoutBdCommand, vppDataBroker, vppEndpoint, vppNodeIid);
+        return createIfaceOnVpp(ifaceWithoutBdCommand, vppDataBroker, vppEndpoint, vppNodeIid);
     }
 
-    private void createIfaceOnVpp(ConfigCommand createIfaceWithoutBdCommand, DataBroker vppDataBroker,
-            VppEndpoint vppEndpoint, InstanceIdentifier<?> vppNodeIid) {
+    private ListenableFuture<Void> createIfaceOnVpp(ConfigCommand createIfaceWithoutBdCommand,
+            DataBroker vppDataBroker, VppEndpoint vppEndpoint, InstanceIdentifier<?> vppNodeIid) {
         ReadWriteTransaction rwTx = vppDataBroker.newReadWriteTransaction();
         createIfaceWithoutBdCommand.execute(rwTx);
-        Futures.addCallback(rwTx.submit(), new FutureCallback<Void>() {
+        return Futures.transform(rwTx.submit(), new AsyncFunction<Void, Void>() {
 
             @Override
-            public void onSuccess(Void result) {
+            public ListenableFuture<Void> apply(Void input) {
                 LOG.debug("Create interface on VPP command was successful:\nVPP: {}\nCommand: {}", vppNodeIid,
                         createIfaceWithoutBdCommand);
-                vppEndpointLocationProvider.createLocationForVppEndpoint(vppEndpoint);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                LOG.error("Create interface on VPP command was NOT successful:\nVPP: {}\nCommand: {}", vppNodeIid,
-                        createIfaceWithoutBdCommand, t);
+                return vppEndpointLocationProvider.createLocationForVppEndpoint(vppEndpoint);
             }
-        });
+        }, netconfWorker);
     }
 
-    private void vppEndpointDeleted(VppEndpoint vppEndpoint) {
-        Optional<ConfigCommand> potentialIfaceCommand = createInterfaceWithoutBdCommand(vppEndpoint, Operations.DELETE);
+    private ListenableFuture<Void> vppEndpointDeleted(@Nonnull VppEndpoint vppEndpoint) {
+        InterfaceTypeChoice interfaceTypeChoice = vppEndpoint.getInterfaceTypeChoice();
+        Optional<ConfigCommand> potentialIfaceCommand = Optional.absent();
+        if (interfaceTypeChoice instanceof VhostUserCase) {
+            potentialIfaceCommand = createInterfaceWithoutBdCommand(vppEndpoint, Operations.DELETE);
+        } else if (interfaceTypeChoice instanceof TapCase) {
+            potentialIfaceCommand = createTapInterfaceWithoutBdCommand(vppEndpoint, Operations.DELETE);
+        }
+
         if (!potentialIfaceCommand.isPresent()) {
-            return;
+            LOG.debug("Interface/DELETE command was not created for VppEndpoint point {}", vppEndpoint);
+            return Futures.immediateFuture(null);
         }
         ConfigCommand ifaceWithoutBdCommand = potentialIfaceCommand.get();
         InstanceIdentifier<?> vppNodeIid = vppEndpoint.getVppNodePath();
         Optional<DataBroker> potentialVppDataProvider = mountDataProvider.getDataBrokerForMountPoint(vppNodeIid);
         if (!potentialVppDataProvider.isPresent()) {
             LOG.debug("Cannot get data broker for mount point {}", vppNodeIid);
-            return;
+            return Futures.immediateFuture(null);
         }
         DataBroker vppDataBroker = potentialVppDataProvider.get();
-        deleteIfaceOnVpp(ifaceWithoutBdCommand, vppDataBroker, vppEndpoint, vppNodeIid);
+        return deleteIfaceOnVpp(ifaceWithoutBdCommand, vppDataBroker, vppEndpoint, vppNodeIid);
     }
 
-    private void deleteIfaceOnVpp(ConfigCommand deleteIfaceWithoutBdCommand, DataBroker vppDataBroker,
-            VppEndpoint vppEndpoint, InstanceIdentifier<?> vppNodeIid) {
+    private ListenableFuture<Void> deleteIfaceOnVpp(ConfigCommand deleteIfaceWithoutBdCommand,
+            DataBroker vppDataBroker, VppEndpoint vppEndpoint, InstanceIdentifier<?> vppNodeIid) {
         ReadWriteTransaction rwTx = vppDataBroker.newReadWriteTransaction();
         deleteIfaceWithoutBdCommand.execute(rwTx);
-        Futures.addCallback(rwTx.submit(), new FutureCallback<Void>() {
+
+        return Futures.transform(rwTx.submit(), new AsyncFunction<Void, Void>() {
 
             @Override
-            public void onSuccess(Void result) {
+            public ListenableFuture<Void> apply(Void input) {
                 LOG.debug("Delete interface on VPP command was successful:\nVPP: {}\nCommand: {}", vppNodeIid,
                         deleteIfaceWithoutBdCommand);
-                vppEndpointLocationProvider.deleteLocationForVppEndpoint(vppEndpoint);
+                return vppEndpointLocationProvider.deleteLocationForVppEndpoint(vppEndpoint);
             }
-
-            @Override
-            public void onFailure(Throwable t) {
-                LOG.error("Delete interface on VPP command was NOT successful:\nVPP: {}\nCommand: {}", vppNodeIid,
-                        deleteIfaceWithoutBdCommand, t);
-            }
-        });
+        }, netconfWorker);
     }
 
     @Subscribe
-    public void vppNodeChanged(NodeOperEvent event) {
+    public synchronized void vppNodeChanged(NodeOperEvent event) {
         switch (event.getDtoModificationType()) {
             case CREATED:
                 if (event.isAfterConnected()) {
@@ -150,7 +184,7 @@ public class InterfaceManager implements AutoCloseable {
                 break;
             case DELETED:
                 if (event.isBeforeConnected()) {
-                    // TODO we could do snapshot of VppEndpoints 
+                    // TODO we could do snapshot of VppEndpoints
                     // which can be used for reconciliation
                 }
                 break;
@@ -181,13 +215,225 @@ public class InterfaceManager implements AutoCloseable {
         return Optional.of(vhostUserCommand);
     }
 
+    private static Optional<ConfigCommand> createTapInterfaceWithoutBdCommand(@Nonnull VppEndpoint vppEp,
+            @Nonnull Operations operation) {
+        if (!hasNodeAndInterface(vppEp)) {
+            LOG.debug("Interface command is not created for {}", vppEp);
+            return Optional.absent();
+        }
+        TapPortCommand.TapPortCommandBuilder builder = TapPortCommand.builder();
+        InterfaceTypeChoice interfaceTypeChoice = vppEp.getInterfaceTypeChoice();
+        if (interfaceTypeChoice instanceof TapCase) {
+            TapCase tapIface = (TapCase) interfaceTypeChoice;
+            String name = tapIface.getName();
+            if (Strings.isNullOrEmpty(name)) {
+                LOG.debug("Tap interface command is not created because name is missing. {}", vppEp);
+                return Optional.absent();
+            }
+            builder.setTapName(name);
+            builder.setPhysAddress(tapIface.getPhysicalAddress());
+        }
+        TapPortCommand tapPortCommand = builder
+                .setOperation(operation)
+                .setDescription(vppEp.getDescription())
+                .setInterfaceName(vppEp.getVppInterfaceName())
+                .build();
+        return Optional.of(tapPortCommand);
+    }
+
+    /**
+     * Adds bridge domain to an interface if the interface exist.<br>
+     * It rewrites bridge domain in case it already exist.<br>
+     * {@link VppEndpointLocationProvider#VPP_ENDPOINT_LOCATION_PROVIDER} will update location
+     * when the interface is created successfully.<br>
+     * If the interface does not exist or other problems occur {@link ListenableFuture} will fail
+     * as {@link Futures#immediateFailedFuture(Throwable)} with {@link Exception}
+     * containing message in {@link Exception#getMessage()}
+     *
+     * @param bridgeDomainName bridge domain
+     * @param addrEpWithLoc {@link AddressEndpointWithLocation} containing
+     *        {@link ExternalLocationCase} where
+     *        {@link ExternalLocationCase#getExternalNodeMountPoint()} MUST NOT be {@code null}
+     *        and {@link ExternalLocationCase#getExternalNodeConnector()} MUST NOT be {@code null}
+     * @return {@link ListenableFuture}
+     */
+    public synchronized @Nonnull ListenableFuture<Void> addBridgeDomainToInterface(@Nonnull String bridgeDomainName,
+            @Nonnull AddressEndpointWithLocation addrEpWithLoc) {
+        ExternalLocationCase epLoc = resolveAndValidateLocation(addrEpWithLoc);
+        InstanceIdentifier<?> vppNodeIid = epLoc.getExternalNodeMountPoint();
+        String interfacePath = epLoc.getExternalNodeConnector();
+
+        Optional<InstanceIdentifier<Interface>> optInterfaceIid =
+                VppPathMapper.interfaceToInstanceIdentifier(interfacePath);
+        if (!optInterfaceIid.isPresent()) {
+            return Futures.immediateFailedFuture(
+                    new Exception("Cannot resolve interface instance-identifier for interface path" + interfacePath));
+        }
+        InstanceIdentifier<Interface> interfaceIid = optInterfaceIid.get();
+
+        Optional<DataBroker> potentialVppDataProvider = mountDataProvider.getDataBrokerForMountPoint(vppNodeIid);
+        if (!potentialVppDataProvider.isPresent()) {
+            return Futures.immediateFailedFuture(new Exception("Cannot get data broker for mount point " + vppNodeIid));
+        }
+
+        ReadWriteTransaction rwTx = potentialVppDataProvider.get().newReadWriteTransaction();
+        CheckedFuture<Optional<Interface>, ReadFailedException> futureIface =
+                rwTx.read(LogicalDatastoreType.CONFIGURATION, interfaceIid);
+        return Futures.transform(futureIface, new AsyncFunction<Optional<Interface>, Void>() {
+
+            @Override
+            public ListenableFuture<Void> apply(Optional<Interface> optIface) throws Exception {
+                if (!optIface.isPresent()) {
+                    return Futures.immediateFailedFuture(new Exception("Iterface "
+                            + interfaceIid.firstKeyOf(Interface.class) + " does not exist on node " + vppNodeIid));
+                }
+
+                String existingBridgeDomain = resolveBridgeDomain(optIface.get());
+                if (bridgeDomainName.equals(existingBridgeDomain)) {
+                    LOG.debug("Bridge domain {} already exists on interface {}", bridgeDomainName, interfacePath);
+                    String bridgeDomainPath = VppPathMapper.bridgeDomainToRestPath(bridgeDomainName);
+                    if (!bridgeDomainPath.equals(epLoc.getExternalNode())) {
+                        return vppEndpointLocationProvider.replaceLocationForEndpoint(new ExternalLocationCaseBuilder()
+                            .setExternalNode(bridgeDomainPath)
+                            .setExternalNodeMountPoint(vppNodeIid)
+                            .setExternalNodeConnector(interfacePath)
+                            .build(), addrEpWithLoc.getKey());
+                    }
+                    return Futures.immediateFuture(null);
+                }
+
+                InstanceIdentifier<L2> l2Iid =
+                        interfaceIid.builder().augmentation(VppInterfaceAugmentation.class).child(L2.class).build();
+                Optional<L2> optL2 = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION, l2Iid, rwTx);
+                L2Builder l2Builder = (optL2.isPresent()) ? new L2Builder(optL2.get()) : new L2Builder();
+                L2 l2 = l2Builder.setInterconnection(new BridgeBasedBuilder().setBridgeDomain(bridgeDomainName).build()).build();
+                rwTx.put(LogicalDatastoreType.CONFIGURATION, l2Iid, l2);
+                LOG.debug("Adding bridge domain {} to interface {}", bridgeDomainName, interfacePath);
+                return Futures.transform(rwTx.submit(), new AsyncFunction<Void, Void>() {
+
+                    @Override
+                    public ListenableFuture<Void> apply(Void input) {
+                        String bridgeDomainPath = VppPathMapper.bridgeDomainToRestPath(bridgeDomainName);
+                        return vppEndpointLocationProvider.replaceLocationForEndpoint(new ExternalLocationCaseBuilder()
+                                .setExternalNode(bridgeDomainPath)
+                                .setExternalNodeMountPoint(vppNodeIid)
+                                .setExternalNodeConnector(interfacePath)
+                                .build(), addrEpWithLoc.getKey());
+                    }
+                }, netconfWorker);
+            }
+        }, netconfWorker);
+    }
+
+    /**
+     * Removes bridge domain (if exist) from an interface (if exist).<br>
+     * {@link VppEndpointLocationProvider#VPP_ENDPOINT_LOCATION_PROVIDER} will update endpoint
+     * location.
+     * <p>
+     * If the interface does not exist or other problems occur {@link ListenableFuture} will fail
+     * as {@link Futures#immediateFailedFuture(Throwable)} with {@link Exception}
+     * containing message in {@link Exception#getMessage()}
+     *
+     * @param addrEpWithLoc {@link AddressEndpointWithLocation} containing
+     *        {@link ExternalLocationCase} where
+     *        {@link ExternalLocationCase#getExternalNodeMountPoint()} MUST NOT be {@code null}
+     *        and {@link ExternalLocationCase#getExternalNodeConnector()} MUST NOT be {@code null}
+     * @return {@link ListenableFuture}
+     */
+    public synchronized @Nonnull ListenableFuture<Void> deleteBridgeDomainFromInterface(
+            @Nonnull AddressEndpointWithLocation addrEpWithLoc) {
+        ExternalLocationCase epLoc = resolveAndValidateLocation(addrEpWithLoc);
+        InstanceIdentifier<?> vppNodeIid = epLoc.getExternalNodeMountPoint();
+        String interfacePath = epLoc.getExternalNodeConnector();
+
+        Optional<InstanceIdentifier<Interface>> optInterfaceIid =
+                VppPathMapper.interfaceToInstanceIdentifier(interfacePath);
+        if (!optInterfaceIid.isPresent()) {
+            return Futures.immediateFailedFuture(
+                    new Exception("Cannot resolve interface instance-identifier for interface path" + interfacePath));
+        }
+        InstanceIdentifier<Interface> interfaceIid = optInterfaceIid.get();
+
+        Optional<DataBroker> potentialVppDataProvider = mountDataProvider.getDataBrokerForMountPoint(vppNodeIid);
+        if (!potentialVppDataProvider.isPresent()) {
+            return Futures.immediateFailedFuture(new Exception("Cannot get data broker for mount point " + vppNodeIid));
+        }
+
+        ReadWriteTransaction rwTx = potentialVppDataProvider.get().newReadWriteTransaction();
+        CheckedFuture<Optional<Interface>, ReadFailedException> futureIface =
+                rwTx.read(LogicalDatastoreType.CONFIGURATION, interfaceIid);
+        return Futures.transform(futureIface, new AsyncFunction<Optional<Interface>, Void>() {
+
+            @Override
+            public ListenableFuture<Void> apply(Optional<Interface> optIface) throws Exception {
+                if (!optIface.isPresent()) {
+                    // interface does not exist so we consider job done
+                    return Futures.immediateFuture(null);
+                }
+
+                String existingBridgeDomain = resolveBridgeDomain(optIface.get());
+                if (Strings.isNullOrEmpty(existingBridgeDomain)) {
+                    LOG.debug("Bridge domain does not exist therefore it is cosidered as"
+                            + "deleted for interface {}", interfacePath);
+                    // bridge domain does not exist on interface so we consider job done
+                    return vppEndpointLocationProvider.replaceLocationForEndpoint(new ExternalLocationCaseBuilder()
+                            .setExternalNode(null)
+                            .setExternalNodeMountPoint(vppNodeIid)
+                            .setExternalNodeConnector(interfacePath)
+                            .build(), addrEpWithLoc.getKey());
+                }
+
+                InstanceIdentifier<L2> l2Iid =
+                        interfaceIid.builder().augmentation(VppInterfaceAugmentation.class).child(L2.class).build();
+                rwTx.delete(LogicalDatastoreType.CONFIGURATION, l2Iid);
+                LOG.debug("Deleting bridge domain from interface {}", interfacePath);
+                return Futures.transform(rwTx.submit(), new AsyncFunction<Void, Void>() {
+
+                    @Override
+                    public ListenableFuture<Void> apply(Void input) {
+                        return vppEndpointLocationProvider.replaceLocationForEndpoint(new ExternalLocationCaseBuilder()
+                                .setExternalNode(null)
+                                .setExternalNodeMountPoint(vppNodeIid)
+                                .setExternalNodeConnector(interfacePath)
+                                .build(), addrEpWithLoc.getKey());
+                    }
+                }, netconfWorker);
+            }
+        }, netconfWorker);
+    }
+
+    private static ExternalLocationCase resolveAndValidateLocation(AddressEndpointWithLocation addrEpWithLoc) {
+        LocationType locationType = addrEpWithLoc.getAbsoluteLocation().getLocationType();
+        if (!(locationType instanceof ExternalLocationCase)) {
+            throw new IllegalArgumentException("Endpoint does not have external location " + addrEpWithLoc);
+        }
+        ExternalLocationCase result = (ExternalLocationCase) locationType;
+        if (result.getExternalNodeMountPoint() == null || result.getExternalNodeConnector() == null) {
+            throw new IllegalArgumentException(
+                    "Endpoint does not have external-node-mount-point or external-node-connector " + addrEpWithLoc);
+        }
+        return result;
+    }
+
+    private static @Nullable String resolveBridgeDomain(@Nonnull Interface iface) {
+        VppInterfaceAugmentation vppInterfaceAugmentation = iface.getAugmentation(VppInterfaceAugmentation.class);
+        L2 existingL2 = vppInterfaceAugmentation.getL2();
+        if (existingL2 != null) {
+            Interconnection interconnection = existingL2.getInterconnection();
+            if (interconnection instanceof BridgeBased) {
+                return ((BridgeBased) interconnection).getBridgeDomain();
+            }
+        }
+        return null;
+    }
+
     private static boolean hasNodeAndInterface(VppEndpoint vppEp) {
         if (vppEp.getVppNodePath() == null) {
-            LOG.trace("vpp-node is missing. {}", vppEp);
+            LOG.debug("vpp-node is missing. {}", vppEp);
             return false;
         }
         if (Strings.isNullOrEmpty(vppEp.getVppInterfaceName())) {
-            LOG.trace("vpp-interface-name is missing. {}", vppEp);
+            LOG.debug("vpp-interface-name is missing. {}", vppEp);
             return false;
         }
         return true;