summaryrefslogtreecommitdiffstats
path: root/v3po/v3po2vpp/src/test/java/io/fd
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-06-05 21:53:18 +0200
committerMarek Gradzki <mgradzki@cisco.com>2016-07-14 15:28:02 +0200
commitda4561dbaaed3f0724c1f1844dba67566bb1062a (patch)
treed3e42c54317a76a9417c63ec5d8e8809e453c21a /v3po/v3po2vpp/src/test/java/io/fd
parente5ddeadb5b19272c11b08bc8378e08551393c0d8 (diff)
HONEYCOMB-49: ACL create/delete support for vpp-interface-augmentation
Change-Id: I5c25bac07ce618f69cf86f988749b0f86e9a6498 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/v3po/translate/v3po/interfaces/AclCustomizerTest.java221
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/AclCustomizerTest.java131
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionWriterTest.java2
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableReaderTest.java2
-rw-r--r--v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableWriterTest.java7
5 files changed, 356 insertions, 7 deletions
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/AclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/AclCustomizerTest.java
new file mode 100644
index 000000000..f08ffd46f
--- /dev/null
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/AclCustomizerTest.java
@@ -0,0 +1,221 @@
+/*
+ * 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.v3po.translate.v3po.interfaces;
+
+import static io.fd.honeycomb.v3po.translate.v3po.test.ContextTestUtils.getMapping;
+import static io.fd.honeycomb.v3po.translate.v3po.test.ContextTestUtils.getMappingIid;
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.Lists;
+import io.fd.honeycomb.v3po.translate.MappingContext;
+import io.fd.honeycomb.v3po.translate.v3po.test.TestHelperUtils;
+import io.fd.honeycomb.v3po.translate.v3po.util.NamingContext;
+import io.fd.honeycomb.v3po.translate.write.WriteContext;
+import io.fd.honeycomb.v3po.translate.write.WriteFailedException;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.Mappings;
+import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.MappingsBuilder;
+import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.mappings.Mapping;
+import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.mappings.MappingKey;
+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.acl.base.attributes.L2Acl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.acl.base.attributes.L2AclBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.Acl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.AclBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.openvpp.jvpp.VppBaseCallException;
+import org.openvpp.jvpp.dto.InputAclSetInterface;
+import org.openvpp.jvpp.dto.InputAclSetInterfaceReply;
+import org.openvpp.jvpp.dto.L2InterfaceVlanTagRewriteReply;
+import org.openvpp.jvpp.future.FutureJVpp;
+
+public class AclCustomizerTest {
+
+ @Mock
+ private FutureJVpp api;
+ @Mock
+ private WriteContext writeContext;
+ @Mock
+ private MappingContext mappingContext;
+
+ private NamingContext interfaceContext;
+ private NamingContext classifyTableContext;
+ private AclCustomizer customizer;
+
+ private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
+ private static final String CT_TEST_INSTANCE = "ct-test-instance";
+ private static final String IF_NAME = "local0";
+ private static final int IF_INDEX = 1;
+
+ private static final int ACL_TABLE_INDEX = 0;
+ private static final String ACL_TABLE_NAME = "table0";
+
+ @Before
+ public void setUp() throws Exception {
+ initMocks(this);
+ interfaceContext = new NamingContext("generatedInterfaceName", IFC_TEST_INSTANCE);
+ classifyTableContext = new NamingContext("generatedClassifyTable", CT_TEST_INSTANCE);
+ doReturn(mappingContext).when(writeContext).getMappingContext();
+ customizer = new AclCustomizer(api, interfaceContext, classifyTableContext);
+
+ final KeyedInstanceIdentifier<Mapping, MappingKey> ifcMappingKey = getMappingIid(IF_NAME, IFC_TEST_INSTANCE);
+ final Optional<Mapping> ifcMapping = getMapping(IF_NAME, IF_INDEX);
+ doReturn(ifcMapping).when(mappingContext).read(ifcMappingKey);
+
+ final KeyedInstanceIdentifier<Mapping, MappingKey> ctMappingKey =
+ getMappingIid(ACL_TABLE_NAME, CT_TEST_INSTANCE);
+ final Optional<Mapping> ctMapping = getMapping(ACL_TABLE_NAME, ACL_TABLE_INDEX);
+ doReturn(ctMapping).when(mappingContext).read(ctMappingKey);
+
+ final List<Mapping> allCtMappings = Lists.newArrayList(ctMapping.get());
+ final Mappings allCtMappingsBaObject = new MappingsBuilder().setMapping(allCtMappings).build();
+ doReturn(Optional.of(allCtMappingsBaObject)).when(mappingContext)
+ .read(ctMappingKey.firstIdentifierOf(Mappings.class));
+ }
+
+
+ private InstanceIdentifier<Acl> getAclId(final String name) {
+ return InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(name)).augmentation(
+ VppInterfaceAugmentation.class).child(Acl.class);
+ }
+
+ private Acl generateAcl(final String tableName) {
+ final AclBuilder builder = new AclBuilder();
+ final L2Acl l2Acl = new L2AclBuilder().setClassifyTable(tableName).build();
+ builder.setL2Acl(l2Acl);
+ return builder.build();
+ }
+
+ private void whenInputAclSetInterfaceThenSuccess() throws ExecutionException, InterruptedException {
+ final CompletableFuture<InputAclSetInterfaceReply> replyFuture = new CompletableFuture<>();
+ final InputAclSetInterfaceReply reply = new InputAclSetInterfaceReply();
+ replyFuture.complete(reply);
+ doReturn(replyFuture).when(api).inputAclSetInterface(any(InputAclSetInterface.class));
+ }
+
+ private void whenInputAclSetInterfaceThenFailure() throws ExecutionException, InterruptedException {
+ doReturn(TestHelperUtils.<L2InterfaceVlanTagRewriteReply>createFutureException()).when(api)
+ .inputAclSetInterface(any(InputAclSetInterface.class));
+ }
+
+ private void verifyInputAclSetInterfaceWasInvoked(final InputAclSetInterface expected) {
+ final ArgumentCaptor<InputAclSetInterface> argumentCaptor = ArgumentCaptor.forClass(InputAclSetInterface.class);
+ verify(api).inputAclSetInterface(argumentCaptor.capture());
+ final InputAclSetInterface actual = argumentCaptor.getValue();
+ assertEquals(expected.swIfIndex, actual.swIfIndex);
+ assertEquals(expected.l2TableIndex, actual.l2TableIndex);
+ assertEquals(expected.ip4TableIndex, actual.ip4TableIndex);
+ assertEquals(expected.ip6TableIndex, actual.ip6TableIndex);
+ assertEquals(expected.isAdd, actual.isAdd);
+ }
+
+ private void verifyInputAclSetInterfaceDisableWasInvoked(final InputAclSetInterface expected) {
+ final ArgumentCaptor<InputAclSetInterface> argumentCaptor = ArgumentCaptor.forClass(InputAclSetInterface.class);
+ verify(api).inputAclSetInterface(argumentCaptor.capture());
+ final InputAclSetInterface actual = argumentCaptor.getValue();
+ assertEquals(expected.swIfIndex, actual.swIfIndex);
+ assertEquals(expected.l2TableIndex, actual.l2TableIndex);
+ assertEquals(0, actual.isAdd);
+ }
+
+ private static InputAclSetInterface generateInputAclSetInterface(final byte isAdd, final int ifIndex,
+ final int l2TableIndex) {
+ final InputAclSetInterface request = new InputAclSetInterface();
+ request.isAdd = isAdd;
+ request.l2TableIndex = l2TableIndex;
+ request.ip4TableIndex = ~0;
+ request.ip6TableIndex = ~0;
+ request.swIfIndex = ifIndex;
+ return request;
+ }
+
+ @Test
+ public void testCreate() throws Exception {
+ final Acl acl = generateAcl(ACL_TABLE_NAME);
+ final InstanceIdentifier<Acl> id = getAclId(IF_NAME);
+
+ whenInputAclSetInterfaceThenSuccess();
+
+ customizer.writeCurrentAttributes(id, acl, writeContext);
+
+ verifyInputAclSetInterfaceWasInvoked(generateInputAclSetInterface((byte) 1, IF_INDEX, ACL_TABLE_INDEX));
+ }
+
+ @Test
+ public void testCreateFailed() throws Exception {
+ final Acl acl = generateAcl(ACL_TABLE_NAME);
+ final InstanceIdentifier<Acl> id = getAclId(IF_NAME);
+
+ whenInputAclSetInterfaceThenFailure();
+
+ try {
+ customizer.writeCurrentAttributes(id, acl, writeContext);
+ } catch (WriteFailedException.CreateFailedException e) {
+ assertTrue(e.getCause() instanceof VppBaseCallException);
+ verifyInputAclSetInterfaceWasInvoked(generateInputAclSetInterface((byte) 1, IF_INDEX, ACL_TABLE_INDEX));
+ return;
+ }
+ fail("WriteFailedException.CreateFailedException was expected");
+ }
+
+ @Test
+ public void testDelete() throws Exception {
+ final Acl acl = generateAcl(ACL_TABLE_NAME);
+ final InstanceIdentifier<Acl> id = getAclId(IF_NAME);
+
+ whenInputAclSetInterfaceThenSuccess();
+
+ customizer.deleteCurrentAttributes(id, acl, writeContext);
+
+ verifyInputAclSetInterfaceDisableWasInvoked(generateInputAclSetInterface((byte) 0, IF_INDEX, ACL_TABLE_INDEX));
+ }
+
+ @Test
+ public void testDeleteFailed() throws Exception {
+ final Acl acl = generateAcl(ACL_TABLE_NAME);
+ final InstanceIdentifier<Acl> id = getAclId(IF_NAME);
+
+ whenInputAclSetInterfaceThenFailure();
+
+ try {
+ customizer.deleteCurrentAttributes(id, acl, writeContext);
+ } catch (WriteFailedException.DeleteFailedException e) {
+ assertTrue(e.getCause() instanceof VppBaseCallException);
+ verifyInputAclSetInterfaceDisableWasInvoked(
+ generateInputAclSetInterface((byte) 0, IF_INDEX, ACL_TABLE_INDEX));
+ return;
+ }
+ fail("WriteFailedException.DeleteFailedException was expected");
+ }
+} \ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/AclCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/AclCustomizerTest.java
new file mode 100644
index 000000000..4e9e5dea4
--- /dev/null
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/AclCustomizerTest.java
@@ -0,0 +1,131 @@
+/*
+ * 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.v3po.translate.v3po.interfacesstate;
+
+import static io.fd.honeycomb.v3po.translate.v3po.test.ContextTestUtils.getMapping;
+import static io.fd.honeycomb.v3po.translate.v3po.test.ContextTestUtils.getMappingIid;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.Lists;
+import io.fd.honeycomb.v3po.translate.spi.read.RootReaderCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.test.ChildReaderCustomizerTest;
+import io.fd.honeycomb.v3po.translate.v3po.util.NamingContext;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.Mappings;
+import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.MappingsBuilder;
+import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.mappings.Mapping;
+import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.contexts.naming.context.mappings.MappingKey;
+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.v3po.rev150105.VppInterfaceStateAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceStateAugmentationBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.acl.base.attributes.L2AclBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.Acl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.AclBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.openvpp.jvpp.dto.ClassifyTableByInterface;
+import org.openvpp.jvpp.dto.ClassifyTableByInterfaceReply;
+
+public class AclCustomizerTest extends ChildReaderCustomizerTest<Acl, AclBuilder> {
+
+ private static final String IF_NAME = "local0";
+ private static final int IF_INDEX = 1;
+ private static final int TABLE_INDEX = 123;
+ private static final String TABLE_NAME = "table123";
+
+ private static final String IFC_TEST_INSTANCE = "ifc-test-instance";
+ private static final String CT_TEST_INSTANCE = "ct-test-instance";
+
+ private NamingContext interfaceContext;
+ private NamingContext classifyTableContext;
+
+ public AclCustomizerTest() {
+ super(Acl.class);
+ }
+
+ @Override
+ public void setUpBefore() {
+ interfaceContext = new NamingContext("generatedIfaceName", IFC_TEST_INSTANCE);
+ classifyTableContext = new NamingContext("generatedTableContext", CT_TEST_INSTANCE);
+
+ final KeyedInstanceIdentifier<Mapping, MappingKey> ifcMappingKey = getMappingIid(IF_NAME, IFC_TEST_INSTANCE);
+ final Optional<Mapping> ifcMapping = getMapping(IF_NAME, IF_INDEX);
+ doReturn(ifcMapping).when(mappingContext).read(ifcMappingKey);
+
+ final KeyedInstanceIdentifier<Mapping, MappingKey> ctMappingKey = getMappingIid(TABLE_NAME, CT_TEST_INSTANCE);
+ final Optional<Mapping> ctMapping = getMapping(TABLE_NAME, TABLE_INDEX);
+ doReturn(ctMapping).when(mappingContext).read(ctMappingKey);
+
+ final List<Mapping> allCtMappings = Lists.newArrayList(ctMapping.get());
+ final Mappings allCtMappingsBaObject = new MappingsBuilder().setMapping(allCtMappings).build();
+ doReturn(Optional.of(allCtMappingsBaObject)).when(mappingContext)
+ .read(ctMappingKey.firstIdentifierOf(Mappings.class));
+
+ final List<Mapping> allIfcMappings = Lists.newArrayList(ifcMapping.get());
+ final Mappings allIfcMappingsBaObject = new MappingsBuilder().setMapping(allIfcMappings).build();
+ doReturn(Optional.of(allIfcMappingsBaObject)).when(mappingContext)
+ .read(ifcMappingKey.firstIdentifierOf(Mappings.class));
+ }
+
+ @Override
+ protected RootReaderCustomizer<Acl, AclBuilder> initCustomizer() {
+ return new AclCustomizer(api, interfaceContext, classifyTableContext);
+ }
+
+ @Test
+ public void testMerge() {
+ final VppInterfaceStateAugmentationBuilder builder = mock(VppInterfaceStateAugmentationBuilder.class);
+ final Acl value = mock(Acl.class);
+ getCustomizer().merge(builder, value);
+ verify(builder).setAcl(value);
+ }
+
+ private InstanceIdentifier<Acl> getAclId(final String name) {
+ return InstanceIdentifier.create(InterfacesState.class).child(Interface.class, new InterfaceKey(name))
+ .augmentation(
+ VppInterfaceStateAugmentation.class).child(Acl.class);
+ }
+
+ @Test
+ public void testRead() throws Exception {
+ final InstanceIdentifier<Acl> id = getAclId(IF_NAME);
+ final AclBuilder builder = mock(AclBuilder.class);
+
+ final CompletableFuture<ClassifyTableByInterfaceReply> replyFuture = new CompletableFuture<>();
+ final ClassifyTableByInterfaceReply reply = new ClassifyTableByInterfaceReply();
+ reply.l2TableId = TABLE_INDEX;
+ reply.ip4TableId = ~0;
+ reply.ip6TableId = ~0;
+ replyFuture.complete(reply);
+ doReturn(replyFuture).when(api).classifyTableByInterface(any(ClassifyTableByInterface.class));
+
+ getCustomizer().readCurrentAttributes(id, builder, ctx);
+
+ verify(builder).setL2Acl(new L2AclBuilder().setClassifyTable(TABLE_NAME).build());
+ verify(builder).setIp4Acl(null);
+ verify(builder).setIp6Acl(null);
+ }
+
+} \ No newline at end of file
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionWriterTest.java
index 04a766fa3..31420e1a7 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionWriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifySessionWriterTest.java
@@ -86,7 +86,7 @@ public class ClassifySessionWriterTest {
private static ClassifySession generateClassifySession(final long opaqueIndex, final String match) {
final ClassifySessionBuilder builder = new ClassifySessionBuilder();
builder.setOpaqueIndex(new OpaqueIndex(opaqueIndex));
- builder.setHitNextIndex(new VppNode(PacketHandlingAction.Deny));
+ builder.setHitNext(new VppNode(PacketHandlingAction.Deny));
builder.setAdvance(123);
builder.setMatch(new HexString(match));
return builder.build();
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableReaderTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableReaderTest.java
index 14d6c5544..8461f0c4a 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableReaderTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableReaderTest.java
@@ -111,7 +111,7 @@ public class ClassifyTableReaderTest extends
verify(builder).setName(TABLE_NAME_1);
verify(builder).setNbuckets(2L);
verify(builder, times(0)).setNextTable(anyString());
- verify(builder).setMissNextIndex(new VppNode(PacketHandlingAction.Permit));
+ verify(builder).setMissNext(new VppNode(PacketHandlingAction.Permit));
verify(builder).setMask(new HexString("00:00:00:00:00:00:01:02:03:04:05:06:00:00:00:00"));
verify(builder).setActiveSessions(0L);
}
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableWriterTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableWriterTest.java
index 683bd69c3..015daf344 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableWriterTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/vppclassifier/ClassifyTableWriterTest.java
@@ -27,7 +27,6 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.MockitoAnnotations.initMocks;
import com.google.common.base.Optional;
@@ -87,7 +86,7 @@ public class ClassifyTableWriterTest {
builder.setSkipNVectors(0L);
builder.setNbuckets(2L);
builder.setMemorySize(2L << 20);
- builder.setMissNextIndex(new VppNode(PacketHandlingAction.Permit));
+ builder.setMissNext(new VppNode(PacketHandlingAction.Permit));
builder.setMask(new HexString("00:00:00:00:00:00:01:02:03:04:05:06:00:00:00:00"));
return builder.build();
}
@@ -220,12 +219,10 @@ public class ClassifyTableWriterTest {
customizer.deleteCurrentAttributes(id, classifyTable, writeContext);
}
- @Test
+ @Test(expected = UnsupportedOperationException.class)
public void testUpdate() throws Exception {
final ClassifyTable classifyTableBefore = generateClassifyTable(TABLE_NAME);
final InstanceIdentifier<ClassifyTable> id = getClassifyTableId(TABLE_NAME);
customizer.updateCurrentAttributes(id, classifyTableBefore, new ClassifyTableBuilder().build(), writeContext);
-
- verifyZeroInteractions(api);
}
} \ No newline at end of file