From b77a5725338dc700873b36c98af85d70acd7bbe4 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Fri, 15 Jun 2018 13:12:53 +0200 Subject: HC2VPP-304 - add SRv6 policy module new models: - hc2vpp-oc-srte-policy@2017-09-18.yang (ietf draft for srte-policies) - vpp-oc-srte-policy@2018-05-14.yang (augments oc-srte-policy model with VPP specific configuration) - policy-context@2018-06-07.yang defines policy contexts for policies and candidate paths new features: - adds support for writing/reading SRv6 policies - adds support for writing/reading L2 steering - adds support for writing/reading L3 steering - implements support for FIB table management (HC2VPP-345) Change-Id: Ie83ac8ecdcc0e46086e1ecdaecbb811746151c2f Signed-off-by: Michal Cmarada --- .../src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java') diff --git a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java index 54e4cdd26..068ea128a 100644 --- a/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java +++ b/srv6/srv6-impl/src/test/java/io/fd/hc2vpp/srv6/Srv6ModuleTest.java @@ -31,7 +31,9 @@ import com.google.inject.name.Named; import com.google.inject.testing.fieldbinder.Bind; import com.google.inject.testing.fieldbinder.BoundFieldModule; import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.hc2vpp.srv6.read.Srv6PolicyReaderFactory; import io.fd.hc2vpp.srv6.read.Srv6ReaderFactory; +import io.fd.hc2vpp.srv6.write.Srv6PolicyWriterFactory; import io.fd.hc2vpp.srv6.write.Srv6WriterFactory; import io.fd.hc2vpp.vpp.classifier.context.VppClassifierContextManager; import io.fd.honeycomb.translate.ModificationCache; @@ -42,6 +44,7 @@ import io.fd.honeycomb.translate.util.YangDAG; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import org.junit.Before; import org.junit.Test; @@ -100,8 +103,10 @@ public class Srv6ModuleTest { readerFactories.forEach(factory -> factory.init(registryBuilder)); registryBuilder.addStructuralReader(Srv6IIds.RT, RoutingBuilder.class); assertNotNull(registryBuilder.build()); - assertEquals(1, readerFactories.size()); - assertTrue(readerFactories.iterator().next() instanceof Srv6ReaderFactory); + assertEquals(2, readerFactories.size()); + Iterator readerFactoryIterator = readerFactories.iterator(); + assertTrue(readerFactoryIterator.next() instanceof Srv6ReaderFactory); + assertTrue(readerFactoryIterator.next() instanceof Srv6PolicyReaderFactory); } @Test @@ -112,7 +117,9 @@ public class Srv6ModuleTest { final FlatWriterRegistryBuilder registryBuilder = new FlatWriterRegistryBuilder(new YangDAG()); writerFactories.forEach(factory -> factory.init(registryBuilder)); assertNotNull(registryBuilder.build()); - assertEquals(1, writerFactories.size()); - assertTrue(writerFactories.iterator().next() instanceof Srv6WriterFactory); + assertEquals(2, writerFactories.size()); + Iterator writerFactoryIterator = writerFactories.iterator(); + assertTrue(writerFactoryIterator.next() instanceof Srv6WriterFactory); + assertTrue(writerFactoryIterator.next() instanceof Srv6PolicyWriterFactory); } } -- cgit 1.2.3-korg