HONEYCOMB-91: write customizer for L2FibEntry

Change-Id: I80353d9468924df755b7dfe2fca33515becdb8b5
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

5 files changed, 405 insertions, 4 deletions

diff --git a/v3po/api/src/main/yang/v3po.yang b/v3po/api/src/main/yang/v3po.yang
index 9d0c286fc..e01edf34c 100644
--- a/v3po/api/src/main/yang/v3po.yang
+++ b/v3po/api/src/main/yang/v3po.yang
@@ -149,6 +149,7 @@ module v3po {
     }
   }
 
+  // TODO express constraints for L2 FIB entries in YANG if possible
   grouping l2-fib-attributes {
     container l2-fib-table {
       list l2-fib-entry {
@@ -160,19 +161,25 @@ module v3po {
 
         leaf outgoing-interface {
           type string;
-          mandatory true;
+          // mandatory true;
+          // mandatory for forward action
+          // FIXME VPP's CLI does not require to set iface id for filter action
+          // VPP's binary api in constrast to CLI does some checks on the iface id value,
+          // so currently it has to be set for all actions
           description
-            "One of interfaces assigned to the FIB table's bridge-domain";
+            "One of interfaces assigned to the FIB table's bridge-domain.";
         }
         leaf static-config {
           type boolean;
           default false;
           description
-            "Static entries cannot be overridden by mac learning";
+            "Static entries cannot be overridden by mac learning.";
         }
         leaf action {
           type l2-fib-action;
           mandatory true;
+          description
+            "L2 FIB action. For filter action, entry must be configured as static.";
         }
         leaf bridged-virtual-interface {
           when "../v3po:action = 'forward'";
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vpp/L2FibEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vpp/L2FibEntryCustomizer.java
new file mode 100644
index 000000000..712938190
--- /dev/null
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vpp/L2FibEntryCustomizer.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.v3po.translate.v3po.vpp;
+
+import static io.fd.honeycomb.v3po.translate.v3po.util.TranslateUtils.booleanToByte;
+import static io.fd.honeycomb.v3po.translate.v3po.util.TranslateUtils.parseMac;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.primitives.Longs;
+import io.fd.honeycomb.v3po.translate.spi.write.ListWriterCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.util.FutureJVppCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.util.NamingContext;
+import io.fd.honeycomb.v3po.translate.v3po.util.TranslateUtils;
+import io.fd.honeycomb.v3po.translate.write.WriteContext;
+import io.fd.honeycomb.v3po.translate.write.WriteFailedException;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import javax.annotation.Nonnull;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.L2FibFilter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.fib.attributes.L2FibTable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.fib.attributes.l2.fib.table.L2FibEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.fib.attributes.l2.fib.table.L2FibEntryKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.bridge.domains.BridgeDomain;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.openvpp.jvpp.VppBaseCallException;
+import org.openvpp.jvpp.dto.L2FibAddDel;
+import org.openvpp.jvpp.dto.L2FibAddDelReply;
+import org.openvpp.jvpp.future.FutureJVpp;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Writer Customizer responsible for L2 FIB create/delete operations.<br> Sends {@code l2_fib_add_del} message to
+ * VPP.<br> Equivalent of invoking {@code vppctl l2fib add/del} command.
+ */
+public class L2FibEntryCustomizer extends FutureJVppCustomizer
+        implements ListWriterCustomizer<L2FibEntry, L2FibEntryKey> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(L2FibEntryCustomizer.class);
+
+    private final NamingContext bdContext;
+    private final NamingContext interfaceContext;
+
+    public L2FibEntryCustomizer(@Nonnull final FutureJVpp futureJvpp, @Nonnull final NamingContext bdContext,
+                                @Nonnull final NamingContext interfaceContext) {
+        super(futureJvpp);
+        this.bdContext = Preconditions.checkNotNull(bdContext, "bdContext should not be null");
+        this.interfaceContext = Preconditions.checkNotNull(interfaceContext, "interfaceContext should not be null");
+    }
+
+    @Nonnull
+    @Override
+    public Optional<List<L2FibEntry>> extract(@Nonnull final InstanceIdentifier<L2FibEntry> currentId,
+                                              @Nonnull final DataObject parentData) {
+        return Optional.fromNullable(((L2FibTable) parentData).getL2FibEntry());
+    }
+
+    @Override
+    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<L2FibEntry> id,
+                                       @Nonnull final L2FibEntry dataAfter, @Nonnull final WriteContext writeContext)
+            throws WriteFailedException.CreateFailedException {
+        try {
+            LOG.debug("Creating L2 FIB entry: {} {}", id, dataAfter);
+            l2FibAddDel(id, dataAfter, writeContext, true);
+            LOG.debug("L2 FIB entry created successfully: {} {}", id, dataAfter);
+        } catch (VppBaseCallException e) {
+            LOG.warn("Failed to create L2 FIB entry: {} {}", id, dataAfter);
+            throw new WriteFailedException.CreateFailedException(id, dataAfter, e);
+        }
+    }
+
+    @Override
+    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<L2FibEntry> id,
+                                        @Nonnull final L2FibEntry dataBefore, @Nonnull final L2FibEntry dataAfter,
+                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
+        throw new UnsupportedOperationException(
+                "L2 FIB entry update is not supported. It has to be deleted and then created.");
+    }
+
+    @Override
+    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<L2FibEntry> id,
+                                        @Nonnull final L2FibEntry dataBefore, @Nonnull final WriteContext writeContext)
+            throws WriteFailedException.DeleteFailedException {
+        try {
+            LOG.debug("Deleting L2 FIB entry: {} {}", id, dataBefore);
+            l2FibAddDel(id, dataBefore, writeContext, false);
+            LOG.debug("L2 FIB entry deleted successfully: {} {}", id, dataBefore);
+        } catch (VppBaseCallException e) {
+            LOG.warn("Failed to delete L2 FIB entry: {} {}", id, dataBefore);
+            throw new WriteFailedException.DeleteFailedException(id, e);
+        }
+    }
+
+    private void l2FibAddDel(@Nonnull final InstanceIdentifier<L2FibEntry> id, @Nonnull final L2FibEntry entry,
+                             final WriteContext writeContext, boolean isAdd) throws VppBaseCallException {
+        final String bdName = id.firstKeyOf(BridgeDomain.class).getName();
+        final int bdId = bdContext.getIndex(bdName, writeContext.getMappingContext());
+
+        int swIfIndex = -1;
+        final String swIfName = entry.getOutgoingInterface();
+        if (swIfName != null) {
+            swIfIndex = interfaceContext.getIndex(swIfName, writeContext.getMappingContext());
+        }
+
+        final L2FibAddDel l2FibRequest = createL2FibRequest(entry, bdId, swIfIndex, isAdd);
+        LOG.debug("Sending l2FibAddDel request: {}", ReflectionToStringBuilder.toString(l2FibRequest));
+        final CompletionStage<L2FibAddDelReply> l2FibAddDelReplyCompletionStage =
+                getFutureJVpp().l2FibAddDel(l2FibRequest);
+
+        TranslateUtils.getReply(l2FibAddDelReplyCompletionStage.toCompletableFuture());
+    }
+
+    private L2FibAddDel createL2FibRequest(final L2FibEntry entry, final int bdId, final int swIfIndex, boolean isAdd) {
+        final L2FibAddDel request = new L2FibAddDel();
+        request.mac = macToLong(entry.getPhysAddress().getValue());
+        request.bdId = bdId;
+        request.swIfIndex = swIfIndex;
+        request.isAdd = booleanToByte(isAdd);
+        if (isAdd) {
+            request.staticMac = booleanToByte(entry.isStaticConfig());
+            request.filterMac = booleanToByte(L2FibFilter.class == entry.getAction());
+        }
+        return request;
+    }
+
+    // mac address is string of the form: 11:22:33:44:55:66
+    // but VPP expects long value in the format 11:22:33:44:55:66:XX:XX
+    private static long macToLong(final String macAddress) {
+        final byte[] mac = parseMac(macAddress);
+        return Longs.fromBytes(mac[0], mac[1], mac[2], mac[3],
+                mac[4], mac[5], (byte) 0, (byte) 0);
+    }
+}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java
index 69c1bfc11..fbd7cd597 100644
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java
+++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java
@@ -8,10 +8,14 @@ import io.fd.honeycomb.v3po.translate.util.write.CloseableWriter;
 import io.fd.honeycomb.v3po.translate.util.write.NoopWriterCustomizer;
 import io.fd.honeycomb.v3po.translate.util.write.ReflexiveChildWriterCustomizer;
 import io.fd.honeycomb.v3po.translate.v3po.vpp.BridgeDomainCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.vpp.L2FibEntryCustomizer;
 import io.fd.honeycomb.v3po.translate.write.ChildWriter;
 import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.Vpp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.fib.attributes.L2FibTable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.fib.attributes.l2.fib.table.L2FibEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.fib.attributes.l2.fib.table.L2FibEntryKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.BridgeDomains;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.bridge.domains.BridgeDomain;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.bridge.domains.BridgeDomainKey;
@@ -35,6 +39,7 @@ public class VppHoneycombWriterModule extends org.opendaylight.yang.gen.v1.urn.h
     public java.lang.AutoCloseable createInstance() {
         final CompositeListWriter<BridgeDomain, BridgeDomainKey> bridgeDomainWriter = new CompositeListWriter<>(
             BridgeDomain.class,
+                RWUtils.singletonChildWriterList(l2FibTableWriter()),
             new BridgeDomainCustomizer(getVppJvppWriterDependency(), getBridgeDomainContextVppDependency()));
 
         final ChildWriter<BridgeDomains> bridgeDomainsWriter = new CompositeChildWriter<>(
@@ -51,4 +56,19 @@ public class VppHoneycombWriterModule extends org.opendaylight.yang.gen.v1.urn.h
             new NoopWriterCustomizer<>()));
     }
 
+    private ChildWriter l2FibTableWriter() {
+        final CompositeListWriter<L2FibEntry, L2FibEntryKey> l2FibEntryWriter = new CompositeListWriter<>(L2FibEntry.class,
+                new L2FibEntryCustomizer(getVppJvppWriterDependency(),
+                        getBridgeDomainContextVppDependency(), getInterfaceContextVppDependency()));
+
+        final ChildWriter<L2FibTable> l2FibTableWriter = new CompositeChildWriter<>(
+                L2FibTable.class,
+                RWUtils.singletonChildWriterList(l2FibEntryWriter),
+                new ReflexiveChildWriterCustomizer<>());
+
+        return l2FibTableWriter;
+    }
+
+
+
 }
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vpp/L2FibEntryCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vpp/L2FibEntryCustomizerTest.java
new file mode 100644
index 000000000..343794073
--- /dev/null
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vpp/L2FibEntryCustomizerTest.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.v3po.translate.v3po.vpp;
+
+import static io.fd.honeycomb.v3po.translate.v3po.test.ContextTestUtils.mockMapping;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import io.fd.honeycomb.v3po.translate.MappingContext;
+import io.fd.honeycomb.v3po.translate.v3po.test.TestHelperUtils;
+import io.fd.honeycomb.v3po.translate.v3po.util.NamingContext;
+import io.fd.honeycomb.v3po.translate.write.WriteContext;
+import io.fd.honeycomb.v3po.translate.write.WriteFailedException;
+import java.util.concurrent.CompletableFuture;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.L2FibFilter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.fib.attributes.L2FibTable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.fib.attributes.l2.fib.table.L2FibEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.fib.attributes.l2.fib.table.L2FibEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.fib.attributes.l2.fib.table.L2FibEntryKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.BridgeDomains;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.bridge.domains.BridgeDomain;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.bridge.domains.BridgeDomainKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.openvpp.jvpp.VppBaseCallException;
+import org.openvpp.jvpp.VppInvocationException;
+import org.openvpp.jvpp.dto.L2FibAddDel;
+import org.openvpp.jvpp.dto.L2FibAddDelReply;
+import org.openvpp.jvpp.dto.L2InterfaceVlanTagRewriteReply;
+import org.openvpp.jvpp.future.FutureJVpp;
+
+public class L2FibEntryCustomizerTest {
+    private static final String BD_CTX_NAME = "bd-test-instance";
+    private static final String IFC_CTX_NAME = "ifc-test-instance";
+
+    private static final String BD_NAME = "testBD0";
+    private static final int BD_ID = 111;
+    private static final String IFACE_NAME = "eth0";
+    private static final int IFACE_ID = 123;
+
+    @Mock
+    private FutureJVpp api;
+    @Mock
+    private WriteContext writeContext;
+    @Mock
+    private MappingContext mappingContext;
+
+    private NamingContext bdContext;
+    private NamingContext interfaceContext;
+
+    private L2FibEntryCustomizer customizer;
+
+    @Before
+    public void setUp() throws Exception {
+        initMocks(this);
+        doReturn(mappingContext).when(writeContext).getMappingContext();
+        bdContext = new NamingContext("generatedBdName", BD_CTX_NAME);
+        interfaceContext = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
+
+        customizer = new L2FibEntryCustomizer(api, bdContext, interfaceContext);
+    }
+
+    private static InstanceIdentifier<L2FibEntry> getL2FibEntryId(final PhysAddress address) {
+        return InstanceIdentifier.create(BridgeDomains.class).child(BridgeDomain.class, new BridgeDomainKey(BD_NAME))
+                .child(L2FibTable.class).child(L2FibEntry.class, new L2FibEntryKey(address));
+    }
+
+    private void whenL2FibAddDelThenSuccess() {
+        final CompletableFuture<L2FibAddDelReply> replyFuture = new CompletableFuture<>();
+        final L2FibAddDelReply reply = new L2FibAddDelReply();
+        replyFuture.complete(reply);
+        doReturn(replyFuture).when(api).l2FibAddDel(any(L2FibAddDel.class));
+    }
+
+    private void whenL2FibAddDelThenFailure() {
+        doReturn(TestHelperUtils.<L2InterfaceVlanTagRewriteReply>createFutureException()).when(api)
+                .l2FibAddDel(any(L2FibAddDel.class));
+    }
+
+    private L2FibAddDel generateL2FibAddDelRequest(final long mac, final byte isAdd) {
+        final L2FibAddDel request = new L2FibAddDel();
+        request.mac = mac;
+        request.bdId = BD_ID;
+        request.swIfIndex = IFACE_ID;
+        request.isAdd = isAdd;
+        if (isAdd == 1) {
+            request.staticMac = 1;
+            request.filterMac = 1;
+        }
+        return request;
+    }
+
+    private L2FibEntry generateL2FibEntry(final PhysAddress address) {
+        final L2FibEntryBuilder entry = new L2FibEntryBuilder();
+        entry.setKey(new L2FibEntryKey(address));
+        entry.setPhysAddress(address);
+        entry.setStaticConfig(true);
+        entry.setBridgedVirtualInterface(false);
+        entry.setAction(L2FibFilter.class);
+        entry.setOutgoingInterface(IFACE_NAME);
+        return entry.build();
+    }
+
+    private void verifyL2FibAddDelWasInvoked(final L2FibAddDel expected) throws
+            VppInvocationException {
+        ArgumentCaptor<L2FibAddDel> argumentCaptor = ArgumentCaptor.forClass(L2FibAddDel.class);
+        verify(api).l2FibAddDel(argumentCaptor.capture());
+        final L2FibAddDel actual = argumentCaptor.getValue();
+        assertEquals(expected.mac, actual.mac);
+        assertEquals(expected.bdId, actual.bdId);
+        assertEquals(expected.swIfIndex, actual.swIfIndex);
+        assertEquals(expected.isAdd, actual.isAdd);
+        assertEquals(expected.staticMac, actual.staticMac);
+        assertEquals(expected.filterMac, actual.filterMac);
+    }
+
+    @Test
+    public void testCreate() throws Exception {
+        final long address_vpp = 0x0102030405060000L;
+        final PhysAddress address = new PhysAddress("01:02:03:04:05:06");
+        final L2FibEntry entry = generateL2FibEntry(address);
+        final InstanceIdentifier<L2FibEntry> id = getL2FibEntryId(address);
+
+        mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
+        mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+
+        whenL2FibAddDelThenSuccess();
+
+        customizer.writeCurrentAttributes(id, entry, writeContext);
+
+        verifyL2FibAddDelWasInvoked(generateL2FibAddDelRequest(address_vpp, (byte) 1));
+    }
+
+    @Test
+    public void testCreateFailed() throws Exception {
+        final long address_vpp = 0x1122334455660000L;
+        final PhysAddress address = new PhysAddress("11:22:33:44:55:66");
+        final L2FibEntry entry = generateL2FibEntry(address);
+        final InstanceIdentifier<L2FibEntry> id = getL2FibEntryId(address);
+
+        mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
+        mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+
+        whenL2FibAddDelThenFailure();
+
+        try {
+            customizer.writeCurrentAttributes(id, entry, writeContext);
+        } catch (WriteFailedException.CreateFailedException e) {
+            assertTrue(e.getCause() instanceof VppBaseCallException);
+            verifyL2FibAddDelWasInvoked(generateL2FibAddDelRequest(address_vpp, (byte) 1));
+            return;
+        }
+        fail("WriteFailedException.CreateFailedException was expected");
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void testUpdate() throws Exception {
+        customizer.updateCurrentAttributes(InstanceIdentifier.create(L2FibEntry.class), mock(L2FibEntry.class),
+                mock(L2FibEntry.class), writeContext);
+    }
+
+    @Test
+    public void testDelete() throws Exception {
+        final long address_vpp = 0x1122334455660000L;
+        final PhysAddress address = new PhysAddress("11:22:33:44:55:66");
+        final L2FibEntry entry = generateL2FibEntry(address);
+        final InstanceIdentifier<L2FibEntry> id = getL2FibEntryId(address);
+
+        mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
+        mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+
+        whenL2FibAddDelThenSuccess();
+
+        customizer.deleteCurrentAttributes(id, entry, writeContext);
+
+        verifyL2FibAddDelWasInvoked(generateL2FibAddDelRequest(address_vpp, (byte) 0));
+    }
+
+    @Test
+    public void testDeleteFailed() throws Exception {
+        final long address_vpp = 0x0102030405060000L;
+        final PhysAddress address = new PhysAddress("01:02:03:04:05:06");
+        final L2FibEntry entry = generateL2FibEntry(address);
+        final InstanceIdentifier<L2FibEntry> id = getL2FibEntryId(address);
+
+        mockMapping(mappingContext, BD_NAME, BD_ID, BD_CTX_NAME);
+        mockMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
+
+        whenL2FibAddDelThenFailure();
+
+        try {
+            customizer.deleteCurrentAttributes(id, entry, writeContext);
+        } catch (WriteFailedException.DeleteFailedException e) {
+            assertTrue(e.getCause() instanceof VppBaseCallException);
+            verifyL2FibAddDelWasInvoked(generateL2FibAddDelRequest(address_vpp, (byte) 0));
+            return;
+        }
+        fail("WriteFailedException.DeleteFailedException was expected");
+    }
+}
\ No newline at end of file
diff --git a/v3po/vpp-translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/v3po/util/TranslateUtils.java b/v3po/vpp-translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/v3po/util/TranslateUtils.java
index d68ea19b7..9aed188d5 100644
--- a/v3po/vpp-translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/v3po/util/TranslateUtils.java
+++ b/v3po/vpp-translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/v3po/util/TranslateUtils.java
@@ -151,7 +151,7 @@ public final class TranslateUtils {
             });
     }
 
-    private static byte parseHexByte(final String aByte) {
+    public static byte parseHexByte(final String aByte) {
         return (byte)Integer.parseInt(aByte, 16);
     }