From 5242cab28f431607c7c2709f75a1f619189e46f0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 15 Oct 2019 14:07:48 +0200 Subject: [PATCH] Further migration of test code from legacy setters This continues the migration of test code from legacy setters and cosntructors to explicitly-typed ones. Change-Id: Iaf3f969ad92a1581a3aab3b3b2a68d8144359cb6 Signed-off-by: Robert Varga --- .../Ipv4ReachabilityTopologyBuilderTest.java | 3 +- .../LinkstateTopologyBuilderTest.java | 46 ++- .../bgp/topology/provider/UriBuilderTest.java | 21 +- bmp/bmp-parser-impl/pom.xml | 4 + .../protocol/bmp/parser/message/TestUtil.java | 77 ++-- bmp/bmp-spi/pom.xml | 4 + .../AbstractBmpPerPeerMessageParserTest.java | 46 +-- .../protocol/bmp/spi/parser/TlvUtilTest.java | 7 +- .../PCEPBandwidthUsageObjectCodecTest.java | 11 +- .../extension/PcRptMessageCodecTest.java | 11 +- .../pcep/ietf/PCEPObjectParserTest.java | 167 ++++---- .../protocol/pcep/ietf/PCEPTlvParserTest.java | 67 +-- .../protocol/pcep/ietf/PCEPValidatorTest.java | 195 +++++---- .../impl/BasePCEPSessionProposalFactory.java | 8 +- .../pcep/impl/AbstractPCEPSessionTest.java | 12 +- .../pcep/impl/FiniteStateMachineTest.java | 4 +- .../pcep/impl/LabelSubobjectParserTest.java | 16 +- .../pcep/impl/PCEPEROSubobjectParserTest.java | 22 +- .../pcep/impl/PCEPObjectParserTest.java | 390 ++++++++++-------- .../pcep/impl/PCEPRROSubobjectParserTest.java | 19 +- .../pcep/impl/PCEPSessionImplTest.java | 8 +- .../protocol/pcep/impl/PCEPTlvParserTest.java | 22 +- .../protocol/pcep/impl/PCEPValidatorTest.java | 229 +++++----- .../pcep/impl/PCEPXROSubobjectParserTest.java | 41 +- .../pcep/pcc/mock/PCCSessionListenerTest.java | 2 +- .../mock/PCCTriggeredFullDBResyncTest.java | 18 +- .../pcc/mock/PCCTriggeredLspResyncTest.java | 5 +- .../pcep/pcc/mock/PCCTriggeredSyncTest.java | 26 +- .../pcc/mock/PCCTunnelManagerImplTest.java | 11 +- .../PCEPSegmentRoutingCapabilityTest.java | 3 +- .../routing/SrEroSubobjectParserTest.java | 114 ++--- .../segment/routing/SrObjectParserTest.java | 46 ++- .../routing/SrRroSubobjectParserTest.java | 99 ++--- .../pcep/segment/routing/SrTlvParserTest.java | 6 +- .../segment/routing/TopologyProviderTest.java | 28 +- .../pcep/spi/AbstractMessageParserTest.java | 5 +- .../pcep/spi/AbstractObjectWithTlvsTest.java | 6 +- .../protocol/pcep/spi/RegistryTest.java | 14 +- .../rpc/TopologyStatsRpcServiceImpl.java | 2 +- .../rpc/TopologyStatsRpcServiceImplTest.java | 110 +++-- .../provider/TunnelProviderDeployer.java | 2 +- .../provider/NodeChangedListenerTest.java | 7 +- .../provider/TunnelProgrammingTest.java | 3 +- 43 files changed, 1056 insertions(+), 881 deletions(-) diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java index 69d067e26b..0cdc94bd12 100755 --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderTest.java @@ -42,10 +42,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.odl.bgp. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.Node1; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint32; public class Ipv4ReachabilityTopologyBuilderTest extends AbstractTopologyBuilderTest { - static final long PATH_ID = 1; + static final Uint32 PATH_ID = Uint32.ONE; private static final String ROUTE_IP4PREFIX = "127.1.0.0/32"; private static final String NEXT_HOP = "127.1.0.1"; private static final String NEW_NEXT_HOP = "127.1.0.2"; diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java index 6ff151e590..af78be6ee4 100755 --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilderTest.java @@ -27,7 +27,6 @@ import static org.opendaylight.protocol.util.CheckUtil.readDataOperational; import com.google.common.collect.Lists; import io.netty.buffer.Unpooled; -import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; @@ -97,6 +96,10 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.IgpNodeAttributes; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.igp.node.attributes.Prefix; 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.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { @@ -105,13 +108,13 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { private static final String ROUTER_1_ID = "127.0.0.1"; private static final String ROUTER_2_ID = "127.0.0.2"; private static final String NODE_1_PREFIX = "127.0.1.1/32"; - private static final AsNumber NODE_1_AS = new AsNumber(1L); - private static final AsNumber NODE_2_AS = new AsNumber(2L); + private static final AsNumber NODE_1_AS = new AsNumber(Uint32.ONE); + private static final AsNumber NODE_2_AS = new AsNumber(Uint32.valueOf(2)); private static final String NODE_1_ISIS_ID = "bgpls://IsisLevel2:1/type=node&as=1&router=0000.0102.0304"; private static final String NODE_2_ISIS_ID = "bgpls://IsisLevel2:1/type=node&as=2"; private static final String NODE_1_OSPF_ID = "bgpls://Ospf:1/type=node&as=1&router=0000.0102.0304"; private static final String NODE_2_OSPF_ID = "bgpls://Ospf:1/type=node&as=2"; - private static final Identifier IDENTIFIER = new Identifier(new BigInteger("1")); + private static final Identifier IDENTIFIER = new Identifier(Uint64.ONE); private static final long LISTENER_RESTART_TIME = 20000; private static final int LISTENER_ENFORCE_COUNTER = 2; @@ -129,7 +132,7 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { .child(Tables.class, new TablesKey(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class)) .build(); this.linkstateRouteIID = path.builder().child(LinkstateRoutesCase.class, LinkstateRoutes.class) - .child(LinkstateRoute.class, new LinkstateRouteKey(new PathId(0L), LINKSTATE_ROUTE_KEY)) + .child(LinkstateRoute.class, new LinkstateRouteKey(new PathId(Uint32.ZERO), LINKSTATE_ROUTE_KEY)) .build(); } @@ -394,10 +397,15 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { .setAttributes(new AttributesBuilder() .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build()) .addAugmentation(Attributes1.class, new Attributes1Builder() - .setLinkStateAttribute(new PrefixAttributesCaseBuilder().setPrefixAttributes( - new PrefixAttributesBuilder().setOspfForwardingAddress(new IpAddress( - new Ipv4Address(ospfFwdAddress))).setPrefixMetric(new IgpMetric(igpMetric)) - .build()).build()).build()).build()).build(); + .setLinkStateAttribute(new PrefixAttributesCaseBuilder() + .setPrefixAttributes(new PrefixAttributesBuilder() + .setOspfForwardingAddress(new IpAddress(new Ipv4Address(ospfFwdAddress))) + .setPrefixMetric(new IgpMetric(Uint32.valueOf(igpMetric))) + .build()) + .build()) + .build()) + .build()) + .build(); } private static LinkstateRoute createLinkstateLinkRoute(final ProtocolId protocolId, final AsNumber localAs, @@ -411,23 +419,27 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { .build()).build()).build()) .setRemoteNodeDescriptors(new RemoteNodeDescriptorsBuilder().setAsNumber(remoteAs).build()) .setLinkDescriptors(new LinkDescriptorsBuilder() - .setMultiTopologyId(new TopologyIdentifier(1)).build()).build()) + .setMultiTopologyId(new TopologyIdentifier(Uint16.ONE)).build()).build()) .setAttributes(new AttributesBuilder() .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build()) .addAugmentation(Attributes1.class, new Attributes1Builder() - .setLinkStateAttribute(new LinkAttributesCaseBuilder().setLinkAttributes( - new LinkAttributesBuilder().setSharedRiskLinkGroups( - Lists.newArrayList(new SrlgId(5L), new SrlgId(15L))) - .setAdminGroup(new AdministrativeGroup(0L)) + .setLinkStateAttribute(new LinkAttributesCaseBuilder() + .setLinkAttributes(new LinkAttributesBuilder() + .setSharedRiskLinkGroups(Lists.newArrayList( + new SrlgId(Uint32.valueOf(5)), new SrlgId(Uint32.valueOf(15)))) + .setAdminGroup(new AdministrativeGroup(Uint32.ZERO)) .setMaxLinkBandwidth( new Bandwidth(new byte[]{0x00, 0x00, (byte) 0xff, (byte) 0xff})) .setMaxReservableBandwidth( new Bandwidth(new byte[]{0x00, 0x00, (byte) 0xff, (byte) 0x1f})) .setUnreservedBandwidth(Lists.newArrayList(new UnreservedBandwidthBuilder() - .withKey(new UnreservedBandwidthKey((short) 1)) + .withKey(new UnreservedBandwidthKey(Uint8.ONE)) .setBandwidth(new Bandwidth(new byte[]{0x00, 0x00, 0x00, (byte) 0xff})) .build())) - .setTeMetric(new TeMetric(100L)).setLinkName(linkName).build()).build()) + .setTeMetric(new TeMetric(Uint32.valueOf(100))) + .setLinkName(linkName) + .build()) + .build()) .build()) .build()) .build(); @@ -436,7 +448,7 @@ public class LinkstateTopologyBuilderTest extends AbstractTopologyBuilderTest { private static LinkstateRouteBuilder createBaseBuilder(final ProtocolId protocolId) { return new LinkstateRouteBuilder() .setIdentifier(IDENTIFIER) - .withKey(new LinkstateRouteKey(new PathId(0L), LINKSTATE_ROUTE_KEY)) + .withKey(new LinkstateRouteKey(new PathId(Uint32.ZERO), LINKSTATE_ROUTE_KEY)) .setRouteKey(LINKSTATE_ROUTE_KEY) .setProtocolId(protocolId); } diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilderTest.java index c0f0bfefbb..0e33c94703 100644 --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilderTest.java @@ -9,7 +9,6 @@ package org.opendaylight.bgpcep.bgp.topology.provider; import static org.junit.Assert.assertEquals; -import java.math.BigInteger; import org.junit.Test; 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.linkstate.rev180329.AreaIdentifier; @@ -31,6 +30,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.link 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.bgp.types.rev180329.RouteDistinguisherBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.IsoSystemIdentifier; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; public class UriBuilderTest { private static final RouteDistinguisher DISTINGUISHER @@ -39,7 +42,7 @@ public class UriBuilderTest { @Test public void test() { final LinkstateRouteBuilder routeB = new LinkstateRouteBuilder().setProtocolId(ProtocolId.Direct) - .setIdentifier(new Identifier(BigInteger.TEN)); + .setIdentifier(new Identifier(Uint64.valueOf(10))); final UriBuilder a = new UriBuilder(routeB.build()); assertEquals("bgpls://Direct:10/", a.toString()); @@ -57,19 +60,21 @@ public class UriBuilderTest { linkB.setLinkDescriptors(new LinkDescriptorsBuilder() .setIpv4InterfaceAddress(new Ipv4InterfaceIdentifier("127.0.0.1")) .setIpv4NeighborAddress(new Ipv4InterfaceIdentifier("20.20.20.20")) - .setMultiTopologyId(new TopologyIdentifier(55)).setLinkLocalIdentifier(1L) - .setLinkRemoteIdentifier(2L).build()); + .setMultiTopologyId(new TopologyIdentifier(Uint16.valueOf(55))) + .setLinkLocalIdentifier(Uint32.ONE) + .setLinkRemoteIdentifier(Uint32.valueOf(2)) + .build()); final LocalNodeDescriptorsBuilder nodeB = new LocalNodeDescriptorsBuilder(); - nodeB.setAsNumber(new AsNumber(12L)).setDomainId(new DomainIdentifier(15L)) - .setAreaId(new AreaIdentifier(17L)); + nodeB.setAsNumber(new AsNumber(Uint32.valueOf(12))).setDomainId(new DomainIdentifier(Uint32.valueOf(15))) + .setAreaId(new AreaIdentifier(Uint32.valueOf(17))); nodeB.setCRouterIdentifier(new OspfNodeCaseBuilder().setOspfNode(new OspfNodeBuilder() - .setOspfRouterId(22L).build()).build()); + .setOspfRouterId(Uint32.valueOf(22)).build()).build()); linkB.setLocalNodeDescriptors(nodeB.build()); final RemoteNodeDescriptorsBuilder nodeR = new RemoteNodeDescriptorsBuilder(); nodeR.setCRouterIdentifier(new IsisPseudonodeCaseBuilder().setIsisPseudonode(new IsisPseudonodeBuilder() .setIsIsRouterIdentifier(new IsIsRouterIdentifierBuilder() .setIsoSystemId(new IsoSystemIdentifier(new byte[]{1, 2, 3, 4, 5, 6})) - .build()).setPsn((short) 2).build()).build()); + .build()).setPsn(Uint8.valueOf(2)).build()).build()); linkB.setRemoteNodeDescriptors(nodeR.build()); c.add(linkB.build()); assertEquals("bgpls://1.2.3.4:258:Direct:10/type=foo&local-as=12&local-domain=15&local-area=17&" diff --git a/bmp/bmp-parser-impl/pom.xml b/bmp/bmp-parser-impl/pom.xml index 8a4b658c7e..fcfdbd754e 100644 --- a/bmp/bmp-parser-impl/pom.xml +++ b/bmp/bmp-parser-impl/pom.xml @@ -70,6 +70,10 @@ org.opendaylight.yangtools concepts + + org.opendaylight.yangtools + yang-common + io.netty netty-buffer diff --git a/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java b/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java index a540535a14..f76c990879 100644 --- a/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java +++ b/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java @@ -10,7 +10,6 @@ package org.opendaylight.protocol.bmp.parser.message; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import java.math.BigInteger; import java.util.ArrayList; import java.util.List; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber; @@ -108,6 +107,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.mess import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.string.informations.StringInformationBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.string.tlv.StringTlvBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.AccumulatedIgpMetric; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; public final class TestUtil { @@ -121,9 +124,9 @@ public final class TestUtil { private static final Ipv4Address IPV4_ADDRESS_40 = new Ipv4Address("40.40.40.40"); private static final Ipv4Address IPV4_ADDRESS_12 = new Ipv4Address("12.12.12.12"); private static final Ipv4Address IPV4_ADDRESS_100 = new Ipv4Address("100.100.100.100"); - public static final AsNumber PEER_AS = new AsNumber(72L); - public static final PortNumber PEER_LOCAL_PORT = new PortNumber(220); - public static final PortNumber PEER_REMOTE_PORT = new PortNumber(5000); + public static final AsNumber PEER_AS = new AsNumber(Uint32.valueOf(72L)); + public static final PortNumber PEER_LOCAL_PORT = new PortNumber(Uint16.valueOf(220)); + public static final PortNumber PEER_REMOTE_PORT = new PortNumber(Uint16.valueOf(5000)); public static InitiationMessage createInitMsg(final String sysDescr, final String sysName, final String info) { final InitiationMessageBuilder initMsgBuilder = new InitiationMessageBuilder(); @@ -155,8 +158,8 @@ public final class TestUtil { .setAs(PEER_AS) .setBgpId(new Ipv4Address(bgpId)) .setAdjRibInType(ribType) - .setTimestampMicro(new Timestamp(10L)) - .setTimestampSec(new Timestamp(5L)) + .setTimestampMicro(new Timestamp(Uint32.valueOf(10))) + .setTimestampSec(new Timestamp(Uint32.valueOf(5))) .setIpv4(true) .setType(PeerType.forValue(0)); return peerHeaderBuilder.build(); @@ -193,7 +196,7 @@ public final class TestUtil { public static PeerDownNotification createPeerDownFSM() { final PeerDownNotificationBuilder peerDownNotifBuilder = new PeerDownNotificationBuilder() - .setData(new FsmEventCodeBuilder().setFsmEventCode(24).build()) + .setData(new FsmEventCodeBuilder().setFsmEventCode(Uint16.valueOf(24)).build()) .setLocalSystemClosed(true) .setPeerHeader(TestUtil.createPeerHeader()); return peerDownNotifBuilder.build(); @@ -203,8 +206,8 @@ public final class TestUtil { final NotificationBuilder notifBuilder = new NotificationBuilder() .setNotification(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message .rev180329.peer.down.data.notification.NotificationBuilder() - .setErrorCode((short) 1) - .setErrorSubcode((short) 1).build()); + .setErrorCode(Uint8.ONE) + .setErrorSubcode(Uint8.ONE).build()); final PeerDownNotificationBuilder peerDownNotifBuilder = new PeerDownNotificationBuilder() .setData(notifBuilder.build()) .setLocalSystemClosed(true) @@ -228,7 +231,7 @@ public final class TestUtil { private static List createOptionalCapabilities(final boolean multiprotocol) { final OptionalCapabilitiesBuilder optCapabilitiesBuilder = new OptionalCapabilitiesBuilder() .setCParameters(new CParametersBuilder().setAs4BytesCapability(new As4BytesCapabilityBuilder() - .setAsNumber(new AsNumber(70L)).build()).build()); + .setAsNumber(new AsNumber(Uint32.valueOf(70))).build()).build()); final CParametersBuilder paramsBuilder = new CParametersBuilder(); if (multiprotocol) { final CParameters1Builder params1Builder = new CParameters1Builder(); @@ -240,7 +243,7 @@ public final class TestUtil { final OptionalCapabilitiesBuilder optCapabilitiesBuilder2 = new OptionalCapabilitiesBuilder() .setCParameters(paramsBuilder .setAs4BytesCapability(new As4BytesCapabilityBuilder() - .setAsNumber(new AsNumber(80L)).build()).build()); + .setAsNumber(new AsNumber(Uint32.valueOf(80))).build()).build()); final List optCapabilities = Lists.newArrayList(); optCapabilities.add(optCapabilitiesBuilder.build()); optCapabilities.add(optCapabilitiesBuilder2.build()); @@ -251,8 +254,8 @@ public final class TestUtil { private static OpenMessage createOpen(final boolean mutiprotocol) { final SentOpenBuilder sentOpenBuilder = new SentOpenBuilder() .setBgpIdentifier(new Ipv4Address(IPV4_ADDRESS_20)) - .setHoldTimer(1000) - .setMyAsNumber(72) + .setHoldTimer(Uint16.valueOf(1000)) + .setMyAsNumber(Uint16.valueOf(72)) .setBgpParameters(createBgpParameters(mutiprotocol)); return sentOpenBuilder.build(); @@ -296,17 +299,17 @@ public final class TestUtil { } private static Attributes createAttributes() { - final List asSequences = Lists.newArrayList(new AsNumber(72L), new AsNumber(82L), - new AsNumber(92L)); + final List asSequences = Lists.newArrayList(new AsNumber(Uint32.valueOf(72)), + new AsNumber(Uint32.valueOf(82)), new AsNumber(Uint32.valueOf(92))); final List segments = Lists.newArrayList(); final SegmentsBuilder segmentsBuild = new SegmentsBuilder(); segmentsBuild.setAsSequence(asSequences).build(); final AttributesBuilder attribBuilder = new AttributesBuilder() - .setAggregator(new AggregatorBuilder().setAsNumber(new AsNumber(72L)) + .setAggregator(new AggregatorBuilder().setAsNumber(new AsNumber(Uint32.valueOf(72))) .setNetworkAddress(new Ipv4Address(IPV4_ADDRESS_20)).build()) .setAigp(new AigpBuilder().setAigpTlv(new AigpTlvBuilder() - .setMetric(new AccumulatedIgpMetric(BigInteger.ONE)).build()).build()) + .setMetric(new AccumulatedIgpMetric(Uint64.ONE)).build()).build()) .setAsPath(new AsPathBuilder().setSegments(segments).build()) .setAtomicAggregate(new AtomicAggregateBuilder().build()) .setClusterId(new ClusterIdBuilder().setCluster(Lists.newArrayList(new ClusterIdentifier(IPV4_ADDRESS_30), @@ -314,8 +317,8 @@ public final class TestUtil { .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal( IPV4_ADDRESS_100).build()).build()) .setCommunities(createCommunities()) - .setLocalPref(new LocalPrefBuilder().setPref(2L).build()) - .setMultiExitDisc(new MultiExitDiscBuilder().setMed(123L).build()) + .setLocalPref(new LocalPrefBuilder().setPref(Uint32.valueOf(2)).build()) + .setMultiExitDisc(new MultiExitDiscBuilder().setMed(Uint32.valueOf(123)).build()) .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build()) .setOriginatorId(new OriginatorIdBuilder().setOriginator(IPV4_ADDRESS_12).build()) .setUnrecognizedAttributes(new ArrayList<>()); @@ -325,11 +328,11 @@ public final class TestUtil { private static List createCommunities() { final List communities = Lists.newArrayList(); final CommunitiesBuilder commBuilder = new CommunitiesBuilder() - .setAsNumber(new AsNumber(65535L)) - .setSemantics(65381); + .setAsNumber(new AsNumber(Uint32.valueOf(65535))) + .setSemantics(Uint16.valueOf(65381)); final CommunitiesBuilder commBuilder2 = new CommunitiesBuilder() - .setAsNumber(new AsNumber(65535L)) - .setSemantics(65382); + .setAsNumber(new AsNumber(Uint32.valueOf(65535))) + .setSemantics(Uint16.valueOf(65382)); communities.add(commBuilder.build()); communities.add(commBuilder2.build()); return communities; @@ -367,35 +370,35 @@ public final class TestUtil { new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.stat .TlvsBuilder(); tlvsBuilder.setAdjRibsInRoutesTlv(new AdjRibsInRoutesTlvBuilder() - .setCount(new Gauge64(BigInteger.valueOf(10L))).build()); + .setCount(new Gauge64(Uint64.valueOf(10L))).build()); tlvsBuilder.setDuplicatePrefixAdvertisementsTlv(new DuplicatePrefixAdvertisementsTlvBuilder() - .setCount(new Counter32(16L)).build()); + .setCount(new Counter32(Uint32.valueOf(16L))).build()); tlvsBuilder.setDuplicateWithdrawsTlv(new DuplicateWithdrawsTlvBuilder() - .setCount(new Counter32(11L)).build()); + .setCount(new Counter32(Uint32.valueOf(11L))).build()); tlvsBuilder.setInvalidatedAsConfedLoopTlv(new InvalidatedAsConfedLoopTlvBuilder() - .setCount(new Counter32(55L)).build()); + .setCount(new Counter32(Uint32.valueOf(55L))).build()); tlvsBuilder.setInvalidatedAsPathLoopTlv(new InvalidatedAsPathLoopTlvBuilder() - .setCount(new Counter32(66L)).build()); + .setCount(new Counter32(Uint32.valueOf(66L))).build()); tlvsBuilder.setInvalidatedClusterListLoopTlv(new InvalidatedClusterListLoopTlvBuilder() - .setCount(new Counter32(53L)).build()); + .setCount(new Counter32(Uint32.valueOf(53L))).build()); tlvsBuilder.setInvalidatedOriginatorIdTlv(new InvalidatedOriginatorIdTlvBuilder() - .setCount(new Counter32(70L)).build()); + .setCount(new Counter32(Uint32.valueOf(70L))).build()); tlvsBuilder.setLocRibRoutesTlv(new LocRibRoutesTlvBuilder() - .setCount(new Gauge64(BigInteger.valueOf(100L))).build()); + .setCount(new Gauge64(Uint64.valueOf(100L))).build()); tlvsBuilder.setRejectedPrefixesTlv(new RejectedPrefixesTlvBuilder() - .setCount(new Counter32(8L)).build()); + .setCount(new Counter32(Uint32.valueOf(8L))).build()); tlvsBuilder.setPerAfiSafiAdjRibInTlv(new PerAfiSafiAdjRibInTlvBuilder() .setAfi(Ipv4AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class) - .setCount(new Gauge64(BigInteger.valueOf(9L))).build()); + .setCount(new Gauge64(Uint64.valueOf(9L))).build()); tlvsBuilder.setPerAfiSafiLocRibTlv(new PerAfiSafiLocRibTlvBuilder() .setAfi(Ipv4AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class) - .setCount(new Gauge64(BigInteger.valueOf(10L))).build()); + .setCount(new Gauge64(Uint64.valueOf(10L))).build()); tlvsBuilder.setUpdatesTreatedAsWithdrawTlv(new UpdatesTreatedAsWithdrawTlvBuilder() - .setCount(new Counter32(11L)).build()); + .setCount(new Counter32(Uint32.valueOf(11L))).build()); tlvsBuilder.setPrefixesTreatedAsWithdrawTlv(new PrefixesTreatedAsWithdrawTlvBuilder() - .setCount(new Counter32(12L)).build()); + .setCount(new Counter32(Uint32.valueOf(12L))).build()); tlvsBuilder.setDuplicateUpdatesTlv(new DuplicateUpdatesTlvBuilder() - .setCount(new Counter32(13L)).build()); + .setCount(new Counter32(Uint32.valueOf(13L))).build()); return statsReportMsgBuilder.setTlvs(tlvsBuilder.build()).build(); } diff --git a/bmp/bmp-spi/pom.xml b/bmp/bmp-spi/pom.xml index 7297b0f750..c68df33725 100644 --- a/bmp/bmp-spi/pom.xml +++ b/bmp/bmp-spi/pom.xml @@ -56,6 +56,10 @@ org.opendaylight.yangtools concepts + + org.opendaylight.yangtools + yang-common + org.opendaylight.mdsal.binding.model.ietf rfc6991-ietf-yang-types 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 ddda27b594..0fac7e3d9b 100644 --- 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 @@ -33,8 +33,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.mess 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.concepts.Builder; 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>(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 IpAddress(new Ipv4Address("192.168.1.1"))) + .setAs(new AsNumber(Uint32.valueOf(168))) + .setBgpId(new Ipv4Address("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 IpAddress(new Ipv6Address("2001::1"))) + .setAs(new AsNumber(Uint32.valueOf(168))) + .setBgpId(new Ipv4Address("1.1.1.2")) + .setTimestampSec(new Timestamp(Uint32.ZERO)) + .setTimestampMicro(new Timestamp(Uint32.ZERO)); assertEquals(phBuilder.build(), perHeader); diff --git a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/TlvUtilTest.java b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/TlvUtilTest.java index 3a18ccefba..be6faae447 100644 --- a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/TlvUtilTest.java +++ b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/TlvUtilTest.java @@ -10,12 +10,13 @@ package org.opendaylight.protocol.bmp.spi.parser; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import java.math.BigInteger; import org.junit.Assert; import org.junit.Test; import org.opendaylight.protocol.util.ByteArray; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Counter32; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Gauge64; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint64; public class TlvUtilTest { @@ -42,7 +43,7 @@ public class TlvUtilTest { @Test public void testFormatTlvCounter32() throws Exception { ByteBuf out = Unpooled.buffer(TLV_COUNTER32_OUT.length); - TlvUtil.formatTlvCounter32(1, new Counter32(5L), out); + TlvUtil.formatTlvCounter32(1, new Counter32(Uint32.valueOf(5)), out); Assert.assertArrayEquals(TLV_COUNTER32_OUT, ByteArray.getAllBytes(out)); out = Unpooled.EMPTY_BUFFER; TlvUtil.formatTlvCounter32(1, null, out); @@ -52,7 +53,7 @@ public class TlvUtilTest { @Test public void testFormatTlvGauge64() throws Exception { ByteBuf out = Unpooled.buffer(TLV_GAUGE64_OUT.length); - TlvUtil.formatTlvGauge64(1, new Gauge64(BigInteger.valueOf(5)), out); + TlvUtil.formatTlvGauge64(1, new Gauge64(Uint64.valueOf(5)), out); Assert.assertArrayEquals(TLV_GAUGE64_OUT, ByteArray.getAllBytes(out)); out = Unpooled.EMPTY_BUFFER; TlvUtil.formatTlvGauge64(1, null, out); diff --git a/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PCEPBandwidthUsageObjectCodecTest.java b/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PCEPBandwidthUsageObjectCodecTest.java index b103df57bb..b27e6aa440 100644 --- a/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PCEPBandwidthUsageObjectCodecTest.java +++ b/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PCEPBandwidthUsageObjectCodecTest.java @@ -5,7 +5,6 @@ * 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.pcep.auto.bandwidth.extension; import static org.junit.Assert.assertArrayEquals; @@ -32,11 +31,11 @@ public class PCEPBandwidthUsageObjectCodecTest { final BandwidthUsageObjectCodec codec = new BandwidthUsageObjectCodec(5); assertEquals(5, codec.getObjectType()); - final BandwidthUsageBuilder builder = new BandwidthUsageBuilder(); - builder.setBwSample(Lists.newArrayList(new Bandwidth(new byte[]{0x00, 0x00, 0x10, 0x00}), - new Bandwidth(new byte[]{0x00, 0x00, 0x40, 0x00}))); - builder.setIgnore(false); - builder.setProcessingRule(false); + final BandwidthUsageBuilder builder = new BandwidthUsageBuilder() + .setBwSample(Lists.newArrayList(new Bandwidth(new byte[]{0x00, 0x00, 0x10, 0x00}), + new Bandwidth(new byte[]{0x00, 0x00, 0x40, 0x00}))) + .setIgnore(false) + .setProcessingRule(false); final BandwidthUsage parsedObject = codec.parseObject(new ObjectHeaderImpl(false, false), Unpooled.wrappedBuffer(BW_BYTES, 4, BW_BYTES.length - 4)); assertEquals(builder.build(), parsedObject); diff --git a/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java b/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java index 730850285b..c97d0f7595 100644 --- a/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java +++ b/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java @@ -5,7 +5,6 @@ * 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.pcep.auto.bandwidth.extension; import static org.junit.Assert.assertNotNull; @@ -51,6 +50,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.Ipv4ExtendedTunnelId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.LspId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.TunnelId; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; public class PcRptMessageCodecTest { @@ -88,11 +89,11 @@ public class PcRptMessageCodecTest { builder.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(new Ipv4AddressNoZone("127.0.1.2"))); builder.setIpv4TunnelEndpointAddress(new Ipv4AddressNoZone("127.0.1.3")); final AddressFamily afiLsp = new Ipv4CaseBuilder().setIpv4(builder.build()).build(); - final LspId lspId = new LspId(1L); - final TunnelId tunnelId = new TunnelId(1); + final LspId lspId = new LspId(Uint32.ONE); + final TunnelId tunnelId = new TunnelId(Uint16.ONE); final LspIdentifiers identifier = new LspIdentifiersBuilder().setAddressFamily(afiLsp) .setLspId(lspId).setTunnelId(tunnelId).build(); - final Lsp lsp = new LspBuilder().setPlspId(new PlspId(1L)) + final Lsp lsp = new LspBuilder().setPlspId(new PlspId(Uint32.ONE)) .setTlvs(new TlvsBuilder().setLspIdentifiers(identifier).build()).build(); final Ero ero = new EroBuilder().build(); final List objects = Lists.newArrayList(lsp, ero, bw); @@ -109,7 +110,7 @@ public class PcRptMessageCodecTest { builder.setIpv4TunnelSenderAddress(new Ipv4AddressNoZone("127.0.1.1")); builder.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(new Ipv4AddressNoZone("127.0.1.2"))); builder.setIpv4TunnelEndpointAddress(new Ipv4AddressNoZone("127.0.1.3")); - final Lsp lsp = new LspBuilder().setPlspId(new PlspId(1L)).build(); + final Lsp lsp = new LspBuilder().setPlspId(new PlspId(Uint32.ONE)).build(); final Ero ero = new EroBuilder().build(); final List objects = Lists.newArrayList(lsp, ero, bw); final Reports validReports = codec.getValidReports(objects, new ArrayList<>()); diff --git a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java index 937d6dbc52..c77f6c5d26 100644 --- a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java +++ b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPObjectParserTest.java @@ -13,7 +13,6 @@ import static org.junit.Assert.assertEquals; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.io.IOException; -import java.math.BigInteger; import org.junit.Before; import org.junit.Test; import org.opendaylight.protocol.pcep.ietf.initiated00.CInitiated00SrpObjectParser; @@ -76,6 +75,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.Ipv4ExtendedTunnelId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.LspId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.TunnelId; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint64; +import org.opendaylight.yangtools.yang.common.Uint8; public class PCEPObjectParserTest { @@ -85,7 +88,7 @@ public class PCEPObjectParserTest { private TlvRegistry tlvRegistry; private VendorInformationTlvRegistry viTlvRegistry; - private static final byte[] DB_VERSION = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}; + private static final Uint64 DB_VERSION = Uint64.valueOf("0102030405060708", 16); private static final byte[] SPEAKER_ID = {0x01, 0x02, 0x03, 0x04}; @Before @@ -110,13 +113,13 @@ public class PCEPObjectParserTest { final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object .OpenBuilder builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types - .rev181109.open.object.OpenBuilder(); - builder.setProcessingRule(false); - builder.setIgnore(false); - builder.setVersion(new ProtocolVersion((short) 1)); - builder.setKeepalive((short) 30); - builder.setDeadTimer((short) 120); - builder.setSessionId((short) 1); + .rev181109.open.object.OpenBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setVersion(new ProtocolVersion(Uint8.ONE)) + .setKeepalive(Uint8.valueOf(30)) + .setDeadTimer(Uint8.valueOf(120)) + .setSessionId(Uint8.ONE); final Stateful tlv1 = new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE) .addAugmentation(Stateful1.class, new Stateful1Builder().build()).build(); @@ -124,10 +127,9 @@ public class PCEPObjectParserTest { final Tlvs1Builder statBuilder = new Tlvs1Builder(); statBuilder.setStateful(tlv1); - final Tlvs3Builder syncOptBuilder = new Tlvs3Builder(); - syncOptBuilder.setLspDbVersion(new LspDbVersionBuilder() - .setLspDbVersionValue(new BigInteger(DB_VERSION)).build()); - syncOptBuilder.setSpeakerEntityId(new SpeakerEntityIdBuilder().setSpeakerEntityIdValue(SPEAKER_ID).build()); + final Tlvs3Builder syncOptBuilder = new Tlvs3Builder() + .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(DB_VERSION).build()) + .setSpeakerEntityId(new SpeakerEntityIdBuilder().setSpeakerEntityIdValue(SPEAKER_ID).build()); builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 .open.object.open.TlvsBuilder() @@ -155,23 +157,22 @@ public class PCEPObjectParserTest { final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes( "src/test/resources/PCEPLspObject1WithTLV.bin")); - final LspBuilder builder = new LspBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(true); - builder.setAdministrative(true); - builder.setDelegate(false); - builder.setRemove(true); - builder.setSync(false); - builder.addAugmentation(Lsp1.class, new Lsp1Builder().setCreate(false).build()); - builder.setOperational(OperationalStatus.GoingDown); - builder.setPlspId(new PlspId(0x12345L)); - - final LspErrorCode tlv1 = new LspErrorCodeBuilder().setErrorCode(627610883L).build(); + final LspBuilder builder = new LspBuilder() + .setProcessingRule(true) + .setIgnore(true) + .setAdministrative(true) + .setDelegate(false) + .setRemove(true) + .setSync(false) + .addAugmentation(Lsp1.class, new Lsp1Builder().setCreate(false).build()) + .setOperational(OperationalStatus.GoingDown) + .setPlspId(new PlspId(Uint32.valueOf(0x12345))); + + final LspErrorCode tlv1 = new LspErrorCodeBuilder().setErrorCode(Uint32.valueOf(627610883)).build(); final SymbolicPathName tlv2 = new SymbolicPathNameBuilder().setPathName( new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109 .SymbolicPathName("Med".getBytes())).build(); - final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(new BigInteger(DB_VERSION)) - .build(); + final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(DB_VERSION).build(); builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful .rev181109.lsp.object.lsp.TlvsBuilder().setLspErrorCode(tlv1).setSymbolicPathName(tlv2) .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep @@ -194,39 +195,45 @@ public class PCEPObjectParserTest { final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes( "src/test/resources/PCEPLspObject2WithTLV.bin")); - final LspBuilder builder = new LspBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(true); - builder.setAdministrative(true); - builder.setDelegate(false); - builder.setRemove(true); - builder.setSync(false); - builder.setOperational(OperationalStatus.GoingDown); - builder.setPlspId(new PlspId(0x12345L)); - - final LspErrorCode tlv1 = new LspErrorCodeBuilder().setErrorCode(627610883L).build(); + final LspBuilder builder = new LspBuilder() + .setProcessingRule(true) + .setIgnore(true) + .setAdministrative(true) + .setDelegate(false) + .setRemove(true) + .setSync(false) + .setOperational(OperationalStatus.GoingDown) + .setPlspId(new PlspId(Uint32.valueOf(0x12345))); + + final LspErrorCode tlv1 = new LspErrorCodeBuilder().setErrorCode(Uint32.valueOf(627610883)).build(); final SymbolicPathName tlv2 = new SymbolicPathNameBuilder().setPathName( new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109 .SymbolicPathName("Med".getBytes())).build(); - final Ipv4Builder afi = new Ipv4Builder(); - afi.setIpv4TunnelSenderAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( - new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))); - afi.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( - new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })))); - afi.setIpv4TunnelEndpointAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( - new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))); final LspIdentifiers tlv3 = new LspIdentifiersBuilder() - .setAddressFamily(new Ipv4CaseBuilder().setIpv4(afi.build()).build()) - .setLspId(new LspId(65535L)).setTunnelId(new TunnelId(4660)).build(); - final RsvpErrorBuilder rsvpBuilder = new RsvpErrorBuilder(); - rsvpBuilder.setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( - new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })))); - rsvpBuilder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820 - .ErrorSpec.Flags(false, true)); - rsvpBuilder.setCode((short) 146); - rsvpBuilder.setValue(5634); + .setAddressFamily(new Ipv4CaseBuilder() + .setIpv4(new Ipv4Builder() + .setIpv4TunnelSenderAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( + new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))) + .setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(Ipv4Util.noZoneAddressForByteBuf( + Unpooled.wrappedBuffer(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })))) + .setIpv4TunnelEndpointAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( + new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))) + .build()) + .build()) + .setLspId(new LspId(Uint32.valueOf(65535))).setTunnelId(new TunnelId(Uint16.valueOf(4660))) + .build(); final RsvpErrorSpec tlv4 = new RsvpErrorSpecBuilder() - .setErrorType(new RsvpCaseBuilder().setRsvpError(rsvpBuilder.build()).build()).build(); + .setErrorType(new RsvpCaseBuilder() + .setRsvpError(new RsvpErrorBuilder() + .setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( + new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })))) + .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820 + .ErrorSpec.Flags(false, true)) + .setCode(Uint8.valueOf(146)) + .setValue(Uint16.valueOf(5634)) + .build()) + .build()) + .build(); builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful .rev181109.lsp.object.lsp.TlvsBuilder().setLspErrorCode(tlv1).setSymbolicPathName(tlv2) .setLspIdentifiers(tlv3).setRsvpErrorSpec(tlv4).build()); @@ -252,17 +259,17 @@ public class PCEPObjectParserTest { (byte) 0x6d, (byte) 0x62, (byte) 0x6f, (byte) 0x6c, (byte) 0x69, (byte) 0x63, (byte) 0x20, (byte) 0x6e, (byte) 0x61, (byte) 0x6d, (byte) 0x65 })).build(); - builder.setIgnore(false); - builder.setProcessingRule(false); - builder.setExcludeAny(new AttributeFilter(0x20A1FEE3L)); - builder.setIncludeAny(new AttributeFilter(0x1A025CC7L)); - builder.setIncludeAll(new AttributeFilter(0x2BB66532L)); - builder.setHoldPriority((short) 0x02); - builder.setSetupPriority((short) 0x03); - builder.setLocalProtectionDesired(true); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.lspa - .object.lspa.TlvsBuilder().addAugmentation(Tlvs2.class, - new Tlvs2Builder().setSymbolicPathName(tlv).build()).build()); + builder.setIgnore(false) + .setProcessingRule(false) + .setExcludeAny(new AttributeFilter(Uint32.valueOf(0x20A1FEE3L))) + .setIncludeAny(new AttributeFilter(Uint32.valueOf(0x1A025CC7L))) + .setIncludeAll(new AttributeFilter(Uint32.valueOf(0x2BB66532L))) + .setHoldPriority(Uint8.valueOf(0x02)) + .setSetupPriority(Uint8.valueOf(0x03)) + .setLocalProtectionDesired(true) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.lspa + .object.lspa.TlvsBuilder().addAugmentation(Tlvs2.class, + new Tlvs2Builder().setSymbolicPathName(tlv).build()).build()); // Tlvs container does not contain toString final Object o = parser.parseObject(new ObjectHeaderImpl(true, true), @@ -283,12 +290,12 @@ public class PCEPObjectParserTest { (byte) 0x21, (byte) 0x10, (byte) 0x00, (byte) 0x0c, 0, 0, 0, (byte) 0x01, 0, 0, 0, (byte) 0x01 }); - final SrpBuilder builder = new SrpBuilder(); - builder.setProcessingRule(false); - builder.setIgnore(false); - builder.setOperationId(new SrpIdNumber(1L)); - builder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(true).build()); - builder.setTlvs(new TlvsBuilder().build()); + final SrpBuilder builder = new SrpBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setOperationId(new SrpIdNumber(Uint32.ONE)) + .addAugmentation(Srp1.class, new Srp1Builder().setRemove(true).build()) + .setTlvs(new TlvsBuilder().build()); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false), result.slice(4, result.readableBytes() - 4))); @@ -305,14 +312,14 @@ public class PCEPObjectParserTest { 0x0, 0x1C, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0 }; final CInitiated00SrpObjectParser parser = new CInitiated00SrpObjectParser(this.tlvRegistry, this.viTlvRegistry); - final SrpBuilder builder = new SrpBuilder(); - builder.setProcessingRule(false); - builder.setIgnore(false); - builder.setOperationId(new SrpIdNumber(1L)); - builder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(true).build()); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful - .rev181109.srp.object.srp.TlvsBuilder() - .setPathSetupType(new PathSetupTypeBuilder().setPst((short) 0).build()).build()); + final SrpBuilder builder = new SrpBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setOperationId(new SrpIdNumber(Uint32.ONE)) + .addAugmentation(Srp1.class, new Srp1Builder().setRemove(true).build()) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful + .rev181109.srp.object.srp.TlvsBuilder() + .setPathSetupType(new PathSetupTypeBuilder().setPst(Uint8.ZERO).build()).build()); final ByteBuf result = Unpooled.wrappedBuffer(srpObjectWithPstTlvBytes); assertEquals(builder.build(), diff --git a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java index e9b6069c9e..e2993cc3d6 100644 --- a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java +++ b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPTlvParserTest.java @@ -55,6 +55,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.Ipv6ExtendedTunnelId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.LspId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.TunnelId; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public class PCEPTlvParserTest { @@ -132,7 +135,7 @@ public class PCEPTlvParserTest { @Test public void testLspErrorCodeTlv() throws PCEPDeserializerException { final Stateful07LspUpdateErrorTlvParser parser = new Stateful07LspUpdateErrorTlvParser(); - final LspErrorCode tlv = new LspErrorCodeBuilder().setErrorCode(627610883L).build(); + final LspErrorCode tlv = new LspErrorCodeBuilder().setErrorCode(Uint32.valueOf(627610883)).build(); assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(LSP_UPDATE_ERROR_BYTES, 4)))); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(tlv, buff); @@ -150,8 +153,8 @@ public class PCEPTlvParserTest { afi.setIpv4TunnelEndpointAddress(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 }))); final LspIdentifiers tlv = new LspIdentifiersBuilder().setAddressFamily( - new Ipv4CaseBuilder().setIpv4(afi.build()).build()).setLspId(new LspId(65535L)) - .setTunnelId(new TunnelId(4660)).build(); + new Ipv4CaseBuilder().setIpv4(afi.build()).build()).setLspId(new LspId(Uint32.valueOf(65535))) + .setTunnelId(new TunnelId(Uint16.valueOf(4660))).build(); assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(LSP_IDENTIFIERS4_BYTES, 4)))); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(tlv, buff); @@ -182,7 +185,7 @@ public class PCEPTlvParserTest { }))); final LspIdentifiers tlv = new LspIdentifiersBuilder() .setAddressFamily(new Ipv6CaseBuilder().setIpv6(afi.build()).build()) - .setLspId(new LspId(4660L)).setTunnelId(new TunnelId(65535)).build(); + .setLspId(new LspId(Uint32.valueOf(4660))).setTunnelId(new TunnelId(Uint16.MAX_VALUE)).build(); assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(LSP_IDENTIFIERS6_BYTES, 4)))); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(tlv, buff); @@ -192,13 +195,13 @@ public class PCEPTlvParserTest { @Test public void testRSVPError4SpecTlv() throws PCEPDeserializerException { final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser(); - final RsvpErrorBuilder builder = new RsvpErrorBuilder(); - builder.setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( - new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })))); - builder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec - .Flags(false, true)); - builder.setCode((short) 146); - builder.setValue(5634); + final RsvpErrorBuilder builder = new RsvpErrorBuilder() + .setNode(new IpAddressNoZone(Ipv4Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( + new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78 })))) + .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec + .Flags(false, true)) + .setCode(Uint8.valueOf(146)) + .setValue(Uint16.valueOf(5634)); final RsvpErrorSpec tlv = new RsvpErrorSpecBuilder() .setErrorType(new RsvpCaseBuilder().setRsvpError(builder.build()).build()).build(); assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(RSVP_ERROR_BYTES, 4)))); @@ -210,17 +213,16 @@ public class PCEPTlvParserTest { @Test public void testRSVPError6SpecTlv() throws PCEPDeserializerException { final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser(); - final RsvpErrorBuilder builder = new RsvpErrorBuilder(); - builder.setNode(new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer( - new byte[] { - (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, - (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0, (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, - (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0 - })))); - builder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec - .Flags(false, true)); - builder.setCode((short) 213); - builder.setValue(50649); + final RsvpErrorBuilder builder = new RsvpErrorBuilder() + .setNode(new IpAddressNoZone(Ipv6Util.noZoneAddressForByteBuf(Unpooled.wrappedBuffer(new byte[] { + (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, + (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0, (byte) 0x12, (byte) 0x34, (byte) 0x56, + (byte) 0x78, (byte) 0x9a, (byte) 0xbc, (byte) 0xde, (byte) 0xf0 + })))) + .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.ErrorSpec + .Flags(false, true)) + .setCode(Uint8.valueOf(213)) + .setValue(Uint16.valueOf(50649)); final RsvpErrorSpec tlv = new RsvpErrorSpecBuilder() .setErrorType(new RsvpCaseBuilder().setRsvpError(builder.build()).build()).build(); assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(RSVP_ERROR6_BYTES, 4)))); @@ -232,11 +234,11 @@ public class PCEPTlvParserTest { @Test public void testUserErrorSpecTlv() throws PCEPDeserializerException { final Stateful07RSVPErrorSpecTlvParser parser = new Stateful07RSVPErrorSpecTlvParser(); - final UserErrorBuilder builder = new UserErrorBuilder(); - builder.setEnterprise(new EnterpriseNumber(12345L)); - builder.setSubOrg((short) 5); - builder.setValue(38); - builder.setDescription("user desc"); + final UserErrorBuilder builder = new UserErrorBuilder() + .setEnterprise(new EnterpriseNumber(Uint32.valueOf(12345))) + .setSubOrg(Uint8.valueOf(5)) + .setValue(Uint16.valueOf(38)) + .setDescription("user desc"); final RsvpErrorSpec tlv = new RsvpErrorSpecBuilder() .setErrorType(new UserCaseBuilder().setUserError(builder.build()).build()).build(); assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(USER_ERROR_BYTES, 4)))); @@ -252,7 +254,7 @@ public class PCEPTlvParserTest { }; final PathBindingTlvParser parser = new PathBindingTlvParser(); final PathBindingBuilder builder = new PathBindingBuilder(); - builder.setBindingTypeValue(new MplsLabelBuilder().setMplsLabel(new MplsLabel(688_374L)).build()); + builder.setBindingTypeValue(new MplsLabelBuilder().setMplsLabel(new MplsLabel(Uint32.valueOf(688374))).build()); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(builder.build(), buff); assertArrayEquals(pathBindingBytes, ByteArray.readAllBytes(buff)); @@ -273,12 +275,11 @@ public class PCEPTlvParserTest { }; final PathBindingTlvParser parser = new PathBindingTlvParser(); final PathBindingBuilder builder = new PathBindingBuilder(); - builder.setBindingTypeValue( - new MplsLabelEntryBuilder() - .setTrafficClass((short) 6) - .setTimeToLive((short) 173) + builder.setBindingTypeValue(new MplsLabelEntryBuilder() + .setTrafficClass(Uint8.valueOf(6)) + .setTimeToLive(Uint8.valueOf(173)) .setBottomOfStack(true) - .setLabel(new MplsLabel(688_374L)).build()); + .setLabel(new MplsLabel(Uint32.valueOf(688374))).build()); final PathBinding tlv = builder.build(); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(tlv, buff); diff --git a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java index 0432b9f57a..a27cad6e0c 100644 --- a/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java +++ b/pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/PCEPValidatorTest.java @@ -110,6 +110,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.record.route.subobjects.subobject.type.UnnumberedCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.record.route.subobjects.subobject.type.UnnumberedCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.record.route.subobjects.subobject.type.unnumbered._case.UnnumberedBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public class PCEPValidatorTest { @@ -195,38 +198,44 @@ public class PCEPValidatorTest { this.act = new BaseParserExtensionActivator(); this.act.start(this.ctx); - final LspaBuilder lspaBuilder = new LspaBuilder(); - lspaBuilder.setProcessingRule(false); - lspaBuilder.setIgnore(false); - lspaBuilder.setLocalProtectionDesired(false); - lspaBuilder.setHoldPriority((short) 0); - lspaBuilder.setSetupPriority((short) 0); - lspaBuilder.setExcludeAny(new AttributeFilter(0L)); - lspaBuilder.setIncludeAll(new AttributeFilter(0L)); - lspaBuilder.setIncludeAny(new AttributeFilter(0L)); - lspaBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 - .lspa.object.lspa.TlvsBuilder().build()); - this.lspa = lspaBuilder.build(); - - final MetricBuilder mBuilder = new MetricBuilder(); - mBuilder.setIgnore(false); - mBuilder.setProcessingRule(false); - mBuilder.setComputed(false); - mBuilder.setBound(false); - mBuilder.setMetricType((short) 1); - mBuilder.setValue(new Float32(new byte[4])); - this.metrics = new MetricsBuilder().setMetric(mBuilder.build()).build(); + this.lspa = new LspaBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setLocalProtectionDesired(false) + .setHoldPriority(Uint8.ZERO) + .setSetupPriority(Uint8.ZERO) + .setExcludeAny(new AttributeFilter(Uint32.ZERO)) + .setIncludeAll(new AttributeFilter(Uint32.ZERO)) + .setIncludeAny(new AttributeFilter(Uint32.ZERO)) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 + .lspa.object.lspa.TlvsBuilder().build()) + .build(); + + this.metrics = new MetricsBuilder() + .setMetric(new MetricBuilder() + .setIgnore(false) + .setProcessingRule(false) + .setComputed(false) + .setBound(false) + .setMetricType(Uint8.ONE) + .setValue(new Float32(new byte[4])).build()) + .build(); this.eroASSubobject = new AsNumberCaseBuilder().setAsNumber(new AsNumberBuilder().setAsNumber( - new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber(0xFFFFL)) + new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber( + Uint32.valueOf(0xFFFF))) .build()).build(); - this.rroUnnumberedSub = new UnnumberedCaseBuilder().setUnnumbered( - new UnnumberedBuilder().setRouterId(0x00112233L).setInterfaceId(0x00ff00ffL).build()).build(); + this.rroUnnumberedSub = new UnnumberedCaseBuilder() + .setUnnumbered(new UnnumberedBuilder() + .setRouterId(Uint32.valueOf(0x00112233L)) + .setInterfaceId(Uint32.valueOf(0x00ff00ffL)) + .build()) + .build(); - final IroBuilder iroBuilder = new IroBuilder(); - iroBuilder.setIgnore(false); - iroBuilder.setProcessingRule(false); + final IroBuilder iroBuilder = new IroBuilder() + .setIgnore(false) + .setProcessingRule(false); final List iroSubs = new ArrayList<>(); iroSubs.add(new SubobjectBuilder().setSubobjectType(this.eroASSubobject).setLoose(false).build()); iroBuilder.setSubobject(iroSubs); @@ -253,34 +262,34 @@ public class PCEPValidatorTest { rroBuilder.setSubobject(rroSubs); this.rro = rroBuilder.build(); - final SrpBuilder srpBuilder = new SrpBuilder(); - srpBuilder.setIgnore(false); - srpBuilder.setProcessingRule(false); - srpBuilder.setOperationId(new SrpIdNumber(1L)); - srpBuilder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(false).build()); - srpBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful - .rev181109.srp.object.srp.TlvsBuilder().build()); - this.srp = srpBuilder.build(); - - final LspBuilder lspBuilder = new LspBuilder(); - lspBuilder.setIgnore(false); - lspBuilder.setProcessingRule(false); - lspBuilder.setAdministrative(false); - lspBuilder.setDelegate(false); - lspBuilder.setPlspId(new PlspId(0L)); - lspBuilder.setOperational(OperationalStatus.Down); - lspBuilder.setSync(false); - lspBuilder.setRemove(false); - lspBuilder.setTlvs(new TlvsBuilder().build()); - lspBuilder.addAugmentation(Lsp1.class, new Lsp1Builder().setCreate(false).build()); + this.srp = new SrpBuilder() + .setIgnore(false) + .setProcessingRule(false) + .setOperationId(new SrpIdNumber(Uint32.ONE)) + .addAugmentation(Srp1.class, new Srp1Builder().setRemove(false).build()) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful + .rev181109.srp.object.srp.TlvsBuilder().build()) + .build(); + + final LspBuilder lspBuilder = new LspBuilder() + .setIgnore(false) + .setProcessingRule(false) + .setAdministrative(false) + .setDelegate(false) + .setPlspId(new PlspId(Uint32.ZERO)) + .setOperational(OperationalStatus.Down) + .setSync(false) + .setRemove(false) + .setTlvs(new TlvsBuilder().build()) + .addAugmentation(Lsp1.class, new Lsp1Builder().setCreate(false).build()); final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp .identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4Builder builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp .identifiers.tlv.lsp.identifiers.address.family.ipv4._case.Ipv4Builder(); builder.setIpv4TunnelSenderAddress(new Ipv4AddressNoZone("127.0.1.1")); - final LspId lspId = new LspId(1L); - final TunnelId tunnelId = new TunnelId(1); + final LspId lspId = new LspId(Uint32.ONE); + final TunnelId tunnelId = new TunnelId(Uint16.ONE); builder.setIpv4ExtendedTunnelId(new Ipv4ExtendedTunnelId(new Ipv4AddressNoZone("127.0.1.2"))); builder.setIpv4TunnelEndpointAddress(new Ipv4AddressNoZone("127.0.1.3")); final AddressFamily afiLsp = new Ipv4CaseBuilder().setIpv4(builder.build()).build(); @@ -326,10 +335,10 @@ public class PCEPValidatorTest { .rev181109.open.object.OpenBuilder() .setProcessingRule(false) .setIgnore(false) - .setVersion(new ProtocolVersion((short) 1)) - .setKeepalive((short) 30) - .setDeadTimer((short) 120) - .setSessionId((short) 1) + .setVersion(new ProtocolVersion(Uint8.ONE)) + .setKeepalive(Uint8.valueOf(30)) + .setDeadTimer(Uint8.valueOf(120)) + .setSessionId(Uint8.ONE) .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 .open.object.open.TlvsBuilder().addAugmentation(Tlvs1.class, new Tlvs1Builder().setStateful(new StatefulBuilder().setLspUpdateCapability(Boolean.TRUE) @@ -524,8 +533,8 @@ public class PCEPValidatorTest { final Stateful07ErrorMessageParser parser = new Stateful07ErrorMessageParser( this.ctx.getObjectHandlerRegistry()); - ErrorObject error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 19) - .setValue((short) 1).build(); + ErrorObject error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false) + .setType(Uint8.valueOf(19)).setValue(Uint8.ONE).build(); List innerErr = new ArrayList<>(); innerErr.add(new ErrorsBuilder().setErrorObject(error1).build()); @@ -533,9 +542,15 @@ public class PCEPValidatorTest { PcerrMessageBuilder builder = new PcerrMessageBuilder(); builder.setErrors(innerErr); final List srps = new ArrayList<>(); - srps.add(new SrpsBuilder().setSrp(new SrpBuilder().setOperationId(new SrpIdNumber(3L)).setIgnore(false) - .setProcessingRule(false).setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang - .pcep.ietf.stateful.rev181109.srp.object.srp.TlvsBuilder().build()).build()).build()); + srps.add(new SrpsBuilder() + .setSrp(new SrpBuilder() + .setOperationId(new SrpIdNumber(Uint32.valueOf(3))) + .setIgnore(false) + .setProcessingRule(false) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful + .rev181109.srp.object.srp.TlvsBuilder().build()) + .build()) + .build()); builder.setErrorType(new StatefulCaseBuilder().setStateful(new org.opendaylight.yang.gen.v1.urn.opendaylight .params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcerr.pcerr.message.error.type.stateful._case .StatefulBuilder().setSrps(srps).build()).build()); @@ -547,30 +562,30 @@ public class PCEPValidatorTest { parser.serializeMessage(new PcerrBuilder().setPcerrMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); - error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 3) - .setValue((short) 1).build(); + error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType(Uint8.valueOf(3)) + .setValue(Uint8.ONE).build(); innerErr = new ArrayList<>(); builder = new PcerrMessageBuilder(); - final RpBuilder rpBuilder = new RpBuilder(); - rpBuilder.setProcessingRule(true); - rpBuilder.setIgnore(false); - rpBuilder.setReoptimization(false); - rpBuilder.setBiDirectional(false); - rpBuilder.setLoose(true); - rpBuilder.setMakeBeforeBreak(false); - rpBuilder.setOrder(false); - rpBuilder.setPathKey(false); - rpBuilder.setSupplyOf(false); - rpBuilder.setFragmentation(false); - rpBuilder.setP2mp(false); - rpBuilder.setEroCompression(false); - rpBuilder.setPriority((short) 1); - rpBuilder.setRequestId(new RequestId(10L)); - rpBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 - .rp.object.rp.TlvsBuilder().build()); - rpBuilder.setProcessingRule(false); + final RpBuilder rpBuilder = new RpBuilder() + .setProcessingRule(true) + .setIgnore(false) + .setReoptimization(false) + .setBiDirectional(false) + .setLoose(true) + .setMakeBeforeBreak(false) + .setOrder(false) + .setPathKey(false) + .setSupplyOf(false) + .setFragmentation(false) + .setP2mp(false) + .setEroCompression(false) + .setPriority(Uint8.ONE) + .setRequestId(new RequestId(Uint32.valueOf(10))) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 + .rp.object.rp.TlvsBuilder().build()) + .setProcessingRule(false); final List rps = new ArrayList<>(); rps.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr @@ -590,8 +605,8 @@ public class PCEPValidatorTest { builder = new PcerrMessageBuilder(); - error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 3) - .setValue((short) 1).build(); + error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType(Uint8.valueOf(3)) + .setValue(Uint8.ONE).build(); innerErr = new ArrayList<>(); innerErr.add(new ErrorsBuilder().setErrorObject(error1).build()); @@ -600,10 +615,10 @@ public class PCEPValidatorTest { builder.setErrorType(new SessionCaseBuilder().setSession(new SessionBuilder() .setOpen(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open .object.OpenBuilder() - .setDeadTimer((short) 1) - .setKeepalive((short) 1) - .setVersion(new ProtocolVersion((short) 1)) - .setSessionId((short) 0) + .setDeadTimer(Uint8.ONE) + .setKeepalive(Uint8.ONE) + .setVersion(new ProtocolVersion(Uint8.ONE)) + .setSessionId(Uint8.ZERO) .setIgnore(false) .setProcessingRule(false) .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types @@ -644,7 +659,11 @@ public class PCEPValidatorTest { final PcerrMessageBuilder errMsgBuilder = new PcerrMessageBuilder(); errMsgBuilder.setErrors(Lists.newArrayList(new ErrorsBuilder() - .setErrorObject(new ErrorObjectBuilder().setType((short) 6).setValue((short) 8).build()).build())); + .setErrorObject(new ErrorObjectBuilder() + .setType(Uint8.valueOf(6)) + .setValue(Uint8.valueOf(8)) + .build()) + .build())); final PcerrBuilder builder = new PcerrBuilder(); builder.setPcerrMessage(errMsgBuilder.build()); @@ -691,7 +710,11 @@ public class PCEPValidatorTest { final PcerrMessageBuilder errMsgBuilder = new PcerrMessageBuilder(); errMsgBuilder.setErrors(Lists.newArrayList(new ErrorsBuilder() - .setErrorObject(new ErrorObjectBuilder().setType((short) 6).setValue((short) 10).build()).build())); + .setErrorObject(new ErrorObjectBuilder() + .setType(Uint8.valueOf(6)) + .setValue(Uint8.valueOf(10)) + .build()) + .build())); final PcerrBuilder builder = new PcerrBuilder(); builder.setPcerrMessage(errMsgBuilder.build()); diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java index 88a47f50ed..fdf6861ad9 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/BasePCEPSessionProposalFactory.java @@ -54,13 +54,13 @@ public final class BasePCEPSessionProposalFactory implements PCEPSessionProposal @Override public Open getSessionProposal(final InetSocketAddress address, final int sessionId, final PCEPPeerProposal peerProposal) { - final OpenBuilder oBuilder = new OpenBuilder(); - oBuilder.setSessionId((short) sessionId); - oBuilder.setKeepalive((short) BasePCEPSessionProposalFactory.this.keepAlive); + final OpenBuilder oBuilder = new OpenBuilder() + .setSessionId(Uint8.valueOf(sessionId)) + .setKeepalive(Uint8.valueOf(BasePCEPSessionProposalFactory.this.keepAlive)); if (BasePCEPSessionProposalFactory.this.keepAlive == 0) { oBuilder.setDeadTimer(Uint8.ZERO); } else { - oBuilder.setDeadTimer((short) BasePCEPSessionProposalFactory.this.deadTimer); + oBuilder.setDeadTimer(Uint8.valueOf(BasePCEPSessionProposalFactory.this.deadTimer)); } final TlvsBuilder builder = new TlvsBuilder(); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionTest.java index f3215531a1..0749d17766 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionTest.java @@ -43,11 +43,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.message.OpenMessageBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.start.tls.message.StartTlsMessageBuilder; import org.opendaylight.yangtools.yang.binding.Notification; +import org.opendaylight.yangtools.yang.common.Uint8; public class AbstractPCEPSessionTest { - protected static final short KEEP_ALIVE = 15; - protected static final short DEADTIMER = 40; + protected static final Uint8 KEEP_ALIVE = Uint8.valueOf(15); + protected static final Uint8 DEADTIMER = Uint8.valueOf(40); @Mock protected Channel channel; @@ -112,15 +113,14 @@ public class AbstractPCEPSessionTest { .open.object.OpenBuilder() .setDeadTimer(DEADTIMER) .setKeepalive(KEEP_ALIVE) - .setSessionId((short) 0) + .setSessionId(Uint8.ZERO) .build()) .build()) .build(); this.kaMsg = new KeepaliveBuilder().setKeepaliveMessage(new KeepaliveMessageBuilder().build()).build(); this.startTlsMsg = new StarttlsBuilder().setStartTlsMessage(new StartTlsMessageBuilder().build()).build(); - this.closeMsg = new CloseBuilder().setCCloseMessage( - new CCloseMessageBuilder().setCClose(new CCloseBuilder().setReason((short) 6).build()).build()).build(); - + this.closeMsg = new CloseBuilder().setCCloseMessage(new CCloseMessageBuilder() + .setCClose(new CCloseBuilder().setReason(Uint8.valueOf(6)).build()).build()).build(); this.listener = new SimpleSessionListener(); } diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java index fa506ccf01..9305ca52fa 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/FiniteStateMachineTest.java @@ -40,7 +40,7 @@ public class FiniteStateMachineTest extends AbstractPCEPSessionTest { @Before public void setup() { final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.Open - localPrefs = new OpenBuilder().setKeepalive((short) 1).build(); + localPrefs = new OpenBuilder().setKeepalive(Uint8.ONE).build(); this.serverSession = new DefaultPCEPSessionNegotiator(new DefaultPromise<>(GlobalEventExecutor.INSTANCE), this.channel, this.listener, (short) 1, 20, localPrefs); this.tlsSessionNegotiator = new DefaultPCEPSessionNegotiator(new DefaultPromise<>(GlobalEventExecutor.INSTANCE), @@ -70,7 +70,7 @@ public class FiniteStateMachineTest extends AbstractPCEPSessionTest { public void testEstablishTLS() { final DefaultPCEPSessionNegotiator negotiator = new DefaultPCEPSessionNegotiator(new DefaultPromise<>(GlobalEventExecutor.INSTANCE), - this.channel, this.listener, (short) 1, 20, new OpenBuilder().setKeepalive((short) 1).build(), + this.channel, this.listener, (short) 1, 20, new OpenBuilder().setKeepalive(Uint8.ONE).build(), SslContextFactoryTest.createTlsConfig()); negotiator.channelActive(null); assertEquals(1, this.msgsSend.size()); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/LabelSubobjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/LabelSubobjectParserTest.java index 34f1c67c93..13ffd25cfa 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/LabelSubobjectParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/LabelSubobjectParserTest.java @@ -25,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.label.type.generalized.label._case.GeneralizedLabelBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.label.type.type1.label._case.Type1LabelBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.label.type.waveband.switching.label._case.WavebandSwitchingLabelBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; public class LabelSubobjectParserTest { @@ -69,10 +70,10 @@ public class LabelSubobjectParserTest { @Test public void testWavebandLabel() throws PCEPDeserializerException { final WavebandSwitchingLabelParser parser = new WavebandSwitchingLabelParser(); - final WavebandSwitchingLabelBuilder iBuilder = new WavebandSwitchingLabelBuilder(); - iBuilder.setWavebandId(0x1234L); - iBuilder.setStartLabel(0x9999L); - iBuilder.setEndLabel(0x1111L); + final WavebandSwitchingLabelBuilder iBuilder = new WavebandSwitchingLabelBuilder() + .setWavebandId(Uint32.valueOf(0x1234L)) + .setStartLabel(Uint32.valueOf(0x9999L)) + .setEndLabel(Uint32.valueOf(0x1111L)); final WavebandSwitchingLabelCaseBuilder builder = new WavebandSwitchingLabelCaseBuilder().setWavebandSwitchingLabel(iBuilder.build()); assertEquals( @@ -98,11 +99,10 @@ public class LabelSubobjectParserTest { @Test public void testTypeOneLabel() throws PCEPDeserializerException { final Type1LabelParser parser = new Type1LabelParser(); - final Type1LabelBuilder iBuilder = new Type1LabelBuilder(); - iBuilder.setType1Label(0x120025ffL); + final Type1LabelBuilder iBuilder = new Type1LabelBuilder().setType1Label(Uint32.valueOf(0x120025ffL)); final Type1LabelCaseBuilder builder = new Type1LabelCaseBuilder().setType1Label(iBuilder.build()); - assertEquals( - builder.build(), parser.parseLabel(Unpooled.wrappedBuffer(ByteArray.cutBytes(TYPE_ONE_LABEL_BYTES, 2)))); + assertEquals(builder.build(), + parser.parseLabel(Unpooled.wrappedBuffer(ByteArray.cutBytes(TYPE_ONE_LABEL_BYTES, 2)))); final ByteBuf buff = Unpooled.buffer(); parser.serializeLabel(true, true, builder.build(), buff); assertArrayEquals(TYPE_ONE_LABEL_BYTES, ByteArray.getAllBytes(buff)); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPEROSubobjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPEROSubobjectParserTest.java index f97a13ec8e..0ce2bf7dd9 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPEROSubobjectParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPEROSubobjectParserTest.java @@ -50,6 +50,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route.subobjects.subobject.type.path.key._case.PathKeyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.label.type.GeneralizedLabelCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.label.type.generalized.label._case.GeneralizedLabelBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; public class PCEPEROSubobjectParserTest { private static final byte[] IP4_PREFIX_BYTES = { @@ -157,7 +159,7 @@ public class PCEPEROSubobjectParserTest { final SubobjectBuilder subs = new SubobjectBuilder() .setLoose(true) .setSubobjectType(new AsNumberCaseBuilder() - .setAsNumber(new AsNumberBuilder().setAsNumber(new AsNumber(0x64L)).build()) + .setAsNumber(new AsNumberBuilder().setAsNumber(new AsNumber(Uint32.valueOf(0x64))).build()) .build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(AS_NUMBER_BYTES, 2)), true)); @@ -182,10 +184,14 @@ public class PCEPEROSubobjectParserTest { @Test public void testEROUnnumberedSubobject() throws PCEPDeserializerException { final EROUnnumberedInterfaceSubobjectParser parser = new EROUnnumberedInterfaceSubobjectParser(); - final SubobjectBuilder subs = new SubobjectBuilder(); - subs.setLoose(true); - subs.setSubobjectType(new UnnumberedCaseBuilder().setUnnumbered( - new UnnumberedBuilder().setRouterId(0x12345000L).setInterfaceId(0xffffffffL).build()).build()); + final SubobjectBuilder subs = new SubobjectBuilder() + .setLoose(true) + .setSubobjectType(new UnnumberedCaseBuilder() + .setUnnumbered(new UnnumberedBuilder() + .setRouterId(Uint32.valueOf(0x12345000L)) + .setInterfaceId(Uint32.valueOf(0xffffffffL)) + .build()) + .build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(UNNUMBERED_BYTES, 2)), true)); final ByteBuf buff = Unpooled.buffer(); @@ -213,7 +219,7 @@ public class PCEPEROSubobjectParserTest { subs.setLoose(true); final PathKeyBuilder pBuilder = new PathKeyBuilder(); pBuilder.setPceId(new PceId(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x50, (byte) 0x00 })); - pBuilder.setPathKey(new PathKey(4660)); + pBuilder.setPathKey(new PathKey(Uint16.valueOf(4660))); subs.setSubobjectType(new PathKeyCaseBuilder().setPathKey(pBuilder.build()).build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(PATH_KEY32_BYTES, 2)), true)); @@ -246,7 +252,7 @@ public class PCEPEROSubobjectParserTest { (byte) 0x12, (byte) 0x34, (byte) 0x54, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 })); - pBuilder.setPathKey(new PathKey(4660)); + pBuilder.setPathKey(new PathKey(Uint16.valueOf(4660))); subs.setSubobjectType(new PathKeyCaseBuilder().setPathKey(pBuilder.build()).build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(PATH_KEY128_BYTES, 2)), true)); @@ -314,7 +320,7 @@ public class PCEPEROSubobjectParserTest { .subobjects.subobject.type.exrs._case.exrs.ExrsBuilder() .setMandatory(true) .setSubobjectType(new AsNumberCaseBuilder() - .setAsNumber(new AsNumberBuilder().setAsNumber(new AsNumber(0x64L)).build()) + .setAsNumber(new AsNumberBuilder().setAsNumber(new AsNumber(Uint32.valueOf(0x64))).build()) .build()) .build()); final SubobjectBuilder subs = new SubobjectBuilder().setLoose(true) diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java index ae0c01bb43..a2738249fe 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPObjectParserTest.java @@ -159,6 +159,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.as.number._case.AsNumberBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.ip.prefix._case.IpPrefixBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.unnumbered._case.UnnumberedBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public class PCEPObjectParserTest { @@ -186,13 +189,13 @@ public class PCEPObjectParserTest { final PCEPOpenObjectParser parser = new PCEPOpenObjectParser(this.tlvRegistry, this.viTlvRegistry); final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPOpenObject1.bin")); - final OpenBuilder builder = new OpenBuilder(); - builder.setProcessingRule(false); - builder.setIgnore(false); - builder.setVersion(new ProtocolVersion((short) 1)); - builder.setKeepalive((short) 30); - builder.setDeadTimer((short) 120); - builder.setSessionId((short) 1); + final OpenBuilder builder = new OpenBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setVersion(new ProtocolVersion(Uint8.ONE)) + .setKeepalive(Uint8.valueOf(30)) + .setDeadTimer(Uint8.valueOf(120)) + .setSessionId(Uint8.ONE); builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open .object.open.TlvsBuilder().build()); @@ -222,12 +225,12 @@ public class PCEPObjectParserTest { final PCEPCloseObjectParser parser = new PCEPCloseObjectParser(this.tlvRegistry, this.viTlvRegistry); final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPCloseObject1.bin")); - final CCloseBuilder builder = new CCloseBuilder(); - builder.setProcessingRule(false); - builder.setIgnore(false); - builder.setReason((short) 5); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.close - .object.c.close.TlvsBuilder().build()); + final CCloseBuilder builder = new CCloseBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setReason(Uint8.valueOf(5)) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.close + .object.c.close.TlvsBuilder().build()); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false), result.slice(4, result.readableBytes() - 4))); @@ -295,19 +298,27 @@ public class PCEPObjectParserTest { final List subs = new ArrayList<>(); subs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit - .route.object.ero.SubobjectBuilder().setLoose( - true).setSubobjectType( - new AsNumberCaseBuilder().setAsNumber(new AsNumberBuilder().setAsNumber(new AsNumber(0xffffL)) - .build()).build()).build()); + .route.object.ero.SubobjectBuilder() + .setLoose(true) + .setSubobjectType(new AsNumberCaseBuilder() + .setAsNumber(new AsNumberBuilder().setAsNumber(new AsNumber(Uint32.valueOf(0xffff))).build()) + .build()) + .build()); subs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit .route.object.ero.SubobjectBuilder().setLoose(true).setSubobjectType(new IpPrefixCaseBuilder() .setIpPrefix( new IpPrefixBuilder().setIpPrefix(new IpPrefix(new Ipv4Prefix("255.255.255.255/32"))).build()) .build()).build()); subs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit - .route.object.ero.SubobjectBuilder().setLoose(true).setSubobjectType(new UnnumberedCaseBuilder() - .setUnnumbered(new UnnumberedBuilder().setRouterId(0xffffffffL).setInterfaceId(0xffffffffL).build()) - .build()).build()); + .route.object.ero.SubobjectBuilder() + .setLoose(true) + .setSubobjectType(new UnnumberedCaseBuilder() + .setUnnumbered(new UnnumberedBuilder() + .setRouterId(Uint32.valueOf(0xffffffffL)) + .setInterfaceId(Uint32.valueOf(0xffffffffL)) + .build()) + .build()) + .build()); builder.setSubobject(subs); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false), @@ -344,7 +355,7 @@ public class PCEPObjectParserTest { subs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.include .route.object.iro.SubobjectBuilder().setSubobjectType( new AsNumberCaseBuilder().setAsNumber(new AsNumberBuilder() - .setAsNumber(new AsNumber(0x10L)).build()).build()).setLoose(true).build()); + .setAsNumber(new AsNumber(Uint32.valueOf(0x10))).build()).build()).setLoose(true).build()); subs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.include .route.object.iro.SubobjectBuilder().setSubobjectType( new IpPrefixCaseBuilder().setIpPrefix( @@ -356,9 +367,9 @@ public class PCEPObjectParserTest { new IpPrefixBuilder().setIpPrefix(new IpPrefix(Ipv6Util.prefixForBytes(ip6PrefixBytes, 22))) .build()).build()).setLoose(true).build()); subs.add(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.include - .route.object.iro.SubobjectBuilder().setSubobjectType( - new UnnumberedCaseBuilder().setUnnumbered( - new UnnumberedBuilder().setRouterId(0x1245678L).setInterfaceId(0x9abcdef0L) + .route.object.iro.SubobjectBuilder().setSubobjectType(new UnnumberedCaseBuilder() + .setUnnumbered(new UnnumberedBuilder() + .setRouterId(Uint32.valueOf(0x1245678L)).setInterfaceId(Uint32.valueOf(0x9abcdef0L)) .build()).build()).setLoose(true).build()); builder.setSubobject(subs); @@ -421,7 +432,8 @@ public class PCEPObjectParserTest { .route.subobjects.subobject.type.UnnumberedCaseBuilder().setUnnumbered( new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.record .route.subobjects.subobject.type.unnumbered._case.UnnumberedBuilder() - .setRouterId(0x1245678L).setInterfaceId(0x9abcdef0L).build()) + .setRouterId(Uint32.valueOf(0x1245678L)).setInterfaceId(Uint32.valueOf(0x9abcdef0L)) + .build()) .build()) .setProtectionAvailable(false).setProtectionInUse(false).build()); builder.setSubobject(subs); @@ -697,11 +709,11 @@ public class PCEPObjectParserTest { public void testErrorObjectWithTlv() throws PCEPDeserializerException, IOException { final PCEPErrorObjectParser parser = new PCEPErrorObjectParser(this.tlvRegistry, this.viTlvRegistry); - final ErrorObjectBuilder builder = new ErrorObjectBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(true); - builder.setType((short) 1); - builder.setValue((short) 1); + final ErrorObjectBuilder builder = new ErrorObjectBuilder() + .setProcessingRule(true) + .setIgnore(true) + .setType(Uint8.ONE) + .setValue(Uint8.ONE); ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPErrorObject1.bin")); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), @@ -712,10 +724,12 @@ public class PCEPObjectParserTest { result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPErrorObject3.bin")); - builder.setType((short) 7); - builder.setValue((short) 0); - builder.setTlvs(new TlvsBuilder().setReqMissing(new ReqMissingBuilder().setRequestId(new RequestId(0x00001155L)) - .build()).build()); + builder.setType(Uint8.valueOf(7)) + .setValue(Uint8.ZERO) + .setTlvs(new TlvsBuilder().setReqMissing(new ReqMissingBuilder() + .setRequestId(new RequestId(Uint32.valueOf(0x00001155L))) + .build()) + .build()); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), result.slice(4, result.readableBytes() - 4))); @@ -741,17 +755,17 @@ public class PCEPObjectParserTest { public void testLspaObject() throws IOException, PCEPDeserializerException { final PCEPLspaObjectParser parser = new PCEPLspaObjectParser(this.tlvRegistry, this.viTlvRegistry); - final LspaBuilder builder = new LspaBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(true); - builder.setExcludeAny(new AttributeFilter(0L)); - builder.setIncludeAny(new AttributeFilter(0L)); - builder.setIncludeAll(new AttributeFilter(0L)); - builder.setHoldPriority((short) 0); - builder.setSetupPriority((short) 0); - builder.setLocalProtectionDesired(false); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.lspa - .object.lspa.TlvsBuilder().build()); + final LspaBuilder builder = new LspaBuilder() + .setProcessingRule(true) + .setIgnore(true) + .setExcludeAny(new AttributeFilter(Uint32.ZERO)) + .setIncludeAny(new AttributeFilter(Uint32.ZERO)) + .setIncludeAll(new AttributeFilter(Uint32.ZERO)) + .setHoldPriority(Uint8.ZERO) + .setSetupPriority(Uint8.ZERO) + .setLocalProtectionDesired(false) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.lspa + .object.lspa.TlvsBuilder().build()); ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPLspaObject1LowerBounds.bin")); @@ -763,12 +777,12 @@ public class PCEPObjectParserTest { result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPLspaObject2UpperBounds.bin")); - builder.setExcludeAny(new AttributeFilter(0xFFFFFFFFL)); - builder.setIncludeAny(new AttributeFilter(0xFFFFFFFFL)); - builder.setIncludeAll(new AttributeFilter(0xFFFFFFFFL)); - builder.setHoldPriority((short) 0xFF); - builder.setSetupPriority((short) 0xFF); - builder.setLocalProtectionDesired(true); + builder.setExcludeAny(new AttributeFilter(Uint32.MAX_VALUE)) + .setIncludeAny(new AttributeFilter(Uint32.MAX_VALUE)) + .setIncludeAll(new AttributeFilter(Uint32.MAX_VALUE)) + .setHoldPriority(Uint8.MAX_VALUE) + .setSetupPriority(Uint8.MAX_VALUE) + .setLocalProtectionDesired(true); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), result.slice(4, result.readableBytes() - 4))); @@ -794,13 +808,13 @@ public class PCEPObjectParserTest { public void testMetricObject() throws IOException, PCEPDeserializerException { final PCEPMetricObjectParser parser = new PCEPMetricObjectParser(); - final MetricBuilder builder = new MetricBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(true); - builder.setComputed(false); - builder.setBound(false); - builder.setMetricType((short) 1); - builder.setValue(new Float32(new byte[] { 0, 0, 0, 0 })); + final MetricBuilder builder = new MetricBuilder() + .setProcessingRule(true) + .setIgnore(true) + .setComputed(false) + .setBound(false) + .setMetricType(Uint8.ONE) + .setValue(new Float32(new byte[] { 0, 0, 0, 0 })); ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPMetricObject1LowerBounds.bin")); @@ -812,10 +826,10 @@ public class PCEPObjectParserTest { result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPMetricObject2UpperBounds.bin")); - builder.setComputed(true); - builder.setBound(false); - builder.setMetricType((short) 2); - builder.setValue(new Float32(new byte[] { (byte) 0x4f, (byte) 0x70, (byte) 0x00, (byte) 0x00 })); + builder.setComputed(true) + .setBound(false) + .setMetricType(Uint8.valueOf(2)) + .setValue(new Float32(new byte[] { (byte) 0x4f, (byte) 0x70, (byte) 0x00, (byte) 0x00 })); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), result.slice(4, result.readableBytes() - 4))); @@ -843,13 +857,13 @@ public class PCEPObjectParserTest { ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPNoPathObject1WithoutTLV.bin")); - final NoPathBuilder builder = new NoPathBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(true); - builder.setNatureOfIssue((short) 1); - builder.setUnsatisfiedConstraints(true); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcrep - .message.pcrep.message.replies.result.failure._case.no.path.TlvsBuilder().build()); + final NoPathBuilder builder = new NoPathBuilder() + .setProcessingRule(true) + .setIgnore(true) + .setNatureOfIssue(Uint8.ONE) + .setUnsatisfiedConstraints(true) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcrep + .message.pcrep.message.replies.result.failure._case.no.path.TlvsBuilder().build()); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), result.slice(4, result.readableBytes() - 4))); @@ -859,7 +873,7 @@ public class PCEPObjectParserTest { result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPNoPathObject2WithTLV.bin")); - builder.setNatureOfIssue((short) 0); + builder.setNatureOfIssue(Uint8.ZERO); builder.setUnsatisfiedConstraints(false); final NoPathVectorBuilder b = new NoPathVectorBuilder(); @@ -894,11 +908,11 @@ public class PCEPObjectParserTest { final PCEPNotificationObjectParser parser = new PCEPNotificationObjectParser(this.tlvRegistry, this.viTlvRegistry); - final CNotificationBuilder builder = new CNotificationBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(true); - builder.setType((short) 0xff); - builder.setValue((short) 0xff); + final CNotificationBuilder builder = new CNotificationBuilder() + .setProcessingRule(true) + .setIgnore(true) + .setType(Uint8.MAX_VALUE) + .setValue(Uint8.MAX_VALUE); ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPNotificationObject2WithoutTlv.bin")); @@ -910,11 +924,11 @@ public class PCEPObjectParserTest { result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPNotificationObject1WithTlv.bin")); - builder.setType((short) 2); - builder.setValue((short) 1); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 + builder.setType(Uint8.valueOf(2)) + .setValue(Uint8.ONE) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 .notification.object.c.notification.TlvsBuilder().setOverloadDuration( - new OverloadDurationBuilder().setDuration(0xff0000a2L).build()).build()); + new OverloadDurationBuilder().setDuration(Uint32.valueOf(0xff0000a2L)).build()).build()); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), result.slice(4, result.readableBytes() - 4))); @@ -941,23 +955,23 @@ public class PCEPObjectParserTest { final PCEPRequestParameterObjectParser parser = new PCEPRequestParameterObjectParser(this.tlvRegistry, this.viTlvRegistry); - final RpBuilder builder = new RpBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(true); - builder.setReoptimization(true); - builder.setBiDirectional(false); - builder.setLoose(true); - builder.setMakeBeforeBreak(true); - builder.setOrder(false); - builder.setPathKey(false); - builder.setSupplyOf(false); - builder.setFragmentation(false); - builder.setP2mp(false); - builder.setEroCompression(false); - builder.setPriority((short) 5); - builder.setRequestId(new RequestId(0xdeadbeefL)); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.rp - .object.rp.TlvsBuilder().build()); + final RpBuilder builder = new RpBuilder() + .setProcessingRule(true) + .setIgnore(true) + .setReoptimization(true) + .setBiDirectional(false) + .setLoose(true) + .setMakeBeforeBreak(true) + .setOrder(false) + .setPathKey(false) + .setSupplyOf(false) + .setFragmentation(false) + .setP2mp(false) + .setEroCompression(false) + .setPriority(Uint8.valueOf(5)) + .setRequestId(new RequestId(Uint32.valueOf(0xdeadbeefL))) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.rp + .object.rp.TlvsBuilder().build()); ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPRPObject1.bin")); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, true), @@ -972,9 +986,9 @@ public class PCEPObjectParserTest { builder.setFragmentation(true); builder.setEroCompression(true); - final OrderBuilder b = new OrderBuilder(); - b.setDelete(0xffffffffL); - b.setSetup(1L); + final OrderBuilder b = new OrderBuilder() + .setDelete(Uint32.valueOf(0xffffffffL)) + .setSetup(Uint32.ONE); builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.rp .object.rp.TlvsBuilder().setOrder(b.build()).build()); @@ -1003,15 +1017,15 @@ public class PCEPObjectParserTest { public void testSvecObject() throws IOException, PCEPDeserializerException { final PCEPSvecObjectParser parser = new PCEPSvecObjectParser(); - final SvecBuilder builder = new SvecBuilder(); - builder.setProcessingRule(false); - builder.setIgnore(false); - builder.setLinkDiverse(false); - builder.setNodeDiverse(false); - builder.setSrlgDiverse(false); - builder.setPartialPathDiverse(false); - builder.setLinkDirectionDiverse(false); - builder.setRequestsIds(Lists.newArrayList(new RequestId(0xFFL))); + final SvecBuilder builder = new SvecBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setLinkDiverse(false) + .setNodeDiverse(false) + .setSrlgDiverse(false) + .setPartialPathDiverse(false) + .setLinkDirectionDiverse(false) + .setRequestsIds(Lists.newArrayList(new RequestId(Uint32.valueOf(0xFF)))); ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPSvecObject2.bin")); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false), @@ -1027,16 +1041,16 @@ public class PCEPObjectParserTest { builder.setSrlgDiverse(true); final List requestIDs = new ArrayList<>(); - requestIDs.add(new RequestId(0xFFFFFFFFL)); - requestIDs.add(new RequestId(0x00000001L)); - requestIDs.add(new RequestId(0x01234567L)); - requestIDs.add(new RequestId(0x89ABCDEFL)); - requestIDs.add(new RequestId(0xFEDCBA98L)); - requestIDs.add(new RequestId(0x76543210L)); - requestIDs.add(new RequestId(0x15825266L)); - requestIDs.add(new RequestId(0x48120BBEL)); - requestIDs.add(new RequestId(0x25FB7E52L)); - requestIDs.add(new RequestId(0xB2F2546BL)); + requestIDs.add(new RequestId(Uint32.valueOf(0xFFFFFFFFL))); + requestIDs.add(new RequestId(Uint32.valueOf(0x00000001L))); + requestIDs.add(new RequestId(Uint32.valueOf(0x01234567L))); + requestIDs.add(new RequestId(Uint32.valueOf(0x89ABCDEFL))); + requestIDs.add(new RequestId(Uint32.valueOf(0xFEDCBA98L))); + requestIDs.add(new RequestId(Uint32.valueOf(0x76543210L))); + requestIDs.add(new RequestId(Uint32.valueOf(0x15825266L))); + requestIDs.add(new RequestId(Uint32.valueOf(0x48120BBEL))); + requestIDs.add(new RequestId(Uint32.valueOf(0x25FB7E52L))); + requestIDs.add(new RequestId(Uint32.valueOf(0xB2F2546BL))); builder.setRequestsIds(requestIDs); @@ -1066,10 +1080,10 @@ public class PCEPObjectParserTest { final ByteBuf result = Unpooled.wrappedBuffer(new byte[] { (byte) 0x16, (byte) 0x12, (byte) 0x00, (byte) 0x08, 0, 0, 0, (byte) 0x04 }); - final ClassTypeBuilder builder = new ClassTypeBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(false); - builder.setClassType(new ClassType((short) 4)); + final ClassTypeBuilder builder = new ClassTypeBuilder() + .setProcessingRule(true) + .setIgnore(false) + .setClassType(new ClassType(Uint8.valueOf(4))); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false), result.slice(4, result.readableBytes() - 4))); @@ -1104,13 +1118,20 @@ public class PCEPObjectParserTest { builder.setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 .exclude.route.object.Xro.Flags(true)); final List subs = new ArrayList<>(); - subs.add(new SubobjectBuilder().setMandatory(true).setSubobjectType( - new IpPrefixCaseBuilder().setIpPrefix( - new IpPrefixBuilder().setIpPrefix(new IpPrefix(new Ipv4Prefix("192.168.0.0/16"))).build()).build()) - .setAttribute(Attribute.Node).build()); - subs.add(new SubobjectBuilder().setMandatory(false).setSubobjectType( - new AsNumberCaseBuilder() - .setAsNumber(new AsNumberBuilder().setAsNumber(new AsNumber(0x1234L)).build()).build()).build()); + subs.add(new SubobjectBuilder() + .setMandatory(true) + .setSubobjectType(new IpPrefixCaseBuilder() + .setIpPrefix(new IpPrefixBuilder().setIpPrefix(new IpPrefix(new Ipv4Prefix("192.168.0.0/16"))).build()) + .build()) + .setAttribute(Attribute.Node).build()); + subs.add(new SubobjectBuilder() + .setMandatory(false) + .setSubobjectType(new AsNumberCaseBuilder() + .setAsNumber(new AsNumberBuilder() + .setAsNumber(new AsNumber(Uint32.valueOf(0x1234L))) + .build()) + .build()) + .build()); builder.setSubobject(subs); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false), @@ -1143,8 +1164,8 @@ public class PCEPObjectParserTest { builder.setProcessingRule(true); builder.setIgnore(false); final List list = new ArrayList<>(); - list.add(new PathKeysBuilder().setLoose(true).setPathKey(new PathKey(0x1234)).setPceId( - new PceId(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x50, (byte) 0x00 })).build()); + list.add(new PathKeysBuilder().setLoose(true).setPathKey(new PathKey(Uint16.valueOf(0x1234))) + .setPceId(new PceId(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x50, (byte) 0x00 })).build()); builder.setPathKeys(list); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false), @@ -1174,12 +1195,12 @@ public class PCEPObjectParserTest { final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPObjectiveFunctionObject.1.bin")); - final OfBuilder builder = new OfBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(false); - builder.setCode(new OfId(4)); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.of - .object.of.TlvsBuilder().build()); + final OfBuilder builder = new OfBuilder() + .setProcessingRule(true) + .setIgnore(false) + .setCode(new OfId(Uint16.valueOf(4))) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.of + .object.of.TlvsBuilder().build()); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false), result.slice(4, result.readableBytes() - 4))); @@ -1208,15 +1229,15 @@ public class PCEPObjectParserTest { final ByteBuf result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCEPGlobalConstraintsObject.1.bin")); - final GcBuilder builder = new GcBuilder(); - builder.setProcessingRule(true); - builder.setIgnore(false); - builder.setMaxHop((short) 1); - builder.setMaxUtilization((short) 0); - builder.setMinUtilization((short) 100); - builder.setOverBookingFactor((short) 99); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.gc - .object.gc.TlvsBuilder().build()); + final GcBuilder builder = new GcBuilder() + .setProcessingRule(true) + .setIgnore(false) + .setMaxHop(Uint8.ONE) + .setMaxUtilization(Uint8.ZERO) + .setMinUtilization(Uint8.valueOf(100)) + .setOverBookingFactor(Uint8.valueOf(99)) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.gc + .object.gc.TlvsBuilder().build()); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(true, false), result.slice(4, result.readableBytes() - 4))); @@ -1311,13 +1332,14 @@ public class PCEPObjectParserTest { final TestEnterpriseSpecificInformation esInfo = new TestEnterpriseSpecificInformation(5); final VendorInformationTlv viTlv = new VendorInformationTlvBuilder() - .setEnterpriseNumber(new EnterpriseNumber(0L)).setEnterpriseSpecificInformation(esInfo).build(); - final CCloseBuilder builder = new CCloseBuilder(); - builder.setProcessingRule(false); - builder.setIgnore(false); - builder.setReason((short) 5); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.close - .object.c.close.TlvsBuilder().setVendorInformationTlv(Lists.newArrayList(viTlv)).build()); + .setEnterpriseNumber(new EnterpriseNumber(Uint32.ZERO)) + .setEnterpriseSpecificInformation(esInfo).build(); + final CCloseBuilder builder = new CCloseBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setReason(Uint8.valueOf(5)) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.close + .object.c.close.TlvsBuilder().setVendorInformationTlv(Lists.newArrayList(viTlv)).build()); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false), result.slice(4, result.readableBytes() - 4))); @@ -1340,7 +1362,8 @@ public class PCEPObjectParserTest { final TestVendorInformationObjectParser parser = new TestVendorInformationObjectParser(); final TestEnterpriseSpecificInformation esInfo = new TestEnterpriseSpecificInformation(5); final VendorInformationObject viObj = new VendorInformationObjectBuilder() - .setEnterpriseNumber(new EnterpriseNumber(0L)).setEnterpriseSpecificInformation(esInfo).build(); + .setEnterpriseNumber(new EnterpriseNumber(Uint32.ZERO)) + .setEnterpriseSpecificInformation(esInfo).build(); final ByteBuf result = Unpooled.wrappedBuffer(viObjBytes); result.readerIndex(8); final VendorInformationObject o = (VendorInformationObject) parser.parseObject( @@ -1363,10 +1386,11 @@ public class PCEPObjectParserTest { 0x00, 0x00, 0x00, 0x10 }; final PCEPMonitoringObjectParser parser = new PCEPMonitoringObjectParser(this.tlvRegistry, this.viTlvRegistry); - final Monitoring monitoring = - new MonitoringBuilder().setMonitoringId(16L).setFlags(new Flags(false, false, true, false, false)).setTlvs( - new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.monitoring - .object.monitoring.TlvsBuilder().build()).build(); + final Monitoring monitoring = new MonitoringBuilder() + .setMonitoringId(Uint32.valueOf(16L)) + .setFlags(new Flags(false, false, true, false, false)) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 + .monitoring.object.monitoring.TlvsBuilder().build()).build(); final ByteBuf result = Unpooled.wrappedBuffer(monitoringBytes); assertEquals(monitoring, parser.parseObject(new ObjectHeaderImpl(false, false), result.slice(4, result.readableBytes() - 4))); @@ -1485,11 +1509,12 @@ public class PCEPObjectParserTest { final PCEPProcTimeObjectParser parser = new PCEPProcTimeObjectParser(); final ProcTime procTime = new ProcTimeBuilder() .setEstimated(true) - .setAverageProcTime(4L) - .setCurrentProcTime(1L) - .setMaxProcTime(3L) - .setMinProcTime(2L) - .setVarianceProcTime(5L).build(); + .setAverageProcTime(Uint32.valueOf(4)) + .setCurrentProcTime(Uint32.ONE) + .setMaxProcTime(Uint32.valueOf(3)) + .setMinProcTime(Uint32.valueOf(2)) + .setVarianceProcTime(Uint32.valueOf(5)) + .build(); final ByteBuf result = Unpooled.wrappedBuffer(proctimeBytes); assertEquals(procTime, parser.parseObject(new ObjectHeaderImpl(false, false), result.slice(4, result.readableBytes() - 4))); @@ -1508,7 +1533,7 @@ public class PCEPObjectParserTest { 0x00, 0x00, 0x00, 0x78 }; final PCEPOverloadObjectParser parser = new PCEPOverloadObjectParser(); - final Overload overload = new OverloadBuilder().setDuration(120).build(); + final Overload overload = new OverloadBuilder().setDuration(Uint16.valueOf(120)).build(); final ByteBuf result = Unpooled.wrappedBuffer(overloadBytes); assertEquals(overload, parser.parseObject(new ObjectHeaderImpl(false, false), result.slice(4, result.readableBytes() - 4))); @@ -1528,23 +1553,26 @@ public class PCEPObjectParserTest { final PCEPRequestParameterObjectParser parser = new PCEPRequestParameterObjectParser(this.tlvRegistry, this.viTlvRegistry); - final RpBuilder builder = new RpBuilder(); - builder.setProcessingRule(false); - builder.setIgnore(false); - builder.setReoptimization(true); - builder.setBiDirectional(false); - builder.setLoose(true); - builder.setMakeBeforeBreak(true); - builder.setOrder(false); - builder.setPathKey(false); - builder.setSupplyOf(false); - builder.setFragmentation(false); - builder.setP2mp(false); - builder.setEroCompression(false); - builder.setPriority((short) 5); - builder.setRequestId(new RequestId(0xdeadbeefL)); - builder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.rp - .object.rp.TlvsBuilder().setPathSetupType(new PathSetupTypeBuilder().setPst((short) 0).build()).build()); + final RpBuilder builder = new RpBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setReoptimization(true) + .setBiDirectional(false) + .setLoose(true) + .setMakeBeforeBreak(true) + .setOrder(false) + .setPathKey(false) + .setSupplyOf(false) + .setFragmentation(false) + .setP2mp(false) + .setEroCompression(false) + .setPriority(Uint8.valueOf(5)) + .setRequestId(new RequestId(Uint32.valueOf(0xdeadbeefL))) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.rp + .object.rp.TlvsBuilder() + .setPathSetupType(new PathSetupTypeBuilder().setPst(Uint8.ZERO) + .build()) + .build()); final ByteBuf result = Unpooled.wrappedBuffer(rpObjectWithPstTlvBytes); assertEquals(builder.build(), parser.parseObject(new ObjectHeaderImpl(false, false), diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPRROSubobjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPRROSubobjectParserTest.java index 3f15b34bc5..15e2673d43 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPRROSubobjectParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPRROSubobjectParserTest.java @@ -40,6 +40,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.record.route.subobjects.subobject.type.label._case.LabelBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.record.route.subobjects.subobject.type.path.key._case.PathKeyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.record.route.subobjects.subobject.type.unnumbered._case.UnnumberedBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; public class PCEPRROSubobjectParserTest { @@ -128,11 +130,14 @@ public class PCEPRROSubobjectParserTest { @Test public void testRROUnnumberedSubobject() throws PCEPDeserializerException { final RROUnnumberedInterfaceSubobjectParser parser = new RROUnnumberedInterfaceSubobjectParser(); - final SubobjectBuilder subs = new SubobjectBuilder(); - subs.setProtectionAvailable(false); - subs.setProtectionInUse(true); - subs.setSubobjectType(new UnnumberedCaseBuilder().setUnnumbered( - new UnnumberedBuilder().setRouterId(0x12345000L).setInterfaceId(0xffffffffL).build()).build()); + final SubobjectBuilder subs = new SubobjectBuilder() + .setProtectionAvailable(false) + .setProtectionInUse(true) + .setSubobjectType(new UnnumberedCaseBuilder() + .setUnnumbered(new UnnumberedBuilder() + .setRouterId(Uint32.valueOf(0x12345000L)).setInterfaceId(Uint32.valueOf(0xffffffffL)) + .build()) + .build()); assertEquals( subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(UNNUMBERED_BYTES, 2)))); final ByteBuf buff = Unpooled.buffer(); @@ -159,7 +164,7 @@ public class PCEPRROSubobjectParserTest { final SubobjectBuilder subs = new SubobjectBuilder(); final PathKeyBuilder pBuilder = new PathKeyBuilder(); pBuilder.setPceId(new PceId(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x50, (byte) 0x00 })); - pBuilder.setPathKey(new PathKey(4660)); + pBuilder.setPathKey(new PathKey(Uint16.valueOf(4660))); subs.setSubobjectType(new PathKeyCaseBuilder().setPathKey(pBuilder.build()).build()); assertEquals( subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(PATH_KEY32_BYTES, 2)))); @@ -190,7 +195,7 @@ public class PCEPRROSubobjectParserTest { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0x12, (byte) 0x34, (byte) 0x54, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 })); - pBuilder.setPathKey(new PathKey(4660)); + pBuilder.setPathKey(new PathKey(Uint16.valueOf(4660))); subs.setSubobjectType(new PathKeyCaseBuilder().setPathKey(pBuilder.build()).build()); assertEquals( subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(PATH_KEY128_BYTES, 2)))); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java index 33ca1ff8f6..15d17b2991 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java @@ -124,13 +124,13 @@ public class PCEPSessionImplTest extends AbstractPCEPSessionTest { Assert.assertEquals(this.ipAddress, this.session.getPeerPref().getIpAddress()); final PeerPref peerPref = this.session.getPeerPref(); Assert.assertEquals(this.ipAddress, peerPref.getIpAddress()); - Assert.assertEquals(DEADTIMER, peerPref.getDeadtimer().shortValue()); - Assert.assertEquals(KEEP_ALIVE, peerPref.getKeepalive().shortValue()); + Assert.assertEquals(DEADTIMER, peerPref.getDeadtimer()); + Assert.assertEquals(KEEP_ALIVE, peerPref.getKeepalive()); Assert.assertEquals(0, peerPref.getSessionId().intValue()); final LocalPref localPref = this.session.getLocalPref(); Assert.assertEquals(this.ipAddress, localPref.getIpAddress()); - Assert.assertEquals(DEADTIMER, localPref.getDeadtimer().shortValue()); - Assert.assertEquals(KEEP_ALIVE, localPref.getKeepalive().shortValue()); + Assert.assertEquals(DEADTIMER, localPref.getDeadtimer()); + Assert.assertEquals(KEEP_ALIVE, localPref.getKeepalive()); Assert.assertEquals(0, localPref.getSessionId().intValue()); final Messages msgs = this.session.getMessages(); Assert.assertEquals(1, msgs.getReceivedMsgCount().longValue()); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java index 2d27f3904e..7a27fa804a 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java @@ -42,6 +42,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.req.missing.tlv.ReqMissingBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.vendor.information.tlvs.VendorInformationTlv; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.vendor.information.tlvs.VendorInformationTlvBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public class PCEPTlvParserTest { private static final byte[] NO_PATH_VECTOR_BYTES = { @@ -86,7 +89,7 @@ public class PCEPTlvParserTest { @Test public void testOverloadedDurationTlv() throws PCEPDeserializerException { final OverloadedDurationTlvParser parser = new OverloadedDurationTlvParser(); - final OverloadDuration tlv = new OverloadDurationBuilder().setDuration(0x7FFFFFFFL).build(); + final OverloadDuration tlv = new OverloadDurationBuilder().setDuration(Uint32.valueOf(0x7FFFFFFFL)).build(); assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(OVERLOADED_BYTES, 4)))); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(tlv, buff); @@ -97,7 +100,7 @@ public class PCEPTlvParserTest { @Test public void testReqMissingTlv() throws PCEPDeserializerException { final ReqMissingTlvParser parser = new ReqMissingTlvParser(); - final ReqMissing tlv = new ReqMissingBuilder().setRequestId(new RequestId(0xF7823517L)).build(); + final ReqMissing tlv = new ReqMissingBuilder().setRequestId(new RequestId(Uint32.valueOf(0xF7823517L))).build(); assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(REQ_MISSING_BYTES, 4)))); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(tlv, buff); @@ -108,7 +111,10 @@ public class PCEPTlvParserTest { @Test public void testOrderTlv() throws PCEPDeserializerException { final OrderTlvParser parser = new OrderTlvParser(); - final Order tlv = new OrderBuilder().setDelete(0xFFFFFFFFL).setSetup(0x00000001L).build(); + final Order tlv = new OrderBuilder() + .setDelete(Uint32.valueOf(0xFFFFFFFFL)) + .setSetup(Uint32.valueOf(0x00000001L)) + .build(); assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(ORDER_BYTES, 4)))); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(tlv, buff); @@ -120,8 +126,8 @@ public class PCEPTlvParserTest { public void testOFListTlv() throws PCEPDeserializerException { final OFListTlvParser parser = new OFListTlvParser(); final List ids = new ArrayList<>(); - ids.add(new OfId(0x1234)); - ids.add(new OfId(0x5678)); + ids.add(new OfId(Uint16.valueOf(0x1234))); + ids.add(new OfId(Uint16.valueOf(0x5678))); final OfList tlv = new OfListBuilder().setCodes(ids).build(); assertEquals(tlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(OF_LIST_BYTES, 4)))); final ByteBuf buff = Unpooled.buffer(); @@ -135,7 +141,7 @@ public class PCEPTlvParserTest { final TestVendorInformationTlvParser parser = new TestVendorInformationTlvParser(); final TestEnterpriseSpecificInformation esInfo = new TestEnterpriseSpecificInformation(5); final VendorInformationTlv viTlv = new VendorInformationTlvBuilder() - .setEnterpriseNumber(new EnterpriseNumber(0L)) + .setEnterpriseNumber(new EnterpriseNumber(Uint32.ZERO)) .setEnterpriseSpecificInformation(esInfo) .build(); @@ -152,7 +158,7 @@ public class PCEPTlvParserTest { @Test public void testPathSetupTypeTlvParser() throws PCEPDeserializerException { final PathSetupTypeTlvParser parser = new PathSetupTypeTlvParser(); - final PathSetupType pstTlv = new PathSetupTypeBuilder().setPst((short) 0).build(); + final PathSetupType pstTlv = new PathSetupTypeBuilder().setPst(Uint8.ZERO).build(); assertEquals(pstTlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(PST_TLV_BYTES, 4)))); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(pstTlv, buff); @@ -168,7 +174,7 @@ public class PCEPTlvParserTest { @Test(expected = IllegalArgumentException.class) public void testUnsupportedPSTSerializer() { final PathSetupTypeTlvParser parser = new PathSetupTypeTlvParser(); - final PathSetupType pstTlv = new PathSetupTypeBuilder().setPst((short) 1).build(); + final PathSetupType pstTlv = new PathSetupTypeBuilder().setPst(Uint8.ONE).build(); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(pstTlv, buff); } diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java index b6f7100c5c..3239ffc27d 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java @@ -155,6 +155,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.as.number._case.AsNumberBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.record.route.subobjects.subobject.type.IpPrefixCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.record.route.subobjects.subobject.type.ip.prefix._case.IpPrefixBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public class PCEPValidatorTest { @@ -192,75 +195,76 @@ public class PCEPValidatorTest { this.act.start(this.ctx); this.viObjAct.start(this.ctx); this.objectRegistry = this.ctx.getObjectHandlerRegistry(); - final RpBuilder rpBuilder = new RpBuilder(); - rpBuilder.setProcessingRule(true); - rpBuilder.setIgnore(false); - rpBuilder.setReoptimization(false); - rpBuilder.setBiDirectional(false); - rpBuilder.setLoose(true); - rpBuilder.setMakeBeforeBreak(false); - rpBuilder.setOrder(false); - rpBuilder.setPathKey(false); - rpBuilder.setSupplyOf(false); - rpBuilder.setFragmentation(false); - rpBuilder.setP2mp(false); - rpBuilder.setEroCompression(false); - rpBuilder.setPriority((short) 1); - rpBuilder.setRequestId(new RequestId(10L)); - rpBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.rp - .object.rp.TlvsBuilder().build()); + final RpBuilder rpBuilder = new RpBuilder() + .setProcessingRule(true) + .setIgnore(false) + .setReoptimization(false) + .setBiDirectional(false) + .setLoose(true) + .setMakeBeforeBreak(false) + .setOrder(false) + .setPathKey(false) + .setSupplyOf(false) + .setFragmentation(false) + .setP2mp(false) + .setEroCompression(false) + .setPriority(Uint8.ONE) + .setRequestId(new RequestId(Uint32.valueOf(10))) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.rp + .object.rp.TlvsBuilder().build()); this.rpTrue = rpBuilder.build(); - rpBuilder.setProcessingRule(false); - this.rpFalse = rpBuilder.build(); + this.rpFalse = rpBuilder.setProcessingRule(false).build(); final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object .OpenBuilder openBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types - .rev181109.open.object.OpenBuilder(); - openBuilder.setProcessingRule(false); - openBuilder.setIgnore(false); - openBuilder.setDeadTimer((short) 1); - openBuilder.setKeepalive((short) 1); - openBuilder.setSessionId((short) 0); - openBuilder.setVersion(new ProtocolVersion((short) 1)); - openBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 - .open.object.open.TlvsBuilder().build()); -//TODO get rid of previous superfluous openBuilder + .rev181109.open.object.OpenBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setDeadTimer(Uint8.ONE) + .setKeepalive(Uint8.ONE) + .setSessionId(Uint8.ZERO) + .setVersion(new ProtocolVersion(Uint8.ONE)) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 + .open.object.open.TlvsBuilder().build()); + // TODO get rid of previous superfluous openBuilder this.open = openBuilder.build(); - final NoPathBuilder npbuilder = new NoPathBuilder(); - npbuilder.setProcessingRule(false); - npbuilder.setIgnore(false); - npbuilder.setNatureOfIssue((short) 0); - npbuilder.setUnsatisfiedConstraints(false); - npbuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 - .pcrep.message.pcrep.message.replies.result.failure._case.no.path.TlvsBuilder().build()); - this.noPath = npbuilder.build(); - - final LspaBuilder lspaBuilder = new LspaBuilder(); - lspaBuilder.setProcessingRule(false); - lspaBuilder.setIgnore(false); - lspaBuilder.setLocalProtectionDesired(false); - lspaBuilder.setHoldPriority((short) 0); - lspaBuilder.setSetupPriority((short) 0); - lspaBuilder.setExcludeAny(new AttributeFilter(0L)); - lspaBuilder.setIncludeAll(new AttributeFilter(0L)); - lspaBuilder.setIncludeAny(new AttributeFilter(0L)); - lspaBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 - .lspa.object.lspa.TlvsBuilder().build()); - this.lspa = lspaBuilder.build(); - - final MetricBuilder mBuilder = new MetricBuilder(); - mBuilder.setIgnore(false); - mBuilder.setProcessingRule(false); - mBuilder.setComputed(false); - mBuilder.setBound(false); - mBuilder.setMetricType((short) 1); - mBuilder.setValue(new Float32(new byte[4])); - this.metrics = new MetricsBuilder().setMetric(mBuilder.build()).build(); + this.noPath = new NoPathBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setNatureOfIssue(Uint8.ZERO) + .setUnsatisfiedConstraints(false) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 + .pcrep.message.pcrep.message.replies.result.failure._case.no.path.TlvsBuilder().build()) + .build(); + + this.lspa = new LspaBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setLocalProtectionDesired(false) + .setHoldPriority(Uint8.ZERO) + .setSetupPriority(Uint8.ZERO) + .setExcludeAny(new AttributeFilter(Uint32.ZERO)) + .setIncludeAll(new AttributeFilter(Uint32.ZERO)) + .setIncludeAny(new AttributeFilter(Uint32.ZERO)) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 + .lspa.object.lspa.TlvsBuilder().build()) + .build(); + + this.metrics = new MetricsBuilder() + .setMetric(new MetricBuilder() + .setIgnore(false) + .setProcessingRule(false) + .setComputed(false) + .setBound(false) + .setMetricType(Uint8.ONE) + .setValue(new Float32(new byte[4])) + .build()) + .build(); this.eroASSubobject = new AsNumberCaseBuilder() .setAsNumber(new AsNumberBuilder() .setAsNumber(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715 - .AsNumber(0xFFFFL)) + .AsNumber(Uint32.valueOf(0xFFFF))) .build()) .build(); @@ -282,45 +286,46 @@ public class PCEPValidatorTest { eroBuilder.setSubobject(eroSubs); this.ero = eroBuilder.build(); - final OfBuilder ofBuilder = new OfBuilder(); - ofBuilder.setIgnore(false); - ofBuilder.setProcessingRule(false); - ofBuilder.setCode(new OfId(0)); - ofBuilder.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.of - .object.of.TlvsBuilder().build()); - this.of = ofBuilder.build(); + this.of = new OfBuilder() + .setIgnore(false) + .setProcessingRule(false) + .setCode(new OfId(Uint16.ZERO)) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.of + .object.of.TlvsBuilder().build()) + .build(); - final Ipv4Builder afi = new Ipv4Builder(); - afi.setSourceIpv4Address(new Ipv4AddressNoZone("255.255.255.255")); - afi.setDestinationIpv4Address(new Ipv4AddressNoZone("255.255.255.255")); + this.endpoints = new EndpointsObjBuilder() + .setIgnore(false) + .setProcessingRule(true) + .setAddressFamily(new Ipv4CaseBuilder() + .setIpv4(new Ipv4Builder() + .setSourceIpv4Address(new Ipv4AddressNoZone("255.255.255.255")) + .setDestinationIpv4Address(new Ipv4AddressNoZone("255.255.255.255")) + .build()) + .build()) + .build(); - final EndpointsObjBuilder epBuilder = new EndpointsObjBuilder(); - epBuilder.setIgnore(false); - epBuilder.setProcessingRule(true); - epBuilder.setAddressFamily(new Ipv4CaseBuilder().setIpv4(afi.build()).build()); - this.endpoints = epBuilder.build(); - - final SvecBuilder sBuilder = new SvecBuilder(); - sBuilder.setIgnore(false); - sBuilder.setProcessingRule(false); - sBuilder.setLinkDiverse(false); - sBuilder.setNodeDiverse(false); - sBuilder.setSrlgDiverse(false); - sBuilder.setLinkDirectionDiverse(false); - sBuilder.setPartialPathDiverse(false); - sBuilder.setRequestsIds(Lists.newArrayList(new RequestId(1L))); - this.svec = sBuilder.build(); + this.svec = new SvecBuilder() + .setIgnore(false) + .setProcessingRule(false) + .setLinkDiverse(false) + .setNodeDiverse(false) + .setSrlgDiverse(false) + .setLinkDirectionDiverse(false) + .setPartialPathDiverse(false) + .setRequestsIds(Lists.newArrayList(new RequestId(Uint32.ONE))) + .build(); this.viObjects = new ArrayList<>(); final TestEnterpriseSpecificInformation esInfo = new TestEnterpriseSpecificInformation(5); final VendorInformationObject viObj = new VendorInformationObjectBuilder() - .setEnterpriseNumber(new EnterpriseNumber(0L)) + .setEnterpriseNumber(new EnterpriseNumber(Uint32.ZERO)) .setEnterpriseSpecificInformation(esInfo) .build(); this.viObjects.add(viObj); this.monitoring = new MonitoringBuilder() - .setMonitoringId(100L) + .setMonitoringId(Uint32.valueOf(100)) .setFlags(new Flags(false, false, false, false, false)) .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 .monitoring.object.monitoring.TlvsBuilder().build()).build(); @@ -331,15 +336,15 @@ public class PCEPValidatorTest { .setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("127.0.0.2"))) .build(); - final ProcTimeBuilder procTimeBuilder = new ProcTimeBuilder(); - procTimeBuilder.setEstimated(false); - procTimeBuilder.setCurrentProcTime(1L); - procTimeBuilder.setMinProcTime(2L); - procTimeBuilder.setMaxProcTime(3L); - procTimeBuilder.setAverageProcTime(4L); - procTimeBuilder.setVarianceProcTime(5L); - this.procTime = procTimeBuilder.build(); - this.overload = new OverloadBuilder().setDuration(120).build(); + this.procTime = new ProcTimeBuilder() + .setEstimated(false) + .setCurrentProcTime(Uint32.ONE) + .setMinProcTime(Uint32.valueOf(2)) + .setMaxProcTime(Uint32.valueOf(3)) + .setAverageProcTime(Uint32.valueOf(4)) + .setVarianceProcTime(Uint32.valueOf(5)) + .build(); + this.overload = new OverloadBuilder().setDuration(Uint16.valueOf(120)).build(); } @Test @@ -350,15 +355,15 @@ public class PCEPValidatorTest { final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object .OpenBuilder b = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 - .open.object.OpenBuilder(); - b.setProcessingRule(false); - b.setIgnore(false); - b.setVersion(new ProtocolVersion((short) 1)); - b.setKeepalive((short) 30); - b.setDeadTimer((short) 120); - b.setSessionId((short) 1); - b.setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object - .open.TlvsBuilder().build()); + .open.object.OpenBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setVersion(new ProtocolVersion(Uint8.ONE)) + .setKeepalive(Uint8.valueOf(30)) + .setDeadTimer(Uint8.valueOf(120)) + .setSessionId(Uint8.ONE) + .setTlvs(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109 + .open.object.open.TlvsBuilder().build()); builder.setOpen(b.build()); assertEquals(new OpenBuilder().setOpenMessage(builder.build()).build(), parser.parseMessage(result.slice(4, @@ -412,7 +417,7 @@ public class PCEPValidatorTest { .setCClose(new CCloseBuilder() .setIgnore(false) .setProcessingRule(false) - .setReason((short) 5) + .setReason(Uint8.valueOf(5)) .setTlvs(new TlvsBuilder().build()) .build()) .build()); @@ -683,7 +688,7 @@ public class PCEPValidatorTest { @Test public void testNotificationMsg() throws IOException, PCEPDeserializerException { final CNotification cn1 = new CNotificationBuilder().setIgnore(false).setProcessingRule(false) - .setType((short) 1).setValue((short) 1).build(); + .setType(Uint8.ONE).setValue(Uint8.ONE).build(); final List innerNot = new ArrayList<>(); @@ -728,8 +733,8 @@ public class PCEPValidatorTest { @Test public void testErrorMsg() throws IOException, PCEPDeserializerException { - ErrorObject error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 3) - .setValue((short) 1).build(); + ErrorObject error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false) + .setType(Uint8.valueOf(3)).setValue(Uint8.ONE).build(); final PCEPErrorMessageParser parser = new PCEPErrorMessageParser(this.ctx.getObjectHandlerRegistry()); @@ -756,8 +761,8 @@ public class PCEPValidatorTest { result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCErr.3.bin")); - error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType((short) 3) - .setValue((short) 1).build(); + error1 = new ErrorObjectBuilder().setIgnore(false).setProcessingRule(false).setType(Uint8.valueOf(3)) + .setValue(Uint8.ONE).build(); innerErr = new ArrayList<>(); innerErr.add(new ErrorsBuilder().setErrorObject(error1).build()); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPXROSubobjectParserTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPXROSubobjectParserTest.java index f11ccd1904..48828ce105 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPXROSubobjectParserTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPXROSubobjectParserTest.java @@ -42,6 +42,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.unnumbered._case.UnnumberedBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route.subobjects.subobject.type.PathKeyCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route.subobjects.subobject.type.path.key._case.PathKeyBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; +import org.opendaylight.yangtools.yang.common.Uint32; public class PCEPXROSubobjectParserTest { @@ -136,11 +138,12 @@ public class PCEPXROSubobjectParserTest { @Test public void testXROSrlgSubobject() throws PCEPDeserializerException { final XROSRLGSubobjectParser parser = new XROSRLGSubobjectParser(); - final SubobjectBuilder subs = new SubobjectBuilder(); - subs.setMandatory(true); - subs.setAttribute(Attribute.Srlg); - subs.setSubobjectType( - new SrlgCaseBuilder().setSrlg(new SrlgBuilder().setSrlgId(new SrlgId(0x12345678L)).build()).build()); + final SubobjectBuilder subs = new SubobjectBuilder() + .setMandatory(true) + .setAttribute(Attribute.Srlg) + .setSubobjectType(new SrlgCaseBuilder() + .setSrlg(new SrlgBuilder().setSrlgId(new SrlgId(Uint32.valueOf(0x12345678L))).build()) + .build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(SRLG_BYTES, 2)), true)); final ByteBuf buff = Unpooled.buffer(); @@ -164,11 +167,15 @@ public class PCEPXROSubobjectParserTest { @Test public void testXROUnnumberedSubobject() throws PCEPDeserializerException { final XROUnnumberedInterfaceSubobjectParser parser = new XROUnnumberedInterfaceSubobjectParser(); - final SubobjectBuilder subs = new SubobjectBuilder(); - subs.setMandatory(true); - subs.setAttribute(Attribute.Node); - subs.setSubobjectType(new UnnumberedCaseBuilder().setUnnumbered( - new UnnumberedBuilder().setRouterId(0x12345000L).setInterfaceId(0xffffffffL).build()).build()); + final SubobjectBuilder subs = new SubobjectBuilder() + .setMandatory(true) + .setAttribute(Attribute.Node) + .setSubobjectType(new UnnumberedCaseBuilder() + .setUnnumbered(new UnnumberedBuilder() + .setRouterId(Uint32.valueOf(0x12345000L)) + .setInterfaceId(Uint32.valueOf(0xffffffffL)) + .build()) + .build()); assertEquals( subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(UNNUMBERED_BYTES, 2)), true)); final ByteBuf buff = Unpooled.buffer(); @@ -192,11 +199,11 @@ public class PCEPXROSubobjectParserTest { @Test public void testXROAsNumberSubobject() throws PCEPDeserializerException { final XROAsNumberSubobjectParser parser = new XROAsNumberSubobjectParser(); - final SubobjectBuilder subs = new SubobjectBuilder(); - subs.setMandatory(true); - subs.setSubobjectType( - new AsNumberCaseBuilder().setAsNumber(new AsNumberBuilder().setAsNumber(new AsNumber(0x64L)).build()) - .build()); + final SubobjectBuilder subs = new SubobjectBuilder() + .setMandatory(true) + .setSubobjectType(new AsNumberCaseBuilder() + .setAsNumber(new AsNumberBuilder().setAsNumber(new AsNumber(Uint32.valueOf(0x64))).build()) + .build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(AS_NUMBER_BYTES, 2)), true)); final ByteBuf buff = Unpooled.buffer(); @@ -224,7 +231,7 @@ public class PCEPXROSubobjectParserTest { subs.setMandatory(true); final PathKeyBuilder pBuilder = new PathKeyBuilder(); pBuilder.setPceId(new PceId(new byte[] { (byte) 0x12, (byte) 0x34, (byte) 0x50, (byte) 0x00 })); - pBuilder.setPathKey(new PathKey(4660)); + pBuilder.setPathKey(new PathKey(Uint16.valueOf(4660))); subs.setSubobjectType(new PathKeyCaseBuilder().setPathKey(pBuilder.build()).build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(PATH_KEY32_BYTES, 2)), true)); @@ -256,7 +263,7 @@ public class PCEPXROSubobjectParserTest { (byte) 0x12, (byte) 0x34, (byte) 0x56, (byte) 0x78, (byte) 0x9A, (byte) 0xBC, (byte) 0xDE, (byte) 0x12, (byte) 0x34, (byte) 0x54, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 })); - pBuilder.setPathKey(new PathKey(4660)); + pBuilder.setPathKey(new PathKey(Uint16.valueOf(4660))); subs.setSubobjectType(new PathKeyCaseBuilder().setPathKey(pBuilder.build()).build()); assertEquals(subs.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(PATH_KEY128_BYTES, 2)), true)); 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 62fc2b6f78..c02f051823 100644 --- 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 @@ -155,7 +155,7 @@ public class PCCSessionListenerTest { .setDelegate(true) .setIgnore(false) .setOperational(OperationalStatus.Up) - .setPlspId(new PlspId(999L)) + .setPlspId(new PlspId(Uint32.valueOf(999))) .setProcessingRule(false) .setRemove(remove) .setSync(true); diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredFullDBResyncTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredFullDBResyncTest.java index 4a7feeb95d..fcce734aa0 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredFullDBResyncTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredFullDBResyncTest.java @@ -30,6 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.Srp; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.SrpBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Message; +import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; public class PCCTriggeredFullDBResyncTest extends PCCMockCommon { @@ -52,17 +53,16 @@ public class PCCTriggeredFullDBResyncTest extends PCCMockCommon { } private static Message createTriggerLspResync() { - final SrpBuilder srpBuilder = new SrpBuilder(); - srpBuilder.setOperationId(new SrpIdNumber(1L)); - srpBuilder.setProcessingRule(Boolean.TRUE); + final SrpBuilder srpBuilder = new SrpBuilder() + .setOperationId(new SrpIdNumber(Uint32.ONE)) + .setProcessingRule(Boolean.TRUE); final Srp srp = srpBuilder.build(); - final Lsp lsp = new LspBuilder().setPlspId(new PlspId(0L)).setSync(Boolean.TRUE).build(); - final UpdatesBuilder rb = new UpdatesBuilder(); - rb.setSrp(srp); - rb.setLsp(lsp); - final PathBuilder pb = new PathBuilder(); - rb.setPath(pb.build()); + final Lsp lsp = new LspBuilder().setPlspId(new PlspId(Uint32.ZERO)).setSync(Boolean.TRUE).build(); + final UpdatesBuilder rb = new UpdatesBuilder() + .setSrp(srp) + .setLsp(lsp) + .setPath(new PathBuilder().build()); final PcupdMessageBuilder ub = new PcupdMessageBuilder(); ub.setUpdates(Collections.singletonList(rb.build())); return new PcupdBuilder().setPcupdMessage(ub.build()).build(); diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredLspResyncTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredLspResyncTest.java index 6f6e5f3eff..564e98e304 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredLspResyncTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredLspResyncTest.java @@ -30,6 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.iet import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.Srp; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.SrpBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Message; +import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; public class PCCTriggeredLspResyncTest extends PCCMockCommon { @@ -53,11 +54,11 @@ public class PCCTriggeredLspResyncTest extends PCCMockCommon { private static Message createTriggerLspResync() { final SrpBuilder srpBuilder = new SrpBuilder(); - srpBuilder.setOperationId(new SrpIdNumber(1L)); + srpBuilder.setOperationId(new SrpIdNumber(Uint32.ONE)); srpBuilder.setProcessingRule(Boolean.TRUE); final Srp srp = srpBuilder.build(); - final Lsp lsp = new LspBuilder().setPlspId(new PlspId(2L)).setSync(Boolean.TRUE).build(); + final Lsp lsp = new LspBuilder().setPlspId(new PlspId(Uint32.valueOf(2))).setSync(Boolean.TRUE).build(); final UpdatesBuilder rb = new UpdatesBuilder(); rb.setSrp(srp); rb.setLsp(lsp); diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredSyncTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredSyncTest.java index 9a85f22a12..b5fb7e32df 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredSyncTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTriggeredSyncTest.java @@ -21,14 +21,13 @@ import org.opendaylight.protocol.pcep.pcc.mock.protocol.PCCPeerProposal; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PcupdBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.PlspId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.SrpIdNumber; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.Lsp; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.lsp.object.LspBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcupd.message.PcupdMessageBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcupd.message.pcupd.message.UpdatesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.pcupd.message.pcupd.message.updates.PathBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.Srp; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev181109.srp.object.SrpBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Message; +import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.common.Uint64; public class PCCTriggeredSyncTest extends PCCMockCommon { @@ -48,20 +47,15 @@ public class PCCTriggeredSyncTest extends PCCMockCommon { } private static Message createTriggerMsg() { - final UpdatesBuilder rb = new UpdatesBuilder(); - // create PCUpd with mandatory objects and LSP object set to 1 - final SrpBuilder srpBuilder = new SrpBuilder(); - srpBuilder.setIgnore(false); - srpBuilder.setProcessingRule(false); - srpBuilder.setOperationId(new SrpIdNumber(1L)); - final Srp srp = srpBuilder.build(); - rb.setSrp(srp); - - final Lsp lsp = new LspBuilder().setPlspId(new PlspId(0L)).setSync(Boolean.TRUE).build(); - rb.setLsp(lsp); - - final PathBuilder pb = new PathBuilder(); - rb.setPath(pb.build()); + final UpdatesBuilder rb = new UpdatesBuilder() + // create PCUpd with mandatory objects and LSP object set to 1 + .setSrp(new SrpBuilder() + .setIgnore(false) + .setProcessingRule(false) + .setOperationId(new SrpIdNumber(Uint32.ONE)) + .build()) + .setLsp(new LspBuilder().setPlspId(new PlspId(Uint32.ZERO)).setSync(Boolean.TRUE).build()) + .setPath(new PathBuilder().build()); final PcupdMessageBuilder ub = new PcupdMessageBuilder(); ub.setUpdates(Collections.singletonList(rb.build())); return new PcupdBuilder().setPcupdMessage(ub.build()).build(); diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java index 557ddc2957..a89e57044d 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java @@ -52,6 +52,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcep.error.object.ErrorObject; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.IpPrefixCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.basic.explicit.route.subobjects.subobject.type.ip.prefix._case.IpPrefixBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; public class PCCTunnelManagerImplTest { @@ -67,7 +68,7 @@ public class PCCTunnelManagerImplTest { private PCCSession session1; @Mock private PCCSession session2; - private Optional timerHandler = Optional.empty(); + private final Optional timerHandler = Optional.empty(); @Before public void setUp() { @@ -301,7 +302,7 @@ public class PCCTunnelManagerImplTest { private static Updates createUpdate(final long plspId, final Optional delegate) { final UpdatesBuilder updsBuilder = new UpdatesBuilder(); - final LspBuilder lsp = new LspBuilder().setPlspId(new PlspId(plspId)); + final LspBuilder lsp = new LspBuilder().setPlspId(new PlspId(Uint32.valueOf(plspId))); if (delegate.isPresent()) { lsp.setDelegate(Boolean.TRUE); } @@ -309,7 +310,7 @@ public class PCCTunnelManagerImplTest { final PathBuilder pathBuilder = new PathBuilder(); pathBuilder.setEro(ERO); updsBuilder.setPath(pathBuilder.build()); - updsBuilder.setSrp(new SrpBuilder().setOperationId(new SrpIdNumber(0L)).build()); + updsBuilder.setSrp(new SrpBuilder().setOperationId(new SrpIdNumber(Uint32.ZERO)).build()); return updsBuilder.build(); } @@ -319,7 +320,7 @@ public class PCCTunnelManagerImplTest { reqBuilder.setEro(ERO); final LspBuilder lsp = new LspBuilder().setTlvs(new TlvsBuilder() .setSymbolicPathName(new SymbolicPathNameBuilder().setPathName( - new SymbolicPathName(SYMBOLIC_NAME)).build()).build()).setPlspId(new PlspId(plspId)); + new SymbolicPathName(SYMBOLIC_NAME)).build()).build()).setPlspId(new PlspId(Uint32.valueOf(plspId))); if (delegate.isPresent()) { lsp.setDelegate(Boolean.TRUE); } @@ -329,7 +330,7 @@ public class PCCTunnelManagerImplTest { if (remove.isPresent()) { srpBuilder.addAugmentation(Srp1.class, new Srp1Builder().setRemove(Boolean.TRUE).build()); } - reqBuilder.setSrp(srpBuilder.setOperationId(new SrpIdNumber(0L)).build()); + reqBuilder.setSrp(srpBuilder.setOperationId(new SrpIdNumber(Uint32.ZERO)).build()); return reqBuilder.build(); } diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/PCEPSegmentRoutingCapabilityTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/PCEPSegmentRoutingCapabilityTest.java index 58e2e469a3..a826063bc9 100644 --- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/PCEPSegmentRoutingCapabilityTest.java +++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/PCEPSegmentRoutingCapabilityTest.java @@ -12,6 +12,7 @@ import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109.sr.pce.capability.tlv.SrPceCapabilityBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.Tlvs; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder; +import org.opendaylight.yangtools.yang.common.Uint8; public class PCEPSegmentRoutingCapabilityTest { @@ -19,7 +20,7 @@ public class PCEPSegmentRoutingCapabilityTest { new TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment .routing.rev181109.Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep .segment.routing.rev181109.Tlvs1Builder().setSrPceCapability(new SrPceCapabilityBuilder() - .setMsd((short) 0).build()).build()).build(); + .setMsd(Uint8.ZERO).build()).build()).build(); @Test public void testSegmentRoutingCapability() { diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParserTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParserTest.java index aa4a3ed271..61fc948474 100644 --- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParserTest.java +++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParserTest.java @@ -26,6 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.seg import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109.sr.subobject.nai.IpNodeIdBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109.sr.subobject.nai.UnnumberedAdjacencyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit.route.object.ero.SubobjectBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; public class SrEroSubobjectParserTest { @@ -109,13 +110,13 @@ public class SrEroSubobjectParserTest { @Test public void testSrEroSubobjectIpv4NodeIdNAI() throws PCEPDeserializerException { - final SrEroTypeBuilder builder = new SrEroTypeBuilder(); - builder.setSidType(SidType.Ipv4NodeId); - builder.setSid(123456L); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.99"))) - .build()); + final SrEroTypeBuilder builder = new SrEroTypeBuilder() + .setSidType(SidType.Ipv4NodeId) + .setSid(Uint32.valueOf(123456)) + .setCFlag(false) + .setMFlag(false) + .setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.99"))) + .build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -127,13 +128,13 @@ public class SrEroSubobjectParserTest { @Test public void testSrEroSubobjectIpv6NodeIdNAI() throws PCEPDeserializerException { - final SrEroTypeBuilder builder = new SrEroTypeBuilder(); - builder.setSidType(SidType.Ipv6NodeId); - builder.setSid(123456L); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone( - new Ipv6AddressNoZone("fe80:cd00::211e:729c"))).build()); + final SrEroTypeBuilder builder = new SrEroTypeBuilder() + .setSidType(SidType.Ipv6NodeId) + .setSid(Uint32.valueOf(123456)) + .setCFlag(false) + .setMFlag(false) + .setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone( + new Ipv6AddressNoZone("fe80:cd00::211e:729c"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -145,14 +146,14 @@ public class SrEroSubobjectParserTest { @Test public void testSrEroSubobjectIpv4AdjacencyNAI() throws PCEPDeserializerException { - final SrEroTypeBuilder builder = new SrEroTypeBuilder(); - builder.setSidType(SidType.Ipv4Adjacency); - builder.setSid(123456L); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new IpAdjacencyBuilder().setLocalIpAddress(new IpAddressNoZone( - new Ipv4AddressNoZone("74.125.43.99"))) - .setRemoteIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.100"))).build()); + final SrEroTypeBuilder builder = new SrEroTypeBuilder() + .setSidType(SidType.Ipv4Adjacency) + .setSid(Uint32.valueOf(123456)) + .setCFlag(false) + .setMFlag(false) + .setNai(new IpAdjacencyBuilder().setLocalIpAddress(new IpAddressNoZone( + new Ipv4AddressNoZone("74.125.43.99"))) + .setRemoteIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.100"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -164,14 +165,15 @@ public class SrEroSubobjectParserTest { @Test public void testSrEroSubobjectIpv6AdjacencyNAI() throws PCEPDeserializerException { - final SrEroTypeBuilder builder = new SrEroTypeBuilder(); - builder.setSidType(SidType.Ipv6Adjacency); - builder.setSid(123456L); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new IpAdjacencyBuilder().setLocalIpAddress(new IpAddressNoZone( - new Ipv6AddressNoZone("fe80:cd00::211e:729c"))) - .setRemoteIpAddress(new IpAddressNoZone(new Ipv6AddressNoZone("fe80:cd00::211e:729d"))).build()); + final SrEroTypeBuilder builder = new SrEroTypeBuilder() + .setSidType(SidType.Ipv6Adjacency) + .setSid(Uint32.valueOf(123456)) + .setCFlag(false) + .setMFlag(false) + .setNai(new IpAdjacencyBuilder() + .setLocalIpAddress(new IpAddressNoZone(new Ipv6AddressNoZone("fe80:cd00::211e:729c"))) + .setRemoteIpAddress(new IpAddressNoZone(new Ipv6AddressNoZone("fe80:cd00::211e:729d"))) + .build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -183,13 +185,15 @@ public class SrEroSubobjectParserTest { @Test public void testSrEroSubobjectUnnumberedNAI() throws PCEPDeserializerException { - final SrEroTypeBuilder builder = new SrEroTypeBuilder(); - builder.setSidType(SidType.Unnumbered); - builder.setSid(123456L); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new UnnumberedAdjacencyBuilder().setLocalNodeId(1L).setLocalInterfaceId(2L) - .setRemoteNodeId(3L).setRemoteInterfaceId(4L).build()); + final SrEroTypeBuilder builder = new SrEroTypeBuilder() + .setSidType(SidType.Unnumbered) + .setSid(Uint32.valueOf(123456)) + .setCFlag(false) + .setMFlag(false) + .setNai(new UnnumberedAdjacencyBuilder() + .setLocalNodeId(Uint32.ONE).setLocalInterfaceId(Uint32.valueOf(2)) + .setRemoteNodeId(Uint32.valueOf(3)).setRemoteInterfaceId(Uint32.valueOf(4)) + .build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -201,11 +205,11 @@ public class SrEroSubobjectParserTest { @Test public void testSrEroSubobjectWithoutNAI() throws PCEPDeserializerException { - final SrEroTypeBuilder builder = new SrEroTypeBuilder(); - builder.setSidType(SidType.Ipv4NodeId); - builder.setSid(123456L); - builder.setCFlag(false); - builder.setMFlag(false); + final SrEroTypeBuilder builder = new SrEroTypeBuilder() + .setSidType(SidType.Ipv4NodeId) + .setSid(Uint32.valueOf(123456)) + .setCFlag(false) + .setMFlag(false); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -217,12 +221,12 @@ public class SrEroSubobjectParserTest { @Test public void testSrEroSubobjectWithoutBody() throws PCEPDeserializerException { - final SrEroTypeBuilder builder = new SrEroTypeBuilder(); - builder.setSidType(SidType.Ipv4NodeId); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone( - new Ipv4AddressNoZone("74.125.43.99"))).build()); + final SrEroTypeBuilder builder = new SrEroTypeBuilder() + .setSidType(SidType.Ipv4NodeId) + .setCFlag(false) + .setMFlag(false) + .setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone( + new Ipv4AddressNoZone("74.125.43.99"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -234,13 +238,13 @@ public class SrEroSubobjectParserTest { @Test public void testSrEroSubobjectIpv4NodeIdNAIMFlag() throws PCEPDeserializerException { - final SrEroTypeBuilder builder = new SrEroTypeBuilder(); - builder.setCFlag(false); - builder.setMFlag(true); - builder.setSidType(SidType.Ipv4NodeId); - builder.setSid(30140L); - builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.99"))) - .build()); + final SrEroTypeBuilder builder = new SrEroTypeBuilder() + .setCFlag(false) + .setMFlag(true) + .setSidType(SidType.Ipv4NodeId) + .setSid(Uint32.valueOf(30140)) + .setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.99"))) + .build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrObjectParserTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrObjectParserTest.java index d8f953bcfe..d0a4a6f6cc 100644 --- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrObjectParserTest.java +++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrObjectParserTest.java @@ -40,6 +40,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.explicit.route.object.ero.SubobjectBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.OpenBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.open.TlvsBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public class SrObjectParserTest { @@ -78,15 +80,15 @@ public class SrObjectParserTest { final PcepOpenObjectWithSpcTlvParser parser = new PcepOpenObjectWithSpcTlvParser(this.tlvRegistry, this.viTlvRegistry); - final OpenBuilder builder = new OpenBuilder(); - builder.setProcessingRule(false); - builder.setIgnore(false); - builder.setVersion(new ProtocolVersion((short) 1)); - builder.setKeepalive((short) 30); - builder.setDeadTimer((short) 120); - builder.setSessionId((short) 1); + final OpenBuilder builder = new OpenBuilder() + .setProcessingRule(false) + .setIgnore(false) + .setVersion(new ProtocolVersion(Uint8.ONE)) + .setKeepalive(Uint8.valueOf(30)) + .setDeadTimer(Uint8.valueOf(120)) + .setSessionId(Uint8.ONE); - final Tlvs1 tlv = new Tlvs1Builder().setSrPceCapability(new SrPceCapabilityBuilder().setMsd((short) 1).build()) + final Tlvs1 tlv = new Tlvs1Builder().setSrPceCapability(new SrPceCapabilityBuilder().setMsd(Uint8.ONE).build()) .build(); builder.setTlvs(new TlvsBuilder() .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful @@ -114,13 +116,13 @@ public class SrObjectParserTest { builder.setIgnore(false); final List subobjects = new ArrayList<>(); - final SrEroTypeBuilder srEroSubBuilder = new SrEroTypeBuilder(); - srEroSubBuilder.setCFlag(false); - srEroSubBuilder.setMFlag(false); - srEroSubBuilder.setSidType(SidType.Ipv4NodeId); - srEroSubBuilder.setSid(123456L); - srEroSubBuilder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone( - new Ipv4AddressNoZone("74.125.43.99"))).build()); + final SrEroTypeBuilder srEroSubBuilder = new SrEroTypeBuilder() + .setCFlag(false) + .setMFlag(false) + .setSidType(SidType.Ipv4NodeId) + .setSid(Uint32.valueOf(123456)) + .setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone( + new Ipv4AddressNoZone("74.125.43.99"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(srEroSubBuilder.build()) .setLoose(false); subobjects.add(subobjBuilder.build()); @@ -147,13 +149,13 @@ public class SrObjectParserTest { final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109.update.lsp .input.arguments.ero.subobject.subobject.type.SrEroTypeBuilder srEroSubBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109 - .update.lsp.input.arguments.ero.subobject.subobject.type.SrEroTypeBuilder(); - srEroSubBuilder.setCFlag(false); - srEroSubBuilder.setMFlag(false); - srEroSubBuilder.setSidType(SidType.Ipv4NodeId); - srEroSubBuilder.setSid(123456L); - srEroSubBuilder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone( - new Ipv4AddressNoZone("74.125.43.99"))).build()); + .update.lsp.input.arguments.ero.subobject.subobject.type.SrEroTypeBuilder() + .setCFlag(false) + .setMFlag(false) + .setSidType(SidType.Ipv4NodeId) + .setSid(Uint32.valueOf(123456)) + .setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone( + new Ipv4AddressNoZone("74.125.43.99"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(srEroSubBuilder.build()) .setLoose(false); builder.setSubobject(Lists.newArrayList(subobjBuilder.build())); diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParserTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParserTest.java index a2d04768f6..bef4b2eb80 100644 --- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParserTest.java +++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParserTest.java @@ -26,6 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.seg import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109.sr.subobject.nai.IpNodeIdBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109.sr.subobject.nai.UnnumberedAdjacencyBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.reported.route.object.rro.SubobjectBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; public class SrRroSubobjectParserTest { @@ -99,13 +100,13 @@ public class SrRroSubobjectParserTest { @Test public void testSrRroSubobjectIpv4NodeIdNAI() throws PCEPDeserializerException { - final SrRroTypeBuilder builder = new SrRroTypeBuilder(); - builder.setSidType(SidType.Ipv4NodeId); - builder.setSid(123456L); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.99"))) - .build()); + final SrRroTypeBuilder builder = new SrRroTypeBuilder() + .setSidType(SidType.Ipv4NodeId) + .setSid(Uint32.valueOf(123456)) + .setCFlag(false) + .setMFlag(false) + .setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.99"))) + .build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -117,13 +118,13 @@ public class SrRroSubobjectParserTest { @Test public void testSrRroSubobjectIpv6NodeIdNAI() throws PCEPDeserializerException { - final SrRroTypeBuilder builder = new SrRroTypeBuilder(); - builder.setSidType(SidType.Ipv6NodeId); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setSid(123456L); - builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone( - new Ipv6AddressNoZone("fe80:cd00::211e:729c"))).build()); + final SrRroTypeBuilder builder = new SrRroTypeBuilder() + .setSidType(SidType.Ipv6NodeId) + .setCFlag(false) + .setMFlag(false) + .setSid(Uint32.valueOf(123456)) + .setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone( + new Ipv6AddressNoZone("fe80:cd00::211e:729c"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -135,14 +136,14 @@ public class SrRroSubobjectParserTest { @Test public void testSrRroSubobjectIpv4AdjacencyNAI() throws PCEPDeserializerException { - final SrRroTypeBuilder builder = new SrRroTypeBuilder(); - builder.setSidType(SidType.Ipv4Adjacency); - builder.setSid(123456L); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new IpAdjacencyBuilder().setLocalIpAddress(new IpAddressNoZone( - new Ipv4AddressNoZone("74.125.43.99"))) - .setRemoteIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.100"))).build()); + final SrRroTypeBuilder builder = new SrRroTypeBuilder() + .setSidType(SidType.Ipv4Adjacency) + .setSid(Uint32.valueOf(123456)) + .setCFlag(false) + .setMFlag(false) + .setNai(new IpAdjacencyBuilder().setLocalIpAddress(new IpAddressNoZone( + new Ipv4AddressNoZone("74.125.43.99"))) + .setRemoteIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.100"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -154,14 +155,14 @@ public class SrRroSubobjectParserTest { @Test public void testSrRroSubobjectIpv6AdjacencyNAI() throws PCEPDeserializerException { - final SrRroTypeBuilder builder = new SrRroTypeBuilder(); - builder.setSidType(SidType.Ipv6Adjacency); - builder.setSid(123456L); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new IpAdjacencyBuilder().setLocalIpAddress(new IpAddressNoZone( - new Ipv6AddressNoZone("fe80:cd00::211e:729c"))) - .setRemoteIpAddress(new IpAddressNoZone(new Ipv6AddressNoZone("fe80:cd00::211e:729d"))).build()); + final SrRroTypeBuilder builder = new SrRroTypeBuilder() + .setSidType(SidType.Ipv6Adjacency) + .setSid(Uint32.valueOf(123456)) + .setCFlag(false) + .setMFlag(false) + .setNai(new IpAdjacencyBuilder().setLocalIpAddress(new IpAddressNoZone( + new Ipv6AddressNoZone("fe80:cd00::211e:729c"))) + .setRemoteIpAddress(new IpAddressNoZone(new Ipv6AddressNoZone("fe80:cd00::211e:729d"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -173,13 +174,15 @@ public class SrRroSubobjectParserTest { @Test public void testSrRroSubobjectUnnumberedNAI() throws PCEPDeserializerException { - final SrRroTypeBuilder builder = new SrRroTypeBuilder(); - builder.setSidType(SidType.Unnumbered); - builder.setSid(123456L); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new UnnumberedAdjacencyBuilder().setLocalNodeId(1L).setLocalInterfaceId(2L).setRemoteNodeId(3L) - .setRemoteInterfaceId(4L).build()); + final SrRroTypeBuilder builder = new SrRroTypeBuilder() + .setSidType(SidType.Unnumbered) + .setSid(Uint32.valueOf(123456)) + .setCFlag(false) + .setMFlag(false) + .setNai(new UnnumberedAdjacencyBuilder() + .setLocalNodeId(Uint32.ONE).setLocalInterfaceId(Uint32.valueOf(2)) + .setRemoteNodeId(Uint32.valueOf(3)).setRemoteInterfaceId(Uint32.valueOf(4)) + .build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -191,11 +194,11 @@ public class SrRroSubobjectParserTest { @Test public void testSrRroSubobjectWithoutNAI() throws PCEPDeserializerException { - final SrRroTypeBuilder builder = new SrRroTypeBuilder(); - builder.setSidType(SidType.Ipv4NodeId); - builder.setSid(123470L); - builder.setCFlag(true); - builder.setMFlag(true); + final SrRroTypeBuilder builder = new SrRroTypeBuilder() + .setSidType(SidType.Ipv4NodeId) + .setSid(Uint32.valueOf(123470)) + .setCFlag(true) + .setMFlag(true); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( @@ -207,12 +210,12 @@ public class SrRroSubobjectParserTest { @Test public void testSrRroSubobjectWithoutBody() throws PCEPDeserializerException { - final SrRroTypeBuilder builder = new SrRroTypeBuilder(); - builder.setSidType(SidType.Ipv4NodeId); - builder.setCFlag(false); - builder.setMFlag(false); - builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.99"))) - .build()); + final SrRroTypeBuilder builder = new SrRroTypeBuilder() + .setSidType(SidType.Ipv4NodeId) + .setCFlag(false) + .setMFlag(false) + .setNai(new IpNodeIdBuilder().setIpAddress(new IpAddressNoZone(new Ipv4AddressNoZone("74.125.43.99"))) + .build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer( diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrTlvParserTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrTlvParserTest.java index 532a787049..6a10c5c108 100644 --- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrTlvParserTest.java +++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrTlvParserTest.java @@ -5,7 +5,6 @@ * 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.pcep.segment.routing; import static org.junit.Assert.assertArrayEquals; @@ -20,6 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.seg import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109.sr.pce.capability.tlv.SrPceCapabilityBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.path.setup.type.tlv.PathSetupType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.path.setup.type.tlv.PathSetupTypeBuilder; +import org.opendaylight.yangtools.yang.common.Uint8; public class SrTlvParserTest { @@ -30,7 +30,7 @@ public class SrTlvParserTest { @Test public void testSrPceCapabilityParser() throws PCEPDeserializerException { final SrPceCapabilityTlvParser parser = new SrPceCapabilityTlvParser(); - final SrPceCapability spcTlv = new SrPceCapabilityBuilder().setMsd((short) 1).build(); + final SrPceCapability spcTlv = new SrPceCapabilityBuilder().setMsd(Uint8.ONE).build(); assertEquals(spcTlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(SPC_TLV_BYTES, 4)))); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(spcTlv, buff); @@ -40,7 +40,7 @@ public class SrTlvParserTest { @Test public void testPathSetupTypeTlvParser() throws PCEPDeserializerException { final SrPathSetupTypeTlvParser parser = new SrPathSetupTypeTlvParser(); - final PathSetupType pstTlv = new PathSetupTypeBuilder().setPst((short) 1).build(); + final PathSetupType pstTlv = new PathSetupTypeBuilder().setPst(Uint8.ONE).build(); assertEquals(pstTlv, parser.parseTlv(Unpooled.wrappedBuffer(ByteArray.cutBytes(SR_TE_PST_BYTES, 4)))); final ByteBuf buff = Unpooled.buffer(); parser.serializeTlv(pstTlv, buff); diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/TopologyProviderTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/TopologyProviderTest.java index 19c0db7da8..6856297045 100644 --- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/TopologyProviderTest.java +++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/TopologyProviderTest.java @@ -49,6 +49,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.path.setup.type.tlv.PathSetupTypeBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.LspId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.pcep.client.attributes.path.computation.client.ReportedLsp; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.common.Uint8; public class TopologyProviderTest extends AbstractPCEPSessionTest { @@ -68,7 +70,7 @@ public class TopologyProviderTest extends AbstractPCEPSessionTest { //check sr-path @@ -86,7 +88,7 @@ public class TopologyProviderTest extends AbstractPCEPSessionTest { //check second lsp sr-path @@ -97,7 +99,7 @@ public class TopologyProviderTest extends AbstractPCEPSessionTest { //check updated sr-path @@ -116,7 +118,7 @@ public class TopologyProviderTest extends AbstractPCEPSessionTest nodes) { + private static Topology createTopology(final String topologyId, final List nodes) { return new TopologyBuilder().setTopologyId(new TopologyId(topologyId)).setNode(nodes).build(); } - private Node createPcepNode(final String nodeId) { + private static Node createPcepNode(final String nodeId) { return new NodeBuilder().setNodeId(new NodeId(nodeId)) .addAugmentation(PcepTopologyNodeStatsAug.class, new PcepTopologyNodeStatsAugBuilder().setPcepSessionState(createTopologySessionState()).build()) .build(); } - private PcepSessionState createTopologySessionState() { - final ReplyTime replyTime = new ReplyTimeBuilder().setAverageTime(1L).setMaxTime(3L).setMinTime(2L).build(); + private static PcepSessionState createTopologySessionState() { + final ReplyTime replyTime = new ReplyTimeBuilder() + .setAverageTime(Uint32.ONE) + .setMaxTime(Uint32.valueOf(3)) + .setMinTime(Uint32.valueOf(2)) + .build(); - final ErrorMessages errorMsg = - new ErrorMessagesBuilder().setReceivedErrorMsgCount(1L).setSentErrorMsgCount(2L).build(); + final ErrorMessages errorMsg = new ErrorMessagesBuilder() + .setReceivedErrorMsgCount(Uint32.ONE) + .setSentErrorMsgCount(Uint32.valueOf(2)) + .build(); - final StatefulMessagesStatsAug statefulMsg = - new StatefulMessagesStatsAugBuilder().setLastReceivedRptMsgTimestamp(1553183614L).setSentUpdMsgCount(1L) - .setReceivedRptMsgCount(2L).setSentInitMsgCount(3L).build(); + final StatefulMessagesStatsAug statefulMsg = new StatefulMessagesStatsAugBuilder() + .setLastReceivedRptMsgTimestamp(Uint32.valueOf(1553183614L)) + .setSentUpdMsgCount(Uint32.ONE) + .setReceivedRptMsgCount(Uint32.valueOf(2)) + .setSentInitMsgCount(Uint32.valueOf(3)) + .build(); - final Messages messages = new MessagesBuilder().setLastSentMsgTimestamp(1553183734L).setUnknownMsgReceived(1) - .setSentMsgCount(5L).setReceivedMsgCount(4L).setReplyTime(replyTime).setErrorMessages(errorMsg) + final Messages messages = new MessagesBuilder() + .setLastSentMsgTimestamp(Uint32.valueOf(1553183734L)) + .setUnknownMsgReceived(Uint16.ONE) + .setSentMsgCount(Uint32.valueOf(5)) + .setReceivedMsgCount(Uint32.valueOf(4)) + .setReplyTime(replyTime) + .setErrorMessages(errorMsg) .addAugmentation(StatefulMessagesStatsAug.class, statefulMsg).build(); final PeerCapabilities capabilities = new PeerCapabilitiesBuilder() @@ -130,29 +147,46 @@ public class TopologyStatsRpcServiceImplTest extends AbstractConcurrentDataBroke .setStateful(true).setInstantiation(true).setActive(true).build()) .build(); - final LocalPref localPref = - new LocalPrefBuilder().setKeepalive((short) 30).setDeadtimer((short) 120).setIpAddress("127.0.0.1") - .setSessionId(0).addAugmentation(PcepEntityIdStatsAug.class, new PcepEntityIdStatsAugBuilder() - .setSpeakerEntityIdValue(new byte[] {0x01, 0x02, 0x03, 0x04}).build()) - .build(); + final LocalPref localPref = new LocalPrefBuilder() + .setKeepalive(Uint8.valueOf(30)) + .setDeadtimer(Uint8.valueOf(120)) + .setIpAddress("127.0.0.1") + .setSessionId(Uint16.ZERO) + .addAugmentation(PcepEntityIdStatsAug.class, new PcepEntityIdStatsAugBuilder() + .setSpeakerEntityIdValue(new byte[] {0x01, 0x02, 0x03, 0x04}) + .build()) + .build(); return new PcepSessionStateBuilder().setSynchronized(true).setSessionDuration("0:00:05:18") - .setDelegatedLspsCount(1).setLocalPref(localPref).setPeerPref(new PeerPrefBuilder(localPref).build()) + .setDelegatedLspsCount(Uint16.ONE).setLocalPref(localPref) + .setPeerPref(new PeerPrefBuilder(localPref).build()) .setPeerCapabilities(capabilities).setMessages(messages).build(); } - private PcepSessionState createRpcSessionState() { - final ReplyTime replyTime = new ReplyTimeBuilder().setAverageTime(1L).setMaxTime(3L).setMinTime(2L).build(); + private static PcepSessionState createRpcSessionState() { + final ReplyTime replyTime = new ReplyTimeBuilder() + .setAverageTime(Uint32.ONE) + .setMaxTime(Uint32.valueOf(3)) + .setMinTime(Uint32.valueOf(2)) + .build(); - final ErrorMessages errorMsg = - new ErrorMessagesBuilder().setReceivedErrorMsgCount(1L).setSentErrorMsgCount(2L).build(); + final ErrorMessages errorMsg = new ErrorMessagesBuilder() + .setReceivedErrorMsgCount(Uint32.ONE).setSentErrorMsgCount(Uint32.valueOf(2)).build(); - final StatefulMessagesRpcAug statefulMsg = - new StatefulMessagesRpcAugBuilder().setLastReceivedRptMsgTimestamp(1553183614L).setSentUpdMsgCount(1L) - .setReceivedRptMsgCount(2L).setSentInitMsgCount(3L).build(); + final StatefulMessagesRpcAug statefulMsg = new StatefulMessagesRpcAugBuilder() + .setLastReceivedRptMsgTimestamp(Uint32.valueOf(1553183614L)) + .setSentUpdMsgCount(Uint32.ONE) + .setReceivedRptMsgCount(Uint32.valueOf(2)) + .setSentInitMsgCount(Uint32.valueOf(3)) + .build(); - final Messages messages = new MessagesBuilder().setLastSentMsgTimestamp(1553183734L).setUnknownMsgReceived(1) - .setSentMsgCount(5L).setReceivedMsgCount(4L).setReplyTime(replyTime).setErrorMessages(errorMsg) + final Messages messages = new MessagesBuilder() + .setLastSentMsgTimestamp(Uint32.valueOf(1553183734L)) + .setUnknownMsgReceived(Uint16.ONE) + .setSentMsgCount(Uint32.valueOf(5)) + .setReceivedMsgCount(Uint32.valueOf(4)) + .setReplyTime(replyTime) + .setErrorMessages(errorMsg) .addAugmentation(StatefulMessagesRpcAug.class, statefulMsg).build(); final PeerCapabilities capabilities = new PeerCapabilitiesBuilder() @@ -160,15 +194,21 @@ public class TopologyStatsRpcServiceImplTest extends AbstractConcurrentDataBroke .setStateful(true).setInstantiation(true).setActive(true).build()) .build(); - final LocalPref localPref = - new LocalPrefBuilder().setKeepalive((short) 30).setDeadtimer((short) 120).setIpAddress("127.0.0.1") - .setSessionId(0).addAugmentation(PcepEntityIdRpcAug.class, new PcepEntityIdRpcAugBuilder() - .setSpeakerEntityIdValue(new byte[] {0x01, 0x02, 0x03, 0x04}).build()) - .build(); + final LocalPref localPref = new LocalPrefBuilder() + .setKeepalive(Uint8.valueOf(30)) + .setDeadtimer(Uint8.valueOf(120)) + .setIpAddress("127.0.0.1") + .setSessionId(Uint16.ZERO) + .addAugmentation(PcepEntityIdRpcAug.class, new PcepEntityIdRpcAugBuilder() + .setSpeakerEntityIdValue(new byte[] {0x01, 0x02, 0x03, 0x04}) + .build()) + .build(); return new PcepSessionStateBuilder().setSynchronized(true).setSessionDuration("0:00:05:18") - .setDelegatedLspsCount(1).setLocalPref(localPref).setPeerPref(new PeerPrefBuilder(localPref).build()) - .setPeerCapabilities(capabilities).setMessages(messages).build(); + .setDelegatedLspsCount(Uint16.ONE).setLocalPref(localPref) + .setPeerPref(new PeerPrefBuilder(localPref).build()) + .setPeerCapabilities(capabilities).setMessages(messages) + .build(); } @Test @@ -262,7 +302,7 @@ public class TopologyStatsRpcServiceImplTest extends AbstractConcurrentDataBroke } @SuppressWarnings("checkstyle:LineLength") - private GetStatsInput createGetStatsInput(final String topologyId, final List nodeIds) { + private static GetStatsInput createGetStatsInput(final String topologyId, final List nodeIds) { final List nodes; if (nodeIds != null) { nodes = nodeIds.stream().map( @@ -285,7 +325,7 @@ public class TopologyStatsRpcServiceImplTest extends AbstractConcurrentDataBroke } @SuppressWarnings("checkstyle:LineLength") - private GetStatsOutput createGetStatsOutput(final String topologyId, final List nodeIds, + private static GetStatsOutput createGetStatsOutput(final String topologyId, final List nodeIds, final PcepSessionState state) { final List nodes; if (nodeIds != null) { diff --git a/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProviderDeployer.java b/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProviderDeployer.java index 6b11c34707..0dcc6a3e1b 100644 --- a/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProviderDeployer.java +++ b/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProviderDeployer.java @@ -105,7 +105,7 @@ public final class TunnelProviderDeployer implements ClusteredDataTreeChangeList } } - private boolean filterPcepTopologies(final TopologyTypes topologyTypes) { + private static boolean filterPcepTopologies(final TopologyTypes topologyTypes) { if (topologyTypes == null) { return false; } diff --git a/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java b/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java index b3ffb93fb2..1d9a0e2687 100644 --- a/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java +++ b/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java @@ -61,6 +61,7 @@ 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.node.attributes.SupportingNode; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Uint32; public class NodeChangedListenerTest extends AbstractConcurrentDataBrokerTest { @@ -70,12 +71,12 @@ public class NodeChangedListenerTest extends AbstractConcurrentDataBrokerTest { private static final String NODE1_IPV4 = "39.39.39.39"; private static final NodeId NODE1_ID = new NodeId("pcc://" + NODE1_IPV4); private static final String LSP1_NAME = "lsp1"; - private static final long LSP1_ID = 1; + private static final Uint32 LSP1_ID = Uint32.ONE; private static final String NODE2_IPV4 = "40.40.40.40"; private static final NodeId NODE2_ID = new NodeId("pcc://" + NODE2_IPV4); private static final String LSP2_NAME = "lsp2"; - private static final long LSP2_ID = 2; + private static final Uint32 LSP2_ID = Uint32.valueOf(2); private static final InstanceIdentifier PCEP_TOPO_IID = InstanceIdentifier.builder(NetworkTopology.class) .child(Topology.class, new TopologyKey(PCEP_TOPOLOGY_ID)).build(); @@ -197,7 +198,7 @@ public class NodeChangedListenerTest extends AbstractConcurrentDataBrokerTest { this.listenerRegistration.close(); } - private void createNode(final NodeId nodeId, final String ipv4Address, final String lspName, final long lspId, + private void createNode(final NodeId nodeId, final String ipv4Address, final String lspName, final Uint32 lspId, final String dstIpv4Address) throws InterruptedException, ExecutionException { final NodeBuilder nodeBuilder = new NodeBuilder(); nodeBuilder.withKey(new NodeKey(nodeId)); diff --git a/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java b/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java index 0b519c7c88..25c4347fa8 100644 --- a/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java +++ b/pcep/tunnel/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java @@ -95,6 +95,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.termination.point.attributes.igp.termination.point.attributes.termination.point.type.IpBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.common.Uint8; import org.osgi.framework.BundleContext; public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest { @@ -233,7 +234,7 @@ public class TunnelProgrammingTest extends AbstractConcurrentDataBrokerTest { @Test public void testTunnelProgramming() throws InterruptedException, ExecutionException { final Bandwidth bwd = new Bandwidth(new byte[] { 0x00, 0x00, 0x00, (byte) 0xff }); - final ClassType classType = new ClassType((short) 1); + final ClassType classType = new ClassType(Uint8.ONE); final String tunnelName = "create-tunnel"; final NetworkTopologyRef topologyRef = new NetworkTopologyRef(TOPO_IID); // create tunnel -- 2.36.6