From a2ba7b3fe8d0cdaa0faead940a064081bcb03975 Mon Sep 17 00:00:00 2001 From: Tibor Král Date: Thu, 31 Jan 2019 17:50:29 +0100 Subject: HC2VPP-387: Validation support for Vpp-Classifier module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia97fa466bc3e39c04bd8f7625c4b6306523e3fce Signed-off-by: Tibor Král --- .../write/ClassifySessionValidatorTest.java | 71 +++++++++++++ .../write/ClassifySessionWriterTest.java | 2 +- .../write/ClassifyTableValidatorTest.java | 97 ++++++++++++++++++ .../classifier/write/ClassifyTableWriterTest.java | 2 +- .../vpp/classifier/write/acl/AclValidatorTest.java | 113 +++++++++++++++++++++ 5 files changed, 283 insertions(+), 2 deletions(-) create mode 100644 vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionValidatorTest.java create mode 100644 vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableValidatorTest.java create mode 100644 vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclValidatorTest.java (limited to 'vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier') diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionValidatorTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionValidatorTest.java new file mode 100644 index 000000000..c6f50d172 --- /dev/null +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionValidatorTest.java @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2019 PANTHEON.tech. + * + * 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.vpp.classifier.write; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.when; +import static org.mockito.MockitoAnnotations.initMocks; + +import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; +import io.fd.honeycomb.translate.write.DataValidationFailedException.CreateValidationFailedException; +import io.fd.honeycomb.translate.write.DataValidationFailedException.DeleteValidationFailedException; +import io.fd.honeycomb.translate.write.WriteContext; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.classify.table.base.attributes.ClassifySession; + +public class ClassifySessionValidatorTest { + + @Mock + private WriteContext writeContext; + @Mock + private VppClassifierContextManager classifyTableContext; + @Mock + private ClassifySession session; + + private NamingContext policerContext; + private ClassifySessionValidator validator; + + private static final String MATCH = "00:00:00:00:00:00:01:02:03:04:05:06:00:00:00:00"; + private static final String TABLE_NAME = "table123"; + + @Before + public void setUp() { + initMocks(this); + policerContext = new NamingContext("testPolicerContext", "testPolicerContext"); + validator = new ClassifySessionValidator(classifyTableContext, policerContext); + } + + @Test + public void testWriteSuccessfull() + throws CreateValidationFailedException { + when(classifyTableContext.containsTable(eq(TABLE_NAME), any())).thenReturn(true); + validator.validateWrite(ClassifySessionWriterTest.getClassifySessionId(TABLE_NAME, MATCH), session, + writeContext); + } + + @Test(expected = DeleteValidationFailedException.class) + public void testDeleteFailedContextMissingTable() + throws DeleteValidationFailedException { + when(classifyTableContext.containsTable(eq(TABLE_NAME), any())).thenReturn(Boolean.FALSE); + validator.validateDelete(ClassifySessionWriterTest.getClassifySessionId(TABLE_NAME, MATCH), session, + writeContext); + } +} diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java index 631ce2edb..84bc4d6a4 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifySessionWriterTest.java @@ -69,7 +69,7 @@ public class ClassifySessionWriterTest extends WriterCustomizerTest { return builder.build(); } - private static InstanceIdentifier getClassifySessionId(final String tableName, + static InstanceIdentifier getClassifySessionId(final String tableName, final String match) { return InstanceIdentifier.create(VppClassifier.class) .child(ClassifyTable.class, new ClassifyTableKey(tableName)) diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableValidatorTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableValidatorTest.java new file mode 100644 index 000000000..bec9df27c --- /dev/null +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableValidatorTest.java @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2019 PANTHEON.tech. + * + * 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.vpp.classifier.write; + +import static org.mockito.MockitoAnnotations.initMocks; + +import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; +import io.fd.honeycomb.translate.write.DataValidationFailedException.CreateValidationFailedException; +import io.fd.honeycomb.translate.write.DataValidationFailedException.DeleteValidationFailedException; +import io.fd.honeycomb.translate.write.WriteContext; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.PacketHandlingAction; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.VppNode; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.VppNodeName; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.vpp.classifier.ClassifyTable; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.vpp.classifier.ClassifyTableBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.rev170327.vpp.classifier.ClassifyTableKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.HexString; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +public class ClassifyTableValidatorTest implements ByteDataTranslator { + + private static final String TABLE_NAME = "table123"; + private InstanceIdentifier tableIID; + + @Mock + private WriteContext writeContext; + + private ClassifyTableValidator validator; + + @Before + public void setUp() { + initMocks(this); + validator = new ClassifyTableValidator(); + tableIID = ClassifyTableWriterTest.getClassifyTableId(TABLE_NAME); + } + + @Test + public void testWriteSuccessfull() + throws CreateValidationFailedException { + ClassifyTableBuilder builder = generatePrePopulatedClassifyTableBuilder(TABLE_NAME); + validator.validateWrite(tableIID, builder.build(), writeContext); + } + + @Test(expected = CreateValidationFailedException.class) + public void testWriteFailedOnEmptyNBuckets() + throws CreateValidationFailedException { + ClassifyTableBuilder builder = generatePrePopulatedClassifyTableBuilder(TABLE_NAME); + builder.setNbuckets(null); + validator.validateWrite(tableIID, builder.build(), writeContext); + } + + @Test(expected = CreateValidationFailedException.class) + public void testWriteFailedOnEmptyMemorySize() + throws CreateValidationFailedException { + ClassifyTableBuilder builder = generatePrePopulatedClassifyTableBuilder(TABLE_NAME); + builder.setMemorySize(null); + validator.validateWrite(tableIID, builder.build(), writeContext); + } + + @Test(expected = DeleteValidationFailedException.class) + public void testDeleteFailedOnEmptySkipNVectors() + throws DeleteValidationFailedException { + ClassifyTableBuilder builder = generatePrePopulatedClassifyTableBuilder(TABLE_NAME); + builder.setSkipNVectors(null); + validator.validateDelete(tableIID, builder.build(), writeContext); + } + + private ClassifyTableBuilder generatePrePopulatedClassifyTableBuilder(final String name) { + final ClassifyTableBuilder builder = new ClassifyTableBuilder(); + builder.setName(name); + builder.setClassifierNode(new VppNodeName("ip4-classifier")); + builder.withKey(new ClassifyTableKey(name)); + builder.setSkipNVectors(0L); + builder.setNbuckets(2L); + builder.setMemorySize(2L << 20); + 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; + } +} diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java index 536a4ae6e..89082c601 100644 --- a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/ClassifyTableWriterTest.java @@ -66,7 +66,7 @@ public class ClassifyTableWriterTest extends WriterCustomizerTest { return builder.build(); } - private static InstanceIdentifier getClassifyTableId(final String name) { + static InstanceIdentifier getClassifyTableId(final String name) { return InstanceIdentifier.create(VppClassifier.class) .child(ClassifyTable.class, new ClassifyTableKey(name)); } diff --git a/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclValidatorTest.java b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclValidatorTest.java new file mode 100644 index 000000000..ee4a20241 --- /dev/null +++ b/vpp-classifier/impl/src/test/java/io/fd/hc2vpp/vpp/classifier/write/acl/AclValidatorTest.java @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2019 PANTHEON.tech. + * + * 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.vpp.classifier.write.acl; + +import static org.mockito.MockitoAnnotations.initMocks; + +import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; +import io.fd.hc2vpp.vpp.classifier.write.acl.ingress.AclValidator; +import io.fd.honeycomb.translate.write.DataValidationFailedException.CreateValidationFailedException; +import io.fd.honeycomb.translate.write.WriteContext; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip4Acl; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip4AclBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip6Acl; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.Ip6AclBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.L2Acl; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.acl.base.attributes.L2AclBuilder; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.vpp.acl.attributes.acl.Ingress; +import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.classifier.acl.rev170503.vpp.acl.attributes.acl.IngressBuilder; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +public class AclValidatorTest { + + @Mock + private VppClassifierContextManager classifyTableContext; + @Mock + private WriteContext writeContext; + + private AclValidator validator; + private NamingContext interfaceContext; + + private InstanceIdentifier ingressIID; + private static final String ACL_TABLE_NAME = "table0"; + + @Before + public void setUp() { + initMocks(this); + ingressIID = InstanceIdentifier.create(Ingress.class); + interfaceContext = new NamingContext("testAclValidator", "testAclValidator"); + validator = new AclValidator(interfaceContext, classifyTableContext); + } + + @Test + public void testWriteSuccessfullL24Acl() + throws CreateValidationFailedException { + final IngressBuilder builder = new IngressBuilder(); + L2Acl l2Acl = new L2AclBuilder().setClassifyTable(ACL_TABLE_NAME).build(); + builder.setL2Acl(l2Acl); + validator.validateWrite(ingressIID, builder.build(), writeContext); + } + + @Test(expected = CreateValidationFailedException.class) + public void testWriteFailedL2Acl() + throws CreateValidationFailedException { + final IngressBuilder builder = new IngressBuilder(); + L2Acl l2Acl = new L2AclBuilder().setClassifyTable(null).build(); + builder.setL2Acl(l2Acl); + validator.validateWrite(ingressIID, builder.build(), writeContext); + } + + @Test + public void testWriteSuccessfullIp4Acl() + throws CreateValidationFailedException { + final IngressBuilder builder = new IngressBuilder(); + Ip4Acl ip42Acl = new Ip4AclBuilder().setClassifyTable(ACL_TABLE_NAME).build(); + builder.setIp4Acl(ip42Acl); + validator.validateWrite(ingressIID, builder.build(), writeContext); + } + + @Test(expected = CreateValidationFailedException.class) + public void testWriteFailedIp4Acl() + throws CreateValidationFailedException { + final IngressBuilder builder = new IngressBuilder(); + Ip4Acl ip42Acl = new Ip4AclBuilder().setClassifyTable(null).build(); + builder.setIp4Acl(ip42Acl); + validator.validateWrite(ingressIID, builder.build(), writeContext); + } + + @Test + public void testWriteSuccessfullIp6Acl() + throws CreateValidationFailedException { + final IngressBuilder builder = new IngressBuilder(); + Ip6Acl ip6Acl = new Ip6AclBuilder().setClassifyTable(ACL_TABLE_NAME).build(); + builder.setIp6Acl(ip6Acl); + validator.validateWrite(ingressIID, builder.build(), writeContext); + } + + @Test(expected = CreateValidationFailedException.class) + public void testWriteFailedIp6Acl() + throws CreateValidationFailedException { + final IngressBuilder builder = new IngressBuilder(); + Ip6Acl ip6Acl = new Ip6AclBuilder().setClassifyTable(null).build(); + builder.setIp6Acl(ip6Acl); + validator.validateWrite(ingressIID, builder.build(), writeContext); + } +} -- cgit 1.2.3-korg