From b3f2a7148ad4718a5fcdff12b65ba6c1a7514655 Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Thu, 2 Nov 2017 12:06:12 +0100 Subject: HONEYCOMB-359 - Wildcarded writers for BGP extensions Defines wildcarded writers for BGP extensions to be able to write theirs respective part of ApplicationRib Change-Id: I0057b59c5977d5f75e0bc3c0c8eae9b8cfdf0f85 Signed-off-by: Jan Srnicek --- .../bgp/extension/LabeledUnicastWriterFactory.java | 24 ++++------------------ 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'infra/northbound/bgp-extensions/labeled-unicast') diff --git a/infra/northbound/bgp-extensions/labeled-unicast/src/main/java/io/fd/honeycomb/northbound/bgp/extension/LabeledUnicastWriterFactory.java b/infra/northbound/bgp-extensions/labeled-unicast/src/main/java/io/fd/honeycomb/northbound/bgp/extension/LabeledUnicastWriterFactory.java index c1ccabacf..0db8f525f 100644 --- a/infra/northbound/bgp-extensions/labeled-unicast/src/main/java/io/fd/honeycomb/northbound/bgp/extension/LabeledUnicastWriterFactory.java +++ b/infra/northbound/bgp-extensions/labeled-unicast/src/main/java/io/fd/honeycomb/northbound/bgp/extension/LabeledUnicastWriterFactory.java @@ -16,20 +16,14 @@ package io.fd.honeycomb.northbound.bgp.extension; -import com.google.common.collect.Sets; import com.google.inject.Inject; import com.google.inject.name.Named; import io.fd.honeycomb.translate.util.write.BindingBrokerWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev150525.labeled.unicast.LabelStack; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev150525.labeled.unicast.ipv6.routes.LabeledUnicastIpv6Routes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev150525.labeled.unicast.routes.LabeledUnicastRoutes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.labeled.unicast.rev150525.labeled.unicast.routes.list.LabeledUnicastRoute; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.Attributes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.LocalPref; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.Origin; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHop; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import javax.annotation.Nonnull; @@ -40,6 +34,7 @@ import static io.fd.honeycomb.northbound.bgp.extension.AbstractBgpExtensionModul public class LabeledUnicastWriterFactory implements WriterFactory { private static final InstanceIdentifier LABELED_UNICAST_ROUTES_IID = TABLES_IID.child((Class) LabeledUnicastRoutes.class); + private static final InstanceIdentifier LABELED_UNICAST_V6_ROUTES_IID = TABLES_IID.child((Class) LabeledUnicastIpv6Routes.class); @Inject @Named("honeycomb-bgp") @@ -47,18 +42,7 @@ public class LabeledUnicastWriterFactory implements WriterFactory { @Override public void init(@Nonnull ModifiableWriterRegistryBuilder registry) { - final InstanceIdentifier subtreeIid = InstanceIdentifier.create(LabeledUnicastRoutes.class); - - //TODO - HONEYCOMB-359 - use wildcarded subtree writer - registry.subtreeAdd( - Sets.newHashSet( - subtreeIid.child(LabeledUnicastRoute.class), - subtreeIid.child(LabeledUnicastRoute.class).child(Attributes.class), - subtreeIid.child(LabeledUnicastRoute.class).child(Attributes.class).child(Origin.class), - subtreeIid.child(LabeledUnicastRoute.class).child(Attributes.class).child(LocalPref.class), - subtreeIid.child(LabeledUnicastRoute.class).child(Attributes.class).child(Ipv4NextHop.class), - subtreeIid.child(LabeledUnicastRoute.class).child(LabelStack.class) - ), - new BindingBrokerWriter<>(LABELED_UNICAST_ROUTES_IID, dataBroker)); + registry.wildcardedSubtreeAdd(new BindingBrokerWriter<>(LABELED_UNICAST_ROUTES_IID, dataBroker)); + registry.wildcardedSubtreeAdd(new BindingBrokerWriter<>(LABELED_UNICAST_V6_ROUTES_IID, dataBroker)); } } -- cgit 1.2.3-korg