summaryrefslogtreecommitdiffstats
path: root/v3po/v3po2vpp/src/test/java/io/fd
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-10-19 14:50:04 +0200
committerMarek Gradzki <mgradzki@cisco.com>2016-10-21 06:56:02 +0000
commitb1eece37415c11bc1eaff545b58a1eebe26e3aa5 (patch)
treea39d78df625530cff9d60b74ee9cc23b11721cfb /v3po/v3po2vpp/src/test/java/io/fd
parent1ea5caa3f6717b16fdc7c65748ef21c8e4093677 (diff)
HONEYCOMB-264: cache classify table delete
Change-Id: I8b43f9a6220b90aaed5d85d60c0d2095518d6226 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp/src/test/java/io/fd')
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java62
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java151
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/IetfAclCustomizerTest.java114
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizerTest.java130
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java31
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java27
6 files changed, 489 insertions, 26 deletions
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java
new file mode 100644
index 000000000..490e26b2b
--- /dev/null
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/common/AclTableContextManagerImplTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.translate.v3po.interfaces.acl.common;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import io.fd.honeycomb.translate.MappingContext;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.MappingTable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
+
+public class AclTableContextManagerImplTest {
+
+ private AclTableContextManagerImpl ctx;
+ @Mock
+ private MappingContext mappingContext;
+ private static final int INDEX = 42;
+
+ @Before
+ public void setUp() throws Exception {
+ initMocks(this);
+ ctx = new AclTableContextManagerImpl(MappingTable.Direction.Ingress);
+ }
+
+ @Test
+ public void testAddEntry() throws Exception {
+ final MappingEntry entry =
+ new MappingEntryBuilder().setL2TableId(1).setIp4TableId(2).setIp6TableId(3).setIndex(INDEX).build();
+ ctx.addEntry(entry, mappingContext);
+ verify(mappingContext).put(ctx.getId(INDEX), entry);
+ }
+
+ @Test
+ public void testRemoveEntry() throws Exception {
+ ctx.removeEntry(INDEX, mappingContext);
+ verify(mappingContext).delete(ctx.getId(INDEX));
+ }
+
+ @Test
+ public void testReadEntry() throws Exception {
+ ctx.getEntry(INDEX, mappingContext);
+ verify(mappingContext).read(ctx.getId(INDEX));
+ }
+} \ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java
new file mode 100644
index 000000000..e1aa0b85e
--- /dev/null
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/EgressIetfAclWriterTest.java
@@ -0,0 +1,151 @@
+/*
+ * 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.egress;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.google.common.base.Optional;
+import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTableContextManager;
+import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
+import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
+import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
+import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
+import io.fd.vpp.jvpp.core.dto.ClassifySetInterfaceL2Tables;
+import io.fd.vpp.jvpp.core.dto.ClassifySetInterfaceL2TablesReply;
+import java.util.Collections;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.AccessListEntriesBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.AceBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.ActionsBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.MatchesBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.actions.packet.handling.PermitBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.AceIpBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.acl.access.list.entries.ace.matches.ace.type.ace.ip.ace.ip.version.AceIpv4Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.ietf.acl.Egress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.ietf.acl.EgressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.InterfaceMode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.AccessLists;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.AccessListsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.access.lists.AclBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public class EgressIetfAclWriterTest extends WriterCustomizerTest {
+
+ private static final int IF_INDEX = 1;
+ private static final String ACL_NAME = "acl1";
+ private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
+
+ private EgressIetfAclWriter writer;
+ @Mock
+ private AclTableContextManager aclCtx;
+ @Mock
+ private InstanceIdentifier<?> id;
+
+ @Override
+ protected void setUp() throws Exception {
+ writer = new EgressIetfAclWriter(api, aclCtx);
+ }
+
+ private static ClassifyAddDelTable classifyAddDelTable(final int tableIndex) {
+ final ClassifyAddDelTable reply = new ClassifyAddDelTable();
+ reply.tableIndex = tableIndex;
+ return reply;
+ }
+
+ private ClassifySetInterfaceL2Tables classifySetInterfaceL2TablesRequest() {
+ final ClassifySetInterfaceL2Tables request = new ClassifySetInterfaceL2Tables();
+ request.isInput = 0;
+ request.ip4TableIndex = -1;
+ request.ip6TableIndex = -1;
+ request.otherTableIndex = -1;
+ request.swIfIndex = IF_INDEX;
+ return request;
+ }
+
+ @Test
+ public void testDeleteAcl() throws Exception {
+ when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
+ when(api.classifySetInterfaceL2Tables(any())).thenReturn(future(new ClassifySetInterfaceL2TablesReply()));
+ when(aclCtx.getEntry(IF_INDEX, mappingContext)).thenReturn(Optional.of(
+ new MappingEntryBuilder()
+ .setIndex(IF_INDEX)
+ .setL2TableId(1)
+ .setIp4TableId(2)
+ .setIp6TableId(3)
+ .build()));
+
+ writer.deleteAcl(id, IF_INDEX, mappingContext);
+
+ verify(api).classifySetInterfaceL2Tables(classifySetInterfaceL2TablesRequest());
+ verify(api).classifyAddDelTable(classifyAddDelTable(1));
+ verify(api).classifyAddDelTable(classifyAddDelTable(2));
+ verify(api).classifyAddDelTable(classifyAddDelTable(3));
+ verify(aclCtx).removeEntry(IF_INDEX, mappingContext);
+ }
+
+ @Test
+ public void testWrite() throws Exception {
+ when(api.classifyAddDelTable(any())).thenReturn(future(new ClassifyAddDelTableReply()));
+ when(api.classifyAddDelSession(any())).thenReturn(future(new ClassifyAddDelSessionReply()));
+ when(api.classifySetInterfaceL2Tables(any())).thenReturn(future(new ClassifySetInterfaceL2TablesReply()));
+
+ final Egress
+ acl = new EgressBuilder().setAccessLists(
+ new AccessListsBuilder().setAcl(
+ Collections.singletonList(new AclBuilder()
+ .setName(ACL_NAME)
+ .setType(ACL_TYPE)
+ .build())
+ ).setMode(InterfaceMode.L2).build()
+ ).build();
+
+ final AccessLists accessLists = acl.getAccessLists();
+
+ when(writeContext.readAfter(any())).thenReturn(Optional.of(
+ new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclBuilder()
+ .setAccessListEntries(
+ new AccessListEntriesBuilder().setAce(Collections.singletonList(new AceBuilder()
+ .setMatches(new MatchesBuilder().setAceType(
+ new AceIpBuilder()
+ .setAceIpVersion(new AceIpv4Builder().build())
+ .setProtocol((short) 1)
+ .build()
+ ).build())
+ .setActions(new ActionsBuilder().setPacketHandling(new PermitBuilder().build()).build())
+ .build())).build()
+ ).build()
+
+ ));
+
+ writer.write(id, IF_INDEX, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
+ writeContext, mappingContext);
+
+ final ClassifySetInterfaceL2Tables request = new ClassifySetInterfaceL2Tables();
+ request.isInput = 0;
+ request.swIfIndex = IF_INDEX;
+ request.otherTableIndex = -1;
+ request.ip4TableIndex = 0;
+ request.ip6TableIndex = -1;
+ verify(api).classifySetInterfaceL2Tables(request);
+ }
+} \ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/IetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/IetfAclCustomizerTest.java
new file mode 100644
index 000000000..2be2212ff
--- /dev/null
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/IetfAclCustomizerTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.egress;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+import io.fd.honeycomb.translate.v3po.interfaces.acl.common.IetfAclWriter;
+import io.fd.honeycomb.translate.vpp.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.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.IetfAcl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.ietf.acl.Egress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.ietf.acl.EgressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.InterfaceMode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.MixedAcl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.AccessLists;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.AccessListsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.access.lists.AclBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public class IetfAclCustomizerTest extends WriterCustomizerTest {
+ private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
+ private static final String IF_NAME = "local0";
+ private static final int IF_INDEX = 1;
+ private static final InstanceIdentifier<Egress> IID =
+ InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
+ VppInterfaceAugmentation.class).child(IetfAcl.class).child(Egress.class);
+ private static final String ACL_NAME = "acl1";
+ private static final Class<? extends AclBase> ACL_TYPE = MixedAcl.class;
+
+ @Mock
+ private IetfAclWriter aclWriter;
+ private IetfAclCustomizer customizer;
+
+ @Override
+ protected void setUp() {
+ customizer = new IetfAclCustomizer(aclWriter, new NamingContext("prefix", IFC_TEST_INSTANCE));
+ defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
+ }
+
+ private static Egress acl(final InterfaceMode mode) {
+ return new EgressBuilder().setAccessLists(
+ new AccessListsBuilder().setAcl(
+ Collections.singletonList(new AclBuilder()
+ .setName(ACL_NAME)
+ .setType(ACL_TYPE)
+ .build())
+ ).setMode(mode)
+ .build()
+ ).build();
+ }
+
+ private void verifyWrite(final AccessLists accessLists) throws WriteFailedException {
+ verify(aclWriter)
+ .write(IID, IF_INDEX, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
+ writeContext, mappingContext);
+ }
+
+ private void verifyDelete() throws WriteFailedException {
+ verify(aclWriter).deleteAcl(IID, IF_INDEX, mappingContext);
+ }
+
+ @Test
+ public void testWriteL3() throws Exception {
+ customizer.writeCurrentAttributes(IID, acl(InterfaceMode.L3), writeContext);
+ verifyZeroInteractions(aclWriter);
+ }
+
+ @Test
+ public void testWriteL2() throws Exception {
+ final Egress acl = acl(InterfaceMode.L2);
+ customizer.writeCurrentAttributes(IID, acl, writeContext);
+ verifyWrite(acl.getAccessLists());
+ }
+
+ @Test
+ public void testUpdate() throws Exception {
+ final Egress aclBefore = acl(InterfaceMode.L3);
+ final Egress aclAfter = acl(InterfaceMode.L2);
+ customizer.updateCurrentAttributes(IID, aclBefore, aclAfter, writeContext);
+ verifyDelete();
+ verifyWrite(aclAfter.getAccessLists());
+ }
+
+ @Test
+ public void testDelete() throws Exception {
+ final Egress acl = acl(InterfaceMode.L2);
+ customizer.deleteCurrentAttributes(IID, acl, writeContext);
+ verifyDelete();
+ }
+} \ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizerTest.java
new file mode 100644
index 000000000..abefa2465
--- /dev/null
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/egress/SubInterfaceIetfAclCustomizerTest.java
@@ -0,0 +1,130 @@
+/*
+ * 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.egress;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import com.google.common.base.Optional;
+import io.fd.honeycomb.translate.v3po.interfaces.acl.common.IetfAclWriter;
+import io.fd.honeycomb.translate.vpp.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.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.InterfaceMode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.MixedAcl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.AccessLists;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.AccessListsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.access.lists.AclBuilder;
+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.SubInterfaceBuilder;
+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.base.attributes.IetfAcl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.base.attributes.ietf.acl.Egress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.sub._interface.base.attributes.ietf.acl.EgressBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
+ private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
+ private static final String IF_NAME = "local0";
+ private static final int IF_INDEX = 1;
+ private static final String SUBIF_NAME = "local0.0";
+ private static final int SUBIF_INDEX = 11;
+ private static final long SUBIF_ID = 0;
+ private static final InstanceIdentifier<Egress> IID =
+ InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation(
+ SubinterfaceAugmentation.class).child(SubInterfaces.class)
+ .child(SubInterface.class, new SubInterfaceKey(SUBIF_ID)).child(IetfAcl.class).child(Egress.class);
+ private static final String ACL_NAME = "acl1";
+ private static final Class<? extends AclBase> ACL_TYPE = MixedAcl.class;
+
+ @Mock
+ private IetfAclWriter aclWriter;
+ private SubInterfaceIetfAclCustomizer customizer;
+
+ @Override
+ protected void setUp() {
+ customizer = new SubInterfaceIetfAclCustomizer(aclWriter, new NamingContext("prefix", IFC_TEST_INSTANCE));
+ defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
+ defineMapping(mappingContext, SUBIF_NAME, SUBIF_INDEX, IFC_TEST_INSTANCE);
+
+
+ when(writeContext.readAfter(IID.firstIdentifierOf(SubInterface.class))).thenReturn(Optional.of(
+ new SubInterfaceBuilder().build()
+ ));
+ }
+
+ private static Egress acl(final InterfaceMode mode) {
+ return new EgressBuilder().setAccessLists(
+ new AccessListsBuilder().setAcl(
+ Collections.singletonList(new AclBuilder()
+ .setName(ACL_NAME)
+ .setType(ACL_TYPE)
+ .build())
+ ).setMode(mode)
+ .build()
+ ).build();
+ }
+
+ private void verifyWrite(final AccessLists accessLists) throws WriteFailedException {
+ verify(aclWriter)
+ .write(IID, SUBIF_INDEX, accessLists.getAcl(), accessLists.getDefaultAction(), accessLists.getMode(),
+ writeContext, 0, mappingContext);
+ }
+
+ private void verifyDelete() throws WriteFailedException {
+ verify(aclWriter).deleteAcl(IID, SUBIF_INDEX, mappingContext);
+ }
+
+ @Test
+ public void testWriteL3() throws Exception {
+ customizer.writeCurrentAttributes(IID, acl(InterfaceMode.L3), writeContext);
+ verifyZeroInteractions(aclWriter);
+ }
+
+ @Test
+ public void testWriteL2() throws Exception {
+ final Egress acl = acl(InterfaceMode.L2);
+ customizer.writeCurrentAttributes(IID, acl, writeContext);
+ verifyWrite(acl.getAccessLists());
+ }
+
+ @Test
+ public void testUpdate() throws Exception {
+ final Egress aclBefore = acl(InterfaceMode.L3);
+ final Egress aclAfter = acl(InterfaceMode.L2);
+ customizer.updateCurrentAttributes(IID, aclBefore, aclAfter, writeContext);
+ verifyDelete();
+ verifyWrite(aclAfter.getAccessLists());
+ }
+
+ @Test
+ public void testDelete() throws Exception {
+ final Egress acl = acl(InterfaceMode.L2);
+ customizer.deleteCurrentAttributes(IID, acl, writeContext);
+ verifyDelete();
+ }
+} \ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java
index bae706262..ccf1f83b3 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/IetfAclCustomizerTest.java
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.google.common.base.Optional;
+import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTableContextManager;
import io.fd.honeycomb.translate.vpp.util.NamingContext;
import io.fd.honeycomb.translate.write.WriteFailedException;
import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
@@ -30,7 +31,6 @@ import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
import java.util.Arrays;
@@ -40,6 +40,7 @@ import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.junit.Test;
import org.mockito.InOrder;
+import org.mockito.Mock;
import org.mockito.Mockito;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
@@ -59,11 +60,12 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.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.rev161214.VppInterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.AccessListsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.access.lists.AclBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.IetfAcl;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.ietf.acl.Ingress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.ietf.acl.IngressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.AccessListsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.access.lists.AclBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
public class IetfAclCustomizerTest extends WriterCustomizerTest {
@@ -77,6 +79,9 @@ public class IetfAclCustomizerTest extends WriterCustomizerTest {
private static final String ACL_NAME = "acl1";
private static final Class<? extends AclBase> ACL_TYPE = EthAcl.class;
+ @Mock
+ private AclTableContextManager aclCtx;
+
private IetfAclCustomizer customizer;
private Ingress acl;
private int DENY = 0;
@@ -84,7 +89,7 @@ public class IetfAclCustomizerTest extends WriterCustomizerTest {
@Override
protected void setUp() {
- customizer = new IetfAclCustomizer(new IngressIetfAclWriter(api), new NamingContext("prefix", IFC_TEST_INSTANCE));
+ customizer = new IetfAclCustomizer(new IngressIetfAclWriter(api, aclCtx), new NamingContext("prefix", IFC_TEST_INSTANCE));
defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
acl = new IngressBuilder().setAccessLists(
new AccessListsBuilder().setAcl(
@@ -186,15 +191,20 @@ public class IetfAclCustomizerTest extends WriterCustomizerTest {
@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()));
+ when(aclCtx.getEntry(IF_INDEX, mappingContext)).thenReturn(Optional.of(
+ new MappingEntryBuilder()
+ .setIndex(IF_INDEX)
+ .setL2TableId(1)
+ .setIp4TableId(2)
+ .setIp6TableId(3)
+ .build()));
customizer.deleteCurrentAttributes(IID, acl, writeContext);
final ClassifyTableByInterface expectedRequest = new ClassifyTableByInterface();
expectedRequest.swIfIndex = IF_INDEX;
- verify(api).classifyTableByInterface(expectedRequest);
verify(api).inputAclSetInterface(inputAclSetInterfaceDeleteRequest());
verify(api).classifyAddDelTable(classifyAddDelTable(1));
verify(api).classifyAddDelTable(classifyAddDelTable(2));
@@ -203,6 +213,7 @@ public class IetfAclCustomizerTest extends WriterCustomizerTest {
private static InputAclSetInterface inputAclSetInterfaceDeleteRequest() {
final InputAclSetInterface request = new InputAclSetInterface();
+ request.swIfIndex = IF_INDEX;
request.l2TableIndex = 1;
request.ip4TableIndex = 2;
request.ip6TableIndex = 3;
@@ -215,14 +226,6 @@ public class IetfAclCustomizerTest extends WriterCustomizerTest {
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;
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
index ddf3206b9..75f2b8ec8 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/translate/v3po/interfaces/acl/ingress/SubInterfaceIetfAclCustomizerTest.java
@@ -21,15 +21,16 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.google.common.base.Optional;
+import io.fd.honeycomb.translate.v3po.interfaces.acl.common.AclTableContextManager;
import io.fd.honeycomb.translate.vpp.util.NamingContext;
import io.fd.honeycomb.translate.write.WriteFailedException;
import io.fd.honeycomb.vpp.test.write.WriterCustomizerTest;
import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
-import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
import java.util.Collections;
import org.junit.Test;
+import org.mockito.Mock;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AclBase;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.EthAcl;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclKey;
@@ -37,6 +38,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.cont
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.context.rev161214.mapping.entry.context.attributes.acl.mapping.entry.context.mapping.table.MappingEntryBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.AccessListsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.ietf.acl.base.attributes.access.lists.AclBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.vlan.rev161214.SubinterfaceAugmentation;
@@ -67,10 +69,13 @@ public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
private SubInterfaceIetfAclCustomizer customizer;
private Ingress acl;
+ @Mock
+ private AclTableContextManager aclCtx;
+
@Override
protected void setUp() {
customizer =
- new SubInterfaceIetfAclCustomizer(new IngressIetfAclWriter(api), new NamingContext("prefix", IFC_TEST_INSTANCE));
+ new SubInterfaceIetfAclCustomizer(new IngressIetfAclWriter(api, aclCtx), new NamingContext("prefix", IFC_TEST_INSTANCE));
defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE);
acl = new IngressBuilder().setAccessLists(
@@ -97,27 +102,25 @@ public class SubInterfaceIetfAclCustomizerTest extends WriterCustomizerTest {
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()));
+ when(aclCtx.getEntry(SUBIF_INDEX, mappingContext)).thenReturn(Optional.of(
+ new MappingEntryBuilder()
+ .setIndex(SUBIF_INDEX)
+ .setL2TableId(-1)
+ .setIp4TableId(-1)
+ .setIp6TableId(-1)
+ .build()));
customizer.deleteCurrentAttributes(IID, acl, writeContext);
final ClassifyTableByInterface expectedRequest = new ClassifyTableByInterface();
expectedRequest.swIfIndex = SUBIF_INDEX;
- verify(api).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.swIfIndex = SUBIF_INDEX;
request.l2TableIndex = -1;
request.ip4TableIndex = -1;
request.ip6TableIndex = -1;