Migrate DTO builders

This migrates trivial cases where we use constants to initialize
DTO builders via deprecated methods.

Change-Id: Ib7ade52cca2a4e0c59379bb8c700e5fb1a111ff7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/cli/pom.xml b/bgp/cli/pom.xml
index 28e1aa8793d069106524e36d9ff88cf366aef3a9..59ff80b95a21c1caf9c32ee10b289cb82e3e4d7e 100644 (file)
--- a/bgp/cli/pom.xml
+++ b/bgp/cli/pom.xml
@@ -33,6 +33,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-api</artifactId>

diff --git a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtilsTest.java b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtilsTest.java
index 5eea7c994fa9248baceebb4165579a1d8424d77a..5ce10f47d4aba35e888bd62e120894a15eeae39e 100644 (file)
--- a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtilsTest.java
+++ b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtilsTest.java
@@ -25,6 +25,7 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAfiSafiStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAfiSafiStateAugmentationBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class GlobalStateCliUtilsTest {
     private final ByteArrayOutputStream output = new ByteArrayOutputStream();
@@ -53,8 +54,8 @@ public class GlobalStateCliUtilsTest {
     static GlobalBuilder buildGlobal(final boolean withStateAug) {
         final GlobalBuilder builder = new GlobalBuilder().setState(new StateBuilder()
                 .setAs(AsNumber.getDefaultInstance("100"))
-                .setTotalPaths(1L)
-                .setTotalPrefixes(2L)
+                .setTotalPaths(Uint32.ONE)
+                .setTotalPrefixes(Uint32.valueOf(2))
                 .build());
 
         final org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp
@@ -63,7 +64,10 @@ public class GlobalStateCliUtilsTest {
                         .common.afi.safi.list.afi.safi.StateBuilder();
         if (withStateAug) {
             stateBuilder.addAugmentation(GlobalAfiSafiStateAugmentation.class,
-                    new GlobalAfiSafiStateAugmentationBuilder().setTotalPaths(3L).setTotalPrefixes(4L).build());
+                    new GlobalAfiSafiStateAugmentationBuilder()
+                        .setTotalPaths(Uint32.valueOf(3))
+                        .setTotalPrefixes(Uint32.valueOf(4))
+                        .build());
         }
 
 

diff --git a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtilsTest.java b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtilsTest.java
index c60d01495920a43e8ef67a5a6b15c62d7f8054be..3399429387eb303a2835b597b309c8be9635a1a3 100644 (file)
--- a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtilsTest.java
+++ b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtilsTest.java
@@ -14,7 +14,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import org.junit.Test;
@@ -51,6 +50,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.open
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.network.instances.network.instance.protocols.protocol.bgp.neighbors.neighbor.state.messages.ReceivedBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.network.instances.network.instance.protocols.protocol.bgp.neighbors.neighbor.state.messages.Sent;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.network.instances.network.instance.protocols.protocol.bgp.neighbors.neighbor.state.messages.SentBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
 
 public class NeighborStateCliUtilsTest {
 
@@ -102,8 +104,11 @@ public class NeighborStateCliUtilsTest {
                 .multiprotocol.rev151009.bgp.common.afi.safi.list.afi.safi.StateBuilder();
 
         builder.addAugmentation(NeighborAfiSafiStateAugmentation.class, new NeighborAfiSafiStateAugmentationBuilder()
-                .setActive(true)
-                .setPrefixes(new PrefixesBuilder().setInstalled(1L).setReceived(1L).setSent(2L).build())
+                .setActive(Boolean.TRUE)
+                .setPrefixes(new PrefixesBuilder()
+                    .setInstalled(Uint32.ONE)
+                    .setReceived(Uint32.ONE)
+                    .setSent(Uint32.valueOf(2)).build())
                 .build());
         final AfiSafi afiSafi = new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
                 .setState(builder.build()).build();
@@ -116,13 +121,13 @@ public class NeighborStateCliUtilsTest {
                         .setSessionState(BgpNeighborState.SessionState.ACTIVE).build());
 
         final Received received = new ReceivedBuilder()
-                .setNOTIFICATION(BigInteger.ONE)
-                .setUPDATE(BigInteger.TEN)
+                .setNOTIFICATION(Uint64.ONE)
+                .setUPDATE(Uint64.valueOf(10))
                 .build();
 
         final Sent sent = new SentBuilder()
-                .setNOTIFICATION(BigInteger.TEN)
-                .setUPDATE(BigInteger.ONE)
+                .setNOTIFICATION(Uint64.valueOf(10))
+                .setUPDATE(Uint64.ONE)
                 .build();
 
         stateBuilder.addAugmentation(BgpNeighborStateAugmentation.class,
@@ -138,8 +143,8 @@ public class NeighborStateCliUtilsTest {
                 .addAugmentation(NeighborTransportStateAugmentation.class,
                         new NeighborTransportStateAugmentationBuilder()
                                 .setRemoteAddress(NEIGHBOR_IP_ADDRESS)
-                                .setLocalPort(new PortNumber(1234))
-                                .setRemotePort(new PortNumber(4321))
+                                .setLocalPort(new PortNumber(Uint16.valueOf(1234)))
+                                .setRemotePort(new PortNumber(Uint16.valueOf(4321)))
                                 .build())
                 .build()).build();
         final Timers timers = new TimersBuilder().setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang
@@ -147,7 +152,7 @@ public class NeighborStateCliUtilsTest {
                 .addAugmentation(NeighborTimersStateAugmentation.class,
                         new NeighborTimersStateAugmentationBuilder()
                                 .setNegotiatedHoldTime(BigDecimal.TEN)
-                                .setUptime(new Timeticks(600L))
+                                .setUptime(new Timeticks(Uint32.valueOf(600)))
                                 .build())
                 .build()).build();
         final Neighbor neighbor = new NeighborBuilder()

diff --git a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtilsTest.java b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtilsTest.java
index 79230af0c279175af055aa6cf06622f74eb9337f..45af340678912c4a193f09cbdd968c0007e54976 100644 (file)
--- a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtilsTest.java
+++ b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtilsTest.java
@@ -19,6 +19,7 @@ import org.junit.Test;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.peer.group.PeerGroupBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.PeerGroupStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.PeerGroupStateAugmentationBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public final class PeerGroupStateCliUtilsTest {
 
@@ -41,8 +42,8 @@ public final class PeerGroupStateCliUtilsTest {
         final PeerGroupBuilder peerGroup = new PeerGroupBuilder().setPeerGroupName(TEST_GROUP);
 
         final PeerGroupStateAugmentation groupState = new PeerGroupStateAugmentationBuilder()
-                .setTotalPrefixes(1L)
-                .setTotalPaths(2L)
+                .setTotalPrefixes(Uint32.ONE)
+                .setTotalPaths(Uint32.valueOf(2))
                 .build();
 
         peerGroup.setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java
index b0567e040703e5c427c7cc42fe5184ee73b1c4f4..a92ef3bb017d119647eb08a7fc950053a13566ae 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java
@@ -31,6 +31,7 @@ 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.Ipv6AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.SubsequentAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.UnicastSubsequentAddressFamily;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class LlGracefulCapabilityHandlerTest {
 
@@ -61,14 +62,14 @@ public class LlGracefulCapabilityHandlerTest {
                 .setTables(Arrays.asList(new TablesBuilder()
                                 .setAfi(Ipv4AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
-                                .setAfiFlags(new Tables.AfiFlags(false))
-                                .setLongLivedStaleTime(10L)
+                                .setAfiFlags(new Tables.AfiFlags(Boolean.FALSE))
+                                .setLongLivedStaleTime(Uint32.valueOf(10))
                                 .build(),
                         new TablesBuilder()
                                 .setAfi(Ipv6AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
-                                .setAfiFlags(new Tables.AfiFlags(true))
-                                .setLongLivedStaleTime(160L)
+                                .setAfiFlags(new Tables.AfiFlags(Boolean.TRUE))
+                                .setLongLivedStaleTime(Uint32.valueOf(160))
                                 .build())
                 ).build();
 
@@ -88,8 +89,8 @@ public class LlGracefulCapabilityHandlerTest {
                 .setTables(Arrays.asList(new TablesBuilder()
                                 .setAfi(AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
-                                .setAfiFlags(new Tables.AfiFlags(false))
-                                .setLongLivedStaleTime(10L)
+                                .setAfiFlags(new Tables.AfiFlags(Boolean.FALSE))
+                                .setLongLivedStaleTime(Uint32.valueOf(10))
                                 .build())).build();
 
         final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,
@@ -104,8 +105,8 @@ public class LlGracefulCapabilityHandlerTest {
                 .setTables(Arrays.asList(new TablesBuilder()
                         .setAfi(Ipv4AddressFamily.class)
                         .setSafi(SubsequentAddressFamily.class)
-                        .setAfiFlags(new Tables.AfiFlags(false))
-                        .setLongLivedStaleTime(10L)
+                        .setAfiFlags(new Tables.AfiFlags(Boolean.FALSE))
+                        .setLongLivedStaleTime(Uint32.valueOf(10))
                         .build())).build();
 
         final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,
@@ -120,7 +121,7 @@ public class LlGracefulCapabilityHandlerTest {
                 .setTables(Arrays.asList(new TablesBuilder()
                                 .setAfi(Ipv4AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
-                                .setAfiFlags(new Tables.AfiFlags(false))
+                                .setAfiFlags(new Tables.AfiFlags(Boolean.FALSE))
                                 .setLongLivedStaleTime(-1L)
                                 .build())).build();
 
@@ -137,8 +138,8 @@ public class LlGracefulCapabilityHandlerTest {
                 .setTables(Arrays.asList(new TablesBuilder()
                         .setAfi(Ipv4AddressFamily.class)
                         .setSafi(UnicastSubsequentAddressFamily.class)
-                        .setAfiFlags(new Tables.AfiFlags(false))
-                        .setLongLivedStaleTime(16777216L)
+                        .setAfiFlags(new Tables.AfiFlags(Boolean.FALSE))
+                        .setLongLivedStaleTime(Uint32.valueOf(16777216L))
                         .build())).build();
 
         final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParserTest.java
index 8d1feb1785ec8026c77b8289cc356e03a2111527..2796ae22e7f105ccd71be23dc43f8897a6d116b4 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParserTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParserTest.java
@@ -22,6 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.AggregatorBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class AggregatorAttributeParserTest {
     private static final byte[] ATTRIBUTE_BYTES = {
@@ -32,7 +33,7 @@ public class AggregatorAttributeParserTest {
 
     private static final Attributes RESULT = new AttributesBuilder()
             .setAggregator(new AggregatorBuilder()
-                    .setAsNumber(new AsNumber(1L))
+                    .setAsNumber(new AsNumber(Uint32.ONE))
                     .setNetworkAddress(new Ipv4Address("255.255.255.1"))
                     .build())
             .build();

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathAttributeParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathAttributeParserTest.java
index 3c9152e9b4aa409874164e3dbc10f9af3f90a881..8b9c8f30b3f055a8c7727cbf6f9aebd80595f54d 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathAttributeParserTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathAttributeParserTest.java
@@ -26,6 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.AsPathBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.as.path.Segments;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.attributes.as.path.SegmentsBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class AsPathAttributeParserTest {
     private static final byte[] ATTRIBUTE_BYTES = {
@@ -42,10 +43,10 @@ public class AsPathAttributeParserTest {
     public void testAttributeParser() throws BGPParsingException, BGPDocumentedException {
         final List<Segments> segments = new ArrayList<>();
         segments.add(new SegmentsBuilder()
-                .setAsSet(Arrays.asList(new AsNumber(1L), new AsNumber(2L)))
+                .setAsSet(Arrays.asList(new AsNumber(Uint32.ONE), new AsNumber(Uint32.valueOf(2))))
                 .build());
         segments.add(new SegmentsBuilder()
-                .setAsSequence(Arrays.asList(new AsNumber(3L), new AsNumber(4L)))
+                .setAsSequence(Arrays.asList(new AsNumber(Uint32.valueOf(3)), new AsNumber(Uint32.valueOf(4))))
                 .build());
         final Attributes attr = new AttributesBuilder().setAsPath(new AsPathBuilder()
                     .setSegments(segments)

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/AsTwoOctetSpecificEcHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/AsTwoOctetSpecificEcHandlerTest.java
index e46a17f33aa1abacaf3b8af49631abd3e55e9948..202f77964237d697293a8d5ce4a9e371b54847df 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/AsTwoOctetSpecificEcHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/extended/communities/AsTwoOctetSpecificEcHandlerTest.java
@@ -18,6 +18,7 @@ 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.extended.community.extended.community.AsSpecificExtendedCommunityCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.AsSpecificExtendedCommunityCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.extended.community.extended.community.as.specific.extended.community._case.AsSpecificExtendedCommunityBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class AsTwoOctetSpecificEcHandlerTest {
 
@@ -30,7 +31,7 @@ public class AsTwoOctetSpecificEcHandlerTest {
         final AsTwoOctetSpecificEcHandler handler = new AsTwoOctetSpecificEcHandler();
         final AsSpecificExtendedCommunityCase expected = new AsSpecificExtendedCommunityCaseBuilder()
                 .setAsSpecificExtendedCommunity(new AsSpecificExtendedCommunityBuilder()
-                    .setGlobalAdministrator(new ShortAsNumber(54L))
+                    .setGlobalAdministrator(new ShortAsNumber(Uint32.valueOf(54)))
                     .setLocalAdministrator(new byte[] { 0, 0, 1, 76 }).build())
                 .build();
 

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtil.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtil.java
index 0a336103067326c09062c2923a086026cfc40ce2..8943996bc7b04539d6a86192691798b22f588e99 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtil.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtil.java
@@ -77,7 +77,7 @@ final class OpenConfigMappingUtil {
     private static final AfiSafi IPV4_AFISAFI = new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class).build();
     private static final List<AfiSafi> DEFAULT_AFISAFI = ImmutableList.of(IPV4_AFISAFI);
     private static final int CONNECT_RETRY = 30;
-    private static final PortNumber PORT = new PortNumber(179);
+    private static final PortNumber PORT = new PortNumber(Uint16.valueOf(179).intern());
 
     private OpenConfigMappingUtil() {
         throw new UnsupportedOperationException();

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPSessionStateImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPSessionStateImpl.java
index 4b5311ea7029e28341a212309b4da86417bb5ce1..f753a1a5e919836dd9c6d44c34aa03eafda8f7f2 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPSessionStateImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPSessionStateImpl.java
@@ -30,11 +30,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.MultiprotocolCapability;
 import org.opendaylight.yangtools.yang.binding.Notification;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 // This class is thread-safe
 public final class BGPSessionStateImpl implements BGPSessionState, BGPTimersState, BGPTransportState,
     BGPSessionStateListener {
-    private static final PortNumber NON_DEFINED_PORT = new PortNumber(0);
+    private static final PortNumber NON_DEFINED_PORT = new PortNumber(Uint16.ZERO);
     private final Stopwatch sessionStopwatch;
     private int holdTimerValue;
     private IpAddress remoteAddress;
@@ -106,8 +107,8 @@ public final class BGPSessionStateImpl implements BGPSessionState, BGPTimersStat
 
         this.holdTimerValue = newHoldTimerValue;
         this.remoteAddress = StrictBGPPeerRegistry.getIpAddress(newRemoteAddress);
-        this.remotePort = new PortNumber(((InetSocketAddress) newRemoteAddress).getPort());
-        this.localPort = new PortNumber(((InetSocketAddress) localAddress).getPort());
+        this.remotePort = new PortNumber(Uint16.valueOf(((InetSocketAddress) newRemoteAddress).getPort()));
+        this.localPort = new PortNumber(Uint16.valueOf(((InetSocketAddress) localAddress).getPort()));
     }
 
     @Override

diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java
index 9d4d9e98cb79555a958cfb41a5e7557c1f43555f..c95af1da1aeec9833d7789151c873a5a43e51d5b 100644 (file)
--- a/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java
+++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java
@@ -19,6 +19,7 @@ import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class ASNumberTest {
     private AsNumber asn1;
@@ -27,9 +28,9 @@ public class ASNumberTest {
 
     @Before
     public void setUp() {
-        this.asn1 = new AsNumber(4294967295L);
-        this.asn3 = new AsNumber((long) 200);
-        this.asn4 = new AsNumber(429496335L);
+        this.asn1 = new AsNumber(Uint32.valueOf(4294967295L));
+        this.asn3 = new AsNumber(Uint32.valueOf(200));
+        this.asn4 = new AsNumber(Uint32.valueOf(429496335L));
     }
 
     @Test

diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSessionListenerTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSessionListenerTest.java
index 44990c73662ebb1dbe021304994a1a3f8fc894f7..62fc2b6f78c076e02ba2bad5149d66a9ad9b27ce 100644 (file)
--- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSessionListenerTest.java
+++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSessionListenerTest.java
@@ -177,13 +177,13 @@ public class PCCSessionListenerTest {
     private static Pcupd createUpdMsg(final boolean delegation) {
         final PcupdMessageBuilder msgBuilder = new PcupdMessageBuilder();
         final UpdatesBuilder updsBuilder = new UpdatesBuilder();
-        updsBuilder.setLsp(new LspBuilder().setDelegate(delegation).setPlspId(new PlspId(1L)).build());
+        updsBuilder.setLsp(new LspBuilder().setDelegate(delegation).setPlspId(new PlspId(Uint32.ONE)).build());
         final PathBuilder pathBuilder = new PathBuilder();
         pathBuilder.setEro(new EroBuilder().setSubobject(Collections.singletonList(new SubobjectBuilder()
             .setSubobjectType(new IpPrefixCaseBuilder().setIpPrefix(new IpPrefixBuilder()
                 .setIpPrefix(new IpPrefix(new Ipv4Prefix("127.0.0.2/32"))).build()).build()).build())).build());
         updsBuilder.setPath(pathBuilder.build());
-        updsBuilder.setSrp(new SrpBuilder().setOperationId(new SrpIdNumber(0L)).build());
+        updsBuilder.setSrp(new SrpBuilder().setOperationId(new SrpIdNumber(Uint32.ZERO)).build());
         msgBuilder.setUpdates(Collections.singletonList(updsBuilder.build()));
         return new PcupdBuilder().setPcupdMessage(msgBuilder.build()).build();
     }

diff --git a/pcep/topology/cli/pom.xml b/pcep/topology/cli/pom.xml
index e152fb3251383febdf9c802461d853a6253dfc92..009b2fba192f7be2b52739395c84d3a57dee43e6 100644 (file)
--- a/pcep/topology/cli/pom.xml
+++ b/pcep/topology/cli/pom.xml
@@ -37,6 +37,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-ietf-stateful07</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-api</artifactId>

diff --git a/pcep/topology/cli/src/test/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtilsTest.java b/pcep/topology/cli/src/test/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtilsTest.java
index 1f1fe44d1d55385c7471cbb1e9feeee2b3817828..72845c26507c7ef6323c5eb77c5aee782dc45686 100644 (file)
--- a/pcep/topology/cli/src/test/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtilsTest.java
+++ b/pcep/topology/cli/src/test/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtilsTest.java
@@ -49,6 +49,9 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 public class PcepStateUtilsTest extends AbstractConcurrentDataBrokerTest {
     private static final String PCEP_TOPOLOGY = "pcep-topology";
@@ -93,54 +96,54 @@ public class PcepStateUtilsTest extends AbstractConcurrentDataBrokerTest {
 
     private static PcepSessionState createPcepSessionState() {
         final LocalPref pref = new LocalPrefBuilder()
-                .setKeepalive((short) 30)
-                .setDeadtimer((short) 120)
+                .setKeepalive(Uint8.valueOf(30))
+                .setDeadtimer(Uint8.valueOf(120))
                 .setIpAddress(IP_ADDRESS)
-                .setSessionId(0)
+                .setSessionId(Uint16.ZERO)
                 .addAugmentation(PcepEntityIdStatsAug.class, new PcepEntityIdStatsAugBuilder()
                         .setSpeakerEntityIdValue(SPEAKER_ID).build())
                 .build();
 
         final PeerCapabilities capa = new PeerCapabilitiesBuilder()
                 .addAugmentation(StatefulCapabilitiesStatsAug.class, new StatefulCapabilitiesStatsAugBuilder()
-                        .setStateful(true)
-                        .setInstantiation(true)
-                        .setActive(true)
+                        .setStateful(Boolean.TRUE)
+                        .setInstantiation(Boolean.TRUE)
+                        .setActive(Boolean.TRUE)
                         .build())
                 .build();
 
         final ReplyTime reply = new ReplyTimeBuilder()
-                .setAverageTime(1L)
-                .setMaxTime(3L)
-                .setMinTime(2L)
+                .setAverageTime(Uint32.ONE)
+                .setMaxTime(Uint32.valueOf(3))
+                .setMinTime(Uint32.valueOf(2))
                 .build();
 
         final ErrorMessages errorMsg = new ErrorMessagesBuilder()
-                .setReceivedErrorMsgCount(1L)
-                .setSentErrorMsgCount(2L)
+                .setReceivedErrorMsgCount(Uint32.ONE)
+                .setSentErrorMsgCount(Uint32.valueOf(2))
                 .build();
 
         final StatefulMessagesStatsAug statefulMsg = new StatefulMessagesStatsAugBuilder()
-                .setLastReceivedRptMsgTimestamp(1512043769L)
-                .setSentUpdMsgCount(1L)
-                .setReceivedRptMsgCount(2L)
-                .setSentInitMsgCount(3L)
+                .setLastReceivedRptMsgTimestamp(Uint32.valueOf(1512043769L))
+                .setSentUpdMsgCount(Uint32.ONE)
+                .setReceivedRptMsgCount(Uint32.valueOf(2))
+                .setSentInitMsgCount(Uint32.valueOf(3))
                 .build();
 
         final Messages messages = new MessagesBuilder()
-                .setLastSentMsgTimestamp(1512043828L)
-                .setUnknownMsgReceived(1)
-                .setSentMsgCount(5L)
-                .setReceivedMsgCount(4L)
+                .setLastSentMsgTimestamp(Uint32.valueOf(1512043828L))
+                .setUnknownMsgReceived(Uint16.ONE)
+                .setSentMsgCount(Uint32.valueOf(5))
+                .setReceivedMsgCount(Uint32.valueOf(4))
                 .setReplyTime(reply)
                 .setErrorMessages(errorMsg)
                 .addAugmentation(StatefulMessagesStatsAug.class, statefulMsg)
                 .build();
 
         return new PcepSessionStateBuilder()
-                .setSynchronized(true)
+                .setSynchronized(Boolean.TRUE)
                 .setSessionDuration("0:00:01:26")
-                .setDelegatedLspsCount(1)
+                .setDelegatedLspsCount(Uint16.ONE)
                 .setLocalPref(pref)
                 .setPeerPref(new PeerPrefBuilder(pref).build())
                 .setPeerCapabilities(capa)

diff --git a/util/src/main/java/org/opendaylight/protocol/util/MplsLabelUtil.java b/util/src/main/java/org/opendaylight/protocol/util/MplsLabelUtil.java
index 3dfd67f4a8b86a7e4bf80026b7731890bc10731a..9912f4627a8efa0fe63f0958a84f75b9c1956730 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/MplsLabelUtil.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/MplsLabelUtil.java
@@ -10,6 +10,7 @@ package org.opendaylight.protocol.util;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.MplsLabel;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Util class for encoding/decoding 20bit leftmost value.
@@ -31,7 +32,7 @@ public final class MplsLabelUtil {
      * @return MplsLabel object
      */
     public static MplsLabel mplsLabelForByteBuf(final ByteBuf buffer) {
-        return new MplsLabel(Long.valueOf(buffer.readUnsignedMedium() >> LABEL_OFFSET));
+        return new MplsLabel(Uint32.valueOf(buffer.readUnsignedMedium() >> LABEL_OFFSET));
     }
 
     /**

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 20ac50c6e3c2c43fc9270a1831b14c239590785c..dca0543f69231c02bc0275122ccef11e6966e097 100644 (file)
--- a/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java
+++ b/util/src/test/java/org/opendaylight/protocol/util/IPAddressesAndPrefixesTest.java
@@ -30,6 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 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.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 public class IPAddressesAndPrefixesTest {
 
@@ -203,12 +204,12 @@ public class IPAddressesAndPrefixesTest {
     @Test
     public void testToInetSocketAddress() {
         final InetSocketAddress isa = Ipv4Util.toInetSocketAddress(new IpAddress(new Ipv4Address("123.42.13.8")),
-                new PortNumber(10));
+                new PortNumber(Uint16.valueOf(10)));
         Assert.assertEquals(10, isa.getPort());
         Assert.assertEquals("123.42.13.8", InetAddresses.toAddrString(isa.getAddress()));
 
-        final InetSocketAddress isa2 = Ipv4Util
-                .toInetSocketAddress(new IpAddress(new Ipv6Address("2001:db8:1:2::")), new PortNumber(10));
+        final InetSocketAddress isa2 = Ipv4Util.toInetSocketAddress(new IpAddress(new Ipv6Address("2001:db8:1:2::")),
+                new PortNumber(Uint16.valueOf(10)));
         Assert.assertEquals(10, isa2.getPort());
         Assert.assertEquals("2001:db8:1:2::", InetAddresses.toAddrString(isa2.getAddress()));
     }

diff --git a/util/src/test/java/org/opendaylight/protocol/util/MplsLabelUtilTest.java b/util/src/test/java/org/opendaylight/protocol/util/MplsLabelUtilTest.java
index cb9e03a6b9cee72b6fd5b92c093b35f967ae76bc..902e626b3590849305d39e1d60ff1dd2b2a5b695 100644 (file)
--- a/util/src/test/java/org/opendaylight/protocol/util/MplsLabelUtilTest.java
+++ b/util/src/test/java/org/opendaylight/protocol/util/MplsLabelUtilTest.java
@@ -14,10 +14,11 @@ import static org.junit.Assert.assertTrue;
 import io.netty.buffer.Unpooled;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.MplsLabel;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class MplsLabelUtilTest {
 
-    private static final long VAL1 = 5;
+    private static final Uint32 VAL1 = Uint32.valueOf(5);
     private static final byte[] VAL1_LEFT_BYTES = new byte[] { 0, 0, 0x50 };
     private static final byte[] VAL1_LEFT_BYTES_BOTTOM = new byte[] { 0, 0, 0x51 };