Bug-1953: Fix bgpcep tests

-ipv4/6 prefixes must contain mask

Change-Id: I93c4ce30e98f5a0cd5fa8ba86a39129ee837d800
Signed-off-by: Milos Fabian <milfabia@cisco.com>

diff --git a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsInTest.java b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsInTest.java
index 6f150ae50f554a81bc13cbbb08ed3a8db4a62d02..cda63e46733c878b1a9033cffcff6fdb9f22cc5a 100644 (file)
--- a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsInTest.java
+++ b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsInTest.java
@@ -245,7 +245,7 @@ public class LinkstateAdjRIBsInTest extends AbstractDataBrokerTest {
     public void testAddAdvertisement() {
         final PrefixCaseBuilder pcb = new PrefixCaseBuilder();
         pcb.setAdvertisingNodeDescriptors(new AdvertisingNodeDescriptorsBuilder().build());
-        pcb.setIpReachabilityInformation(new IpPrefix(new Ipv4Prefix("127.0.0.1"))).build();
+        pcb.setIpReachabilityInformation(new IpPrefix(new Ipv4Prefix("127.0.0.1/32"))).build();
         LinkstateRoute data = new LinkstateRouteBuilder().setObjectType(pcb.build()).build();
         final MpReachNlriBuilder mpBuilder = new MpReachNlriBuilder();
         this.lrib.addAdvertisement(mpBuilder, data);

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjacencyRIBsInTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjacencyRIBsInTest.java
index b401dfa3035ef3aaced6c4254d033d1ed484ef34..3636a9e3bb4a5658bb64a0fc2123d1f0aa1b498a 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjacencyRIBsInTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjacencyRIBsInTest.java
@@ -122,7 +122,7 @@ public class AdjacencyRIBsInTest extends AbstractDataBrokerTest {
         MpReachNlriBuilder mpBuilder = new MpReachNlriBuilder();
         mpBuilder.setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType(
             new DestinationIpv4CaseBuilder().setDestinationIpv4(new DestinationIpv4Builder().setIpv4Prefixes(
-                Lists.newArrayList(new Ipv4Prefix("127.0.0.1"))).build()).build()).build());
+                Lists.newArrayList(new Ipv4Prefix("127.0.0.1/32"))).build()).build()).build());
         final PathAttributesBuilder paBuilder = new PathAttributesBuilder();
         this.a1.addRoutes(this.adjTrans4, this.peer, mpBuilder.build(), paBuilder.build());
         Mockito.verify(this.adjTrans4).advertise(Mockito.any(RouteEncoder.class), Mockito.anyObject(), Mockito.any(InstanceIdentifier.class), Mockito.eq(this.peer), Mockito.any(Route.class));
@@ -132,7 +132,7 @@ public class AdjacencyRIBsInTest extends AbstractDataBrokerTest {
         mpBuilder = new MpReachNlriBuilder();
         mpBuilder.setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType(
             new DestinationIpv6CaseBuilder().setDestinationIpv6(new DestinationIpv6Builder().setIpv6Prefixes(
-                Lists.newArrayList(new Ipv6Prefix("2001:db8:1:2::"))).build()).build()).build());
+                Lists.newArrayList(new Ipv6Prefix("2001:db8:1:2::/128"))).build()).build()).build());
         a2.addRoutes(this.adjTrans6, this.peer, mpBuilder.build(), paBuilder.build());
         Mockito.verify(this.adjTrans6).advertise(Mockito.any(RouteEncoder.class), Mockito.anyObject(), Mockito.any(InstanceIdentifier.class), Mockito.eq(this.peer), Mockito.any(Route.class));
 

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsTest.java
index 2d7b82d4155516d53ace7bd0200e3d6163ea13ea..4caf3f3675f90f6e599c85f21991f40dc11bb302 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsTest.java
@@ -54,9 +54,9 @@ public class AbstractAdjRIBsTest {
 
     private static final AsNumber TEST_AS_NUMBER = new AsNumber(35L);
 
-    private static final Ipv4Prefix IPV4_PREFIX1 = new Ipv4Prefix("test-prefix1");
+    private static final Ipv4Prefix IPV4_PREFIX1 = new Ipv4Prefix("1.1.1.1/32");
 
-    private static final Ipv4Prefix IPV4_PREFIX2 = new Ipv4Prefix("test-prefix2");
+    private static final Ipv4Prefix IPV4_PREFIX2 = new Ipv4Prefix("2.2.2.2/32");
 
     private static final InstanceIdentifier<Rib> RIB_IID = InstanceIdentifier.builder(BgpRib.class).child(Rib.class, new RibKey(new RibId("test-rib"))).toInstance();
 

diff --git a/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java b/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java
index 87a1ed18462bafc2d72c7c55136e62f4aeca7016..b95678e1484f0f4f52f70d7fa116a831f181402f 100644 (file)
--- a/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java
+++ b/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java
@@ -38,8 +38,8 @@ public class IPAddressesAndPrefixesTest {
 
     @Test
     public void test4() throws UnknownHostException {
-        assertNotNull(new IpPrefix(new Ipv4Prefix("123.123.123.123")).getIpv4Prefix());
-        assertNotNull(new IpPrefix(new Ipv6Prefix("2001::1")).getIpv6Prefix());
+        assertNotNull(new IpPrefix(new Ipv4Prefix("123.123.123.123/32")).getIpv4Prefix());
+        assertNotNull(new IpPrefix(new Ipv6Prefix("2001::1/120")).getIpv6Prefix());
     }
 
     @Test