Mass-convert all compontents to use -no-zone addresses

[bgpcep.git] / bmp / bmp-spi / src / test / java / org / opendaylight / protocol / bmp / spi / parser / AbstractBmpPerPeerMessageParserTest.java

diff --git a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java
index 6d6bd7a1747b5871c365eafbd8fefb45a81bb2df..d19c71f9149d3a14bfec722524789253a36e6bcd 100644 (file)
--- a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java
+++ b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParserTest.java
@@ -20,21 +20,21 @@ import org.opendaylight.protocol.bgp.parser.spi.MessageRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timestamp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.RdTwoOctetAs;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.RouteDistinguisher;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev171207.AdjRibInType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev171207.Peer.PeerDistinguisher;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev171207.PeerType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev171207.PeerUpNotification;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev171207.PeerUpNotificationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev171207.peer.header.PeerHeader;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev171207.peer.header.PeerHeaderBuilder;
-import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RdTwoOctetAs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.RouteDistinguisher;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.AdjRibInType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.Peer.PeerDistinguisher;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.PeerType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.PeerUpNotification;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.PeerUpNotificationBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.peer.header.PeerHeader;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.peer.header.PeerHeaderBuilder;
 import org.opendaylight.yangtools.yang.binding.Notification;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class AbstractBmpPerPeerMessageParserTest {
     private static final String RD = "5:3";
@@ -58,7 +58,7 @@ public class AbstractBmpPerPeerMessageParserTest {
     public void setUp() {
         this.ctx = ServiceLoaderBGPExtensionProviderContext.getSingletonInstance();
         final MessageRegistry msgRegistry = this.ctx.getMessageRegistry();
-        this.parser = new AbstractBmpPerPeerMessageParser<Builder<?>>(msgRegistry) {
+        this.parser = new AbstractBmpPerPeerMessageParser<>(msgRegistry) {
             @Override
             public Notification parseMessageBody(final ByteBuf bytes) {
                 return null;
@@ -90,16 +90,16 @@ public class AbstractBmpPerPeerMessageParserTest {
         final PeerHeader perHeader = AbstractBmpPerPeerMessageParser
                 .parsePerPeerHeader(Unpooled.wrappedBuffer(msgBytes));
 
-        final PeerHeaderBuilder phBuilder = new PeerHeaderBuilder();
-        phBuilder.setType(PeerType.forValue(0));
-        phBuilder.setAdjRibInType(AdjRibInType.forValue(1));
-        phBuilder.setIpv4(true);
-        phBuilder.setAddress(new IpAddress(new Ipv4Address("192.168.1.1")));
-        phBuilder.setAs(new AsNumber(168L));
-        phBuilder.setBgpId(new Ipv4Address("1.1.1.1"));
-        phBuilder.setTimestampSec(new Timestamp(16909060L));
-        phBuilder.setTimestampMicro(new Timestamp(16909060L));
-        assertEquals(perHeader, phBuilder.build());
+        assertEquals(perHeader, new PeerHeaderBuilder()
+            .setType(PeerType.forValue(0))
+            .setAdjRibInType(AdjRibInType.forValue(1))
+            .setIpv4(true)
+            .setAddress(new IpAddressNoZone(new Ipv4AddressNoZone("192.168.1.1")))
+            .setAs(new AsNumber(Uint32.valueOf(168)))
+            .setBgpId(new Ipv4AddressNoZone("1.1.1.1"))
+            .setTimestampSec(new Timestamp(Uint32.valueOf(16909060)))
+            .setTimestampMicro(new Timestamp(Uint32.valueOf(16909060)))
+            .build());
 
         final ByteBuf aggregator = Unpooled.buffer();
         this.parser.serializePerPeerHeader(perHeader, aggregator);
@@ -112,17 +112,17 @@ public class AbstractBmpPerPeerMessageParserTest {
         final PeerHeader perHeader = AbstractBmpPerPeerMessageParser
                 .parsePerPeerHeader(Unpooled.wrappedBuffer(this.ipv6MsgWithDistinguishergBytes));
 
-        final PeerHeaderBuilder phBuilder = new PeerHeaderBuilder();
-        phBuilder.setType(PeerType.L3vpn);
-        phBuilder.setPeerDistinguisher(new PeerDistinguisher(
-                new RouteDistinguisher(new RdTwoOctetAs("0:" + RD))));
-        phBuilder.setAdjRibInType(AdjRibInType.forValue(1));
-        phBuilder.setIpv4(false);
-        phBuilder.setAddress(new IpAddress(new Ipv6Address("2001::1")));
-        phBuilder.setAs(new AsNumber(168L));
-        phBuilder.setBgpId(new Ipv4Address("1.1.1.2"));
-        phBuilder.setTimestampSec(new Timestamp(0L));
-        phBuilder.setTimestampMicro(new Timestamp(0L));
+        final PeerHeaderBuilder phBuilder = new PeerHeaderBuilder()
+                .setType(PeerType.L3vpn)
+                .setPeerDistinguisher(new PeerDistinguisher(
+                    new RouteDistinguisher(new RdTwoOctetAs("0:" + RD))))
+                .setAdjRibInType(AdjRibInType.forValue(1))
+                .setIpv4(false)
+                .setAddress(new IpAddressNoZone(new Ipv6AddressNoZone("2001::1")))
+                .setAs(new AsNumber(Uint32.valueOf(168)))
+                .setBgpId(new Ipv4AddressNoZone("1.1.1.2"))
+                .setTimestampSec(new Timestamp(Uint32.ZERO))
+                .setTimestampMicro(new Timestamp(Uint32.ZERO));
 
         assertEquals(phBuilder.build(), perHeader);