create L3pn unicast package

for split new implementation for
multicast l3von support.

Change-Id: I00596dac87b99bd32d8921b8ab8ccebe5bdbcc10
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNextHopParserSerializer.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/AbstractVpnNextHopParserSerializer.java
similarity index 97%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNextHopParserSerializer.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/AbstractVpnNextHopParserSerializer.java
index d2119d87e874e4f708a3748805888ab8620caf97..20dd7c4c526a9fc28d157a77be51b9a18303b182 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNextHopParserSerializer.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/AbstractVpnNextHopParserSerializer.java
@@ -5,7 +5,7 @@
  * 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;
+package org.opendaylight.protocol.bgp.l3vpn.unicast;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNlriParser.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/AbstractVpnNlriParser.java
similarity index 99%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNlriParser.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/AbstractVpnNlriParser.java
index d41b9fef70a69b68e975a97684847c3375c63741..ce24e94a48a431aea051067d1e81c3b6a3e61261 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNlriParser.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/AbstractVpnNlriParser.java
@@ -5,7 +5,7 @@
  * 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;
+package org.opendaylight.protocol.bgp.l3vpn.unicast;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnRIBSupport.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/AbstractVpnRIBSupport.java
similarity index 99%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnRIBSupport.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/AbstractVpnRIBSupport.java
index fa7b981b295bd0dd404e799dc56189c46d664b01..0e276e071bedff67a082e737672d329ec129d783 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnRIBSupport.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/AbstractVpnRIBSupport.java
@@ -5,7 +5,7 @@
  * 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;
+package org.opendaylight.protocol.bgp.l3vpn.unicast;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/TableTypeActivator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/TableTypeActivator.java
similarity index 97%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/TableTypeActivator.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/TableTypeActivator.java
index b0d37d7e2478e738d2503393824e6154fbb36800..eb45b19b8f7d8311697da084fb54a2c5fc66ffaf 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/TableTypeActivator.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/TableTypeActivator.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.bgp.l3vpn;
+package org.opendaylight.protocol.bgp.l3vpn.unicast;
 
 import com.google.common.collect.Lists;
 import java.util.List;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/VpnDestinationUtil.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/VpnDestinationUtil.java
similarity index 98%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/VpnDestinationUtil.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/VpnDestinationUtil.java
index 32f3c0cb80af133fc4f1ff8e32bd485ff6a62809..9f6e3b45da7c9b88339be54b78888043e2cdf768 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/VpnDestinationUtil.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/VpnDestinationUtil.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.bgp.l3vpn;
+package org.opendaylight.protocol.bgp.l3vpn.unicast;
 
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/BgpIpv4Activator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4Activator.java
similarity index 96%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/BgpIpv4Activator.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4Activator.java
index c7fc135cb6f4da5f42b5430fb820e710cb098dc9..e92fe1d144338fcd777225c2e2a063b47d910bb7 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/BgpIpv4Activator.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4Activator.java
@@ -5,7 +5,7 @@
  * 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.ipv4;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/RibIpv4Activator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/RibIpv4Activator.java
similarity index 95%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/RibIpv4Activator.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/RibIpv4Activator.java
index 2e4fa0a5ccbe43cd2050a62614cecefaff78f2eb..6b3d4824ad86da1a60ed5b2c207cb36138c7a1f5 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/RibIpv4Activator.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/RibIpv4Activator.java
@@ -5,7 +5,7 @@
  * 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.ipv4;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NextHopParserSerializer.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NextHopParserSerializer.java
similarity index 82%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NextHopParserSerializer.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NextHopParserSerializer.java
index 5d1a6712fe539ee31fbc24863001d249d2f44326..a0aa715934f334568b9ab9936fec9aeece02ebcb 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NextHopParserSerializer.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NextHopParserSerializer.java
@@ -5,9 +5,9 @@
  * 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.ipv4;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
 
-import org.opendaylight.protocol.bgp.l3vpn.AbstractVpnNextHopParserSerializer;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.AbstractVpnNextHopParserSerializer;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv4NextHopCase;
 

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NlriParser.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NlriParser.java
similarity index 96%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NlriParser.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NlriParser.java
index a1146cd0e2006131368c376458428075503bad11..e32e775db04f0da8d3ccafe518e0514092f7f5b7 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NlriParser.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NlriParser.java
@@ -5,10 +5,10 @@
  * 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.ipv4;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
 
 import java.util.List;
-import org.opendaylight.protocol.bgp.l3vpn.AbstractVpnNlriParser;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.AbstractVpnNlriParser;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.destination.DestinationType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.mp.reach.nlri.AdvertizedRoutes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.mp.reach.nlri.AdvertizedRoutesBuilder;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4RIBSupport.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4RIBSupport.java
similarity index 97%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4RIBSupport.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4RIBSupport.java
index 7783fb73e11b9f8889b035a04d4314291991e3b4..c72f72854b18176b58e3835b5bda9f96ad531380 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4RIBSupport.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4RIBSupport.java
@@ -5,12 +5,12 @@
  * 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.ipv4;
+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.l3vpn.AbstractVpnRIBSupport;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.AbstractVpnRIBSupport;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.destination.DestinationType;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/BgpIpv6Activator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6Activator.java
similarity index 96%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/BgpIpv6Activator.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6Activator.java
index fad259b54c14b6eccd7a88e547a18fde828dc9c7..1c3576862697bf0319ba7a887500695d5c546a35 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/BgpIpv6Activator.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6Activator.java
@@ -5,7 +5,7 @@
  * 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.ipv6;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/RibIpv6Activator.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/RibIpv6Activator.java
similarity index 95%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/RibIpv6Activator.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/RibIpv6Activator.java
index e74f119fecb0565ece457ab198d0920731016ce0..821fead2cc32630ea383be4d6ff0073fff643af6 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/RibIpv6Activator.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/RibIpv6Activator.java
@@ -5,7 +5,7 @@
  * 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.ipv6;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NextHopParserSerializer.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NextHopParserSerializer.java
similarity index 83%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NextHopParserSerializer.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NextHopParserSerializer.java
index 2ffff9c46a3af6e21a3f6a6225f91b78a8cb5697..3b966815f690b1db782fbfee65f91df8ee099ccf 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NextHopParserSerializer.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NextHopParserSerializer.java
@@ -5,9 +5,9 @@
  * 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.ipv6;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
 
-import org.opendaylight.protocol.bgp.l3vpn.AbstractVpnNextHopParserSerializer;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.AbstractVpnNextHopParserSerializer;
 import org.opendaylight.protocol.util.Ipv6Util;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.next.hop.c.next.hop.Ipv6NextHopCase;
 

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NlriParser.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NlriParser.java
similarity index 96%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NlriParser.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NlriParser.java
index 0e4ecf404afc7a9d8ae96fb144dc168b6b3a029c..08844ab5c9316dc08c757cb2214fb1df2a2b6e2e 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NlriParser.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NlriParser.java
@@ -5,10 +5,10 @@
  * 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.ipv6;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
 
 import java.util.List;
-import org.opendaylight.protocol.bgp.l3vpn.AbstractVpnNlriParser;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.AbstractVpnNlriParser;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.destination.DestinationType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.mp.reach.nlri.AdvertizedRoutes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.mp.reach.nlri.AdvertizedRoutesBuilder;

diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6RIBSupport.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6RIBSupport.java
similarity index 97%
rename from bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6RIBSupport.java
rename to bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6RIBSupport.java
index a5db5d5e541794bccadcb6ba55e6d5e371c74e4d..5882389279f980317c063c11bcd9aeb2a1d656c7 100644 (file)
--- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6RIBSupport.java
+++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6RIBSupport.java
@@ -5,12 +5,12 @@
  * 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.ipv6;
+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.l3vpn.AbstractVpnRIBSupport;
+import org.opendaylight.protocol.bgp.l3vpn.unicast.AbstractVpnRIBSupport;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.destination.DestinationType;

diff --git a/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryProviderActivator b/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryProviderActivator
index dfe746c892aceb14b1bcdaaae59fe39d05228451..f53a2a5be2d9ed8e88c05dad3487106f2be0470c 100644 (file)
--- a/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryProviderActivator
+++ b/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryProviderActivator
@@ -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.TableTypeActivator
\ No newline at end of file
+org.opendaylight.protocol.bgp.l3vpn.unicast.TableTypeActivator
\ No newline at end of file

diff --git a/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator b/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator
index 4bd82dbce4a8afebb64aea15c10977248caeaa33..0f09b44cebf29ff20cf7fe8a815bf7ec0f3fc239 100644 (file)
--- a/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator
+++ b/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator
@@ -4,5 +4,5 @@
 # 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.ipv4.BgpIpv4Activator
-org.opendaylight.protocol.bgp.l3vpn.ipv6.BgpIpv6Activator
+org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.BgpIpv4Activator
+org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.BgpIpv6Activator

diff --git a/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator b/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator
index f33dcafc5ec70d84060899420f002933a79eb3c5..07fb823c828a202cff1804830b038cdf35bdc525 100644 (file)
--- a/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator
+++ b/bgp/l3vpn/src/main/resources/META-INF/services/org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator
@@ -4,5 +4,5 @@
 # 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.ipv4.RibIpv4Activator
-org.opendaylight.protocol.bgp.l3vpn.ipv6.RibIpv6Activator
+org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.RibIpv4Activator
+org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.RibIpv6Activator

diff --git a/bgp/l3vpn/src/main/resources/org/opendaylight/blueprint/bgp-l3vpn.xml b/bgp/l3vpn/src/main/resources/org/opendaylight/blueprint/bgp-l3vpn.xml
index 2d12835221568215cd585786a624e9f39242fd05..23e3179217faaa55fe7b2348ceb92976e0afcb57 100644 (file)
--- a/bgp/l3vpn/src/main/resources/org/opendaylight/blueprint/bgp-l3vpn.xml
+++ b/bgp/l3vpn/src/main/resources/org/opendaylight/blueprint/bgp-l3vpn.xml
@@ -9,28 +9,28 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
 
-  <bean id="BGPIpv4Activator" class="org.opendaylight.protocol.bgp.l3vpn.ipv4.BgpIpv4Activator"/>
+  <bean id="BGPIpv4Activator" class="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.BgpIpv4Activator"/>
 
-  <bean id="RIBIpv4Activator" class="org.opendaylight.protocol.bgp.l3vpn.ipv4.RibIpv4Activator"/>
+  <bean id="RIBIpv4Activator" class="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.RibIpv4Activator"/>
 
   <service ref="BGPIpv4Activator" interface="org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator"
-          odl:type="org.opendaylight.protocol.bgp.l3vpn.ipv4.BgpIpv4Activator"/>
+          odl:type="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.BgpIpv4Activator"/>
 
   <service ref="RIBIpv4Activator" interface="org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderActivator"
-          odl:type="org.opendaylight.protocol.bgp.l3vpn.ipv4.RibIpv4Activator"/>
+          odl:type="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.RibIpv4Activator"/>
 
-  <bean id="BGPIpv6Activator" class="org.opendaylight.protocol.bgp.l3vpn.ipv6.BgpIpv6Activator"/>
+  <bean id="BGPIpv6Activator" class="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.BgpIpv6Activator"/>
 
-  <bean id="RIBIpv6Activator" class="org.opendaylight.protocol.bgp.l3vpn.ipv6.RibIpv6Activator"/>
+  <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.ipv6.BgpIpv6Activator"/>
+          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.ipv6.RibIpv6Activator"/>
+          odl:type="org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.RibIpv6Activator"/>
 
-  <bean id="TableTypeActivator" class="org.opendaylight.protocol.bgp.l3vpn.TableTypeActivator"/>
+  <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.TableTypeActivator"/>
+          odl:type="org.opendaylight.protocol.bgp.l3vpn.unicast.TableTypeActivator"/>
 </blueprint>
\ No newline at end of file

diff --git a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/TableTypeActivatorTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/TableTypeActivatorTest.java
index 9586b3d1506c71c17d1f0cfb43e57937ff6bca13..268d901384d3e9ac79079b3a29b13eb05c7d942e 100644 (file)
--- a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/TableTypeActivatorTest.java
+++ b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/TableTypeActivatorTest.java
@@ -11,6 +11,7 @@ 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/ipv4/BgpIpv4ActivatorTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4ActivatorTest.java
similarity index 94%
rename from bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/BgpIpv4ActivatorTest.java
rename to bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4ActivatorTest.java
index e95d4ae1674a42806b6c54473c77089450977ea6..059d813c138740e89eeed81ba9f20b4ab440cf99 100644 (file)
--- a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/BgpIpv4ActivatorTest.java
+++ b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/BgpIpv4ActivatorTest.java
@@ -5,7 +5,7 @@
  * 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.ipv4;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

diff --git a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NextHopTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NextHopTest.java
similarity index 97%
rename from bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NextHopTest.java
rename to bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NextHopTest.java
index 1d961ba49bdb2da80222f1fbb0e1813a00ded861..bbca25f0594bf9937a3eef5e9b464d7c7a3a6f6d 100644 (file)
--- a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NextHopTest.java
+++ b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NextHopTest.java
@@ -5,7 +5,7 @@
  * 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.ipv4;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;

diff --git a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NlriParserTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NlriParserTest.java
similarity index 99%
rename from bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NlriParserTest.java
rename to bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NlriParserTest.java
index 4db1be504cd38caa756c85960928dbc54777f387..66230cd51b0693786d5c3a56495b899bf4ee3b5f 100755 (executable)
--- a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4NlriParserTest.java
+++ b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4NlriParserTest.java
@@ -5,7 +5,7 @@
  * 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.ipv4;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;

diff --git a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4RIBSupportTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4RIBSupportTest.java
similarity index 95%
rename from bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4RIBSupportTest.java
rename to bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4RIBSupportTest.java
index 6d84d4a2adc55bb11a26fc2821dd488617197c2a..4a9a18e3783ea3487810f944d93d6f9d739fa3be 100644 (file)
--- a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv4/VpnIpv4RIBSupportTest.java
+++ b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv4/VpnIpv4RIBSupportTest.java
@@ -6,15 +6,15 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.bgp.l3vpn.ipv4;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.opendaylight.protocol.bgp.l3vpn.ipv4.VpnIpv4NlriParserTest.DISTINGUISHER;
-import static org.opendaylight.protocol.bgp.l3vpn.ipv4.VpnIpv4NlriParserTest.IPV4_PREFIX;
-import static org.opendaylight.protocol.bgp.l3vpn.ipv4.VpnIpv4NlriParserTest.IPV4_VPN;
-import static org.opendaylight.protocol.bgp.l3vpn.ipv4.VpnIpv4NlriParserTest.LABEL_STACK;
+import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.VpnIpv4NlriParserTest.DISTINGUISHER;
+import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.VpnIpv4NlriParserTest.IPV4_PREFIX;
+import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.VpnIpv4NlriParserTest.IPV4_VPN;
+import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv4.VpnIpv4NlriParserTest.LABEL_STACK;
 import static org.opendaylight.protocol.bgp.parser.spi.PathIdUtil.NON_PATH_ID;
 
 import com.google.common.collect.ImmutableSet;

diff --git a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/BgpIpv6ActivatorTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6ActivatorTest.java
similarity index 94%
rename from bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/BgpIpv6ActivatorTest.java
rename to bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6ActivatorTest.java
index 00e3463413a178f0beb01432d21d613d048ae8b5..5306cd4fb35b3268908ff74076105e49d8ece888 100644 (file)
--- a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/BgpIpv6ActivatorTest.java
+++ b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/BgpIpv6ActivatorTest.java
@@ -5,7 +5,7 @@
  * 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.ipv6;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

diff --git a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NextHopTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NextHopTest.java
similarity index 97%
rename from bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NextHopTest.java
rename to bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NextHopTest.java
index 93f49a879e222252ee3754ebd9f67b094b6ab630..2d9217a1bb13f599ad7cfcf144fab26491394e1d 100644 (file)
--- a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NextHopTest.java
+++ b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NextHopTest.java
@@ -5,7 +5,7 @@
  * 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.ipv6;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;

diff --git a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NlriParserTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NlriParserTest.java
similarity index 99%
rename from bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NlriParserTest.java
rename to bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NlriParserTest.java
index 88e30a61307af18d9a8134122125a06343af5e53..d7c451d0d63f07b696138191fb7e6c23ab75ac84 100755 (executable)
--- a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6NlriParserTest.java
+++ b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6NlriParserTest.java
@@ -5,7 +5,7 @@
  * 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.ipv6;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;

diff --git a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6RIBSupportTest.java b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6RIBSupportTest.java
similarity index 95%
rename from bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6RIBSupportTest.java
rename to bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6RIBSupportTest.java
index 8731dfd5b4f3fe2dcaa656314973f0bab435d3ee..5d2db5668ed440044d742f0b4b9845aa35bb3fe8 100644 (file)
--- a/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/ipv6/VpnIpv6RIBSupportTest.java
+++ b/bgp/l3vpn/src/test/java/org/opendaylight/protocol/bgp/l3vpn/unicast/ipv6/VpnIpv6RIBSupportTest.java
@@ -6,14 +6,14 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.protocol.bgp.l3vpn.ipv6;
+package org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.opendaylight.protocol.bgp.l3vpn.ipv6.VpnIpv6NlriParserTest.DISTINGUISHER;
-import static org.opendaylight.protocol.bgp.l3vpn.ipv6.VpnIpv6NlriParserTest.IPV6PREFIX;
-import static org.opendaylight.protocol.bgp.l3vpn.ipv6.VpnIpv6NlriParserTest.IPV6_VPN;
-import static org.opendaylight.protocol.bgp.l3vpn.ipv6.VpnIpv6NlriParserTest.LABEL_STACK;
+import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6NlriParserTest.DISTINGUISHER;
+import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6NlriParserTest.IPV6PREFIX;
+import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6NlriParserTest.IPV6_VPN;
+import static org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.VpnIpv6NlriParserTest.LABEL_STACK;
 import static org.opendaylight.protocol.bgp.parser.spi.PathIdUtil.NON_PATH_ID;
 
 import com.google.common.collect.ImmutableSet;

diff --git a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java
index 685325790256b7a4a17955c564cb87020178326e..b06499655143c9ed827ba991342216d22430b5db 100644 (file)
--- a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java
+++ b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java
@@ -101,12 +101,12 @@ final class BGPTestTool {
                 = new org.opendaylight.protocol.bgp.labeled.unicast.BGPActivator();
         labeledActivator.start(ctx);
 
-        final org.opendaylight.protocol.bgp.l3vpn.ipv4.BgpIpv4Activator bgpIpv4Activator
-                = new org.opendaylight.protocol.bgp.l3vpn.ipv4.BgpIpv4Activator();
+        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.ipv6.BgpIpv6Activator bgpIpv6Activator
-                = new org.opendaylight.protocol.bgp.l3vpn.ipv6.BgpIpv6Activator();
+        final org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.BgpIpv6Activator bgpIpv6Activator
+                = new org.opendaylight.protocol.bgp.l3vpn.unicast.ipv6.BgpIpv6Activator();
         bgpIpv6Activator.start(ctx);
 
         return new BGPDispatcherImpl(ctx.getMessageRegistry(), new NioEventLoopGroup(), new NioEventLoopGroup(),