HONEYCOMB-195: increase coverage for ietf-acl customizers over 80%

Change-Id: I6a56402e9309edcd84aba46689bbcb93d40e20f8
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/AceIp6Writer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/AceIp6Writer.java
index 1e222ec..9439083 100644 (file)
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/AceIp6Writer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/acl/AceIp6Writer.java
@@ -106,6 +106,7 @@ final class AceIp6Writer extends AbstractAceWriter<AceIp> {
         final int baseOffset = getVlanTagsLen(vlanTags);
 
         if (aceIp.getProtocol() != null) {
+            aceIsEmpty = false;
             request.mask[baseOffset + IP_VERSION_OFFSET] |= IP_VERSION_MASK;
         }
 
@@ -168,6 +169,7 @@ final class AceIp6Writer extends AbstractAceWriter<AceIp> {
         final int baseOffset = getVlanTagsLen(vlanTags);
 
         if (aceIp.getProtocol() != null) {
+            noMatch = false;
             request.match[baseOffset + IP_VERSION_OFFSET] |=
                 (byte) (IP_VERSION_MASK & (aceIp.getProtocol().intValue() << 4));
         }

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/AclWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/AclWriterTest.java
new file mode 100644 (file)
index 0000000..98d645d
--- /dev/null
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/AclWriterTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.translate.v3po.interfaces.acl;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
+import com.google.common.base.Optional;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AccessLists;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceAugmentationBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.ietf.acl.base.attributes.AccessListsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.ietf.acl.base.attributes.access.lists.AclBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.IetfAclBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public class AclWriterTest extends WriterCustomizerTest {
+
+    private static final String ACL_NAME = "acl1";
+    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
+    private static final InstanceIdentifier<Acl> IID =
+        InstanceIdentifier.create(AccessLists.class).child(Acl.class, new AclKey(ACL_NAME, ACL_TYPE));
+
+    @Mock
+    private Acl acl;
+    private AclWriter customizer;
+
+    @Override
+    public void setUp() {
+        customizer = new AclWriter();
+        when(acl.getAclName()).thenReturn(ACL_NAME);
+        doReturn(ACL_TYPE).when(acl).getAclType();
+    }
+
+    private void defineInterfacesContext(final List<Interface> interfaces) {
+        when(writeContext.readAfter(InstanceIdentifier.create(Interfaces.class))).thenReturn(Optional.of(
+            new InterfacesBuilder().setInterface(interfaces).build()
+        ));
+    }
+
+    @Test
+    public void testWrite() throws Exception {
+        customizer.writeCurrentAttributes(IID, acl, writeContext);
+    }
+
+    @Test
+    public void testUpdate() throws WriteFailedException {
+        defineInterfacesContext(Collections.emptyList());
+        customizer.updateCurrentAttributes(IID, acl, acl, writeContext);
+    }
+
+    @Test
+    public void testDelete() throws WriteFailedException {
+        defineInterfacesContext(Collections.emptyList());
+        customizer.deleteCurrentAttributes(IID, acl, writeContext);
+    }
+
+    @Test(expected = WriteFailedException.class)
+    public void testDeleteFailed() throws WriteFailedException {
+        final Interface iface = new InterfaceBuilder().addAugmentation(VppInterfaceAugmentation.class,
+            new VppInterfaceAugmentationBuilder().setIetfAcl(
+                new IetfAclBuilder().setAccessLists(
+                    new AccessListsBuilder().setAcl(
+                        Collections.singletonList(new AclBuilder().setName(ACL_NAME).setType(ACL_TYPE).build())
+                    ).build()
+                ).build()
+            ).build()
+        ).build();
+        defineInterfacesContext(Collections.singletonList(iface));
+        customizer.deleteCurrentAttributes(IID, acl, writeContext);
+    }
+}
\ No newline at end of file

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/IetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/IetfAclCustomizerTest.java
new file mode 100644 (file)
index 0000000..a1c6069
--- /dev/null
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/IetfAclCustomizerTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.translate.v3po.interfaces.acl;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.google.common.base.Optional;
+import io.fd.honeycomb.translate.v3po.util.NamingContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import java.util.Collections;
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntriesBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.AceBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.ActionsBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.MatchesBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.DenyBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv6Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.ietf.acl.base.attributes.AccessListsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.ietf.acl.base.attributes.access.lists.AclBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.IetfAcl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.IetfAclBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.openvpp.jvpp.core.dto.ClassifyAddDelSessionReply;
+import org.openvpp.jvpp.core.dto.ClassifyAddDelTable;
+import org.openvpp.jvpp.core.dto.ClassifyAddDelTableReply;
+import org.openvpp.jvpp.core.dto.ClassifyTableByInterface;
+import org.openvpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
+import org.openvpp.jvpp.core.dto.InputAclSetInterface;
+import org.openvpp.jvpp.core.dto.InputAclSetInterfaceReply;
+
+public class IetfAclCustomizerTest extends WriterCustomizerTest {
+
+    private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
+    private static final String IF_NAME = "local0";
+    private static final int IF_INDEX = 1;
+    private static final InstanceIdentifier<IetfAcl> IID = InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
+        VppInterfaceAugmentation.class).child(IetfAcl.class);
+    private static final String ACL_NAME = "acl1";
+    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
+
+    private IetfAclCustomizer customizer;
+    private IetfAcl acl;
+
+    @Override
+    protected void setUp() {
+        customizer = new IetfAclCustomizer(new IetfAClWriter(api), new NamingContext("prefix", IFC_TEST_INSTANCE));
+        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
+        acl = new IetfAclBuilder().setAccessLists(
+            new AccessListsBuilder().setAcl(
+                Collections.singletonList(new AclBuilder()
+                    .setName(ACL_NAME)
+                    .setType(ACL_TYPE)
+                    .build())
+            ).build()
+        ).build();
+    }
+
+    @Test
+    public void testWrite() throws WriteFailedException {
+        when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
+        when(api.classifyAddDelSession(any())).thenReturn(future(new ClassifyAddDelSessionReply()));
+
+        when(writeContext.readAfter(any())).thenReturn(Optional.of(
+            new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclBuilder()
+                .setAccessListEntries(
+                    new AccessListEntriesBuilder().setAce(Collections.singletonList(
+                        new AceBuilder()
+                            .setMatches(new MatchesBuilder().setAceType(
+                                new AceIpBuilder()
+                                    .setAceIpVersion(new AceIpv6Builder().build())
+                                    .setProtocol((short)1)
+                                    .build()
+                            ).build())
+                            .setActions(new ActionsBuilder().setPacketHandling(new DenyBuilder().build()).build())
+                            .build()
+                    )).build()
+                ).build()
+
+        ));
+        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
+
+        customizer.writeCurrentAttributes(IID, acl, writeContext);
+
+        verify(api).classifyAddDelTable(any());
+        verify(api).classifyAddDelSession(any());
+        verify(api).inputAclSetInterface(inputAclSetInterfaceWriteRequest());
+    }
+
+    @Test
+    public void testDelete() throws WriteFailedException {
+        when(api.classifyTableByInterface(any())).thenReturn(future(classifyTableByInterfaceReply()));
+        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
+        when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
+
+        customizer.deleteCurrentAttributes(IID, acl, writeContext);
+
+        final ClassifyTableByInterface expectedRequest = new ClassifyTableByInterface();
+        expectedRequest.swIfIndex = IF_INDEX;
+        verify(api).classifyTableByInterface(expectedRequest);
+        verify(api).inputAclSetInterface(inputAclSetInterfaceDeleteRequest());
+        verify(api).classifyAddDelTable(classifyAddDelTable(1));
+        verify(api).classifyAddDelTable(classifyAddDelTable(2));
+        verify(api).classifyAddDelTable(classifyAddDelTable(3));
+    }
+
+    private static InputAclSetInterface inputAclSetInterfaceDeleteRequest() {
+        final InputAclSetInterface request = new InputAclSetInterface();
+        request.l2TableIndex = 1;
+        request.ip4TableIndex = 2;
+        request.ip6TableIndex = 3;
+        return request;
+    }
+
+    private static ClassifyAddDelTable classifyAddDelTable(final int tableIndex) {
+        final ClassifyAddDelTable reply = new ClassifyAddDelTable();
+        reply.tableIndex = tableIndex;
+        return reply;
+    }
+
+    private static ClassifyTableByInterfaceReply classifyTableByInterfaceReply() {
+        final ClassifyTableByInterfaceReply reply = new ClassifyTableByInterfaceReply();
+        reply.l2TableId = 1;
+        reply.ip4TableId = 2;
+        reply.ip6TableId = 3;
+        return reply;
+    }
+
+    private static InputAclSetInterface inputAclSetInterfaceWriteRequest() {
+        final InputAclSetInterface request = new InputAclSetInterface();
+        request.swIfIndex = IF_INDEX;
+        request.isAdd = 1;
+        request.l2TableIndex = -1;
+        request.ip4TableIndex = -1;
+        request.ip6TableIndex = 0;
+        return request;
+    }
+}
\ No newline at end of file

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/SubInterfaceIetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/SubInterfaceIetfAclCustomizerTest.java
new file mode 100644 (file)
index 0000000..38fd799
--- /dev/null
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/SubInterfaceIetfAclCustomizerTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.translate.v3po.interfaces.acl;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.google.common.base.Optional;
+import io.fd.honeycomb.translate.v3po.util.NamingContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import java.util.Collections;
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntriesBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.ietf.acl.base.attributes.AccessListsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.ietf.acl.base.attributes.access.lists.AclBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev150527.SubinterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev150527.interfaces._interface.SubInterfaces;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev150527.interfaces._interface.sub.interfaces.SubInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev150527.interfaces._interface.sub.interfaces.SubInterfaceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev150527.interfaces._interface.sub.interfaces.SubInterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev150527.sub._interface.base.attributes.IetfAcl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev150527.sub._interface.base.attributes.IetfAclBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.openvpp.jvpp.core.dto.ClassifyTableByInterface;
+import org.openvpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
+import org.openvpp.jvpp.core.dto.InputAclSetInterface;
+import org.openvpp.jvpp.core.dto.InputAclSetInterfaceReply;
+
+public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
+
+    private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
+    private static final String IF_NAME = "local0";
+    private static final int IF_INDEX = 1;
+    private static final String SUBIF_NAME = "local0.123";
+    private static final int SUBIF_INDEX = 2;
+    private static final long SUB_IF_ID = 123;
+    private static final InstanceIdentifier<IetfAcl> IID =
+        InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
+            SubinterfaceAugmentation.class).child(SubInterfaces.class)
+            .child(SubInterface.class, new SubInterfaceKey(SUB_IF_ID)).child(IetfAcl.class);
+    private static final String ACL_NAME = "acl1";
+    private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
+
+    private SubInterfaceIetfAclCustomizer customizer;
+    private IetfAcl acl;
+
+    @Override
+    protected void setUp() {
+        customizer =
+            new SubInterfaceIetfAclCustomizer(new IetfAClWriter(api), new NamingContext("prefix", IFC_TEST_INSTANCE));
+        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
+
+        acl = new IetfAclBuilder().setAccessLists(
+            new AccessListsBuilder().setAcl(
+                Collections.singletonList(new AclBuilder()
+                    .setName(ACL_NAME)
+                    .setType(ACL_TYPE)
+                    .build())
+            ).build()
+        ).build();
+    }
+
+    private static InputAclSetInterface inputAclSetInterfaceWriteRequest() {
+        final InputAclSetInterface request = new InputAclSetInterface();
+        request.swIfIndex = SUBIF_INDEX;
+        request.isAdd = 1;
+        request.l2TableIndex = -1;
+        request.ip4TableIndex = -1;
+        request.ip6TableIndex = -1;
+        return request;
+    }
+
+    @Test
+    public void testDelete() throws WriteFailedException {
+        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
+        defineMapping(mappingContext, SUBIF_NAME, SUBIF_INDEX, IFC_TEST_INSTANCE);
+        when(api.classifyTableByInterface(any())).thenReturn(future(noClassifyTablesAssigned()));
+        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
+
+        customizer.deleteCurrentAttributes(IID, acl, writeContext);
+
+        final ClassifyTableByInterface expectedRequest = new ClassifyTableByInterface();
+        expectedRequest.swIfIndex = SUBIF_INDEX;
+        verify(api).classifyTableByInterface(expectedRequest);
+        verify(api).inputAclSetInterface(inputAclSetInterfaceDeleteRequest());
+    }
+
+    private static ClassifyTableByInterfaceReply noClassifyTablesAssigned() {
+        final ClassifyTableByInterfaceReply reply = new ClassifyTableByInterfaceReply();
+        reply.l2TableId = -1;
+        reply.ip4TableId = -1;
+        reply.ip6TableId = -1;
+        return reply;
+    }
+
+    private static InputAclSetInterface inputAclSetInterfaceDeleteRequest() {
+        final InputAclSetInterface request = new InputAclSetInterface();
+        request.l2TableIndex = -1;
+        request.ip4TableIndex = -1;
+        request.ip6TableIndex = -1;
+        return request;
+    }
+
+    @Test
+    public void testWrite() throws WriteFailedException {
+        defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
+        defineMapping(mappingContext, SUBIF_NAME, SUBIF_INDEX, IFC_TEST_INSTANCE);
+
+        when(writeContext.readAfter(IID.firstIdentifierOf(SubInterface.class))).thenReturn(Optional.of(
+            new SubInterfaceBuilder().build()
+        ));
+
+        when(writeContext.readAfter(AclWriter.ACL_ID.child(
+            org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl.class,
+            new AclKey(ACL_NAME, ACL_TYPE)))).thenReturn(Optional.of(
+            new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclBuilder()
+                .setAccessListEntries(
+                    new AccessListEntriesBuilder().setAce(Collections.emptyList()).build()
+                ).build()
+        ));
+
+        when(api.inputAclSetInterface(any())).thenReturn(future(new InputAclSetInterfaceReply()));
+
+        customizer.writeCurrentAttributes(IID, acl, writeContext);
+
+        verify(api).inputAclSetInterface(inputAclSetInterfaceWriteRequest());
+    }
+}
\ No newline at end of file

diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java
index c905042..6486c8e 100644 (file)
--- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/read/ReaderCustomizerTest.java
@@ -61,7 +61,7 @@ public abstract class ReaderCustomizerTest<D extends DataObject, B extends Build
     }
 
     @Before
-    public void setUpParent() throws Exception {
+    public final void setUpParent() throws Exception {
         MockitoAnnotations.initMocks(this);
         cache = new ModificationCache();
         Mockito.doReturn(cache).when(ctx).getModificationCache();

diff --git a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java
index fe8c8fe..98bff86 100644 (file)
--- a/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java
+++ b/vpp-common/vpp-translate-test/src/main/java/io/fd/honeycomb/vpp/test/write/WriterCustomizerTest.java
@@ -47,7 +47,7 @@ public abstract class WriterCustomizerTest implements FutureProducer,
     }
 
     @Before
-    public void setUpParent() throws Exception {
+    public final void setUpParent() throws Exception {
         MockitoAnnotations.initMocks(this);
         cache = new ModificationCache();
         Mockito.doReturn(cache).when(writeContext).getModificationCache();