HC2VPP-14: remove deprecated, classfier based ietf-acl model implementation

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

14 files changed, 0 insertions, 1685 deletions

diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java
index 3b51a6dca..dc822a924 100644
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java
+++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/VppClassifierModuleTest.java
@@ -63,11 +63,8 @@ public class VppClassifierModuleTest {
         ifcContext = new NamingContext("interface-", "interface-context");
         Guice.createInjector(
                 new VppClassifierModule(),
-                new VppClassifierAclModule(),
                 new InterfaceClassifierAclModule(),
-                new InterfaceClassifierIetfAclModule(),
                 new SubInterfaceClassifierAclModule(),
-                new SubInterfaceClassifierIetfAclModule(),
                 BoundFieldModule.of(this)).injectMembers(this);
     }
 
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclWriterTest.java
deleted file mode 100644
index 5b620a82e..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclWriterTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.IngressBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class AclWriterTest extends WriterCustomizerTest {
-
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
-    private static final InstanceIdentifier<Acl> IID =
-        InstanceIdentifier.create(AccessLists.class).child(Acl.class, new AclKey(ACL_NAME, ACL_TYPE));
-
-    @Mock
-    private Acl acl;
-    private IetfAclWriter customizer;
-
-    @Override
-    public void setUpTest() {
-        customizer = new IetfAclWriter();
-        when(acl.getAclName()).thenReturn(ACL_NAME);
-        doReturn(ACL_TYPE).when(acl).getAclType();
-    }
-
-    private void defineInterfacesContext(final List<Interface> interfaces) {
-        when(writeContext.readAfter(InstanceIdentifier.create(Interfaces.class))).thenReturn(Optional.of(
-            new InterfacesBuilder().setInterface(interfaces).build()
-        ));
-    }
-
-    @Test
-    public void testWrite() throws Exception {
-        customizer.writeCurrentAttributes(IID, acl, writeContext);
-    }
-
-    @Test
-    public void testUpdate() throws WriteFailedException {
-        defineInterfacesContext(Collections.emptyList());
-        customizer.updateCurrentAttributes(IID, acl, acl, writeContext);
-    }
-
-    @Test
-    public void testDelete() throws WriteFailedException {
-        defineInterfacesContext(Collections.emptyList());
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-    }
-
-    @Test(expected = WriteFailedException.class)
-    public void testDeleteFailed() throws WriteFailedException {
-        final Interface iface = new InterfaceBuilder().addAugmentation(VppInterfaceAclAugmentation.class,
-            new VppInterfaceAclAugmentationBuilder().setIetfAcl(
-                new IetfAclBuilder().setIngress(
-                    new IngressBuilder().setAccessLists(
-                        new AccessListsBuilder().setAcl(
-                            Collections.singletonList(new AclBuilder().setName(ACL_NAME).setType(ACL_TYPE).build())
-                        ).build()
-                    ).build()
-                ).build()
-            ).build()
-        ).build();
-        defineInterfacesContext(Collections.singletonList(iface));
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceEthWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceEthWriterTest.java
deleted file mode 100644
index e588e35f5..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceEthWriterTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.common;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceEth;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceEthBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-
-public class AceEthWriterTest {
-
-    private AceEthWriter writer;
-    private PacketHandling action;
-    private AceEth aceEth;
-
-    @Before
-    public void setUp() {
-        initMocks(this);
-        writer = new AceEthWriter();
-        action = new DenyBuilder().setDeny(true).build();
-        aceEth = new AceEthBuilder()
-            .setDestinationMacAddress(new MacAddress("11:22:33:44:55:66"))
-            .setDestinationMacAddressMask(new MacAddress("ff:ff:ff:ff:ff:ff"))
-            .setSourceMacAddress(new MacAddress("aa:bb:cc:dd:ee:ff"))
-            .setSourceMacAddressMask(new MacAddress("ff:ff:ff:00:00:00"))
-            .build();
-    }
-
-    @Test
-    public void testCreateTable() {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request = writer.createTable(aceEth, InterfaceMode.L2, nextTableIndex, 0);
-
-        assertEquals(1, request.isAdd);
-        assertEquals(-1, request.tableIndex);
-        assertEquals(1, request.nbuckets);
-        assertEquals(nextTableIndex, request.nextTableIndex);
-        assertEquals(0, request.skipNVectors);
-        assertEquals(AceEthWriter.MATCH_N_VECTORS, request.matchNVectors);
-        assertEquals(AceEthWriter.TABLE_MEM_SIZE, request.memorySize);
-
-        byte[] expectedMask = new byte[] {
-            // destination MAC:
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
-            // source MAC:
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, 0, 0, 0,
-            0, 0, 0, 0
-        };
-        assertArrayEquals(expectedMask, request.mask);
-    }
-
-    @Test
-    public void testCreateClassifySession() {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request = writer.createSession(action, aceEth, InterfaceMode.L2, tableIndex, 0).get(0);
-
-        assertEquals(1, request.isAdd);
-        assertEquals(tableIndex, request.tableIndex);
-        assertEquals(0, request.hitNextIndex);
-
-        byte[] expectedMatch = new byte[] {
-            // destination MAC:
-            (byte) 0x11, (byte) 0x22, (byte) 0x33, (byte) 0x44, (byte) 0x55, (byte) 0x66,
-            // source MAC:
-            (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, (byte) 0xee, (byte) 0xff,
-            0, 0, 0, 0
-        };
-        assertArrayEquals(expectedMatch, request.match);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp4WriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp4WriterTest.java
deleted file mode 100644
index 2d3d6eeb6..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp4WriterTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.common;
-
-import static io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTranslator.VLAN_TAG_LEN;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv4Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Dscp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-
-public class AceIp4WriterTest {
-
-    private AceIp4Writer writer;
-    private PacketHandling action;
-    private AceIp aceIp;
-
-    @Before
-    public void setUp() throws Exception {
-        initMocks(this);
-        writer = new AceIp4Writer();
-        action = new DenyBuilder().setDeny(true).build();
-        aceIp = new AceIpBuilder()
-            .setProtocol((short) 132)
-            .setDscp(new Dscp((short) 11))
-            .setAceIpVersion(new AceIpv4Builder()
-                .setSourceIpv4Network(new Ipv4Prefix("1.2.3.4/32"))
-                .setDestinationIpv4Network(new Ipv4Prefix("1.2.4.5/24"))
-                .build())
-            .setSourcePortRange(new SourcePortRangeBuilder().setLowerPort(new PortNumber(0x1111)).build())
-            .setDestinationPortRange(new DestinationPortRangeBuilder().setLowerPort(new PortNumber(0x2222)).build())
-            .build();
-    }
-
-    private static void verifyTableRequest(final ClassifyAddDelTable request, final int nextTableIndex,
-                                           final int vlanTags, final boolean isL2) {
-        assertEquals(1, request.isAdd);
-        assertEquals(-1, request.tableIndex);
-        assertEquals(1, request.nbuckets);
-        assertEquals(nextTableIndex, request.nextTableIndex);
-        assertEquals(0, request.skipNVectors);
-        assertEquals(AceIp4Writer.MATCH_N_VECTORS, request.matchNVectors);
-        assertEquals(AceIp4Writer.TABLE_MEM_SIZE, request.memorySize);
-
-        byte[] expectedMask = new byte[] {
-            // L2:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // dscp:
-            (byte) 0x00, (byte) 0xfc,
-            // protocol:
-            0, 0, 0, 0, 0, 0, 0, (byte) 0xff, 0, 0,
-            // source address:
-            -1, -1, -1, -1,
-            // destination address:
-            -1, -1, -1, 0,
-            // source and destination port:
-            -1, -1, -1, -1,
-            // padding:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
-
-        if (isL2) {
-            expectedMask[12] = (byte) 0xff;
-            expectedMask[13] = (byte) 0xff;
-        }
-        AceIpWriterTestUtils
-            .assertArrayEqualsWithOffset(expectedMask, expectedMask.length, request.mask, vlanTags * VLAN_TAG_LEN);
-
-    }
-
-    private static void verifySessionRequest(final ClassifyAddDelSession request, final int tableIndex,
-                                             final int vlanTags, final boolean isL2) {
-        assertEquals(1, request.isAdd);
-        assertEquals(tableIndex, request.tableIndex);
-        assertEquals(0, request.hitNextIndex);
-
-        byte[] expectedMatch = new byte[] {
-            // L2:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // dscp:
-            0, (byte) 0x2c,
-            // protocol (132):
-            0, 0, 0, 0, 0, 0, 0, (byte) 132, 0, 0,
-            // source address:
-            1, 2, 3, 4,
-            // destination address:
-            1, 2, 4, 0,
-            // source and destination port:
-            0x11, 0x11, 0x22, 0x22,
-            // padding:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
-
-        if (isL2) {
-            expectedMatch[12] = (byte) 0x08;
-            expectedMatch[13] = (byte) 0x00;
-        }
-        AceIpWriterTestUtils.assertArrayEqualsWithOffset(expectedMatch, expectedMatch.length, request.match, vlanTags * VLAN_TAG_LEN);
-
-    }
-
-    @Test
-    public void testCreateTable() throws Exception {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request = writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, 0);
-        verifyTableRequest(request, nextTableIndex, 0, false);
-    }
-
-    @Test
-    public void testCreateTableForL2Interface() throws Exception {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request = writer.createTable(aceIp, InterfaceMode.L2, nextTableIndex, 0);
-        verifyTableRequest(request, nextTableIndex, 0, true);
-    }
-
-    @Test
-    public void testCreateTable1VlanTag() throws Exception {
-        final int nextTableIndex = 42;
-        final int vlanTags = 1;
-        final ClassifyAddDelTable request = writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, vlanTags);
-        verifyTableRequest(request, nextTableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateTable2VlanTags() throws Exception {
-        final int nextTableIndex = 42;
-        final int vlanTags = 2;
-        final ClassifyAddDelTable request = writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, vlanTags);
-        verifyTableRequest(request, nextTableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateClassifySession() throws Exception {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request = writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, 0).get(0);
-        verifySessionRequest(request, tableIndex, 0, false);
-    }
-
-    @Test
-    public void testCreateClassifySessionForL2Interface() throws Exception {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request = writer.createSession(action, aceIp, InterfaceMode.L2, tableIndex, 0).get(0);
-        verifySessionRequest(request, tableIndex, 0, true);
-    }
-
-    @Test
-    public void testCreateClassifySession1VlanTag() throws Exception {
-        final int tableIndex = 123;
-        final int vlanTags = 1;
-        final ClassifyAddDelSession request = writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, vlanTags).get(0);
-        verifySessionRequest(request, tableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateClassifySession2VlanTags() throws Exception {
-        final int tableIndex = 123;
-        final int vlanTags = 2;
-        final ClassifyAddDelSession request = writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, vlanTags).get(0);
-
-        verifySessionRequest(request, tableIndex, vlanTags, false);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp6WriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp6WriterTest.java
deleted file mode 100644
index b193a2c78..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIp6WriterTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.common;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv6Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Dscp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6FlowLabel;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-
-public class AceIp6WriterTest {
-
-    private AceIp6Writer writer;
-    private PacketHandling action;
-    private AceIp aceIp;
-
-    @Before
-    public void setUp() {
-        initMocks(this);
-        writer = new AceIp6Writer();
-        action = new DenyBuilder().setDeny(true).build();
-        aceIp = new AceIpBuilder()
-            .setProtocol((short) 132)
-            .setDscp(new Dscp((short) 11))
-            .setAceIpVersion(new AceIpv6Builder()
-                .setFlowLabel(new Ipv6FlowLabel(123L))
-                .setSourceIpv6Network(new Ipv6Prefix("2001:db8:85a3:8d3:1319:8a2e:370:7348/128"))
-                .setDestinationIpv6Network(new Ipv6Prefix("fe80:1234:5678:abcd:ef01::/64"))
-                .build())
-            .setSourcePortRange(new SourcePortRangeBuilder().setLowerPort(new PortNumber(0x1111)).build())
-            .setDestinationPortRange(new DestinationPortRangeBuilder().setLowerPort(new PortNumber(0x2222)).build())
-            .build();
-    }
-
-
-    private static void verifyTableRequest(final ClassifyAddDelTable request, final int nextTableIndex,
-                                           final int vlanTags, final boolean isL2) {
-        assertEquals(1, request.isAdd);
-        assertEquals(-1, request.tableIndex);
-        assertEquals(1, request.nbuckets);
-        assertEquals(nextTableIndex, request.nextTableIndex);
-        assertEquals(0, request.skipNVectors);
-        assertEquals(vlanTags == 2 ? 5 : 4, request.matchNVectors);
-        assertEquals(AceIp6Writer.TABLE_MEM_SIZE, request.memorySize);
-
-        byte[] expectedMask = new byte[] {
-            // L2:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // dscp, flow:
-            (byte) 0x0f, (byte) 0xcf, (byte) 0xff, (byte) 0xff,
-            // protocol:
-            0, 0, (byte) 0xff, 0,
-            // source address:
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
-            // destination address:
-            (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
-            0, 0, 0, 0, 0, 0, 0, 0,
-            // source and destination port:
-            -1, -1, -1, -1,
-            // padding to multiple of 16B:
-            0, 0, 0, 0, 0, 0
-        };
-
-        if (isL2) {
-            expectedMask[12] = (byte) 0xff;
-            expectedMask[13] = (byte) 0xff;
-        }
-        AceIpWriterTestUtils.assertArrayEqualsWithOffset(expectedMask, vlanTags == 2 ? 80 : 64, request.mask, vlanTags * AclTranslator.VLAN_TAG_LEN);
-    }
-
-    private static void verifySessionRequest(final ClassifyAddDelSession request, final int tableIndex,
-                                             final int vlanTags, final boolean isL2) {
-        assertEquals(1, request.isAdd);
-        assertEquals(tableIndex, request.tableIndex);
-        assertEquals(0, request.hitNextIndex);
-
-        byte[] expectedMatch = new byte[] {
-            // L2:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // dscp(11), flow(123):
-            (byte) 0x02, (byte) 0xc0, (byte) 0x00, (byte) 0x7b,
-            // protocol (132):
-            0, 0, (byte) 132, 0,
-            // source address:
-            (byte) 0x20, (byte) 0x01, (byte) 0x0d, (byte) 0xb8, (byte) 0x85, (byte) 0xa3, (byte) 0x08, (byte) 0xd3,
-            (byte) 0x13, (byte) 0x19, (byte) 0x8a, (byte) 0x2e, (byte) 0x03, (byte) 0x70, (byte) 0x73, (byte) 0x48,
-            // destination address:
-            (byte) 0xfe, (byte) 0x80, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0xab, (byte) 0xcd,
-            0, 0, 0, 0, 0, 0, 0, 0,
-            // source and destination port:
-            0x11, 0x11, 0x22, 0x22,
-            // padding to multiple of 16B:
-            0, 0, 0, 0, 0, 0
-        };
-
-        if (isL2) {
-            expectedMatch[12] = (byte) 0x86;
-            expectedMatch[13] = (byte) 0xdd;
-        }
-        AceIpWriterTestUtils.assertArrayEqualsWithOffset(expectedMatch, vlanTags == 2 ? 80 : 64, request.match, vlanTags * AclTranslator.VLAN_TAG_LEN);
-
-    }
-
-    @Test
-    public void testCreateTable() {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request =
-            writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, 0);
-        verifyTableRequest(request, nextTableIndex, 0, false);
-    }
-
-    @Test
-    public void testCreateTableForL2Interface() {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request =
-            writer.createTable(aceIp, InterfaceMode.L2, nextTableIndex, 0);
-        verifyTableRequest(request, nextTableIndex, 0, true);
-    }
-
-    @Test
-    public void testCreateTable1VlanTag() {
-        final int nextTableIndex = 42;
-        final int vlanTags = 1;
-        final ClassifyAddDelTable request =
-            writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, vlanTags);
-        verifyTableRequest(request, nextTableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateTable2VlanTags() {
-        final int nextTableIndex = 42;
-        final int vlanTags = 2;
-        final ClassifyAddDelTable request =
-            writer.createTable(aceIp, InterfaceMode.L3, nextTableIndex, vlanTags);
-        verifyTableRequest(request, nextTableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateClassifySession() {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request =
-            writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, 0).get(0);
-        verifySessionRequest(request, tableIndex, 0, false);
-    }
-
-    @Test
-    public void testCreateClassifySessionForL2Interface() {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request =
-            writer.createSession(action, aceIp, InterfaceMode.L2, tableIndex, 0).get(0);
-        verifySessionRequest(request, tableIndex, 0, true);
-    }
-
-    @Test
-    public void testCreateClassifySession1VlanTag() {
-        final int tableIndex = 123;
-        final int vlanTags = 1;
-        final ClassifyAddDelSession request =
-            writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, vlanTags).get(0);
-        verifySessionRequest(request, tableIndex, vlanTags, false);
-    }
-
-    @Test
-    public void testCreateClassifySession2VlanTags() {
-        final int tableIndex = 123;
-        final int vlanTags = 2;
-        final ClassifyAddDelSession request =
-            writer.createSession(action, aceIp, InterfaceMode.L3, tableIndex, vlanTags).get(0);
-        verifySessionRequest(request, tableIndex, vlanTags, false);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpAndEthWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpAndEthWriterTest.java
deleted file mode 100644
index 5626352b3..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpAndEthWriterTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.common;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpAndEth;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpAndEthBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.AceIpAndEthNodesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.ace.ip.and.eth.nodes.ace.ip.version.AceIpv4Builder;
-
-public class AceIpAndEthWriterTest {
-
-    private AceIpAndEthWriter writer;
-    private PacketHandling action;
-    private AceIpAndEth ace;
-
-    @Before
-    public void setUp() {
-        initMocks(this);
-        writer = new AceIpAndEthWriter();
-        action = new DenyBuilder().setDeny(true).build();
-        ace = new AceIpAndEthBuilder().setAceIpAndEthNodes(new AceIpAndEthNodesBuilder()
-            .setDestinationMacAddress(new MacAddress("11:22:33:44:55:66"))
-            .setSourceMacAddress(new MacAddress("aa:bb:cc:dd:ee:ff"))
-            .setAceIpVersion(new AceIpv4Builder()
-                .setSourceIpv4Network(new Ipv4Prefix("1.2.3.4/32")).build())
-            .setSourcePortRange(new SourcePortRangeBuilder().setLowerPort(new PortNumber(0x1111)).build())
-            .setDestinationPortRange(new DestinationPortRangeBuilder().setLowerPort(new PortNumber(0x2222)).build())
-            .build()).build();
-    }
-
-    @Test
-    public void testCreateTable() {
-        final int nextTableIndex = 42;
-        final ClassifyAddDelTable request = writer.createTable(ace, InterfaceMode.L2, nextTableIndex, 0);
-
-        assertEquals(1, request.isAdd);
-        assertEquals(-1, request.tableIndex);
-        assertEquals(1, request.nbuckets);
-        assertEquals(nextTableIndex, request.nextTableIndex);
-        assertEquals(0, request.skipNVectors);
-        assertEquals(3, request.matchNVectors);
-        assertEquals(AceEthWriter.TABLE_MEM_SIZE, request.memorySize);
-
-        byte[] expectedMask = new byte[] {
-            // destination MAC:
-            -1, -1, -1, -1, -1, -1,
-            // source MAC:
-            -1, -1, -1, -1, -1, -1,
-            // ether type:
-            -1, -1,
-            // IP header
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // source address:
-            -1, -1, -1, -1,
-            // destination address:
-            0, 0, 0, 0,
-            // source and destination port:
-            -1, -1, -1, -1,
-            // padding:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
-        assertArrayEquals(expectedMask, request.mask);
-    }
-
-    @Test
-    public void testCreateClassifySession() {
-        final int tableIndex = 123;
-        final ClassifyAddDelSession request = writer.createSession(action, ace, InterfaceMode.L2, tableIndex, 0).get(0);
-
-        assertEquals(1, request.isAdd);
-        assertEquals(tableIndex, request.tableIndex);
-        assertEquals(0, request.hitNextIndex);
-
-        byte[] expectedMatch = new byte[] {
-            // destination MAC:
-            (byte) 0x11, (byte) 0x22, (byte) 0x33, (byte) 0x44, (byte) 0x55, (byte) 0x66,
-            // source MAC:
-            (byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xdd, (byte) 0xee, (byte) 0xff,
-            // ether type (IP4):
-            0x08, 0,
-            // IP header
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            // source address:
-            1, 2, 3, 4,
-            // destination address:
-            0, 0, 0, 0,
-            // source and destination port:
-            0x11, 0x11, 0x22, 0x22,
-            // padding:
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
-        assertArrayEquals(expectedMatch, request.match);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpWriterTestUtils.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpWriterTestUtils.java
deleted file mode 100644
index 257840169..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AceIpWriterTestUtils.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.common;
-
-import static org.junit.Assert.assertArrayEquals;
-
-final class AceIpWriterTestUtils {
-
-    private AceIpWriterTestUtils() {
-        throw new UnsupportedOperationException("This utility class cannot be instantiated");
-    }
-
-    protected static void assertArrayEqualsWithOffset(final byte[] baseExpected, final int expectedLength, final byte[] actual,
-                                                      final int offset) {
-        byte[] expected = new byte[expectedLength];
-        System.arraycopy(baseExpected, 0, expected, offset, Math.min(baseExpected.length, expectedLength-offset));
-
-        assertArrayEquals(expected, actual);
-    }
-}
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManagerImplTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManagerImplTest.java
deleted file mode 100644
index f2b73b44b..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/AclTableContextManagerImplTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.common;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import io.fd.honeycomb.translate.MappingContext;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.MappingTable;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
-
-public class AclTableContextManagerImplTest {
-
-    private AclTableContextManagerImpl ctx;
-    @Mock
-    private MappingContext mappingContext;
-    private static final int INDEX = 42;
-
-    @Before
-    public void setUp() throws Exception {
-        initMocks(this);
-        ctx = new AclTableContextManagerImpl(MappingTable.Direction.Ingress);
-    }
-
-    @Test
-    public void testAddEntry() throws Exception {
-        final MappingEntry entry =
-            new MappingEntryBuilder().setL2TableId(1).setIp4TableId(2).setIp6TableId(3).setIndex(INDEX).build();
-        ctx.addEntry(entry, mappingContext);
-        verify(mappingContext).put(ctx.getId(INDEX), entry);
-    }
-
-    @Test
-    public void testRemoveEntry() throws Exception {
-        ctx.removeEntry(INDEX, mappingContext);
-        verify(mappingContext).delete(ctx.getId(INDEX));
-    }
-
-    @Test
-    public void testReadEntry() throws Exception {
-        ctx.getEntry(INDEX, mappingContext);
-        verify(mappingContext).read(ctx.getId(INDEX));
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/PortPairTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/PortPairTest.java
deleted file mode 100644
index 9126d8c01..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/common/PortPairTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.common;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.hasSize;
-
-import java.util.List;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.DestinationPortRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRange;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160708.acl.transport.header.fields.SourcePortRangeBuilder;
-
-public class PortPairTest {
-
-    @Test
-    public void testSingleSrc() {
-        final SourcePortRange src = new SourcePortRangeBuilder().setLowerPort(new PortNumber(123)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, null);
-        assertThat(portPairs, hasSize(1));
-        assertThat(portPairs, contains(new PortPair(123, null)));
-    }
-
-    @Test
-    public void testSrcRange() {
-        final SourcePortRange src = new SourcePortRangeBuilder()
-            .setLowerPort(new PortNumber(123))
-            .setUpperPort(new PortNumber(125)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, null);
-        assertThat(portPairs, hasSize(3));
-        assertThat(portPairs, contains(new PortPair(123, null), new PortPair(124, null), new PortPair(125, null)));
-    }
-
-    @Test
-    public void testSrcRangeWithDst() {
-        final SourcePortRange src = new SourcePortRangeBuilder()
-            .setLowerPort(new PortNumber(123))
-            .setUpperPort(new PortNumber(125)).build();
-        final DestinationPortRange dst = new DestinationPortRangeBuilder().setLowerPort(new PortNumber(111)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, dst);
-        assertThat(portPairs, hasSize(3));
-        assertThat(portPairs, contains(new PortPair(123, 111), new PortPair(124, 111), new PortPair(125, 111)));
-    }
-
-    @Test
-    public void testSingleDst() {
-        final DestinationPortRange dst = new DestinationPortRangeBuilder().setLowerPort(new PortNumber(123)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(null, dst);
-        assertThat(portPairs, hasSize(1));
-        assertThat(portPairs, contains(new PortPair(null, 123)));
-    }
-
-    @Test
-    public void testDstRange() {
-        final DestinationPortRange dst = new DestinationPortRangeBuilder()
-            .setLowerPort(new PortNumber(10))
-            .setUpperPort(new PortNumber(11)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(null, dst);
-        assertThat(portPairs, hasSize(2));
-        assertThat(portPairs, contains(new PortPair(null, 10), new PortPair(null, 11)));
-    }
-
-    @Test
-    public void testDstRangeWithSrc() {
-        final SourcePortRange src = new SourcePortRangeBuilder().setLowerPort(new PortNumber(111)).build();
-        final DestinationPortRange dst = new DestinationPortRangeBuilder()
-            .setLowerPort(new PortNumber(10))
-            .setUpperPort(new PortNumber(11)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, dst);
-        assertThat(portPairs, hasSize(2));
-        assertThat(portPairs, contains(new PortPair(111, 10), new PortPair(111, 11)));
-    }
-
-    @Test
-    public void testSinglePair() {
-        final SourcePortRange src = new SourcePortRangeBuilder().setLowerPort(new PortNumber(123)).build();
-        final DestinationPortRange dst = new DestinationPortRangeBuilder().setLowerPort(new PortNumber(321)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, dst);
-        assertThat(portPairs, hasSize(1));
-        assertThat(portPairs, contains(new PortPair(123, 321)));
-    }
-
-    @Test
-    public void testCartesianProduct() {
-        final SourcePortRange src = new SourcePortRangeBuilder()
-            .setLowerPort(new PortNumber(1))
-            .setUpperPort(new PortNumber(2)).build();
-        final DestinationPortRange dst = new DestinationPortRangeBuilder()
-            .setLowerPort(new PortNumber(1))
-            .setUpperPort(new PortNumber(3)).build();
-        final List<PortPair> portPairs = PortPair.fromRange(src, dst);
-        assertThat(portPairs, hasSize(6));
-        assertThat(portPairs,
-            contains(new PortPair(1, 1), new PortPair(1, 2), new PortPair(1, 3), new PortPair(2, 1), new PortPair(2, 2),
-                new PortPair(2, 3)));
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/EgressIetfAclWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/EgressIetfAclWriterTest.java
deleted file mode 100644
index 0c7e42733..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/EgressIetfAclWriterTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.egress;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTableContextManager;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
-import io.fd.vpp.jvpp.core.dto.ClassifySetInterfaceL2Tables;
-import io.fd.vpp.jvpp.core.dto.ClassifySetInterfaceL2TablesReply;
-import java.util.Collections;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntriesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.AceBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.ActionsBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.MatchesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.PermitBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv4Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Egress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.EgressBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class EgressIetfAclWriterTest extends WriterCustomizerTest {
-
-    private static final int IF_INDEX = 1;
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
-
-    private EgressIetfAclWriter writer;
-    @Mock
-    private AclTableContextManager aclCtx;
-    @Mock
-    private InstanceIdentifier<?> id;
-
-    private static ClassifyAddDelTable classifyAddDelTable(final int tableIndex) {
-        final ClassifyAddDelTable reply = new ClassifyAddDelTable();
-        reply.tableIndex = tableIndex;
-        reply.delChain = 1;
-        return reply;
-    }
-
-    @Override
-    protected void setUpTest() throws Exception {
-        writer = new EgressIetfAclWriter(api, aclCtx);
-    }
-
-    private ClassifySetInterfaceL2Tables classifySetInterfaceL2TablesRequest() {
-        final ClassifySetInterfaceL2Tables request = new ClassifySetInterfaceL2Tables();
-        request.isInput = 0;
-        request.ip4TableIndex = -1;
-        request.ip6TableIndex = -1;
-        request.otherTableIndex = -1;
-        request.swIfIndex = IF_INDEX;
-        return request;
-    }
-
-    @Test
-    public void testDeleteAcl() throws Exception {
-        when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
-        when(api.classifySetInterfaceL2Tables(any())).thenReturn(future(new ClassifySetInterfaceL2TablesReply()));
-        when(aclCtx.getEntry(IF_INDEX, mappingContext)).thenReturn(Optional.of(
-            new MappingEntryBuilder()
-                .setIndex(IF_INDEX)
-                .setL2TableId(1)
-                .setIp4TableId(2)
-                .setIp6TableId(3)
-                .build()));
-
-        writer.deleteAcl(id, IF_INDEX, mappingContext);
-
-        verify(api).classifySetInterfaceL2Tables(classifySetInterfaceL2TablesRequest());
-        verify(api).classifyAddDelTable(classifyAddDelTable(1));
-        verify(api).classifyAddDelTable(classifyAddDelTable(2));
-        verify(api).classifyAddDelTable(classifyAddDelTable(3));
-        verify(aclCtx).removeEntry(IF_INDEX, mappingContext);
-    }
-
-    @Test
-    public void testWrite() throws Exception {
-        when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
-        when(api.classifyAddDelSession(any())).thenReturn(future(new ClassifyAddDelSessionReply()));
-        when(api.classifySetInterfaceL2Tables(any())).thenReturn(future(new ClassifySetInterfaceL2TablesReply()));
-
-        final Egress
-            acl = new EgressBuilder().setAccessLists(
-            new AccessListsBuilder().setAcl(
-                Collections.singletonList(new AclBuilder()
-                    .setName(ACL_NAME)
-                    .setType(ACL_TYPE)
-                    .build())
-            ).setMode(InterfaceMode.L2).build()
-        ).build();
-
-        final AccessLists accessLists = acl.getAccessLists();
-
-        when(writeContext.readAfter(any())).thenReturn(Optional.of(
-            new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclBuilder()
-                .setAccessListEntries(
-                    new AccessListEntriesBuilder().setAce(Collections.singletonList(new AceBuilder()
-                        .setMatches(new MatchesBuilder().setAceType(
-                            new AceIpBuilder()
-                                .setAceIpVersion(new AceIpv4Builder().build())
-                                .setProtocol((short) 1)
-                                .build()
-                        ).build())
-                        .setActions(new ActionsBuilder().setPacketHandling(new PermitBuilder().build()).build())
-                        .build())).build()
-                ).build()
-
-        ));
-
-        writer.write(id, IF_INDEX, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
-            writeContext, mappingContext);
-
-        final ClassifySetInterfaceL2Tables request = new ClassifySetInterfaceL2Tables();
-        request.isInput = 0;
-        request.swIfIndex = IF_INDEX;
-        request.otherTableIndex = -1;
-        request.ip4TableIndex = 0;
-        request.ip6TableIndex = -1;
-        verify(api).classifySetInterfaceL2Tables(request);
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/IetfAclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/IetfAclCustomizerTest.java
deleted file mode 100644
index fc6453faf..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/IetfAclCustomizerTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.egress;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.IetfAclWriter;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import java.util.Collections;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.MixedAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Egress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.EgressBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class IetfAclCustomizerTest extends WriterCustomizerTest {
-    private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
-    private static final String IF_NAME = "local0";
-    private static final int IF_INDEX = 1;
-    private static final InstanceIdentifier<Egress> IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
-            VppInterfaceAclAugmentation.class).child(IetfAcl.class).child(Egress.class);
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = MixedAcl.class;
-
-    @Mock
-    private IetfAclWriter aclWriter;
-    private IetfAclCustomizer customizer;
-
-    private static Egress acl(final InterfaceMode mode) {
-        return new EgressBuilder().setAccessLists(
-            new AccessListsBuilder().setAcl(
-                Collections.singletonList(new AclBuilder()
-                    .setName(ACL_NAME)
-                    .setType(ACL_TYPE)
-                    .build())
-            ).setMode(mode)
-                .build()
-        ).build();
-    }
-
-    @Override
-    protected void setUpTest() {
-        customizer = new IetfAclCustomizer(aclWriter, new NamingContext("prefix", IFC_TEST_INSTANCE));
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-    }
-
-    private void verifyWrite(final AccessLists accessLists) throws WriteFailedException {
-        verify(aclWriter)
-            .write(IID, IF_INDEX, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
-                writeContext, mappingContext);
-    }
-
-    private void verifyDelete() throws WriteFailedException {
-        verify(aclWriter).deleteAcl(IID, IF_INDEX, mappingContext);
-    }
-
-    @Test
-    public void testWriteL3() throws Exception {
-        customizer.writeCurrentAttributes(IID, acl(InterfaceMode.L3), writeContext);
-        verifyZeroInteractions(aclWriter);
-    }
-
-    @Test
-    public void testWriteL2() throws Exception {
-        final Egress acl = acl(InterfaceMode.L2);
-        customizer.writeCurrentAttributes(IID, acl, writeContext);
-        verifyWrite(acl.getAccessLists());
-    }
-
-    @Test
-    public void testUpdate() throws Exception {
-        final Egress aclBefore = acl(InterfaceMode.L3);
-        final Egress aclAfter = acl(InterfaceMode.L2);
-        customizer.updateCurrentAttributes(IID, aclBefore, aclAfter, writeContext);
-        verifyDelete();
-        verifyWrite(aclAfter.getAccessLists());
-    }
-
-    @Test
-    public void testDelete() throws Exception {
-        final Egress acl = acl(InterfaceMode.L2);
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-        verifyDelete();
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/SubInterfaceIetfAclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/SubInterfaceIetfAclCustomizerTest.java
deleted file mode 100644
index e015a530f..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/egress/SubInterfaceIetfAclCustomizerTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.egress;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.IetfAclWriter;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import java.util.Collections;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.MixedAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessLists;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Egress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.EgressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.subinterface.acl.rev170315.VppSubinterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.SubinterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.SubInterfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterfaceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
-    private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
-    private static final String IF_NAME = "local0";
-    private static final int IF_INDEX = 1;
-    private static final String SUBIF_NAME = "local0.0";
-    private static final int SUBIF_INDEX = 11;
-    private static final long SUBIF_ID = 0;
-    private static final InstanceIdentifier<Egress> IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
-            SubinterfaceAugmentation.class).child(SubInterfaces.class)
-            .child(SubInterface.class, new SubInterfaceKey(SUBIF_ID))
-                .augmentation(VppSubinterfaceAclAugmentation.class)
-                .child(IetfAcl.class).child(Egress.class);
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = MixedAcl.class;
-
-    @Mock
-    private IetfAclWriter aclWriter;
-    private SubInterfaceIetfAclCustomizer customizer;
-
-    private static Egress acl(final InterfaceMode mode) {
-        return new EgressBuilder().setAccessLists(
-            new AccessListsBuilder().setAcl(
-                Collections.singletonList(new AclBuilder()
-                    .setName(ACL_NAME)
-                    .setType(ACL_TYPE)
-                    .build())
-            ).setMode(mode)
-                .build()
-        ).build();
-    }
-
-    @Override
-    protected void setUpTest() {
-        customizer = new SubInterfaceIetfAclCustomizer(aclWriter, new NamingContext("prefix", IFC_TEST_INSTANCE));
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-        defineMapping(mappingContext, SUBIF_NAME, SUBIF_INDEX, IFC_TEST_INSTANCE);
-
-
-        when(writeContext.readAfter(IID.firstIdentifierOf(SubInterface.class))).thenReturn(Optional.of(
-                new SubInterfaceBuilder().build()
-        ));
-    }
-
-    private void verifyWrite(final AccessLists accessLists) throws WriteFailedException {
-        verify(aclWriter)
-            .write(IID, SUBIF_INDEX, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
-                writeContext, 0, mappingContext);
-    }
-
-    private void verifyDelete() throws WriteFailedException {
-        verify(aclWriter).deleteAcl(IID, SUBIF_INDEX, mappingContext);
-    }
-
-    @Test
-    public void testWriteL3() throws Exception {
-        customizer.writeCurrentAttributes(IID, acl(InterfaceMode.L3), writeContext);
-        verifyZeroInteractions(aclWriter);
-    }
-
-    @Test
-    public void testWriteL2() throws Exception {
-        final Egress acl = acl(InterfaceMode.L2);
-        customizer.writeCurrentAttributes(IID, acl, writeContext);
-        verifyWrite(acl.getAccessLists());
-    }
-
-    @Test
-    public void testUpdate() throws Exception {
-        final Egress aclBefore = acl(InterfaceMode.L3);
-        final Egress aclAfter = acl(InterfaceMode.L2);
-        customizer.updateCurrentAttributes(IID, aclBefore, aclAfter, writeContext);
-        verifyDelete();
-        verifyWrite(aclAfter.getAccessLists());
-    }
-
-    @Test
-    public void testDelete() throws Exception {
-        final Egress acl = acl(InterfaceMode.L2);
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-        verifyDelete();
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IetfAclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IetfAclCustomizerTest.java
deleted file mode 100644
index 44cc3a744..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/IetfAclCustomizerTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.ingress;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTableContextManager;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
-import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
-import java.util.Arrays;
-import java.util.Collections;
-import org.junit.Test;
-import org.mockito.ArgumentMatcher;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntriesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.Ace;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.AceBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.ActionsBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.MatchesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.PacketHandling;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.Deny;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.Permit;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.PermitBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv6Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp._interface.acl.rev170315.VppInterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Ingress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.IngressBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class IetfAclCustomizerTest extends WriterCustomizerTest {
-
-    private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
-    private static final String IF_NAME = "local0";
-    private static final int IF_INDEX = 1;
-    private static final InstanceIdentifier<Ingress> IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
-            VppInterfaceAclAugmentation.class).child(IetfAcl.class).child(Ingress.class);
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
-
-    @Mock
-    private AclTableContextManager aclCtx;
-
-    private IetfAclCustomizer customizer;
-    private Ingress acl;
-    private int DENY = 0;
-    private int PERMIT = -1;
-
-    private static Ace ace(final PacketHandling action) {
-        return new AceBuilder()
-                .setMatches(new MatchesBuilder().setAceType(
-                        new AceIpBuilder()
-                                .setAceIpVersion(new AceIpv6Builder().build())
-                                .setProtocol((short) 1)
-                                .build()
-                ).build())
-                .setActions(new ActionsBuilder().setPacketHandling(action).build())
-                .build();
-    }
-
-    private static InputAclSetInterface inputAclSetInterfaceDeleteRequest() {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.swIfIndex = IF_INDEX;
-        request.l2TableIndex = 1;
-        request.ip4TableIndex = 2;
-        request.ip6TableIndex = 3;
-        return request;
-    }
-
-    private static ClassifyAddDelTable classifyAddDelTable(final int tableIndex) {
-        final ClassifyAddDelTable reply = new ClassifyAddDelTable();
-        reply.tableIndex = tableIndex;
-        reply.delChain = 1;
-        return reply;
-    }
-
-    private static InputAclSetInterface inputAclSetInterfaceWriteRequest() {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.swIfIndex = IF_INDEX;
-        request.isAdd = 1;
-        request.l2TableIndex = -1;
-        request.ip4TableIndex = -1;
-        request.ip6TableIndex = 0;
-        return request;
-    }
-
-    @Override
-    protected void setUpTest() {
-        customizer = new IetfAclCustomizer(new IngressIetfAclWriter(api, aclCtx), new NamingContext("prefix", IFC_TEST_INSTANCE));
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-        acl = new IngressBuilder().setAccessLists(
-            new AccessListsBuilder().setAcl(
-                Collections.singletonList(new AclBuilder()
-                    .setName(ACL_NAME)
-                    .setType(ACL_TYPE)
-                    .build())
-            ).build()
-        ).build();
-    }
-
-    @Test
-    public void testWrite() throws WriteFailedException {
-        when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
-        when(api.classifyAddDelSession(any())).thenReturn(future(new ClassifyAddDelSessionReply()));
-
-        when(writeContext.readAfter(any())).thenReturn(Optional.of(
-            new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclBuilder()
-                .setAccessListEntries(
-                    new AccessListEntriesBuilder().setAce(Arrays.asList(ace(permit()), ace(permit()), ace(deny())
-                    )).build()
-                ).build()
-
-        ));
-        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
-
-        customizer.writeCurrentAttributes(IID, acl, writeContext);
-
-        final InOrder inOrder = Mockito.inOrder(api);
-        inOrder.verify(api).classifyAddDelTable(argThat(actionOnMissEquals(DENY))); // default action
-        inOrder.verify(api).classifyAddDelTable(any());
-        inOrder.verify(api).classifyAddDelSession(argThat(actionOnHitEquals(DENY))); // last deny ACE
-        inOrder.verify(api).classifyAddDelTable(any());
-        inOrder.verify(api).classifyAddDelSession(argThat(actionOnHitEquals(PERMIT)));
-        inOrder.verify(api).classifyAddDelTable(any());
-        inOrder.verify(api).classifyAddDelSession(argThat(actionOnHitEquals(PERMIT)));
-        inOrder.verify(api).inputAclSetInterface(inputAclSetInterfaceWriteRequest()); // assignment
-    }
-
-    private ArgumentMatcher<ClassifyAddDelTable> actionOnMissEquals(final int action) {
-        return table -> table.missNextIndex == action;
-    }
-
-    private ArgumentMatcher<ClassifyAddDelSession> actionOnHitEquals(final int action) {
-        return session -> session.hitNextIndex == action;
-    }
-
-    private Deny deny() {
-        return new DenyBuilder().build();
-    }
-
-    private Permit permit() {
-        return new PermitBuilder().build();
-    }
-
-    @Test
-    public void testDelete() throws WriteFailedException {
-        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
-        when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
-        when(aclCtx.getEntry(IF_INDEX, mappingContext)).thenReturn(Optional.of(
-            new MappingEntryBuilder()
-                .setIndex(IF_INDEX)
-                .setL2TableId(1)
-                .setIp4TableId(2)
-                .setIp6TableId(3)
-                .build()));
-
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-
-        final ClassifyTableByInterface expectedRequest = new ClassifyTableByInterface();
-        expectedRequest.swIfIndex = IF_INDEX;
-        verify(api).inputAclSetInterface(inputAclSetInterfaceDeleteRequest());
-        verify(api).classifyAddDelTable(classifyAddDelTable(1));
-        verify(api).classifyAddDelTable(classifyAddDelTable(2));
-        verify(api).classifyAddDelTable(classifyAddDelTable(3));
-    }
-}
\ No newline at end of file
diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceIetfAclCustomizerTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
deleted file mode 100644
index 15c960aff..000000000
--- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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.hc2vpp.vpp.classifier.write.acl.ingress;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.vpp.classifier.write.acl.IetfAclWriter;
-import io.fd.hc2vpp.vpp.classifier.write.acl.common.AclTableContextManager;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
-import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
-import java.util.Collections;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntriesBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.ietf.acl.base.attributes.access.lists.AclBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.IetfAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.Ingress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.classifier.acl.rev170315.vpp.acl.attributes.ietf.acl.IngressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.subinterface.acl.rev170315.VppSubinterfaceAclAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.SubinterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.SubInterfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterfaceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev170315.interfaces._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
-
-    private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
-    private static final String IF_NAME = "local0";
-    private static final int IF_INDEX = 1;
-    private static final String SUBIF_NAME = "local0.123";
-    private static final int SUBIF_INDEX = 2;
-    private static final long SUB_IF_ID = 123;
-    private static final InstanceIdentifier<Ingress> IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
-            SubinterfaceAugmentation.class).child(SubInterfaces.class)
-            .child(SubInterface.class, new SubInterfaceKey(SUB_IF_ID))
-                .augmentation(VppSubinterfaceAclAugmentation.class)
-                .child(IetfAcl.class).child(Ingress.class);
-    private static final String ACL_NAME = "acl1";
-    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
-
-    private SubInterfaceIetfAclCustomizer customizer;
-    private Ingress acl;
-
-    @Mock
-    private AclTableContextManager aclCtx;
-
-    private static InputAclSetInterface inputAclSetInterfaceWriteRequest() {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.swIfIndex = SUBIF_INDEX;
-        request.isAdd = 1;
-        request.l2TableIndex = -1;
-        request.ip4TableIndex = -1;
-        request.ip6TableIndex = -1;
-        return request;
-    }
-
-    private static InputAclSetInterface inputAclSetInterfaceDeleteRequest() {
-        final InputAclSetInterface request = new InputAclSetInterface();
-        request.swIfIndex = SUBIF_INDEX;
-        request.l2TableIndex = -1;
-        request.ip4TableIndex = -1;
-        request.ip6TableIndex = -1;
-        return request;
-    }
-
-    @Override
-    protected void setUpTest() {
-        customizer =
-            new SubInterfaceIetfAclCustomizer(new IngressIetfAclWriter(api, aclCtx), new NamingContext("prefix", IFC_TEST_INSTANCE));
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-
-        acl = new IngressBuilder().setAccessLists(
-            new AccessListsBuilder().setAcl(
-                Collections.singletonList(new AclBuilder()
-                    .setName(ACL_NAME)
-                    .setType(ACL_TYPE)
-                    .build())
-            ).build()
-        ).build();
-    }
-
-    @Test
-    public void testDelete() throws WriteFailedException {
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-        defineMapping(mappingContext, SUBIF_NAME, SUBIF_INDEX, IFC_TEST_INSTANCE);
-        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
-        when(aclCtx.getEntry(SUBIF_INDEX, mappingContext)).thenReturn(Optional.of(
-            new MappingEntryBuilder()
-                .setIndex(SUBIF_INDEX)
-                .setL2TableId(-1)
-                .setIp4TableId(-1)
-                .setIp6TableId(-1)
-                .build()));
-
-        customizer.deleteCurrentAttributes(IID, acl, writeContext);
-
-        final ClassifyTableByInterface expectedRequest = new ClassifyTableByInterface();
-        expectedRequest.swIfIndex = SUBIF_INDEX;
-        verify(api).inputAclSetInterface(inputAclSetInterfaceDeleteRequest());
-    }
-
-    @Test
-    public void testWrite() throws WriteFailedException {
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
-        defineMapping(mappingContext, SUBIF_NAME, SUBIF_INDEX, IFC_TEST_INSTANCE);
-
-        when(writeContext.readAfter(IID.firstIdentifierOf(SubInterface.class))).thenReturn(Optional.of(
-            new SubInterfaceBuilder().build()
-        ));
-
-        when(writeContext.readAfter(IetfAclWriter.ACL_ID.child(
-            org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl.class,
-            new AclKey(ACL_NAME, ACL_TYPE)))).thenReturn(Optional.of(
-            new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclBuilder()
-                .setAccessListEntries(
-                    new AccessListEntriesBuilder().setAce(Collections.emptyList()).build()
-                ).build()
-        ));
-
-        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
-
-        customizer.writeCurrentAttributes(IID, acl, writeContext);
-
-        verify(api).inputAclSetInterface(inputAclSetInterfaceWriteRequest());
-    }
-}
\ No newline at end of file