Rework L3VPN Activators 79/72479/2
authorClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Wed, 30 May 2018 10:59:49 +0000 (12:59 +0200)
committerClaudio David Gasparini <claudio.gasparini@pantheon.tech>
Wed, 30 May 2018 15:25:23 +0000 (15:25 +0000)
Change-Id: Icc41267f190431ccb147276f6381df73a94e056a
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
19 files changed:
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/BGPActivator.java [new file with mode: 0644]
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/RIBActivator.java [new file with mode: 0644]
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/TableTypeActivator.java [moved from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/TableTypeActivator.java with 87% similarity]
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4Activator.java [deleted file]
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/RibIpv4Activator.java [deleted file]
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NlriParser.java
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4RIBSupport.java
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6Activator.java [deleted file]
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/RibIpv6Activator.java [deleted file]
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NlriParser.java
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6RIBSupport.java
bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryProviderActivator
bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator
bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator
bgp/l3vpn/src/main/resources/org/opendaylight/blueprint/bgp-l3vpn.xml
bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/TableTypeActivatorTest.java
bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4ActivatorTest.java [deleted file]
bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6ActivatorTest.java [deleted file]
bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/BGPActivator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/BGPActivator.java
new file mode 100644 (file)
index 0000000..dabf2ec
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.protocol.bgp.l3vpn;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.VpnIpv4NextHopParserSerializer;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.VpnIpv4NlriParser;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6NextHopParserSerializer;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6NlriParser;
+import org.opendaylight.protocol.bgp.parser.spi.AbstractBGPExtensionProviderActivator;
+import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv6AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.MplsLabeledVpnSubsequentAddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv6NextHopCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv4.rev180329.l3vpn.ipv4.routes.VpnIpv4Routes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv6.rev180329.l3vpn.ipv6.routes.VpnIpv6Routes;
+
+/**
+ * Registers NLRI, Attributes, Extended communities Handlers.
+ *
+ * @author Claudio D. Gasparini
+ */
+public final class BGPActivator extends AbstractBGPExtensionProviderActivator {
+    private static void registerNlri(
+            final BGPExtensionProviderContext context,
+            final List<AutoCloseable> regs) {
+        final VpnIpv4NlriParser vpnIpv4NlriParser = new VpnIpv4NlriParser();
+        final VpnIpv4NextHopParserSerializer vpnIpv4NextHopParserSerializer = new VpnIpv4NextHopParserSerializer();
+
+        regs.add(context.registerNlriParser(Ipv4AddressFamily.class, MplsLabeledVpnSubsequentAddressFamily.class,
+                vpnIpv4NlriParser, vpnIpv4NextHopParserSerializer, Ipv4NextHopCase.class));
+        regs.add(context.registerNlriSerializer(VpnIpv4Routes.class, vpnIpv4NlriParser));
+
+        final VpnIpv6NlriParser vpnIpv6NlriParser = new VpnIpv6NlriParser();
+        final VpnIpv6NextHopParserSerializer vpnIpv6NextHopParserSerializer = new VpnIpv6NextHopParserSerializer();
+
+        regs.add(context.registerNlriParser(Ipv6AddressFamily.class, MplsLabeledVpnSubsequentAddressFamily.class,
+                vpnIpv6NlriParser, vpnIpv6NextHopParserSerializer, Ipv6NextHopCase.class));
+        regs.add(context.registerNlriSerializer(VpnIpv6Routes.class, vpnIpv6NlriParser));
+    }
+
+    @Override
+    protected List<AutoCloseable> startImpl(final BGPExtensionProviderContext context) {
+        final List<AutoCloseable> regs = new ArrayList<>();
+        registerNlri(context, regs);
+        return regs;
+    }
+}
diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/RIBActivator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/RIBActivator.java
new file mode 100644 (file)
index 0000000..2734e9f
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.protocol.bgp.l3vpn;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.VpnIpv4RIBSupport;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6RIBSupport;
+import org.opendaylight.protocol.bgp.rib.spi.AbstractRIBExtensionProviderActivator;
+import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv6AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.MplsLabeledVpnSubsequentAddressFamily;
+
+/**
+ * RIBActivator.
+ *
+ * @author Claudio D. Gasparini
+ */
+public final class RIBActivator extends AbstractRIBExtensionProviderActivator {
+    @Override
+    protected List<AutoCloseable> startRIBExtensionProviderImpl(final RIBExtensionProviderContext context,
+            final BindingNormalizedNodeSerializer mappingService) {
+        return Lists.newArrayList(
+                context.registerRIBSupport(Ipv4AddressFamily.class,
+                        MplsLabeledVpnSubsequentAddressFamily.class, VpnIpv4RIBSupport.getInstance(mappingService)),
+                context.registerRIBSupport(Ipv6AddressFamily.class,
+                        MplsLabeledVpnSubsequentAddressFamily.class, VpnIpv6RIBSupport.getInstance(mappingService))
+        );
+    }
+}
similarity index 87%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/TableTypeActivator.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/TableTypeActivator.java
index eb45b19b8f7d8311697da084fb54a2c5fc66ffaf..76d20f5c0b9c91262bed141f55295321d5813710 100644 (file)
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.bgp.l3vpn.unicast;
+package org.opendaylight.protocol.bgp.l3vpn;
 
 import com.google.common.collect.Lists;
 import java.util.List;
@@ -19,8 +19,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.MplsLabeledVpnSubsequentAddressFamily;
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
 
+/**
+ * Registers L3VPN Family types.
+ *
+ * @author Claudio D. Gasparini
+ */
 public final class TableTypeActivator extends AbstractBGPTableTypeRegistryProviderActivator {
-
     @Override
     protected List<AbstractRegistration> startBGPTableTypeRegistryProviderImpl(
             final BGPTableTypeRegistryProvider provider) {
@@ -28,7 +32,7 @@ public final class TableTypeActivator extends AbstractBGPTableTypeRegistryProvid
                 provider.registerBGPTableType(Ipv4AddressFamily.class,
                         MplsLabeledVpnSubsequentAddressFamily.class, L3VPNIPV4UNICAST.class),
                 provider.registerBGPTableType(Ipv6AddressFamily.class,
-                        MplsLabeledVpnSubsequentAddressFamily.class, L3VPNIPV6UNICAST.class));
+                        MplsLabeledVpnSubsequentAddressFamily.class, L3VPNIPV6UNICAST.class)
+        );
     }
-
 }
diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4Activator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4Activator.java
deleted file mode 100644 (file)
index e92fe1d..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.opendaylight.protocol.bgp.parser.spi.AbstractBGPExtensionProviderActivator;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.MplsLabeledVpnSubsequentAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv4.rev180329.l3vpn.ipv4.routes.VpnIpv4Routes;
-
-public final class BgpIpv4Activator extends AbstractBGPExtensionProviderActivator {
-
-    @Override
-    protected List<AutoCloseable> startImpl(final BGPExtensionProviderContext context) {
-        final List<AutoCloseable> regs = new ArrayList<>();
-
-        final VpnIpv4NlriParser nlriParser = new VpnIpv4NlriParser();
-        final VpnIpv4NextHopParserSerializer nextHopParser = new VpnIpv4NextHopParserSerializer();
-
-        regs.add(context.registerNlriParser(Ipv4AddressFamily.class, MplsLabeledVpnSubsequentAddressFamily.class,
-            nlriParser, nextHopParser, Ipv4NextHopCase.class));
-        regs.add(context.registerNlriSerializer(VpnIpv4Routes.class, nlriParser));
-
-        return regs;
-    }
-
-}
diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/RibIpv4Activator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/RibIpv4Activator.java
deleted file mode 100644 (file)
index 6b3d482..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
-
-import java.util.Collections;
-import java.util.List;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.protocol.bgp.rib.spi.AbstractRIBExtensionProviderActivator;
-import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.MplsLabeledVpnSubsequentAddressFamily;
-
-public class RibIpv4Activator extends AbstractRIBExtensionProviderActivator {
-
-    @Override
-    protected List<AutoCloseable> startRIBExtensionProviderImpl(
-            final RIBExtensionProviderContext context,
-            final BindingNormalizedNodeSerializer mappingService) {
-
-        return Collections.singletonList(context.registerRIBSupport(Ipv4AddressFamily.class,
-                MplsLabeledVpnSubsequentAddressFamily.class, VpnIpv4RIBSupport.getInstance(mappingService)));
-    }
-
-}
index e32e775db04f0da8d3ccafe518e0514092f7f5b7..6abb15caec3b0f85b980f8929ddbf5d4f77dad0d 100644 (file)
@@ -18,7 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv4.rev180329.l3vpn.ipv4.destination.VpnIpv4DestinationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.rev180329.l3vpn.ip.destination.type.VpnDestination;
 
-final class VpnIpv4NlriParser extends AbstractVpnNlriParser {
+public final class VpnIpv4NlriParser extends AbstractVpnNlriParser {
 
     private <T extends L3vpnIpv4Destination> List<VpnDestination> getVpnDestination(DestinationType dst,
             Class<T> dstTypeCaseClazz) {
index c72f72854b18176b58e3835b5bda9f96ad531380..e70995246d5e5649f94e9100465fe1e97e16cc46 100644 (file)
@@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv4.rev180329.l3vpn.ipv4.routes.VpnIpv4RoutesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.rev180329.l3vpn.ip.destination.type.VpnDestination;
 
-final class VpnIpv4RIBSupport extends AbstractVpnRIBSupport<VpnIpv4RoutesCase, VpnIpv4Routes> {
+public final class VpnIpv4RIBSupport extends AbstractVpnRIBSupport<VpnIpv4RoutesCase, VpnIpv4Routes> {
     private static final VpnIpv4Routes EMPTY_CONTAINER
             = new VpnIpv4RoutesBuilder().setVpnRoute(Collections.emptyList()).build();
     private static final VpnIpv4RoutesCase EMPTY_CASE
diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6Activator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6Activator.java
deleted file mode 100644 (file)
index 1c35768..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2016 Brocade Communications Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.opendaylight.protocol.bgp.parser.spi.AbstractBGPExtensionProviderActivator;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv6AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.MplsLabeledVpnSubsequentAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv6NextHopCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv6.rev180329.l3vpn.ipv6.routes.VpnIpv6Routes;
-
-public final class BgpIpv6Activator extends AbstractBGPExtensionProviderActivator {
-
-    @Override
-    protected List<AutoCloseable> startImpl(final BGPExtensionProviderContext context) {
-        final List<AutoCloseable> regs = new ArrayList<>();
-
-        final VpnIpv6NlriParser nlriParser = new VpnIpv6NlriParser();
-        final VpnIpv6NextHopParserSerializer nextHopParser = new VpnIpv6NextHopParserSerializer();
-
-        regs.add(context.registerNlriParser(Ipv6AddressFamily.class, MplsLabeledVpnSubsequentAddressFamily.class,
-            nlriParser, nextHopParser, Ipv6NextHopCase.class));
-        regs.add(context.registerNlriSerializer(VpnIpv6Routes.class, nlriParser));
-
-        return regs;
-    }
-
-}
diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/RibIpv6Activator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/RibIpv6Activator.java
deleted file mode 100644 (file)
index 821fead..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2016 Brocade Communications Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
-
-import java.util.Collections;
-import java.util.List;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.protocol.bgp.rib.spi.AbstractRIBExtensionProviderActivator;
-import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv6AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.MplsLabeledVpnSubsequentAddressFamily;
-
-public class RibIpv6Activator extends AbstractRIBExtensionProviderActivator {
-
-    @Override
-    protected List<AutoCloseable> startRIBExtensionProviderImpl(
-            final RIBExtensionProviderContext context,
-            final BindingNormalizedNodeSerializer mappingService) {
-        return Collections.singletonList((context.registerRIBSupport(Ipv6AddressFamily.class,
-                MplsLabeledVpnSubsequentAddressFamily.class, VpnIpv6RIBSupport.getInstance(mappingService))));
-    }
-}
index 08844ab5c9316dc08c757cb2214fb1df2a2b6e2e..195330c3d723a6761c8c6cef42c52b25114b1be2 100644 (file)
@@ -18,7 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv6.rev180329.l3vpn.ipv6.destination.VpnIpv6DestinationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.rev180329.l3vpn.ip.destination.type.VpnDestination;
 
-class VpnIpv6NlriParser extends AbstractVpnNlriParser {
+public class VpnIpv6NlriParser extends AbstractVpnNlriParser {
 
     private <T extends L3vpnIpv6Destination> List<VpnDestination> getVpnDestination(DestinationType dst,
             Class<T> dstTypeCaseClazz) {
index 5882389279f980317c063c11bcd9aeb2a1d656c7..639a49e48bba4f6c75bd2cc4044e6d4e50e5accd 100644 (file)
@@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.ipv6.rev180329.l3vpn.ipv6.routes.VpnIpv6RoutesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.vpn.rev180329.l3vpn.ip.destination.type.VpnDestination;
 
-final class VpnIpv6RIBSupport extends AbstractVpnRIBSupport<VpnIpv6RoutesCase, VpnIpv6Routes> {
+public final class VpnIpv6RIBSupport extends AbstractVpnRIBSupport<VpnIpv6RoutesCase, VpnIpv6Routes> {
     private static final VpnIpv6Routes EMPTY_CONTAINER
             = new VpnIpv6RoutesBuilder().setVpnRoute(Collections.emptyList()).build();
     private static final VpnIpv6RoutesCase EMPTY_CASE
index f53a2a5be2d9ed8e88c05dad3487106f2be0470c..dfe746c892aceb14b1bcdaaae59fe39d05228451 100644 (file)
@@ -4,4 +4,4 @@
 # under the terms of the Eclipse Public License v1.0 which
 # accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-org.opendaylight.protocol.bgp.l3vpn.unicast.TableTypeActivator
\ No newline at end of file
+org.opendaylight.protocol.bgp.l3vpn.TableTypeActivator
\ No newline at end of file
index 0f09b44cebf29ff20cf7fe8a815bf7ec0f3fc239..05ed701d1bb589a80d9f33e6cadef2e802960a9d 100644 (file)
@@ -4,5 +4,4 @@
 # under the terms of the Eclipse Public License v1.0 which
 # accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.BgpIpv4Activator
-org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.BgpIpv6Activator
+org.opendaylight.protocol.bgp.l3vpn.BGPActivator
\ No newline at end of file
index 07fb823c828a202cff1804830b038cdf35bdc525..5ff83465c135dd1dd0fd2d7b866fe8871c9f60dc 100644 (file)
@@ -4,5 +4,4 @@
 # under the terms of the Eclipse Public License v1.0 which
 # accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.RibIpv4Activator
-org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.RibIpv6Activator
+org.opendaylight.protocol.bgp.l3vpn.RIBActivator
\ No newline at end of file
index 23e3179217faaa55fe7b2348ceb92976e0afcb57..6afcb8a01a6e9e1f28c8dad8a2e5f0b947101cc8 100644 (file)
@@ -6,31 +6,22 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-  <bean id="BGPIpv4Activator" class="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.BgpIpv4Activator"/>
+    <bean id="BGPActivator" class="org.opendaylight.protocol.bgp.l3vpn.BGPActivator"/>
 
-  <bean id="RIBIpv4Activator" class="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.RibIpv4Activator"/>
+    <service ref="BGPActivator" interface="org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator"
+             odl:type="org.opendaylight.protocol.bgp.l3vpn.BGPActivator"/>
 
-  <service ref="BGPIpv4Activator" interface="org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator"
-          odl:type="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.BgpIpv4Activator"/>
+    <bean id="RIBActivator" class="org.opendaylight.protocol.bgp.l3vpn.RIBActivator"/>
 
-  <service ref="RIBIpv4Activator" interface="org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator"
-          odl:type="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.RibIpv4Activator"/>
+    <service ref="RIBActivator" interface="org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator"
+             odl:type="org.opendaylight.protocol.bgp.l3vpn.RIBActivator"/>
 
-  <bean id="BGPIpv6Activator" class="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.BgpIpv6Activator"/>
+    <bean id="TableTypeActivator" class="org.opendaylight.protocol.bgp.l3vpn.TableTypeActivator"/>
 
-  <bean id="RIBIpv6Activator" class="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.RibIpv6Activator"/>
-
-  <service ref="BGPIpv6Activator" interface="org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator"
-          odl:type="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.BgpIpv6Activator"/>
-
-  <service ref="RIBIpv6Activator" interface="org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator"
-          odl:type="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.RibIpv6Activator"/>
-
-  <bean id="TableTypeActivator" class="org.opendaylight.protocol.bgp.l3vpn.unicast.TableTypeActivator"/>
-
-  <service ref="TableTypeActivator" interface="org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryProviderActivator"
-          odl:type="org.opendaylight.protocol.bgp.l3vpn.unicast.TableTypeActivator"/>
+    <service ref="TableTypeActivator"
+             interface="org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryProviderActivator"
+             odl:type="org.opendaylight.protocol.bgp.l3vpn.TableTypeActivator"/>
 </blueprint>
\ No newline at end of file
index 268d901384d3e9ac79079b3a29b13eb05c7d942e..9586b3d1506c71c17d1f0cfb43e57937ff6bca13 100644 (file)
@@ -11,7 +11,6 @@ package org.opendaylight.protocol.bgp.l3vpn;
 import java.util.Optional;
 import org.junit.Assert;
 import org.junit.Test;
-import org.opendaylight.protocol.bgp.l3vpn.unicast.TableTypeActivator;
 import org.opendaylight.protocol.bgp.openconfig.spi.SimpleBGPTableTypeRegistryProvider;
 import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.AfiSafiType;
diff --git a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4ActivatorTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4ActivatorTest.java
deleted file mode 100644 (file)
index 059d813..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
-import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext;
-
-public class BgpIpv4ActivatorTest {
-
-    @Test
-    public void testActivator() throws Exception {
-        final BgpIpv4Activator act = new BgpIpv4Activator();
-        final BGPExtensionProviderContext context = new SimpleBGPExtensionProviderContext();
-        assertFalse(context.getNlriRegistry().getSerializers().iterator().hasNext());
-        act.start(context);
-        assertTrue(context.getNlriRegistry().getSerializers().iterator().next() instanceof VpnIpv4NlriParser);
-        act.close();
-    }
-}
diff --git a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6ActivatorTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6ActivatorTest.java
deleted file mode 100644 (file)
index 5306cd4..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2016 Brocade Communications Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
-import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext;
-
-public class BgpIpv6ActivatorTest {
-
-    @Test
-    public void testActivator() throws Exception {
-        final BgpIpv6Activator act = new BgpIpv6Activator();
-        final BGPExtensionProviderContext context = new SimpleBGPExtensionProviderContext();
-        assertFalse(context.getNlriRegistry().getSerializers().iterator().hasNext());
-        act.start(context);
-        assertTrue(context.getNlriRegistry().getSerializers().iterator().next() instanceof VpnIpv6NlriParser);
-        act.close();
-    }
-}
\ No newline at end of file
index b06499655143c9ed827ba991342216d22430b5db..a662efde39b00ab0278a5bb8f5fe57f1db62388a 100644 (file)
@@ -101,13 +101,9 @@ final class BGPTestTool {
                 = new org.opendaylight.protocol.bgp.labeled.unicast.BGPActivator();
         labeledActivator.start(ctx);
 
-        final org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.BgpIpv4Activator bgpIpv4Activator
-                = new org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.BgpIpv4Activator();
-        bgpIpv4Activator.start(ctx);
-
-        final org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.BgpIpv6Activator bgpIpv6Activator
-                = new org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.BgpIpv6Activator();
-        bgpIpv6Activator.start(ctx);
+        final org.opendaylight.protocol.bgp.l3vpn.BGPActivator l3vpnBGPActivator
+                = new org.opendaylight.protocol.bgp.l3vpn.BGPActivator();
+        l3vpnBGPActivator.start(ctx);
 
         return new BGPDispatcherImpl(ctx.getMessageRegistry(), new NioEventLoopGroup(), new NioEventLoopGroup(),
             new StrictBGPPeerRegistry());