HONEYCOMB-359 - Wildcarded writers for BGP extensions 10/8710/8
authorJan Srnicek <jsrnicek@cisco.com>
Thu, 2 Nov 2017 11:06:12 +0000 (12:06 +0100)
committerJan Srnicek <jsrnicek@cisco.com>
Mon, 6 Nov 2017 07:46:39 +0000 (08:46 +0100)
Defines wildcarded writers for BGP extensions to be able to
write theirs respective part of ApplicationRib

Change-Id: I0057b59c5977d5f75e0bc3c0c8eae9b8cfdf0f85
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
infra/northbound/bgp-extensions/evpn/src/main/java/io/fd/honeycomb/northbound/bgp/extension/EvpnModule.java
infra/northbound/bgp-extensions/evpn/src/main/java/io/fd/honeycomb/northbound/bgp/extension/EvpnWriterFactory.java [new file with mode: 0644]
infra/northbound/bgp-extensions/inet/src/main/java/io/fd/honeycomb/northbound/bgp/extension/InetWriterFactory.java
infra/northbound/bgp-extensions/l3-vpn-v4/src/main/java/io/fd/honeycomb/northbound/bgp/extension/L3VpnV4Module.java
infra/northbound/bgp-extensions/l3-vpn-v4/src/main/java/io/fd/honeycomb/northbound/bgp/extension/L3VpnV4WriterFactory.java [new file with mode: 0644]
infra/northbound/bgp-extensions/l3-vpn-v6/src/main/java/io/fd/honeycomb/northbound/bgp/extension/L3VpnV6Module.java
infra/northbound/bgp-extensions/l3-vpn-v6/src/main/java/io/fd/honeycomb/northbound/bgp/extension/L3VpnV6WriterFactory.java [new file with mode: 0644]
infra/northbound/bgp-extensions/labeled-unicast/src/main/java/io/fd/honeycomb/northbound/bgp/extension/LabeledUnicastWriterFactory.java
infra/northbound/bgp-extensions/linkstate/src/main/java/io/fd/honeycomb/northbound/bgp/extension/LinkstateModule.java
infra/northbound/bgp-extensions/linkstate/src/main/java/io/fd/honeycomb/northbound/bgp/extension/LinkstateWriterFactory.java [new file with mode: 0644]

index a04fa68..b3bf0af 100644 (file)
@@ -61,8 +61,7 @@ public class EvpnModule extends AbstractBgpExtensionModule {
 
     @Override
     public Set<Class<? extends WriterFactory>> getApplicationRibWriters() {
-        //TODO - HONEYCOMB-359 - use wildcaded subtree writer
-        return Collections.emptySet();
+        return ImmutableSet.of(EvpnWriterFactory.class);
     }
 
     @Override
diff --git a/infra/northbound/bgp-extensions/evpn/src/main/java/io/fd/honeycomb/northbound/bgp/extension/EvpnWriterFactory.java b/infra/northbound/bgp-extensions/evpn/src/main/java/io/fd/honeycomb/northbound/bgp/extension/EvpnWriterFactory.java
new file mode 100644 (file)
index 0000000..e06c79b
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017 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.northbound.bgp.extension;
+
+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.evpn.rev160321.evpn.routes.EvpnRoutes;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+import javax.annotation.Nonnull;
+
+import static io.fd.honeycomb.northbound.bgp.extension.AbstractBgpExtensionModule.TABLES_IID;
+
+public class EvpnWriterFactory implements WriterFactory {
+
+    private static final InstanceIdentifier<EvpnRoutes> EVPN_ROUTES_IID = TABLES_IID.child((Class) EvpnRoutes.class);
+
+    @Inject
+    @Named("honeycomb-bgp")
+    private DataBroker dataBroker;
+
+    @Override
+    public void init(@Nonnull ModifiableWriterRegistryBuilder registry) {
+        registry.wildcardedSubtreeAdd(new BindingBrokerWriter<>(EVPN_ROUTES_IID, dataBroker));
+    }
+}
index de61c8d..cc7064c 100644 (file)
@@ -16,7 +16,6 @@
 
 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;
@@ -24,11 +23,7 @@ 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.inet.rev150305.ipv4.routes.Ipv4Routes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv4.routes.ipv4.routes.Ipv4Route;
-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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.ipv6.routes.Ipv6Routes;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 import javax.annotation.Nonnull;
@@ -38,6 +33,8 @@ import static io.fd.honeycomb.northbound.bgp.extension.AbstractBgpExtensionModul
 public class InetWriterFactory implements WriterFactory {
 
     private static final InstanceIdentifier<Ipv4Routes> IPV4_ROUTES_IID = TABLES_IID.child((Class) Ipv4Routes.class);
+    private static final InstanceIdentifier<Ipv4Routes> IPV6_ROUTES_IID = TABLES_IID.child((Class) Ipv6Routes.class);
+
 
     @Inject
     @Named("honeycomb-bgp")
@@ -45,17 +42,7 @@ public class InetWriterFactory implements WriterFactory {
 
     @Override
     public void init(@Nonnull ModifiableWriterRegistryBuilder registry) {
-        final InstanceIdentifier<Ipv4Routes> subtreeIid = InstanceIdentifier.create(Ipv4Routes.class);
-
-        //TODO - HONEYCOMB-359 - use wildcarded subtree writer
-        registry.subtreeAdd(
-                Sets.newHashSet(
-                        subtreeIid.child(Ipv4Route.class),
-                        subtreeIid.child(Ipv4Route.class).child(Attributes.class),
-                        subtreeIid.child(Ipv4Route.class).child(Attributes.class).child(Origin.class),
-                        subtreeIid.child(Ipv4Route.class).child(Attributes.class).child(LocalPref.class),
-                        subtreeIid.child(Ipv4Route.class).child(Attributes.class).child(Ipv4NextHop.class)),
-                new BindingBrokerWriter<>(IPV4_ROUTES_IID, dataBroker)
-        );
+        registry.wildcardedSubtreeAdd(new BindingBrokerWriter<>(IPV4_ROUTES_IID, dataBroker));
+        registry.wildcardedSubtreeAdd(new BindingBrokerWriter<>(IPV6_ROUTES_IID, dataBroker));
     }
 }
index 777b4ad..0ac311b 100644 (file)
@@ -63,8 +63,7 @@ public class L3VpnV4Module extends AbstractBgpExtensionModule {
 
     @Override
     public Set<Class<? extends WriterFactory>> getApplicationRibWriters() {
-        //TODO - HONEYCOMB-359 - use wildcarded subtree writer
-        return Collections.emptySet();
+        return ImmutableSet.of(L3VpnV4WriterFactory.class);
     }
 
     @Override
diff --git a/infra/northbound/bgp-extensions/l3-vpn-v4/src/main/java/io/fd/honeycomb/northbound/bgp/extension/L3VpnV4WriterFactory.java b/infra/northbound/bgp-extensions/l3-vpn-v4/src/main/java/io/fd/honeycomb/northbound/bgp/extension/L3VpnV4WriterFactory.java
new file mode 100644 (file)
index 0000000..255a55d
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017 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.northbound.bgp.extension;
+
+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.vpn.ipv4.rev160210.l3vpn.ipv4.routes.VpnIpv4Routes;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+import javax.annotation.Nonnull;
+
+import static io.fd.honeycomb.northbound.bgp.extension.AbstractBgpExtensionModule.TABLES_IID;
+
+public class L3VpnV4WriterFactory implements WriterFactory {
+
+    private static final InstanceIdentifier<VpnIpv4Routes> V4_ROUTES_IID = TABLES_IID.child((Class) VpnIpv4Routes.class);
+
+    @Inject
+    @Named("honeycomb-bgp")
+    private DataBroker dataBroker;
+
+    @Override
+    public void init(@Nonnull ModifiableWriterRegistryBuilder registry) {
+        registry.wildcardedSubtreeAdd(new BindingBrokerWriter<>(V4_ROUTES_IID, dataBroker));
+    }
+}
index 7125774..2583d4a 100644 (file)
@@ -65,8 +65,7 @@ public class L3VpnV6Module extends AbstractBgpExtensionModule {
 
     @Override
     public Set<Class<? extends WriterFactory>> getApplicationRibWriters() {
-        //TODO - HONEYCOMB-359 - use wildcarded subtree writer
-        return Collections.emptySet();
+        return ImmutableSet.of(L3VpnV6WriterFactory.class);
     }
 
     @Override
diff --git a/infra/northbound/bgp-extensions/l3-vpn-v6/src/main/java/io/fd/honeycomb/northbound/bgp/extension/L3VpnV6WriterFactory.java b/infra/northbound/bgp-extensions/l3-vpn-v6/src/main/java/io/fd/honeycomb/northbound/bgp/extension/L3VpnV6WriterFactory.java
new file mode 100644 (file)
index 0000000..3e2c3cd
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017 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.northbound.bgp.extension;
+
+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.vpn.ipv6.rev160331.l3vpn.ipv6.routes.VpnIpv6Routes;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+import javax.annotation.Nonnull;
+
+import static io.fd.honeycomb.northbound.bgp.extension.AbstractBgpExtensionModule.TABLES_IID;
+
+public class L3VpnV6WriterFactory implements WriterFactory {
+
+    private static final InstanceIdentifier<VpnIpv6Routes> V6_ROUTES_IID = TABLES_IID.child((Class) VpnIpv6Routes.class);
+
+    @Inject
+    @Named("honeycomb-bgp")
+    private DataBroker dataBroker;
+
+    @Override
+    public void init(@Nonnull ModifiableWriterRegistryBuilder registry) {
+        registry.wildcardedSubtreeAdd(new BindingBrokerWriter<>(V6_ROUTES_IID, dataBroker));
+    }
+}
index c1ccaba..0db8f52 100644 (file)
 
 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<LabeledUnicastRoutes> LABELED_UNICAST_ROUTES_IID = TABLES_IID.child((Class) LabeledUnicastRoutes.class);
+    private static final InstanceIdentifier<LabeledUnicastRoutes> 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<LabeledUnicastRoutes> 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));
     }
 }
index 6221172..528fe64 100644 (file)
@@ -35,7 +35,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.open
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Collections;
 import java.util.Set;
 
 import static io.fd.honeycomb.northbound.bgp.extension.AbstractBgpExtensionModule.TableTypeRegistration.tableType;
@@ -67,8 +66,7 @@ public class LinkstateModule extends AbstractBgpExtensionModule {
 
     @Override
     public Set<Class<? extends WriterFactory>> getApplicationRibWriters() {
-        //TODO - HONEYCOMB-359 - use wildcarded subtree writer
-        return Collections.emptySet();
+        return ImmutableSet.of(LinkstateWriterFactory.class);
     }
 
     @Override
diff --git a/infra/northbound/bgp-extensions/linkstate/src/main/java/io/fd/honeycomb/northbound/bgp/extension/LinkstateWriterFactory.java b/infra/northbound/bgp-extensions/linkstate/src/main/java/io/fd/honeycomb/northbound/bgp/extension/LinkstateWriterFactory.java
new file mode 100644 (file)
index 0000000..7f4aaba
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2017 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.northbound.bgp.extension;
+
+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.linkstate.rev150210.linkstate.routes.LinkstateRoutes;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+import javax.annotation.Nonnull;
+
+import static io.fd.honeycomb.northbound.bgp.extension.AbstractBgpExtensionModule.TABLES_IID;
+
+public class LinkstateWriterFactory implements WriterFactory {
+
+    private static final InstanceIdentifier<LinkstateRoutes> LINKSTATE_ROUTES_IID = TABLES_IID.child((Class) LinkstateRoutes.class);
+
+    @Inject
+    @Named("honeycomb-bgp")
+    private DataBroker dataBroker;
+
+    @Override
+    public void init(@Nonnull ModifiableWriterRegistryBuilder registry) {
+        registry.wildcardedSubtreeAdd(new BindingBrokerWriter<>(LINKSTATE_ROUTES_IID, dataBroker));
+    }
+}