HC2VPP-7 - L3 split to separate module

ipv4/ipv6/proxy arp/nd proxy

Change-Id: I536298dd5584f79f357e94da08d402e67e79bb71
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

18 files changed, 0 insertions, 2385 deletions

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizerTest.java
deleted file mode 100644
index 2e6d17b90..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizerTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2017 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.v3po.interfaces;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.v3po.interfaces.ip.v4.ProxyArpCustomizer;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.ProxyArpIntfcEnableDisable;
-import io.fd.vpp.jvpp.core.dto.ProxyArpIntfcEnableDisableReply;
-import org.junit.Test;
-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.proxy.arp.rev170315.ProxyArpInterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.proxy.arp.rev170315.interfaces._interface.ProxyArp;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class ProxyArpCustomizerTest extends WriterCustomizerTest implements ByteDataTranslator {
-    private static final String IF_NAME = "eth1";
-    private static final int IF_INDEX = 42;
-    private static final String IFACE_CTX_NAME = "ifc-test-instance";
-
-    private static final InstanceIdentifier<ProxyArp>
-        IID = InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME))
-        .augmentation(ProxyArpInterfaceAugmentation.class).child(ProxyArp.class);
-
-    private ProxyArpCustomizer customizer;
-    private ProxyArp data;
-
-    @Override
-    public void setUpTest() throws Exception {
-        data = mock(ProxyArp.class);
-        customizer = new ProxyArpCustomizer(api, new NamingContext("ifacePrefix", IFACE_CTX_NAME));
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFACE_CTX_NAME);
-    }
-
-    @Test
-    public void testWrite() throws WriteFailedException {
-        when(api.proxyArpIntfcEnableDisable(any())).thenReturn(future(new ProxyArpIntfcEnableDisableReply()));
-        customizer.writeCurrentAttributes(IID, data, writeContext);
-        verify(api).proxyArpIntfcEnableDisable(expectedEnableRequest(true));
-    }
-
-    @Test(expected = WriteFailedException.class)
-    public void testWriteFailed() throws WriteFailedException {
-        when(api.proxyArpIntfcEnableDisable(any())).thenReturn(failedFuture());
-        customizer.writeCurrentAttributes(IID, data, writeContext);
-    }
-
-    @Test(expected = WriteFailedException.UpdateFailedException.class)
-    public void testUpdate() throws WriteFailedException {
-        customizer.updateCurrentAttributes(IID, data, data, writeContext);
-    }
-
-    @Test
-    public void testDelete() throws WriteFailedException {
-        when(api.proxyArpIntfcEnableDisable(any())).thenReturn(future(new ProxyArpIntfcEnableDisableReply()));
-        customizer.deleteCurrentAttributes(IID, data, writeContext);
-        verify(api).proxyArpIntfcEnableDisable(expectedEnableRequest(false));
-    }
-
-    @Test(expected = WriteFailedException.DeleteFailedException.class)
-    public void testDeleteFailed() throws WriteFailedException {
-        when(api.proxyArpIntfcEnableDisable(any())).thenReturn(failedFuture());
-        customizer.deleteCurrentAttributes(IID, data, writeContext);
-    }
-
-    private ProxyArpIntfcEnableDisable expectedEnableRequest(final boolean enable) {
-        final ProxyArpIntfcEnableDisable request = new ProxyArpIntfcEnableDisable();
-        request.swIfIndex = IF_INDEX;
-        request.enableDisable = booleanToByte(enable);
-        return request;
-    }
-}
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyRangeCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyRangeCustomizerTest.java
deleted file mode 100644
index 9b4760916..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyRangeCustomizerTest.java
+++ /dev/null
@@ -1,96 +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.v3po.interfaces;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
-import io.fd.hc2vpp.v3po.interfaces.ip.v4.ProxyRangeCustomizer;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.ProxyArpAddDel;
-import io.fd.vpp.jvpp.core.dto.ProxyArpAddDelReply;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.proxy.arp.rev170315.ProxyRanges;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.proxy.arp.rev170315.proxy.ranges.ProxyRange;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.proxy.arp.rev170315.proxy.ranges.ProxyRangeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.proxy.arp.rev170315.proxy.ranges.ProxyRangeKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
-
-public class ProxyRangeCustomizerTest extends WriterCustomizerTest implements ByteDataTranslator {
-
-    private KeyedInstanceIdentifier<ProxyRange, ProxyRangeKey> IID;
-    private ProxyRange RANGE;
-    private ProxyRangeCustomizer customizer;
-
-    @Override
-    public void setUpTest() throws Exception {
-        final Ipv4Address highAddr = new Ipv4AddressNoZone("10.1.1.2");
-        final Ipv4Address lowAddr = new Ipv4AddressNoZone("10.1.1.1");
-        final long vrfId = 123;
-        IID = InstanceIdentifier.create(ProxyRanges.class)
-            .child(ProxyRange.class, new ProxyRangeKey(highAddr, lowAddr, vrfId));
-        RANGE = new ProxyRangeBuilder().setVrfId(vrfId).setHighAddr(highAddr).setLowAddr(new Ipv4AddressNoZone(lowAddr))
-            .build();
-        customizer = new ProxyRangeCustomizer(api);
-    }
-
-    @Test
-    public void testWrite() throws WriteFailedException {
-        when(api.proxyArpAddDel(any())).thenReturn(future(new ProxyArpAddDelReply()));
-        customizer.writeCurrentAttributes(IID, RANGE, writeContext);
-        verify(api).proxyArpAddDel(expectedAddDelRequest(true));
-    }
-
-    @Test(expected = WriteFailedException.class)
-    public void testWriteFailed() throws WriteFailedException {
-        when(api.proxyArpAddDel(any())).thenReturn(failedFuture());
-        customizer.writeCurrentAttributes(IID, RANGE, writeContext);
-    }
-
-    @Test(expected = WriteFailedException.UpdateFailedException.class)
-    public void testUpdate() throws WriteFailedException {
-        customizer.updateCurrentAttributes(IID, RANGE, RANGE, writeContext);
-    }
-
-    @Test
-    public void testDelete() throws WriteFailedException {
-        when(api.proxyArpAddDel(any())).thenReturn(future(new ProxyArpAddDelReply()));
-        customizer.deleteCurrentAttributes(IID, RANGE, writeContext);
-        verify(api).proxyArpAddDel(expectedAddDelRequest(false));
-    }
-
-    @Test(expected = WriteFailedException.DeleteFailedException.class)
-    public void testDeleteFailed() throws WriteFailedException {
-        when(api.proxyArpAddDel(any())).thenReturn(failedFuture());
-        customizer.deleteCurrentAttributes(IID, RANGE, writeContext);
-    }
-
-    private ProxyArpAddDel expectedAddDelRequest(final boolean isAdd) {
-        final ProxyArpAddDel request = new ProxyArpAddDel();
-        request.isAdd = booleanToByte(isAdd);
-        request.vrfId = 123;
-        request.lowAddress = new byte[] {10, 1, 1, 1};
-        request.hiAddress = new byte[] {10, 1, 1, 2};
-        return request;
-    }
-}
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizerTest.java
deleted file mode 100644
index 98ff8da64..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/SubInterfaceIpv4AddressCustomizerTest.java
+++ /dev/null
@@ -1,145 +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.v3po.interfaces.ip;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.v3po.interfaces.ip.v4.subinterface.SubInterfaceIpv4AddressCustomizer;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.VppBaseCallException;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddress;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddressReply;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
-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.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DottedQuad;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.SubinterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces._interface.SubInterfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.Address;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.AddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.address.Subnet;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.address.subnet.Netmask;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.address.subnet.NetmaskBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.address.subnet.PrefixLength;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.address.subnet.PrefixLengthBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class SubInterfaceIpv4AddressCustomizerTest extends WriterCustomizerTest implements ByteDataTranslator {
-
-    private static final String IFC_CTX_NAME = "ifc-test-instance";
-    private static final String IFACE_NAME = "eth0";
-    private static final int IFACE_INDEX = 0;
-    private static final String SUBIF_NAME = "eth0.1";
-    private static final long SUBIF_ID = 1;
-    private static final int SUBIF_INDEX = 123;
-    private static final InstanceIdentifier<Address> IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IFACE_NAME))
-            .augmentation(SubinterfaceAugmentation.class).child(SubInterfaces.class)
-            .child(SubInterface.class, new SubInterfaceKey(SUBIF_ID)).child(Ipv4.class).child(Address.class);
-
-    private SubInterfaceIpv4AddressCustomizer customizer;
-
-    @Override
-    protected void setUpTest() {
-        customizer = new SubInterfaceIpv4AddressCustomizer(api, new NamingContext("prefix", IFC_CTX_NAME));
-        defineMapping(mappingContext, IFACE_NAME, IFACE_INDEX, IFC_CTX_NAME);
-        defineMapping(mappingContext, SUBIF_NAME, SUBIF_INDEX, IFC_CTX_NAME);
-    }
-
-    @Test
-    public void testWrite() throws WriteFailedException {
-        when(api.swInterfaceAddDelAddress(any())).thenReturn(future(new SwInterfaceAddDelAddressReply()));
-        customizer.writeCurrentAttributes(IID, address(prefixLength()), writeContext);
-        verify(api).swInterfaceAddDelAddress(expectedRequest(true));
-    }
-
-    @Test
-    public void testWriteFailed() {
-        when(api.swInterfaceAddDelAddress(any())).thenReturn(failedFuture());
-        try {
-            customizer.writeCurrentAttributes(IID, address(prefixLength()), writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(api).swInterfaceAddDelAddress(expectedRequest(true));
-            return;
-        }
-        fail("WriteFailedException expected");
-    }
-
-    @Test
-    public void testDelete() throws WriteFailedException {
-        when(api.swInterfaceAddDelAddress(any())).thenReturn(future(new SwInterfaceAddDelAddressReply()));
-        customizer.deleteCurrentAttributes(IID, address(netmask()), writeContext);
-        verify(api).swInterfaceAddDelAddress(expectedRequest(false));
-    }
-
-    @Test
-    public void testDeleteFailed() {
-        when(api.swInterfaceAddDelAddress(any())).thenReturn(failedFuture());
-        try {
-            customizer.deleteCurrentAttributes(IID, address(netmask()), writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(api).swInterfaceAddDelAddress(expectedRequest(false));
-            return;
-        }
-        fail("WriteFailedException expected");
-    }
-
-    private SwInterfaceAddDelAddress expectedRequest(boolean isAdd) {
-        final SwInterfaceAddDelAddress request = new SwInterfaceAddDelAddress();
-        request.isAdd = booleanToByte(isAdd);
-        request.swIfIndex = SUBIF_INDEX;
-        request.isIpv6 = 0;
-        request.delAll = 0;
-        request.addressLength = 24;
-        request.address = new byte[] {(byte) 192, (byte) 168, 2, 1};
-        return request;
-    }
-
-    @Test(expected = WriteFailedException.UpdateFailedException.class)
-    public void testUpdate() throws Exception {
-        final Address address = address(prefixLength());
-        customizer.updateCurrentAttributes(IID, address, address, writeContext);
-    }
-
-    private Address address(final Subnet subnet) {
-        final Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
-        return new AddressBuilder().setIp(noZoneIp).setSubnet(subnet).build();
-    }
-
-    private PrefixLength prefixLength() {
-        return new PrefixLengthBuilder().setPrefixLength(new Integer(24).shortValue()).build();
-    }
-
-    private Netmask netmask() {
-        return new NetmaskBuilder().setNetmask(new DottedQuad("255.255.255.0")).build();
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/Ipv4AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/Ipv4AddressCustomizerTest.java
deleted file mode 100644
index ffae78ea8..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/Ipv4AddressCustomizerTest.java
+++ /dev/null
@@ -1,295 +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.v3po.interfaces.ip.v4;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-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.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.VppBaseCallException;
-import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddress;
-import io.fd.vpp.jvpp.core.dto.SwInterfaceAddDelAddressReply;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
-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.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface1;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv4Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.AddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.address.subnet.Netmask;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.address.subnet.NetmaskBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.address.subnet.PrefixLength;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.address.subnet.PrefixLengthBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DottedQuad;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class Ipv4AddressCustomizerTest extends WriterCustomizerTest {
-
-    private static final String IFC_CTX_NAME = "ifc-test-instance";
-    private static final String IFACE_NAME = "eth0";
-    private static final int IFACE_ID = 123;
-
-    private NamingContext interfaceContext;
-    private Ipv4AddressCustomizer customizer;
-
-    private static InstanceIdentifier<Address> getAddressId(final String ifaceName) {
-        return InstanceIdentifier.builder(Interfaces.class)
-                .child(Interface.class, new InterfaceKey(ifaceName))
-                .augmentation(Interface1.class)
-                .child(Ipv4.class)
-                .child(Address.class)
-                .build();
-    }
-
-    private static ArgumentMatcher<InstanceIdentifier<?>> matchInstanceIdentifier(
-            Class<?> desiredClass) {
-        return o -> o instanceof InstanceIdentifier && (o.getTargetType().equals(desiredClass));
-    }
-
-    @Before
-    public void setUpTest() throws Exception {
-        interfaceContext = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
-
-        customizer = new Ipv4AddressCustomizer(api, interfaceContext);
-
-        doReturn(future(new IpAddressDetailsReplyDump())).when(api).ipAddressDump(any());
-    }
-
-    private void whenSwInterfaceAddDelAddressThenSuccess() {
-        doReturn(future(new SwInterfaceAddDelAddressReply())).when(api).swInterfaceAddDelAddress(any(SwInterfaceAddDelAddress.class));
-    }
-
-    private void whenSwInterfaceAddDelAddressThenFailure() {
-        doReturn(failedFuture()).when(api).swInterfaceAddDelAddress(any(SwInterfaceAddDelAddress.class));
-    }
-
-    @Test
-    public void testAddPrefixLengthIpv4Address() throws Exception {
-        final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
-        when(writeContext.readBefore(id)).thenReturn(Optional.absent());
-
-        Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
-        PrefixLength length = new PrefixLengthBuilder().setPrefixLength(new Integer(24).shortValue()).build();
-        Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(length).build();
-
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        whenSwInterfaceAddDelAddressThenSuccess();
-
-        customizer.writeCurrentAttributes(id, data, writeContext);
-
-        verify(api).swInterfaceAddDelAddress(generateSwInterfaceAddDelAddressRequest(new byte[]{-64, -88, 2, 1},
-                (byte) 1, (byte) 24));
-    }
-
-    @Test
-    public void testAddPrefixLengthIpv4AddressFailed() throws Exception {
-        final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
-        when(writeContext.readBefore(id)).thenReturn(Optional.absent());
-
-        Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
-        PrefixLength length = new PrefixLengthBuilder().setPrefixLength(new Integer(24).shortValue()).build();
-        Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(length).build();
-
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        whenSwInterfaceAddDelAddressThenFailure();
-
-        try {
-            customizer.writeCurrentAttributes(id, data, writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(api).swInterfaceAddDelAddress(
-                    generateSwInterfaceAddDelAddressRequest(new byte[]{-64, -88, 2, 1},
-                            (byte) 1, (byte) 24));
-            return;
-        }
-        fail("WriteFailedException was expected");
-    }
-
-    @Test(expected =  WriteFailedException.UpdateFailedException.class)
-    public void testUpdate() throws Exception {
-        final Address data = mock(Address.class);
-        customizer.updateCurrentAttributes(getAddressId(IFACE_NAME), data, data, writeContext);
-    }
-
-    private SwInterfaceAddDelAddress generateSwInterfaceAddDelAddressRequest(final byte[] address, final byte isAdd,
-                                                                             final byte prefixLength) {
-        final SwInterfaceAddDelAddress request = new SwInterfaceAddDelAddress();
-        request.swIfIndex = IFACE_ID;
-        request.isAdd = isAdd;
-        request.isIpv6 = 0;
-        request.delAll = 0;
-        request.addressLength = prefixLength;
-        request.address = address;
-        return request;
-    }
-
-    @Test
-    public void testDeletePrefixLengthIpv4Address() throws Exception {
-        final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
-
-        Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
-        PrefixLength length = new PrefixLengthBuilder().setPrefixLength(new Integer(24).shortValue()).build();
-        Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(length).build();
-
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        whenSwInterfaceAddDelAddressThenSuccess();
-
-        customizer.deleteCurrentAttributes(id, data, writeContext);
-
-        verify(api).swInterfaceAddDelAddress(generateSwInterfaceAddDelAddressRequest(new byte[]{-64, -88, 2, 1},
-                (byte) 0, (byte) 24));
-    }
-
-    @Test
-    public void testDeletePrefixLengthIpv4AddressFailed() throws Exception {
-        final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
-
-        Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
-        PrefixLength length = new PrefixLengthBuilder().setPrefixLength(new Integer(24).shortValue()).build();
-        Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(length).build();
-
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        whenSwInterfaceAddDelAddressThenFailure();
-
-        try {
-            customizer.deleteCurrentAttributes(id, data, writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(api).swInterfaceAddDelAddress(
-                    generateSwInterfaceAddDelAddressRequest(new byte[]{-64, -88, 2, 1},
-                            (byte) 0, (byte) 24));
-            return;
-        }
-        fail("WriteFailedException was expec16ted");
-    }
-
-    @Test
-    public void testNetmaskFailed() {
-        final int expectedPrefixLength = 1;
-        final String stringMask = "128.0.0.0";
-        final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
-        when(writeContext.readBefore(id)).thenReturn(Optional.absent());
-
-        Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
-        Netmask subnet = new NetmaskBuilder().setNetmask(new DottedQuad(stringMask)).build();
-        Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(subnet).build();
-
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        whenSwInterfaceAddDelAddressThenFailure();
-
-        try {
-            customizer.writeCurrentAttributes(id, data, writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(api).swInterfaceAddDelAddress(generateSwInterfaceAddDelAddressRequest(new byte[]{-64, -88, 2, 1},
-                (byte) 1, (byte) expectedPrefixLength));
-            return;
-        }
-        fail("WriteFailedException was expec16ted");
-
-    }
-
-    private void testSingleNetmask(final int expectedPrefixLength, final String stringMask) throws Exception {
-        final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
-        when(writeContext.readBefore(id)).thenReturn(Optional.absent());
-
-        Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
-        Netmask subnet = new NetmaskBuilder().setNetmask(new DottedQuad(stringMask)).build();
-        Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(subnet).build();
-
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        whenSwInterfaceAddDelAddressThenSuccess();
-
-        customizer.writeCurrentAttributes(id, data, writeContext);
-
-        verify(api).swInterfaceAddDelAddress(generateSwInterfaceAddDelAddressRequest(new byte[]{-64, -88, 2, 1},
-            (byte) 1, (byte) expectedPrefixLength));
-    }
-
-    private void testSingleIllegalNetmask(final String stringMask) throws Exception {
-        try {
-            final InstanceIdentifier<Address> id = getAddressId(IFACE_NAME);
-            when(writeContext.readBefore(id)).thenReturn(Optional.absent());
-
-            Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
-            Netmask subnet = new NetmaskBuilder().setNetmask(new DottedQuad(stringMask)).build();
-            Address data = new AddressBuilder().setIp(noZoneIp).setSubnet(subnet).build();
-
-            defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-            whenSwInterfaceAddDelAddressThenSuccess();
-
-            customizer.writeCurrentAttributes(id, data, writeContext);
-        } catch (IllegalArgumentException e) {
-            return;
-        }
-        fail("IllegalArgumentException expected");
-
-    }
-
-    /**
-     * Test contiguous netmask length from QuadDotted notation
-     */
-    @Test
-    public void testNetmaskLength() throws Exception {
-        testSingleNetmask(1, "128.0.0.0");
-        testSingleNetmask(2, "192.0.0.0");
-        testSingleNetmask(8, "255.0.0.0");
-        testSingleNetmask(9, "255.128.0.0");
-        testSingleNetmask(16, "255.255.0.0");
-        testSingleNetmask(24, "255.255.255.0");
-    }
-
-    @Test
-    public void testNetmaskIllegal() throws Exception {
-        testSingleIllegalNetmask("");
-        testSingleIllegalNetmask(".");
-        testSingleIllegalNetmask(".255");
-        testSingleIllegalNetmask("255");
-        testSingleIllegalNetmask("255.");
-        testSingleIllegalNetmask("255.255");
-        testSingleIllegalNetmask("255.255.0");
-        testSingleIllegalNetmask("255.255.255.");
-        testSingleIllegalNetmask("255.255.255.256");
-        testSingleIllegalNetmask("0.0.0.0");
-        testSingleIllegalNetmask("10.10.10.10");
-        testSingleIllegalNetmask("255.1.255.0");
-        testSingleIllegalNetmask("255.255.255.255");
-    }
-}
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/Ipv4NeighbourCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/Ipv4NeighbourCustomizerTest.java
deleted file mode 100644
index 3e5f969bd..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/Ipv4NeighbourCustomizerTest.java
+++ /dev/null
@@ -1,155 +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.v3po.interfaces.ip.v4;
-
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.times;
-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.Ipv4Translator;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.v3po.interfaces.ip.v4.Ipv4NeighbourCustomizer;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.VppBaseCallException;
-import io.fd.vpp.jvpp.core.dto.IpNeighborAddDel;
-import io.fd.vpp.jvpp.core.dto.IpNeighborAddDelReply;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
-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.InterfaceBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface1;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.Neighbor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.NeighborBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.RoutingBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class Ipv4NeighbourCustomizerTest extends WriterCustomizerTest implements Ipv4Translator {
-
-    private static final String IFC_CTX_NAME = "ifc-test-instance";
-    private static final String IFACE_NAME = "parent";
-    private static final int IFACE_ID = 5;
-    private static final InstanceIdentifier<Neighbor> IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IFACE_NAME))
-            .augmentation(Interface1.class).child(Ipv4.class).child(Neighbor.class);
-
-    private Ipv4NeighbourCustomizer customizer;
-
-    @Override
-    public void setUpTest() {
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        customizer = new Ipv4NeighbourCustomizer(api, new NamingContext("prefix", IFC_CTX_NAME));
-    }
-
-    @Test
-    public void testWriteCurrentAttributes() throws WriteFailedException {
-        when(writeContext.readBefore(IID.firstIdentifierOf(Interface.class))).thenReturn(Optional.absent());
-        when(api.ipNeighborAddDel(any())).thenReturn(future(new IpNeighborAddDelReply()));
-        customizer.writeCurrentAttributes(IID, getData(), writeContext);
-        verify(api).ipNeighborAddDel(getExpectedRequest(true));
-    }
-
-    @Test
-    public void testWriteCurrentAttributesFailed() {
-        when(writeContext.readBefore(IID.firstIdentifierOf(Interface.class))).thenReturn(Optional.absent());
-        when(api.ipNeighborAddDel(any())).thenReturn(failedFuture());
-        try {
-            customizer.writeCurrentAttributes(IID, getData(), writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(api).ipNeighborAddDel(getExpectedRequest(true));
-            return;
-        }
-        fail("WriteFailedException expected");
-    }
-    @Test(expected = UnsupportedOperationException.class)
-    public void testUpdateCurrentAttributes() throws WriteFailedException {
-        customizer.updateCurrentAttributes(IID, getData(), getData(), writeContext);
-    }
-
-    @Test
-    public void testDeleteCurrentAttributes() throws WriteFailedException {
-        when(writeContext.readBefore(IID.firstIdentifierOf(Interface.class))).thenReturn(Optional.absent());
-        when(api.ipNeighborAddDel(any())).thenReturn(future(new IpNeighborAddDelReply()));
-        customizer.deleteCurrentAttributes(IID, getData(), writeContext);
-        verify(api).ipNeighborAddDel(getExpectedRequest(false));
-    }
-
-    @Test
-    public void testDeleteCurrentAttributesFailed() {
-        when(writeContext.readBefore(IID.firstIdentifierOf(Interface.class))).thenReturn(Optional.absent());
-        when(api.ipNeighborAddDel(any())).thenReturn(failedFuture());
-        try {
-            customizer.deleteCurrentAttributes(IID, getData(), writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(api).ipNeighborAddDel(getExpectedRequest(false));
-            return;
-        }
-        fail("WriteFailedException expected");
-    }
-
-    @Test
-    public void testVrfExtractionCornerCases() throws WriteFailedException {
-        when(api.ipNeighborAddDel(any())).thenReturn(future(new IpNeighborAddDelReply()));
-
-        when(writeContext.readBefore(IID.firstIdentifierOf(Interface.class)))
-                // no augment
-                .thenReturn(Optional.of(new InterfaceBuilder().build()))
-                // empty augment
-                .thenReturn(Optional.of(new InterfaceBuilder()
-                        .addAugmentation(VppInterfaceAugmentation.class, new VppInterfaceAugmentationBuilder().build()).build()))
-                //empty routing
-                .thenReturn(Optional.of(new InterfaceBuilder()
-                        .addAugmentation(VppInterfaceAugmentation.class, new VppInterfaceAugmentationBuilder()
-                                .setRouting(new RoutingBuilder().build())
-                                .build()).build()));
-
-
-        customizer.writeCurrentAttributes(IID, getData(), writeContext);
-        customizer.writeCurrentAttributes(IID, getData(), writeContext);
-        customizer.writeCurrentAttributes(IID, getData(), writeContext);
-        verify(api, times(3)).ipNeighborAddDel(getExpectedRequest(true));
-    }
-
-    private Neighbor getData() {
-        final Ipv4AddressNoZone noZoneIp = new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1"));
-        final PhysAddress mac = new PhysAddress("aa:bb:cc:ee:11:22");
-        return new NeighborBuilder().setIp(noZoneIp).setLinkLayerAddress(mac).build();
-    }
-    private IpNeighborAddDel getExpectedRequest(final boolean isAdd) {
-        final IpNeighborAddDel request = new IpNeighborAddDel();
-        request.isIpv6 = 0;
-        request.isAdd = booleanToByte(isAdd);
-        request.isStatic = 1;
-        request.dstAddress = new byte[] {(byte) 192, (byte) 168, 2, 1};
-        request.macAddress = new byte[] {(byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xee, 0x11, 0x22};
-        request.swIfIndex = IFACE_ID;
-        return request;
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v6/Ipv6NeighbourCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v6/Ipv6NeighbourCustomizerTest.java
deleted file mode 100644
index ca6bae56e..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v6/Ipv6NeighbourCustomizerTest.java
+++ /dev/null
@@ -1,154 +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.v3po.interfaces.ip.v6;
-
-import com.google.common.base.Optional;
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.Ipv6Translator;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.VppBaseCallException;
-import io.fd.vpp.jvpp.core.dto.IpNeighborAddDel;
-import io.fd.vpp.jvpp.core.dto.IpNeighborAddDelReply;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
-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.InterfaceBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface1;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv6.Neighbor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv6.NeighborBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.RoutingBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-public class Ipv6NeighbourCustomizerTest extends WriterCustomizerTest implements Ipv6Translator {
-
-    private static final String IFC_CTX_NAME = "ifc-test-instance";
-    private static final String IFACE_NAME = "parent";
-    private static final int IFACE_ID = 5;
-    private static final InstanceIdentifier<Neighbor> IID =
-            InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IFACE_NAME))
-                    .augmentation(Interface1.class).child(Ipv6.class).child(Neighbor.class);
-
-    private Ipv6NeighbourCustomizer customizer;
-
-    @Override
-    public void setUpTest() {
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        customizer = new Ipv6NeighbourCustomizer(api, new NamingContext("prefix", IFC_CTX_NAME));
-    }
-
-    @Test
-    public void testWriteCurrentAttributes() throws WriteFailedException {
-        when(writeContext.readBefore(IID.firstIdentifierOf(Interface.class))).thenReturn(Optional.absent());
-        when(api.ipNeighborAddDel(any())).thenReturn(future(new IpNeighborAddDelReply()));
-        customizer.writeCurrentAttributes(IID, getData(), writeContext);
-        verify(api).ipNeighborAddDel(getExpectedRequest(true));
-    }
-
-    @Test
-    public void testWriteCurrentAttributesFailed() {
-        when(writeContext.readBefore(IID.firstIdentifierOf(Interface.class))).thenReturn(Optional.absent());
-        when(api.ipNeighborAddDel(any())).thenReturn(failedFuture());
-        try {
-            customizer.writeCurrentAttributes(IID, getData(), writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(api).ipNeighborAddDel(getExpectedRequest(true));
-            return;
-        }
-        fail("WriteFailedException expected");
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void testUpdateCurrentAttributes() throws WriteFailedException {
-        customizer.updateCurrentAttributes(IID, getData(), getData(), writeContext);
-    }
-
-    @Test
-    public void testDeleteCurrentAttributes() throws WriteFailedException {
-        when(writeContext.readBefore(IID.firstIdentifierOf(Interface.class))).thenReturn(Optional.absent());
-        when(api.ipNeighborAddDel(any())).thenReturn(future(new IpNeighborAddDelReply()));
-        customizer.deleteCurrentAttributes(IID, getData(), writeContext);
-        verify(api).ipNeighborAddDel(getExpectedRequest(false));
-    }
-
-    @Test
-    public void testDeleteCurrentAttributesFailed() {
-        when(writeContext.readBefore(IID.firstIdentifierOf(Interface.class))).thenReturn(Optional.absent());
-        when(api.ipNeighborAddDel(any())).thenReturn(failedFuture());
-        try {
-            customizer.deleteCurrentAttributes(IID, getData(), writeContext);
-        } catch (WriteFailedException e) {
-            assertTrue(e.getCause() instanceof VppBaseCallException);
-            verify(api).ipNeighborAddDel(getExpectedRequest(false));
-            return;
-        }
-        fail("WriteFailedException expected");
-    }
-
-    @Test
-    public void testVrfExtractionCornerCases() throws WriteFailedException {
-        when(api.ipNeighborAddDel(any())).thenReturn(future(new IpNeighborAddDelReply()));
-
-        when(writeContext.readBefore(IID.firstIdentifierOf(Interface.class)))
-                // no augment
-                .thenReturn(Optional.of(new InterfaceBuilder().build()))
-                // empty augment
-                .thenReturn(Optional.of(new InterfaceBuilder()
-                        .addAugmentation(VppInterfaceAugmentation.class, new VppInterfaceAugmentationBuilder().build()).build()))
-                //empty routing
-                .thenReturn(Optional.of(new InterfaceBuilder()
-                        .addAugmentation(VppInterfaceAugmentation.class, new VppInterfaceAugmentationBuilder()
-                                .setRouting(new RoutingBuilder().build())
-                                .build()).build()));
-
-
-        customizer.writeCurrentAttributes(IID, getData(), writeContext);
-        customizer.writeCurrentAttributes(IID, getData(), writeContext);
-        customizer.writeCurrentAttributes(IID, getData(), writeContext);
-        verify(api, times(3)).ipNeighborAddDel(getExpectedRequest(true));
-    }
-
-    private Neighbor getData() {
-        final Ipv6AddressNoZone noZoneIp = new Ipv6AddressNoZone(new Ipv6Address("2001:0db8:0a0b:12f0:0000:0000:0000:0001"));
-        final PhysAddress mac = new PhysAddress("aa:bb:cc:ee:11:22");
-        return new NeighborBuilder().setIp(noZoneIp).setLinkLayerAddress(mac).build();
-    }
-
-    private IpNeighborAddDel getExpectedRequest(final boolean isAdd) {
-        final IpNeighborAddDel request = new IpNeighborAddDel();
-        request.isIpv6 = 1;
-        request.isAdd = booleanToByte(isAdd);
-        request.isStatic = 1;
-        request.dstAddress = new byte[]{32, 1, 13, -72, 10, 11, 18, -16, 0, 0, 0, 0, 0, 0, 0, 1};
-        request.macAddress = new byte[]{(byte) 0xaa, (byte) 0xbb, (byte) 0xcc, (byte) 0xee, 0x11, 0x22};
-        request.swIfIndex = IFACE_ID;
-        return request;
-    }
-
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v6/nd/NdProxyCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v6/nd/NdProxyCustomizerTest.java
deleted file mode 100644
index 7d6fcb062..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ip/v6/nd/NdProxyCustomizerTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2017 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.v3po.interfaces.ip.v6.nd;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.Ip6NdProxyAddDel;
-import io.fd.vpp.jvpp.core.dto.Ip6NdProxyAddDelReply;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
-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.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface1;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.NdProxyIp6Augmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.interfaces._interface.ipv6.NdProxies;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.interfaces._interface.ipv6.nd.proxies.NdProxy;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.interfaces._interface.ipv6.nd.proxies.NdProxyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.interfaces._interface.ipv6.nd.proxies.NdProxyKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class NdProxyCustomizerTest extends WriterCustomizerTest {
-    private static final String IF_NAME = "eth1";
-    private static final InstanceIdentifier<NdProxies> ND_PROXIES_IID =
-        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME))
-            .augmentation(Interface1.class).child(Ipv6.class).augmentation(NdProxyIp6Augmentation.class)
-            .child(NdProxies.class);
-    private static final int IF_INDEX = 1;
-
-    private static final String IFACE_CTX_NAME = "ifc-test-instance";
-
-    private NdProxyCustomizer customizer;
-
-    @Override
-    protected void setUpTest() {
-        customizer = new NdProxyCustomizer(api, new NamingContext("ifacePrefix", IFACE_CTX_NAME));
-        when(api.ip6NdProxyAddDel(any())).thenReturn(future(new Ip6NdProxyAddDelReply()));
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFACE_CTX_NAME);
-    }
-
-    @Test
-    public void testWrite() throws WriteFailedException {
-        final Ipv6AddressNoZone address = new Ipv6AddressNoZone("2001::1");
-        final NdProxy data = new NdProxyBuilder().setAddress(address).build();
-        customizer.writeCurrentAttributes(getId(address), data, writeContext);
-        final Ip6NdProxyAddDel request = new Ip6NdProxyAddDel();
-        request.swIfIndex = IF_INDEX;
-        request.address = new byte[] {0x20, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01};
-        verify(api).ip6NdProxyAddDel(request);
-    }
-
-    @Test(expected = WriteFailedException.UpdateFailedException.class)
-    public void testUpdate() throws WriteFailedException {
-        final Ipv6AddressNoZone address = new Ipv6AddressNoZone("2001::2");
-        final NdProxy data = new NdProxyBuilder().setAddress(address).build();
-        customizer.updateCurrentAttributes(getId(address), mock(NdProxy.class), data, writeContext);
-    }
-
-    @Test
-    public void testDelete() throws WriteFailedException {
-        final Ipv6AddressNoZone address = new Ipv6AddressNoZone("2001::3");
-        final NdProxy data = new NdProxyBuilder().setAddress(address).build();
-        customizer.deleteCurrentAttributes(getId(address), data, writeContext);
-        final Ip6NdProxyAddDel request = new Ip6NdProxyAddDel();
-        request.isDel = 1;
-        request.swIfIndex = IF_INDEX;
-        request.address = new byte[] {0x20, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x03};
-        verify(api).ip6NdProxyAddDel(request);
-    }
-
-    private InstanceIdentifier<NdProxy> getId(final Ipv6AddressNoZone address) {
-        return ND_PROXIES_IID.child(NdProxy.class, new NdProxyKey(address));
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/InterfaceChildNodeTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/InterfaceChildNodeTest.java
deleted file mode 100644
index 4e323e45d..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/InterfaceChildNodeTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2017 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.v3po.interfacesstate.ip;
-
-import io.fd.hc2vpp.common.test.util.FutureProducer;
-import io.fd.hc2vpp.common.test.util.NamingContextHelper;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.vpp.jvpp.core.dto.*;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
-
-import javax.annotation.Nonnull;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;
-
-public interface InterfaceChildNodeTest extends NamingContextHelper, FutureProducer {
-
-    String INTERFACE_CONTEXT_NAME = "iface-context";
-    NamingContext INTERFACE_CONTEXT = new NamingContext("prefix", INTERFACE_CONTEXT_NAME);
-
-    String IFACE_NAME = "eth0";
-    int IFACE_ID = 1;
-
-    String SUB_IFACE_NAME = "eth0.4";
-    int SUB_IFACE_ID = 4;
-
-    String IFACE_2_NAME = "eth1";
-    int IFACE_2_ID = 2;
-
-    String SUB_IFACE_2_NAME = "eth1.7";
-    int SUB_IFACE_2_ID = 7;
-
-    String IPV6_ONE_COMPRESSED = "2001:db8:a0b:12f0::1";
-    byte[] IPV6_ONE_BYTES = {32, 1, 13, -72, 10, 11, 18, -16, 0, 0, 0, 0, 0, 0, 0, 1};
-    byte IPV6_ONE_PREFIX = 64;
-    Ipv6AddressNoZone IPV6_ONE_ADDRESS_COMPRESSED = new Ipv6AddressNoZone(IPV6_ONE_COMPRESSED);
-
-    String IPV6_TWO_COMPRESSED = "2001:db8:a0b:12f0::2";
-    byte[] IPV6_TWO_BYTES = {32, 1, 13, -72, 10, 11, 18, -16, 0, 0, 0, 0, 0, 0, 0, 2};
-    byte IPV6_TWO_PREFIX = 48;
-    Ipv6AddressNoZone IPV6_TWO_ADDRESS_COMPRESSED = new Ipv6AddressNoZone(IPV6_TWO_COMPRESSED);
-
-    String IPV4_ONE = "192.168.2.1";
-    byte[] IPV4_ONE_BYTES = {-64, -88, 2, 1};
-    byte IPV4_ONE_PREFIX = 24;
-    Ipv4AddressNoZone IPV4_ONE_ADDRESS = new Ipv4AddressNoZone(IPV4_ONE);
-
-    String IPV4_TWO = "192.168.2.2";
-    byte[] IPV4_TWO_BYTES = {-64, -88, 2, 2};
-    byte IPV4_TWO_PREFIX = 24;
-    Ipv4AddressNoZone IPV4_TWO_ADDRESS = new Ipv4AddressNoZone(IPV4_TWO);
-
-    String MAC_ONE = "00:00:00:00:00:00";
-    byte[] MAC_ONE_BYTES = {0, 0, 0, 0, 0, 0};
-    PhysAddress MAC_ONE_ADDRESS = new PhysAddress(MAC_ONE);
-
-    String MAC_TWO = "00:00:00:00:00:01";
-    byte[] MAC_TWO_BYTES = {0, 0, 0, 0, 0, 1};
-    PhysAddress MAC_TWO_ADDRESS = new PhysAddress(MAC_TWO);
-
-    String MAC_THREE = "00:00:00:00:00:02";
-    byte[] MAC_THREE_BYTES = {0, 0, 0, 0, 0, 2};
-    PhysAddress MAC_THREE_ADDRESS = new PhysAddress(MAC_THREE);
-
-    String MAC_FOUR = "00:00:00:00:00:03";
-    byte[] MAC_FOUR_BYTES = {0, 0, 0, 0, 0, 3};
-    PhysAddress MAC_FOUR_ADDRESS = new PhysAddress(MAC_FOUR);
-
-    default void mockNeighborDump(@Nonnull final FutureJVppCore api,
-                                  @Nonnull final IpNeighborDump request,
-                                  @Nonnull final IpNeighborDetailsReplyDump reply) {
-        when(api.ipNeighborDump(request)).thenReturn(future(reply));
-    }
-
-    default void mockAddressDump(@Nonnull final FutureJVppCore api,
-                                 @Nonnull final IpAddressDump request,
-                                 @Nonnull final IpAddressDetailsReplyDump reply) {
-        when(api.ipAddressDump(request)).thenReturn(future(reply));
-    }
-
-    default IpAddressDump dumpV6AddressesIfaceTwo() {
-        IpAddressDump request = new IpAddressDump();
-        request.isIpv6 = 1;
-        request.swIfIndex = IFACE_2_ID;
-        return request;
-    }
-
-    default IpAddressDump dumpV6AddressesSubIfaceOne() {
-        IpAddressDump request = new IpAddressDump();
-        request.swIfIndex = SUB_IFACE_ID;
-        request.isIpv6 = 1;
-        return request;
-    }
-
-
-    default IpNeighborDump dumpV4NeighborIfaceOne() {
-        IpNeighborDump request = new IpNeighborDump();
-        request.swIfIndex = IFACE_ID;
-        request.isIpv6 = 0;
-        return request;
-    }
-
-    default IpNeighborDump dumpV6NeighborsIfaceOne() {
-        IpNeighborDump request = new IpNeighborDump();
-        request.swIfIndex = IFACE_ID;
-        request.isIpv6 = 1;
-        return request;
-    }
-
-    default IpNeighborDump dumpV6NeighborsSubIfaceTwo() {
-        IpNeighborDump request = new IpNeighborDump();
-        request.swIfIndex = SUB_IFACE_2_ID;
-        request.isIpv6 = 1;
-        return request;
-    }
-
-    default IpNeighborDump dumpV4NeighborsSubIfaceOne() {
-        IpNeighborDump request = new IpNeighborDump();
-        request.swIfIndex = SUB_IFACE_ID;
-        request.isIpv6 = 0;
-        return request;
-    }
-
-    default void verifyList(@Nonnull final List<?> expected, @Nonnull final List<?> current) {
-        assertThat(current, hasSize(expected.size()));
-        assertTrue(expected.containsAll(current));
-    }
-
-    default IpNeighborDetailsReplyDump v4Neighbors() {
-        IpNeighborDetailsReplyDump fullDump = new IpNeighborDetailsReplyDump();
-        fullDump.ipNeighborDetails = Arrays.asList(
-                neighborDump(IPV4_ONE_BYTES, 0, MAC_ONE_BYTES),
-                neighborDump(IPV4_TWO_BYTES, 0, MAC_TWO_BYTES));
-        return fullDump;
-    }
-
-    default IpNeighborDetailsReplyDump v6Neighbors() {
-        IpNeighborDetailsReplyDump fullDump = new IpNeighborDetailsReplyDump();
-        fullDump.ipNeighborDetails = Arrays.asList(
-                neighborDump(IPV6_ONE_BYTES, 1, MAC_THREE_BYTES),
-                neighborDump(IPV6_TWO_BYTES, 1, MAC_FOUR_BYTES));
-        return fullDump;
-    }
-
-    default IpAddressDetailsReplyDump v4Addresses() {
-        IpAddressDetailsReplyDump fullDump = new IpAddressDetailsReplyDump();
-        fullDump.ipAddressDetails = Arrays.asList(
-                addressDump(IPV4_ONE_BYTES, IPV4_ONE_PREFIX),
-                addressDump(IPV4_TWO_BYTES, IPV4_TWO_PREFIX));
-        return fullDump;
-    }
-
-    default IpAddressDetailsReplyDump v6Addresses() {
-        IpAddressDetailsReplyDump fullDump = new IpAddressDetailsReplyDump();
-        fullDump.ipAddressDetails = Arrays.asList(
-                addressDump(IPV6_ONE_BYTES, IPV6_ONE_PREFIX),
-                addressDump(IPV6_TWO_BYTES, IPV6_TWO_PREFIX));
-        return fullDump;
-    }
-
-    static IpNeighborDetails neighborDump(byte[] address, int isIpv6, byte[] mac) {
-        IpNeighborDetails detail = new IpNeighborDetails();
-        detail.ipAddress = address;
-        detail.isIpv6 = (byte) isIpv6;
-        detail.macAddress = mac;
-        return detail;
-    }
-
-    static IpAddressDetails addressDump(byte[] address, byte prefix) {
-        IpAddressDetails details = new IpAddressDetails();
-        details.ip = address;
-        details.prefixLength = prefix;
-        return details;
-    }
-}
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/Ipv4AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/Ipv4AddressCustomizerTest.java
deleted file mode 100644
index 58077d6e9..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/Ipv4AddressCustomizerTest.java
+++ /dev/null
@@ -1,269 +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.v3po.interfacesstate.ip.v4;
-
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.v3po.interfacesstate.ip.InterfaceChildNodeTest;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.honeycomb.translate.util.read.cache.CacheKeyFactory;
-import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory;
-import io.fd.vpp.jvpp.core.dto.IpAddressDetails;
-import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump;
-import io.fd.vpp.jvpp.core.dto.IpAddressDump;
-import org.hamcrest.Matchers;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.AddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.AddressKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.address.subnet.PrefixLength;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.when;
-
-public class Ipv4AddressCustomizerTest extends ListReaderCustomizerTest<Address, AddressKey, AddressBuilder> implements
-        Ipv4Translator,InterfaceChildNodeTest {
-
-
-    private static final String IFC_CTX_NAME = "ifc-test-instance";
-
-    private NamingContext interfacesContext;
-    private InstanceIdentifier<Address> ifaceOneAddressOneIdentifier;
-    private InstanceIdentifier<Address> ifaceTwoAddressOneIdentifier;
-    private CacheKeyFactory cacheKeyFactory;
-
-    public Ipv4AddressCustomizerTest() {
-        super(Address.class, Ipv4Builder.class);
-    }
-
-    private static InstanceIdentifier<Address> getId(final String address, final String ifaceName) {
-        return InstanceIdentifier.builder(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(ifaceName))
-                .augmentation(Interface2.class)
-                .child(Ipv4.class)
-                .child(Address.class, new AddressKey(new Ipv4AddressNoZone(new Ipv4Address(address))))
-                .build();
-    }
-
-    @Override
-    public void setUp() {
-        interfacesContext = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, IFC_CTX_NAME);
-        defineMapping(mappingContext, IFACE_2_NAME, IFACE_2_ID, IFC_CTX_NAME);
-
-        ifaceOneAddressOneIdentifier =
-                InstanceIdentifier.create(InterfacesState.class)
-                        .child(Interface.class, new InterfaceKey(IFACE_NAME))
-                        .augmentation(Interface2.class)
-                        .child(Ipv4.class)
-                        .child(Address.class, new AddressKey(new Ipv4AddressNoZone("192.168.2.1")));
-        ifaceTwoAddressOneIdentifier =
-                InstanceIdentifier.create(InterfacesState.class)
-                        .child(Interface.class, new InterfaceKey(IFACE_2_NAME))
-                        .augmentation(Interface2.class)
-                        .child(Ipv4.class)
-                        .child(Address.class, new AddressKey(new Ipv4AddressNoZone("192.168.2.1")));
-
-        // to simulate complex key
-        cacheKeyFactory = new TypeAwareIdentifierCacheKeyFactory(IpAddressDetailsReplyDump.class,
-                ImmutableSet.of(Interface.class));
-    }
-
-    @Override
-    protected ReaderCustomizer<Address, AddressBuilder> initCustomizer() {
-        return new Ipv4AddressCustomizer(api, interfacesContext);
-    }
-
-    @Test
-    public void testReadCurrentAttributesFor2Ifcs() throws ReadFailedException {
-        //changed to mock to not store first dumped data(otherwise that double thenReturn on line 118 is not gonna work)
-
-        IpAddressDetails detail1 = new IpAddressDetails();
-        IpAddressDetails detail2 = new IpAddressDetails();
-
-        detail1.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
-        detail2.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2")));
-
-        IpAddressDetailsReplyDump reply = new IpAddressDetailsReplyDump();
-        reply.ipAddressDetails = ImmutableList.of(detail1);
-        IpAddressDetailsReplyDump reply2 = new IpAddressDetailsReplyDump();
-        reply2.ipAddressDetails = ImmutableList.of(detail2);
-
-        CompletableFuture<IpAddressDetailsReplyDump> future = new CompletableFuture<>();
-        future.complete(reply);
-        CompletableFuture<IpAddressDetailsReplyDump> future2 = new CompletableFuture<>();
-        future2.complete(reply2);
-
-        when(api.ipAddressDump(Mockito.any(IpAddressDump.class))).thenReturn(future).thenReturn(future2)
-                .thenReturn(future).thenReturn(future2);
-        when(api.ipAddressDump(Mockito.any(IpAddressDump.class))).thenReturn(future(reply)).thenReturn(future(reply2))
-                .thenReturn(future(reply)).thenReturn(future(reply2));
-        when(ctx.getModificationCache()).thenReturn(cache);
-
-
-        final InstanceIdentifier<Address> id = getId("192.168.2.1", IFACE_NAME);
-        final InstanceIdentifier<Address> id2 = getId("192.168.2.2", IFACE_2_NAME);
-
-        final List<AddressKey> ifc1Ids = getCustomizer().getAllIds(id, ctx);
-        assertThat(ifc1Ids.size(), is(1));
-        assertThat(ifc1Ids, Matchers.hasItem(new AddressKey(new Ipv4AddressNoZone("192.168.2.1"))));
-        final List<AddressKey> ifc2Ids = getCustomizer().getAllIds(id2, ctx);
-        assertThat(ifc2Ids.size(), is(1));
-        assertThat(ifc2Ids, Matchers.hasItem(new AddressKey(new Ipv4AddressNoZone("192.168.2.2"))));
-
-        AddressBuilder builder = new AddressBuilder();
-        getCustomizer().readCurrentAttributes(id, builder, ctx);
-        assertEquals(builder.getIp().getValue(), "192.168.2.1");
-        builder = new AddressBuilder();
-        getCustomizer().readCurrentAttributes(id2, builder, ctx);
-        assertEquals(builder.getIp().getValue(), "192.168.2.2");
-    }
-
-    @Test
-    public void testReadCurrentAttributesSuccessfull() throws ReadFailedException {
-        IpAddressDetails detail1 = new IpAddressDetails();
-        IpAddressDetails detail2 = new IpAddressDetails();
-        IpAddressDetails detail3 = new IpAddressDetails();
-
-        detail1.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
-        detail2.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2")));
-        detail3.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.3")));
-
-        IpAddressDetailsReplyDump reply = new IpAddressDetailsReplyDump();
-        reply.ipAddressDetails = ImmutableList.of(detail1, detail2, detail3);
-        when(api.ipAddressDump(Mockito.any(IpAddressDump.class))).thenReturn(future(reply));
-        when(ctx.getModificationCache()).thenReturn(cache);
-
-        final AddressBuilder builder = new AddressBuilder();
-        final InstanceIdentifier<Address> id = getId("192.168.2.1", IFACE_NAME);
-
-        getCustomizer().readCurrentAttributes(id, builder, ctx);
-
-        assertEquals("192.168.2.1", builder.getIp().getValue());
-    }
-
-    @Test
-    public void testGetAllIdsFromSuccessfull() throws ReadFailedException {
-        IpAddressDetails detail1 = new IpAddressDetails();
-        IpAddressDetails detail2 = new IpAddressDetails();
-        IpAddressDetails detail3 = new IpAddressDetails();
-
-        detail1.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
-        detail2.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.2")));
-        detail3.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.3")));
-
-        IpAddressDetailsReplyDump reply = new IpAddressDetailsReplyDump();
-        reply.ipAddressDetails = ImmutableList.of(detail1, detail2, detail3);
-        when(api.ipAddressDump(Mockito.any(IpAddressDump.class))).thenReturn(future(reply));
-        when(ctx.getModificationCache()).thenReturn(cache);
-
-        final InstanceIdentifier<Address> id = getId("192.168.2.1", IFACE_NAME);
-
-        List<Ipv4AddressNoZone> ids = getCustomizer().getAllIds(id, ctx).stream()
-                .map(key -> key.getIp())
-                .collect(Collectors.toList());
-
-        assertEquals(3, ids.size());
-        assertEquals(true, "192.168.2.1".equals(ids.get(0).getValue()));
-        assertEquals(true, "192.168.2.2".equals(ids.get(1).getValue()));
-        assertEquals(true, "192.168.2.3".equals(ids.get(2).getValue()));
-    }
-
-    @Test
-    public void testCachingScopeSpecificRequest() throws ReadFailedException {
-        fillCacheForTwoIfaces();
-        final AddressBuilder ifaceOneAddressBuilder = new AddressBuilder();
-        final AddressBuilder ifaceTwoAddressBuilder = new AddressBuilder();
-
-        getCustomizer().readCurrentAttributes(ifaceOneAddressOneIdentifier, ifaceOneAddressBuilder, ctx);
-        getCustomizer().readCurrentAttributes(ifaceTwoAddressOneIdentifier, ifaceTwoAddressBuilder, ctx);
-
-        // addresses have caching scope of parent interface, so returned address should have respective prefix lengths
-        assertEquals("192.168.2.1", ifaceOneAddressBuilder.getIp().getValue());
-        assertTrue(ifaceOneAddressBuilder.getSubnet() instanceof PrefixLength);
-        assertEquals(22, PrefixLength.class.cast(ifaceOneAddressBuilder.getSubnet()).getPrefixLength().intValue());
-
-        assertEquals("192.168.2.1", ifaceTwoAddressBuilder.getIp().getValue());
-        assertTrue(ifaceTwoAddressBuilder.getSubnet() instanceof PrefixLength);
-        assertEquals(23, PrefixLength.class.cast(ifaceTwoAddressBuilder.getSubnet()).getPrefixLength().intValue());
-    }
-
-    @Test
-    public void testCachingScopeGetAll() throws ReadFailedException {
-        fillCacheForFirstIfaceSecondEmpty();
-
-        final List<AddressKey> keysForIfaceOne = getCustomizer().getAllIds(ifaceOneAddressOneIdentifier, ctx);
-        assertThat(keysForIfaceOne, hasSize(1));
-        final AddressKey keyIfaceOne = keysForIfaceOne.get(0);
-        assertEquals("192.168.2.1", keyIfaceOne.getIp().getValue());
-
-        final List<AddressKey> keysForIfaceTwo = getCustomizer().getAllIds(ifaceTwoAddressOneIdentifier, ctx);
-        assertThat(keysForIfaceTwo, is(empty()));
-    }
-
-    private void fillCacheForTwoIfaces() {
-        IpAddressDetails detailIfaceOneAddressOne = new IpAddressDetails();
-        IpAddressDetails detailIfaceTwoAddressOne = new IpAddressDetails();
-        IpAddressDetailsReplyDump replyIfaceOne = new IpAddressDetailsReplyDump();
-        IpAddressDetailsReplyDump replyIfaceTwo = new IpAddressDetailsReplyDump();
-
-        replyIfaceOne.ipAddressDetails = Arrays.asList(detailIfaceOneAddressOne);
-        replyIfaceTwo.ipAddressDetails = Arrays.asList(detailIfaceTwoAddressOne);
-
-        detailIfaceOneAddressOne.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
-        detailIfaceOneAddressOne.prefixLength = 22;
-
-        detailIfaceTwoAddressOne.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
-        detailIfaceTwoAddressOne.prefixLength = 23;
-
-        cache.put(cacheKeyFactory.createKey(ifaceOneAddressOneIdentifier), replyIfaceOne);
-        cache.put(cacheKeyFactory.createKey(ifaceTwoAddressOneIdentifier), replyIfaceTwo);
-    }
-
-    private void fillCacheForFirstIfaceSecondEmpty() {
-        IpAddressDetails detailIfaceOneAddressOne = new IpAddressDetails();
-        IpAddressDetailsReplyDump replyIfaceOne = new IpAddressDetailsReplyDump();
-        replyIfaceOne.ipAddressDetails = Arrays.asList(detailIfaceOneAddressOne);
-
-        detailIfaceOneAddressOne.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
-        detailIfaceOneAddressOne.prefixLength = 22;
-
-        cache.put(cacheKeyFactory.createKey(ifaceOneAddressOneIdentifier), replyIfaceOne);
-        cache.put(cacheKeyFactory.createKey(ifaceTwoAddressOneIdentifier), new IpAddressDetailsReplyDump());
-    }
-}
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/Ipv4CustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/Ipv4CustomizerTest.java
deleted file mode 100644
index da2213027..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/Ipv4CustomizerTest.java
+++ /dev/null
@@ -1,44 +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.v3po.interfacesstate.ip.v4;
-
-import io.fd.hc2vpp.common.test.read.ReaderCustomizerTest;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4Builder;
-
-import static org.mockito.Mockito.verifyZeroInteractions;
-
-public class Ipv4CustomizerTest extends ReaderCustomizerTest<Ipv4, Ipv4Builder> {
-
-    public Ipv4CustomizerTest() {
-        super(Ipv4.class, Interface2Builder.class);
-    }
-
-    @Test
-    public void testReadCurrentAttributes() throws Exception {
-        customizer.readCurrentAttributes(null, null, ctx);
-        verifyZeroInteractions(api);
-    }
-
-    @Override
-    protected ReaderCustomizer<Ipv4, Ipv4Builder> initCustomizer() {
-        return new Ipv4Customizer(api);
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/Ipv4NeighbourCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/Ipv4NeighbourCustomizerTest.java
deleted file mode 100644
index d540dfa3b..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/Ipv4NeighbourCustomizerTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2017 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.v3po.interfacesstate.ip.v4;
-
-import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
-import io.fd.hc2vpp.v3po.interfacesstate.ip.InterfaceChildNodeTest;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.Neighbor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.NeighborBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.NeighborKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-
-public class Ipv4NeighbourCustomizerTest extends ListReaderCustomizerTest<Neighbor, NeighborKey, NeighborBuilder>
-        implements InterfaceChildNodeTest {
-
-    private InstanceIdentifier<Neighbor> instanceIdentifier;
-
-    public Ipv4NeighbourCustomizerTest() {
-        super(Neighbor.class, Ipv4Builder.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        instanceIdentifier = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(IFACE_NAME))
-                .augmentation(Interface2.class)
-                .child(Ipv4.class)
-                .child(Neighbor.class, new NeighborKey(IPV4_ONE_ADDRESS));
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, INTERFACE_CONTEXT_NAME);
-        mockNeighborDump(api, dumpV4NeighborIfaceOne(), v4Neighbors());
-    }
-
-    @Test
-    public void testGetAll() throws ReadFailedException {
-        verifyList(Arrays.asList(new NeighborKey(IPV4_ONE_ADDRESS), new NeighborKey(IPV4_TWO_ADDRESS)),
-                getCustomizer().getAllIds(instanceIdentifier, ctx));
-    }
-
-    @Test
-    public void readCurrent() throws ReadFailedException {
-        final NeighborBuilder builder = new NeighborBuilder();
-        getCustomizer().readCurrentAttributes(instanceIdentifier, builder, ctx);
-
-        assertEquals(IPV4_ONE_ADDRESS, builder.getIp());
-        assertEquals(MAC_ONE_ADDRESS, builder.getLinkLayerAddress());
-    }
-
-    @Override
-    protected ReaderCustomizer<Neighbor, NeighborBuilder> initCustomizer() {
-        return new Ipv4NeighbourCustomizer(api, INTERFACE_CONTEXT);
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/subinterface/SubInterfaceIpv4AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/subinterface/SubInterfaceIpv4AddressCustomizerTest.java
deleted file mode 100644
index 736ff0031..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/subinterface/SubInterfaceIpv4AddressCustomizerTest.java
+++ /dev/null
@@ -1,235 +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.v3po.interfacesstate.ip.v4.subinterface;
-
-import com.google.common.collect.ImmutableSet;
-import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.Ipv4Translator;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer;
-import io.fd.honeycomb.translate.util.read.cache.CacheKeyFactory;
-import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory;
-import io.fd.vpp.jvpp.core.dto.IpAddressDetails;
-import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump;
-import org.junit.Assert;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.SubinterfaceStateAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.SubInterfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.Ipv4Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.Address;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.AddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.AddressKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.address.subnet.PrefixLength;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.address.subnet.PrefixLengthBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
-
-public class SubInterfaceIpv4AddressCustomizerTest extends ListReaderCustomizerTest<Address, AddressKey, AddressBuilder>
-        implements Ipv4Translator {
-
-    private static final String IFC_CTX_NAME = "ifc-test-instance";
-    private static final String IF_NAME = "local0";
-    private static final int IF_INDEX = 1;
-    private static final String SUB_IF_NAME = "local0.1";
-    private static final String SUB_IF_2_NAME = "local0.2";
-    private static final long SUB_IF_ID = 1;
-    private static final int SUB_IF_INDEX = 11;
-    private static final int SUB_IF_2_INDEX = 12;
-    private static final InstanceIdentifier<Ipv4> IP4_IID =
-            InstanceIdentifier.create(InterfacesState.class).child(Interface.class, new InterfaceKey(IF_NAME))
-                    .augmentation(SubinterfaceStateAugmentation.class)
-                    .child(SubInterfaces.class).child(SubInterface.class, new SubInterfaceKey(SUB_IF_ID))
-                    .child(Ipv4.class);
-    private static final Ipv4AddressNoZone IP1 = new Ipv4AddressNoZone("10.1.1.1");
-    private static final Ipv4AddressNoZone IP2 = new Ipv4AddressNoZone("10.1.1.2");
-    private static final short PREFIX_LENGTH = 16;
-    private InstanceIdentifier<Address> ifaceOneAddressOneIdentifier;
-    private InstanceIdentifier<Address> ifaceTwoAddressOneIdentifier;
-    private CacheKeyFactory cacheKeyFactory;
-    private NamingContext interfaceContext;
-
-    public SubInterfaceIpv4AddressCustomizerTest() {
-        super(Address.class, Ipv4Builder.class);
-    }
-
-    private static InstanceIdentifier<Address> getId() {
-        return IP4_IID.child(Address.class);
-    }
-
-    private static InstanceIdentifier<Address> getId(final Ipv4AddressNoZone ip) {
-        return IP4_IID.child(Address.class, new AddressKey(ip));
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        interfaceContext = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
-
-        ifaceOneAddressOneIdentifier = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(IF_NAME))
-                .augmentation(SubinterfaceStateAugmentation.class)
-                .child(SubInterfaces.class)
-                .child(SubInterface.class, new SubInterfaceKey(1L))
-                .child(Ipv4.class)
-                .child(Address.class, new AddressKey(new Ipv4AddressNoZone("192.168.2.1")));
-        ifaceTwoAddressOneIdentifier = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(IF_NAME))
-                .augmentation(SubinterfaceStateAugmentation.class)
-                .child(SubInterfaces.class)
-                .child(SubInterface.class, new SubInterfaceKey(2L))
-                .child(Ipv4.class)
-                .child(Address.class, new AddressKey(new Ipv4AddressNoZone("192.168.2.1")));
-
-        // to simulate complex key
-        cacheKeyFactory = new TypeAwareIdentifierCacheKeyFactory(IpAddressDetailsReplyDump.class,
-                ImmutableSet.of(SubInterface.class));
-
-        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_CTX_NAME);
-        defineMapping(mappingContext, SUB_IF_NAME, SUB_IF_INDEX, IFC_CTX_NAME);
-        defineMapping(mappingContext, SUB_IF_2_NAME, SUB_IF_2_INDEX, IFC_CTX_NAME);
-    }
-
-    @Override
-    protected ListReaderCustomizer<Address, AddressKey, AddressBuilder> initCustomizer() {
-        return new SubInterfaceIpv4AddressCustomizer(api, interfaceContext);
-    }
-
-    @Test
-    public void testRead() throws ReadFailedException {
-        final AddressBuilder builder = mock(AddressBuilder.class);
-        when(api.ipAddressDump(any())).thenReturn(future(dump()));
-        getCustomizer().readCurrentAttributes(getId(IP2), builder, ctx);
-        verify(builder).setIp(IP2);
-        verify(builder).setSubnet(new PrefixLengthBuilder().setPrefixLength(PREFIX_LENGTH).build());
-    }
-
-    @Test(expected = ReadFailedException.class)
-    public void testReadFailed() throws ReadFailedException {
-        when(api.ipAddressDump(any())).thenReturn(failedFuture());
-        getCustomizer().readCurrentAttributes(getId(IP1), mock(AddressBuilder.class), ctx);
-    }
-
-    @Test
-    public void testGetAllIds() throws ReadFailedException {
-        when(api.ipAddressDump(any())).thenReturn(future(dump()));
-        final List<AddressKey> allIds = getCustomizer().getAllIds(getId(), ctx);
-        assertThat(allIds, hasSize(2));
-        assertThat(allIds, containsInAnyOrder(new AddressKey(IP1), new AddressKey(IP2)));
-    }
-
-    @Test(expected = ReadFailedException.class)
-    public void testGetAllIdsFailed() throws ReadFailedException {
-        when(api.ipAddressDump(any())).thenReturn(failedFuture());
-        getCustomizer().getAllIds(getId(), ctx);
-    }
-
-    @Test
-    public void testCachingScopeSpecificRequest() throws ReadFailedException {
-        fillCacheForTwoIfaces();
-        final AddressBuilder ifaceOneAddressBuilder = new AddressBuilder();
-        final AddressBuilder ifaceTwoAddressBuilder = new AddressBuilder();
-
-        getCustomizer().readCurrentAttributes(ifaceOneAddressOneIdentifier, ifaceOneAddressBuilder, ctx);
-        getCustomizer().readCurrentAttributes(ifaceTwoAddressOneIdentifier, ifaceTwoAddressBuilder, ctx);
-
-        // addresses have caching scope of parent interface, so returned address should have respective prefix lengths
-        assertEquals("192.168.2.1", ifaceOneAddressBuilder.getIp().getValue());
-        assertTrue(ifaceOneAddressBuilder.getSubnet() instanceof PrefixLength);
-        assertEquals(22, PrefixLength.class.cast(ifaceOneAddressBuilder.getSubnet()).getPrefixLength().intValue());
-
-        assertEquals("192.168.2.1", ifaceTwoAddressBuilder.getIp().getValue());
-        assertTrue(ifaceTwoAddressBuilder.getSubnet() instanceof PrefixLength);
-        assertEquals(23, PrefixLength.class.cast(ifaceTwoAddressBuilder.getSubnet()).getPrefixLength().intValue());
-    }
-
-    @Test
-    public void testCachingScopeGetAll() throws ReadFailedException {
-        fillCacheForFirstIfaceSecondEmpty();
-
-        final List<AddressKey> keysForIfaceOne = getCustomizer().getAllIds(ifaceOneAddressOneIdentifier, ctx);
-        Assert.assertThat(keysForIfaceOne, hasSize(1));
-        final AddressKey keyIfaceOne = keysForIfaceOne.get(0);
-        assertEquals("192.168.2.1", keyIfaceOne.getIp().getValue());
-
-        final List<AddressKey> keysForIfaceTwo = getCustomizer().getAllIds(ifaceTwoAddressOneIdentifier, ctx);
-        Assert.assertThat(keysForIfaceTwo, is(empty()));
-    }
-
-    private void fillCacheForTwoIfaces() {
-        IpAddressDetails detailIfaceOneAddressOne = new IpAddressDetails();
-        IpAddressDetails detailIfaceTwoAddressOne = new IpAddressDetails();
-        IpAddressDetailsReplyDump replyIfaceOne = new IpAddressDetailsReplyDump();
-        IpAddressDetailsReplyDump replyIfaceTwo = new IpAddressDetailsReplyDump();
-
-        replyIfaceOne.ipAddressDetails = Arrays.asList(detailIfaceOneAddressOne);
-        replyIfaceTwo.ipAddressDetails = Arrays.asList(detailIfaceTwoAddressOne);
-
-        detailIfaceOneAddressOne.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
-        detailIfaceOneAddressOne.prefixLength = 22;
-
-        detailIfaceTwoAddressOne.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
-        detailIfaceTwoAddressOne.prefixLength = 23;
-
-        cache.put(cacheKeyFactory.createKey(ifaceOneAddressOneIdentifier), replyIfaceOne);
-        cache.put(cacheKeyFactory.createKey(ifaceTwoAddressOneIdentifier), replyIfaceTwo);
-    }
-
-    private void fillCacheForFirstIfaceSecondEmpty() {
-        IpAddressDetails detailIfaceOneAddressOne = new IpAddressDetails();
-        IpAddressDetailsReplyDump replyIfaceOne = new IpAddressDetailsReplyDump();
-        replyIfaceOne.ipAddressDetails = Arrays.asList(detailIfaceOneAddressOne);
-
-        detailIfaceOneAddressOne.ip = ipv4AddressNoZoneToArray(new Ipv4AddressNoZone(new Ipv4Address("192.168.2.1")));
-        detailIfaceOneAddressOne.prefixLength = 22;
-
-        cache.put(cacheKeyFactory.createKey(ifaceOneAddressOneIdentifier), replyIfaceOne);
-        cache.put(cacheKeyFactory.createKey(ifaceTwoAddressOneIdentifier), new IpAddressDetailsReplyDump());
-    }
-
-    private IpAddressDetailsReplyDump dump() {
-        final IpAddressDetailsReplyDump reply = new IpAddressDetailsReplyDump();
-
-        final IpAddressDetails details1 = new IpAddressDetails();
-        details1.ip = new byte[]{10, 1, 1, 1};
-        details1.prefixLength = (byte) PREFIX_LENGTH;
-        reply.ipAddressDetails.add(details1);
-
-        final IpAddressDetails details2 = new IpAddressDetails();
-        details2.ip = new byte[]{10, 1, 1, 2};
-        details2.prefixLength = (byte) PREFIX_LENGTH;
-        reply.ipAddressDetails.add(details2);
-
-        return reply;
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/subinterface/SubInterfaceIpv4NeighbourCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/subinterface/SubInterfaceIpv4NeighbourCustomizerTest.java
deleted file mode 100644
index 02fe52457..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v4/subinterface/SubInterfaceIpv4NeighbourCustomizerTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2017 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.v3po.interfacesstate.ip.v4.subinterface;
-
-import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
-import io.fd.hc2vpp.v3po.interfacesstate.ip.InterfaceChildNodeTest;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.SubinterfaceStateAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.SubInterfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.Ipv4Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.Neighbor;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.NeighborBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip4.attributes.ipv4.NeighborKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-
-public class SubInterfaceIpv4NeighbourCustomizerTest extends ListReaderCustomizerTest<Neighbor, NeighborKey, NeighborBuilder>
-        implements InterfaceChildNodeTest {
-
-    private InstanceIdentifier<Neighbor> instanceIdentifier;
-
-    public SubInterfaceIpv4NeighbourCustomizerTest() {
-        super(Neighbor.class, Ipv4Builder.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        instanceIdentifier = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(IFACE_NAME))
-                .augmentation(SubinterfaceStateAugmentation.class)
-                .child(SubInterfaces.class)
-                .child(SubInterface.class, new SubInterfaceKey((long) SUB_IFACE_ID))
-                .child(Ipv4.class)
-                .child(Neighbor.class, new NeighborKey(IPV4_TWO_ADDRESS));
-
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, INTERFACE_CONTEXT_NAME);
-        defineMapping(mappingContext, SUB_IFACE_NAME, SUB_IFACE_ID, INTERFACE_CONTEXT_NAME);
-        mockNeighborDump(api, dumpV4NeighborsSubIfaceOne(), v4Neighbors());
-    }
-
-    @Test
-    public void testGetAll() throws ReadFailedException {
-        verifyList(Arrays.asList(new NeighborKey(IPV4_ONE_ADDRESS), new NeighborKey(IPV4_TWO_ADDRESS)),
-                getCustomizer().getAllIds(instanceIdentifier, ctx));
-    }
-
-    @Test
-    public void testReadCurrent() throws ReadFailedException {
-        final NeighborBuilder neighborBuilder = new NeighborBuilder();
-        getCustomizer().readCurrentAttributes(instanceIdentifier, neighborBuilder, ctx);
-
-        assertEquals(MAC_TWO_ADDRESS, neighborBuilder.getLinkLayerAddress());
-        assertEquals(IPV4_TWO_ADDRESS, neighborBuilder.getIp());
-    }
-
-    @Override
-    protected ReaderCustomizer<Neighbor, NeighborBuilder> initCustomizer() {
-        return new SubInterfaceIpv4NeighbourCustomizer(api, INTERFACE_CONTEXT);
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/Ipv6AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/Ipv6AddressCustomizerTest.java
deleted file mode 100644
index 487f56918..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/Ipv6AddressCustomizerTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2017 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.v3po.interfacesstate.ip.v6;
-
-import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
-import io.fd.hc2vpp.v3po.interfacesstate.ip.InterfaceChildNodeTest;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv6Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv6.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv6.AddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv6.AddressKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-
-public class Ipv6AddressCustomizerTest extends ListReaderCustomizerTest<Address, AddressKey, AddressBuilder>
-        implements InterfaceChildNodeTest {
-
-    private InstanceIdentifier<Address> instanceIdentifier;
-
-    public Ipv6AddressCustomizerTest() {
-        super(Address.class, Ipv6Builder.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        instanceIdentifier = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(IFACE_2_NAME))
-                .augmentation(Interface2.class)
-                .child(Ipv6.class)
-                .child(Address.class, new AddressKey(IPV6_TWO_ADDRESS_COMPRESSED));
-        defineMapping(mappingContext, IFACE_2_NAME, IFACE_2_ID, INTERFACE_CONTEXT_NAME);
-        mockAddressDump(api, dumpV6AddressesIfaceTwo(), v6Addresses());
-    }
-
-    @Override
-    protected ReaderCustomizer<Address, AddressBuilder> initCustomizer() {
-        return new Ipv6AddressCustomizer(api, INTERFACE_CONTEXT);
-    }
-
-    @Test
-    public void testGetAll() throws ReadFailedException {
-        verifyList(Arrays.asList(
-                new AddressKey(IPV6_ONE_ADDRESS_COMPRESSED), new AddressKey(IPV6_TWO_ADDRESS_COMPRESSED)),
-                getCustomizer().getAllIds(instanceIdentifier, ctx));
-    }
-
-    @Test
-    public void testReadCurrent() throws ReadFailedException {
-        AddressBuilder builder = new AddressBuilder();
-        getCustomizer().readCurrentAttributes(instanceIdentifier, builder, ctx);
-
-        assertEquals(IPV6_TWO_ADDRESS_COMPRESSED, builder.getIp());
-        assertEquals(IPV6_TWO_PREFIX, builder.getPrefixLength().longValue());
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/Ipv6NeighbourCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/Ipv6NeighbourCustomizerTest.java
deleted file mode 100644
index 6f5a08abb..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/Ipv6NeighbourCustomizerTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2017 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.v3po.interfacesstate.ip.v6;
-
-import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
-import io.fd.hc2vpp.v3po.interfacesstate.ip.InterfaceChildNodeTest;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv6Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv6.Neighbor;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv6.NeighborBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv6.NeighborKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-
-
-public class Ipv6NeighbourCustomizerTest extends ListReaderCustomizerTest<Neighbor, NeighborKey, NeighborBuilder>
-        implements InterfaceChildNodeTest {
-
-    private InstanceIdentifier<Neighbor> instanceIdentifier;
-
-    public Ipv6NeighbourCustomizerTest() {
-        super(Neighbor.class, Ipv6Builder.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        instanceIdentifier = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(IFACE_NAME))
-                .augmentation(Interface2.class)
-                .child(Ipv6.class)
-                .child(Neighbor.class, new NeighborKey(IPV6_ONE_ADDRESS_COMPRESSED));
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, INTERFACE_CONTEXT_NAME);
-        mockNeighborDump(api, dumpV6NeighborsIfaceOne(), v6Neighbors());
-    }
-
-    @Test
-    public void testGetAll() throws ReadFailedException {
-        verifyList(Arrays.asList(
-                new NeighborKey(IPV6_ONE_ADDRESS_COMPRESSED),
-                new NeighborKey(IPV6_TWO_ADDRESS_COMPRESSED)),
-                getCustomizer().getAllIds(instanceIdentifier, ctx));
-    }
-
-    @Test
-    public void readCurrent() throws ReadFailedException {
-        final NeighborBuilder builder = new NeighborBuilder();
-        getCustomizer().readCurrentAttributes(instanceIdentifier, builder, ctx);
-
-        assertEquals(IPV6_ONE_ADDRESS_COMPRESSED, builder.getIp());
-        assertEquals(MAC_THREE_ADDRESS, builder.getLinkLayerAddress());
-    }
-
-    @Override
-    protected ReaderCustomizer<Neighbor, NeighborBuilder> initCustomizer() {
-        return new Ipv6NeighbourCustomizer(api, INTERFACE_CONTEXT);
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/nd/NdProxyCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/nd/NdProxyCustomizerTest.java
deleted file mode 100644
index 0db4c95fd..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/nd/NdProxyCustomizerTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2017 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.v3po.interfacesstate.ip.v6.nd;
-
-import static io.fd.hc2vpp.v3po.interfacesstate.ip.v6.nd.NdProxyCustomizer.getCfgId;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.vpp.jvpp.core.dto.Ip6NdProxyDetails;
-import io.fd.vpp.jvpp.core.dto.Ip6NdProxyDetailsReplyDump;
-import java.util.List;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.NdProxyIp6StateAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.interfaces.state._interface.ipv6.NdProxies;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.interfaces.state._interface.ipv6.NdProxiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.interfaces.state._interface.ipv6.nd.proxies.NdProxy;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.interfaces.state._interface.ipv6.nd.proxies.NdProxyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.interfaces.state._interface.ipv6.nd.proxies.NdProxyKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class NdProxyCustomizerTest extends InitializingListReaderCustomizerTest<NdProxy, NdProxyKey, NdProxyBuilder> {
-    private static final String IF1_NAME = "eth1";
-    private static final int IF1_INDEX = 1;
-    private static final String IF2_NAME = "eth2";
-    private static final int IF2_INDEX = 2;
-    private static final String IFACE_CTX_NAME = "ifc-test-instance";
-
-    public NdProxyCustomizerTest() {
-        super(NdProxy.class, NdProxiesBuilder.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        defineMapping(mappingContext, IF1_NAME, IF1_INDEX, IFACE_CTX_NAME);
-        defineMapping(mappingContext, IF2_NAME, IF2_INDEX, IFACE_CTX_NAME);
-        final Ip6NdProxyDetailsReplyDump reply = new Ip6NdProxyDetailsReplyDump();
-        final Ip6NdProxyDetails proxy1 = new Ip6NdProxyDetails();
-        proxy1.swIfIndex = IF1_INDEX;
-        proxy1.address = new byte[] {0x20, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01};
-        final Ip6NdProxyDetails proxy2 = new Ip6NdProxyDetails();
-        proxy2.swIfIndex = IF1_INDEX;
-        proxy2.address = new byte[] {0x20, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x02};
-        final Ip6NdProxyDetails proxy3 = new Ip6NdProxyDetails();
-        proxy3.swIfIndex = IF2_INDEX;
-        proxy3.address = new byte[] {0x20, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x03};
-        reply.ip6NdProxyDetails.add(proxy1);
-        reply.ip6NdProxyDetails.add(proxy2);
-        reply.ip6NdProxyDetails.add(proxy3);
-        when(api.ip6NdProxyDump(any())).thenReturn(future(reply));
-    }
-
-    @Override
-    protected ReaderCustomizer<NdProxy, NdProxyBuilder> initCustomizer() {
-        return new NdProxyCustomizer(api, new NamingContext("ifacePrefix", IFACE_CTX_NAME));
-    }
-
-    @Test
-    public void readCurrent() throws ReadFailedException {
-        final NdProxyBuilder builder = new NdProxyBuilder();
-        final Ipv6AddressNoZone address = new Ipv6AddressNoZone("2001::1");
-        getCustomizer().readCurrentAttributes(getId(IF1_NAME, address), builder, ctx);
-        assertEquals(builder.getAddress(), address);
-    }
-
-    @Test
-    public void testGetAllInterface1() throws ReadFailedException {
-        final List<NdProxyKey> allIds = getCustomizer().getAllIds(getProxiesId(IF1_NAME).child(NdProxy.class), ctx);
-        assertThat(allIds, containsInAnyOrder(
-            new NdProxyKey(new Ipv6AddressNoZone("2001::1")),
-            new NdProxyKey(new Ipv6AddressNoZone("2001::2"))
-        ));
-    }
-
-    @Test
-    public void testGetAllInterface2() throws ReadFailedException {
-        final List<NdProxyKey> allIds = getCustomizer().getAllIds(getProxiesId(IF2_NAME).child(NdProxy.class), ctx);
-        assertThat(allIds, containsInAnyOrder(new NdProxyKey(new Ipv6AddressNoZone("2001::3"))));
-    }
-
-    @Test
-    public void testInit() {
-        final Ipv6AddressNoZone address = new Ipv6AddressNoZone("2001::1");
-        final InstanceIdentifier<NdProxy> id = getId(IF1_NAME, address);
-        invokeInitTest(
-            id,
-            new NdProxyBuilder().setAddress(address).build(),
-            getCfgId(id),
-            new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.nd.proxy.rev170315.interfaces._interface.ipv6.nd.proxies.NdProxyBuilder()
-                .setAddress(address).build()
-        );
-    }
-
-    private InstanceIdentifier<NdProxy> getId(final String ifName, final Ipv6AddressNoZone address) {
-        return getProxiesId(ifName).child(NdProxy.class, new NdProxyKey(address));
-    }
-
-    private InstanceIdentifier<NdProxies> getProxiesId(final String ifName) {
-        return InstanceIdentifier.create(InterfacesState.class).child(Interface.class, new InterfaceKey(ifName))
-            .augmentation(Interface2.class).child(Ipv6.class).augmentation(NdProxyIp6StateAugmentation.class)
-            .child(NdProxies.class);
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/subinterface/SubInterfaceIpv6AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/subinterface/SubInterfaceIpv6AddressCustomizerTest.java
deleted file mode 100644
index 51d9f603f..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/subinterface/SubInterfaceIpv6AddressCustomizerTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2017 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.v3po.interfacesstate.ip.v6.subinterface;
-
-import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
-import io.fd.hc2vpp.v3po.interfacesstate.ip.InterfaceChildNodeTest;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.SubinterfaceStateAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.SubInterfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip6.attributes.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip6.attributes.Ipv6Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip6.attributes.ipv6.Address;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip6.attributes.ipv6.AddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip6.attributes.ipv6.AddressKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-import java.util.Arrays;
-
-public class SubInterfaceIpv6AddressCustomizerTest extends ListReaderCustomizerTest<Address, AddressKey, AddressBuilder>
-        implements InterfaceChildNodeTest {
-
-    private InstanceIdentifier<Address> instanceIdentifier;
-
-    public SubInterfaceIpv6AddressCustomizerTest() {
-        super(Address.class, Ipv6Builder.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        instanceIdentifier = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(IFACE_NAME))
-                .augmentation(SubinterfaceStateAugmentation.class)
-                .child(SubInterfaces.class)
-                .child(SubInterface.class, new SubInterfaceKey((long) SUB_IFACE_ID))
-                .child(Ipv6.class)
-                .child(Address.class, new AddressKey(IPV6_TWO_ADDRESS_COMPRESSED));
-
-        defineMapping(mappingContext, IFACE_NAME, IFACE_ID, INTERFACE_CONTEXT_NAME);
-        defineMapping(mappingContext, SUB_IFACE_NAME, SUB_IFACE_ID, INTERFACE_CONTEXT_NAME);
-        mockAddressDump(api, dumpV6AddressesSubIfaceOne(), v6Addresses());
-    }
-
-    @Test
-    public void testGetAll() throws ReadFailedException {
-        verifyList(Arrays.asList(
-                new AddressKey(IPV6_ONE_ADDRESS_COMPRESSED), new AddressKey(IPV6_TWO_ADDRESS_COMPRESSED)),
-                getCustomizer().getAllIds(instanceIdentifier, ctx));
-    }
-
-    @Override
-    protected ReaderCustomizer<Address, AddressBuilder> initCustomizer() {
-        return new SubInterfaceIpv6AddressCustomizer(api, INTERFACE_CONTEXT);
-    }
-}
\ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/subinterface/SubInterfaceIpv6NeighbourCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/subinterface/SubInterfaceIpv6NeighbourCustomizerTest.java
deleted file mode 100644
index 24fd17eb8..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/subinterface/SubInterfaceIpv6NeighbourCustomizerTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2017 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.v3po.interfacesstate.ip.v6.subinterface;
-
-import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
-import io.fd.hc2vpp.v3po.interfacesstate.ip.InterfaceChildNodeTest;
-import io.fd.honeycomb.translate.read.ReadFailedException;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.SubinterfaceStateAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.SubInterfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.sub.interfaces.SubInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.interfaces.state._interface.sub.interfaces.SubInterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip6.attributes.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip6.attributes.Ipv6Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip6.attributes.ipv6.Neighbor;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip6.attributes.ipv6.NeighborBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.ip6.attributes.ipv6.NeighborKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-
-public class SubInterfaceIpv6NeighbourCustomizerTest extends ListReaderCustomizerTest<Neighbor, NeighborKey, NeighborBuilder>
-        implements InterfaceChildNodeTest {
-
-    private InstanceIdentifier<Neighbor> instanceIdentifier;
-
-    public SubInterfaceIpv6NeighbourCustomizerTest() {
-        super(Neighbor.class, Ipv6Builder.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        instanceIdentifier = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(IFACE_2_NAME))
-                .augmentation(SubinterfaceStateAugmentation.class)
-                .child(SubInterfaces.class)
-                .child(SubInterface.class, new SubInterfaceKey((long) SUB_IFACE_2_ID))
-                .child(Ipv6.class)
-                .child(Neighbor.class, new NeighborKey(IPV6_TWO_ADDRESS_COMPRESSED));
-        defineMapping(mappingContext, IFACE_2_NAME, IFACE_2_ID, INTERFACE_CONTEXT_NAME);
-        defineMapping(mappingContext, SUB_IFACE_2_NAME, SUB_IFACE_2_ID, INTERFACE_CONTEXT_NAME);
-        mockNeighborDump(api, dumpV6NeighborsSubIfaceTwo(), v6Neighbors());
-    }
-
-    @Test
-    public void testGetAll() throws ReadFailedException {
-        verifyList(Arrays.asList(
-                new NeighborKey(IPV6_ONE_ADDRESS_COMPRESSED),
-                new NeighborKey(IPV6_TWO_ADDRESS_COMPRESSED)),
-                getCustomizer().getAllIds(instanceIdentifier, ctx));
-    }
-
-    @Test
-    public void readCurrent() throws ReadFailedException {
-        NeighborBuilder builder = new NeighborBuilder();
-        getCustomizer().readCurrentAttributes(instanceIdentifier, builder, ctx);
-
-        assertEquals(IPV6_TWO_ADDRESS_COMPRESSED, builder.getIp());
-        assertEquals(MAC_FOUR_ADDRESS, builder.getLinkLayerAddress());
-    }
-
-    @Override
-    protected ReaderCustomizer<Neighbor, NeighborBuilder> initCustomizer() {
-        return new SubInterfaceIpv6NeighbourCustomizer(api, INTERFACE_CONTEXT);
-    }
-}
\ No newline at end of file