HC2VPP-411: remove deprecated interface-state

 - new ietf-interfaces obsoletes interfaces-state container,
   only interfaces container should be used from now on.

Change-Id: Ifb24611a3dca987bdf6b029d32e01d9b1f479fe8
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

1 files changed, 0 insertions, 196 deletions

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java
deleted file mode 100644
index a3188b426..000000000
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfacesstate/InterfaceCustomizerTest.java
+++ /dev/null
@@ -1,196 +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;
-
-import static org.junit.Assert.assertEquals;
-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.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import io.fd.hc2vpp.common.test.read.ListReaderCustomizerTest;
-import io.fd.hc2vpp.common.test.util.InterfaceDumpHelper;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.v3po.DisabledInterfacesManager;
-import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager;
-import io.fd.honeycomb.translate.spi.read.ReaderCustomizer;
-import io.fd.jvpp.core.dto.SwInterfaceDetails;
-import io.fd.jvpp.core.dto.SwInterfaceDump;
-import io.fd.jvpp.core.types.InterfaceIndex;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.InterfacesState;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.InterfacesStateBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.interfaces.state.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.interfaces.state.InterfaceBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.interfaces.state.InterfaceKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public class InterfaceCustomizerTest extends ListReaderCustomizerTest<Interface, InterfaceKey, InterfaceBuilder>
-        implements InterfaceDataTranslator, InterfaceDumpHelper {
-
-    private static final String IFC_CTX_NAME = "ifc-test-instance";
-    private static final String IFACE0_NAME = "eth0";
-    private static final String IFACE1_NAME = "eth1";
-    private static final String SUB_IFACE_NAME = "eth1.1";
-    private static final int IFACE0_ID = 0;
-    private static final int IFACE1_ID = 1;
-    private static final int SUB_IFACE_ID = 2;
-
-    private NamingContext interfacesContext;
-    @Mock
-    private DisabledInterfacesManager interfaceDisableContext;
-    @Mock
-    private InterfaceCacheDumpManager dumpCacheManager;
-
-    public InterfaceCustomizerTest() {
-        super(Interface.class, InterfacesStateBuilder.class);
-    }
-
-    @Override
-    public void setUp() {
-        interfacesContext = new NamingContext("generatedIfaceName", IFC_CTX_NAME);
-        defineMapping(mappingContext, IFACE0_NAME, IFACE0_ID, IFC_CTX_NAME);
-        defineMapping(mappingContext, IFACE1_NAME, IFACE1_ID, IFC_CTX_NAME);
-        defineMapping(mappingContext, SUB_IFACE_NAME, SUB_IFACE_ID, IFC_CTX_NAME);
-    }
-
-    @Override
-    protected ReaderCustomizer<Interface, InterfaceBuilder> initCustomizer() {
-        return new InterfaceCustomizer(interfacesContext, interfaceDisableContext, dumpCacheManager);
-    }
-
-    private void assertIfacesAreEqual(final Interface iface, final SwInterfaceDetails details) {
-        assertEquals(iface.getName(), new String(details.interfaceName));
-        assertEquals(yangIfIndexToVpp(iface.getIfIndex().intValue()), details.swIfIndex);
-        assertEquals(iface.getPhysAddress().getValue(), vppPhysAddrToYang(details.l2Address));
-    }
-
-    @Test
-    public void testReadCurrentAttributes() throws Exception {
-        final InstanceIdentifier<Interface> id = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(IFACE0_NAME));
-        final InterfaceBuilder builder = getCustomizer().getBuilder(id);
-
-        final SwInterfaceDetails iface = new SwInterfaceDetails();
-        iface.interfaceName = IFACE0_NAME.getBytes();
-        iface.swIfIndex = 0;
-        iface.linkSpeed = 1;
-        iface.l2AddressLength = 6;
-        iface.l2Address = new byte[iface.l2AddressLength];
-        when(dumpCacheManager.getInterfaceDetail(id, ctx, IFACE0_NAME)).thenReturn(iface);
-
-        getCustomizer().readCurrentAttributes(id, builder, ctx);
-
-        final SwInterfaceDump request = new SwInterfaceDump();
-        request.swIfIndex = new InterfaceIndex();
-        request.swIfIndex.interfaceindex =~0;
-        request.nameFilter = IFACE0_NAME.getBytes();
-        request.nameFilterValid = 1;
-
-        assertIfacesAreEqual(builder.build(), iface);
-        verify(dumpCacheManager, times(1)).getInterfaceDetail(id, ctx, IFACE0_NAME);
-    }
-
-    @Test
-    public void testReadSubInterface() throws Exception {
-        final InstanceIdentifier<Interface> id = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class, new InterfaceKey(SUB_IFACE_NAME));
-        final InterfaceBuilder builder = mock(InterfaceBuilder.class);
-
-        final SwInterfaceDetails iface = new SwInterfaceDetails();
-        iface.interfaceName = SUB_IFACE_NAME.getBytes();
-        iface.swIfIndex = 2;
-        iface.supSwIfIndex = 1;
-        iface.subId = 1;
-        when(dumpCacheManager.getInterfaceDetail(id, ctx, SUB_IFACE_NAME)).thenReturn(iface);
-
-        getCustomizer().readCurrentAttributes(id, builder, ctx);
-
-        final SwInterfaceDump request = new SwInterfaceDump();
-        request.swIfIndex = new InterfaceIndex();
-        request.swIfIndex.interfaceindex =~0;
-        request.nameFilter = SUB_IFACE_NAME.getBytes();
-        request.nameFilterValid = 1;
-
-        verifyZeroInteractions(builder);
-        verify(dumpCacheManager, times(1)).getInterfaceDetail(id, ctx, SUB_IFACE_NAME);
-    }
-
-    @Test
-    public void testGetAllIds() throws Exception {
-        final InstanceIdentifier<Interface> id = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class);
-
-        final SwInterfaceDetails swIf0 = new SwInterfaceDetails();
-        swIf0.swIfIndex = 0;
-        swIf0.supSwIfIndex = 0;
-        swIf0.interfaceName = IFACE0_NAME.getBytes();
-        final SwInterfaceDetails swIf1 = new SwInterfaceDetails();
-        swIf1.swIfIndex = 1;
-        swIf1.supSwIfIndex = 1;
-        swIf1.interfaceName = IFACE1_NAME.getBytes();
-        final SwInterfaceDetails swSubIf1 = new SwInterfaceDetails();
-        swSubIf1.swIfIndex = 2;
-        swSubIf1.subId = 1;
-        swSubIf1.supSwIfIndex = 1;
-        swSubIf1.interfaceName = SUB_IFACE_NAME.getBytes();
-        when(dumpCacheManager.getInterfaces(id, ctx)).thenReturn(Stream.of(swIf0, swIf1, swSubIf1));
-
-        final List<InterfaceKey> expectedIds = Arrays.asList(new InterfaceKey(IFACE0_NAME), new InterfaceKey(
-                IFACE1_NAME));
-        final List<InterfaceKey> actualIds = getCustomizer().getAllIds(id, ctx);
-
-        final SwInterfaceDump request = new SwInterfaceDump();
-        request.swIfIndex = new InterfaceIndex();
-        request.swIfIndex.interfaceindex = ~0;
-        request.nameFilter = "".getBytes();
-        request.nameFilterValid = 0;
-
-        // sub-interface should not be on the list
-        assertEquals(expectedIds, actualIds);
-        verify(dumpCacheManager, times(1)).getInterfaces(id, ctx);
-    }
-
-    @Test
-    public void testGetAllIdsWithDisabled() throws Exception {
-        final InstanceIdentifier<Interface> id = InstanceIdentifier.create(InterfacesState.class)
-                .child(Interface.class);
-
-        doReturn(true).when(interfaceDisableContext).isInterfaceDisabled(1, mappingContext);
-
-        final SwInterfaceDetails swIf0 = new SwInterfaceDetails();
-        swIf0.swIfIndex = 0;
-        swIf0.interfaceName = IFACE0_NAME.getBytes();
-        final SwInterfaceDetails swIf1 = new SwInterfaceDetails();
-        swIf1.swIfIndex = 1;
-        swIf1.interfaceName = IFACE1_NAME.getBytes();
-        when(dumpCacheManager.getInterfaces(id, ctx)).thenReturn(Stream.of(swIf0, swIf1));
-
-        final List<InterfaceKey> expectedIds = Arrays.asList(new InterfaceKey(IFACE0_NAME));
-        final List<InterfaceKey> actualIds = getCustomizer().getAllIds(id, ctx);
-
-        // disabled interface should not be on the list
-        assertEquals(expectedIds, actualIds);
-        verify(dumpCacheManager, times(1)).getInterfaces(id, ctx);
-    }
-}