7 files changed, 0 insertions, 817 deletions
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceEthWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceEthWriterTest.java
deleted file mode 100644
index 3a50b7673..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/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.honeycomb.translate.v3po.interfaces.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.acl.rev161214.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/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp4WriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp4WriterTest.java
deleted file mode 100644
index f3a9d0f87..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/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.honeycomb.translate.v3po.interfaces.acl.common;
-
-import static io.fd.honeycomb.translate.v3po.interfaces.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.acl.rev161214.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/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp6WriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp6WriterTest.java
deleted file mode 100644
index 382d8840e..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIp6WriterTest.java
+++ /dev/null
@@ -1,201 +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.honeycomb.translate.v3po.interfaces.acl.common;
-
-import static io.fd.honeycomb.translate.v3po.interfaces.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.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.acl.rev161214.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 * 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 * 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/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriterTest.java
deleted file mode 100644
index d224a067f..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpAndEthWriterTest.java
+++ /dev/null
@@ -1,123 +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.honeycomb.translate.v3po.interfaces.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.acl.rev161214.InterfaceMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpAndEth;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpAndEthBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.and.eth.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()
-            .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();
-    }
-
-    @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/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpWriterTestUtils.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AceIpWriterTestUtils.java
deleted file mode 100644
index 59e22a87b..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/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.honeycomb.translate.v3po.interfaces.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/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java
deleted file mode 100644
index 490e26b2b..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/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.honeycomb.translate.v3po.interfaces.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/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/PortPairTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/PortPairTest.java
deleted file mode 100644
index 2127fb0fa..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/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.honeycomb.translate.v3po.interfaces.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