From b72a0dc7a080fe66c774ae4081bdb84bb147a5cd Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 28 Jun 2020 19:37:41 +0200 Subject: [PATCH] Cleanup deprecation warnings in bgp/testtool Eliminate some leftovers from codegen change. Change-Id: I0c6ff683263500bf34e551c3b9c37ff81b2ba9b5 Signed-off-by: Robert Varga --- .../protocol/bgp/testtool/BGPTestTool.java | 33 ++++++++++------ .../bgp/testtool/PrefixesBuilder.java | 38 ++++++++++--------- 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java index 5d17d2c581..021245458e 100644 --- a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java +++ b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/BGPTestTool.java @@ -40,7 +40,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.OptionalCapabilitiesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.CParametersBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.c.parameters.As4BytesCapabilityBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.SendReceive; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.AddPathCapabilityBuilder; @@ -127,10 +126,16 @@ final class BGPTestTool { private static OptionalCapabilities createMPCapability(final Class afi, final Class safi) { - return new OptionalCapabilitiesBuilder().setCParameters(new CParametersBuilder() - .addAugmentation(CParameters1.class, new CParameters1Builder() - .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder().setAfi(afi) - .setSafi(safi).build()).build()).build()).build(); + return new OptionalCapabilitiesBuilder() + .setCParameters(new CParametersBuilder() + .addAugmentation(new CParameters1Builder() + .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder() + .setAfi(afi) + .setSafi(safi) + .build()) + .build()) + .build()) + .build(); } private static OptionalCapabilities createAs4BytesMPCapability(final AsNumber as) { @@ -143,13 +148,19 @@ final class BGPTestTool { } private static OptionalCapabilities createAddPathCapability() { - return new OptionalCapabilitiesBuilder().setCParameters(new CParametersBuilder() - .addAugmentation(CParameters1.class, new CParameters1Builder() + return new OptionalCapabilitiesBuilder() + .setCParameters(new CParametersBuilder() + .addAugmentation(new CParameters1Builder() .setAddPathCapability(new AddPathCapabilityBuilder() - .setAddressFamilies(Lists.newArrayList(new AddressFamiliesBuilder() - .setAfi(Ipv4AddressFamily.class) - .setSafi(UnicastSubsequentAddressFamily.class) - .setSendReceive(SendReceive.Both).build())).build()).build()).build()).build(); + .setAddressFamilies(Lists.newArrayList(new AddressFamiliesBuilder() + .setAfi(Ipv4AddressFamily.class) + .setSafi(UnicastSubsequentAddressFamily.class) + .setSendReceive(SendReceive.Both) + .build())) + .build()) + .build()) + .build()) + .build(); } void printCount(final String localAddress) { diff --git a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/PrefixesBuilder.java b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/PrefixesBuilder.java index 837b3536e2..553d8be243 100644 --- a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/PrefixesBuilder.java +++ b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/PrefixesBuilder.java @@ -27,7 +27,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.LocalPrefBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.MultiExitDiscBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.OriginBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes1; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes1Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlriBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.mp.reach.nlri.AdvertizedRoutesBuilder; @@ -67,27 +66,32 @@ final class PrefixesBuilder { private static Attributes createAttributes(final List extCom, final boolean multiPathSupport, final Ipv4Prefix addressPrefix) { - final AttributesBuilder attBuilder = new AttributesBuilder(); - attBuilder.setOrigin(new OriginBuilder().setValue(BgpOrigin.Egp).build()); - attBuilder.setAsPath(new AsPathBuilder().setSegments(Collections.emptyList()).build()); - attBuilder.setMultiExitDisc(new MultiExitDiscBuilder().setMed(Uint32.ZERO).build()); - attBuilder.setLocalPref(new LocalPrefBuilder().setPref(Uint32.valueOf(100L)).build()); - attBuilder.setExtendedCommunities(createExtComm(extCom)); - attBuilder.setUnrecognizedAttributes(Collections.emptyList()); - final Ipv4PrefixesBuilder prefixes = new Ipv4PrefixesBuilder().setPrefix(addressPrefix); if (multiPathSupport) { prefixes.setPathId(new PathId(Uint32.valueOf(5))); } - attBuilder.addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri( - new MpReachNlriBuilder().setCNextHop(NEXT_HOP).setAfi(Ipv4AddressFamily.class) - .setSafi(UnicastSubsequentAddressFamily.class) - .setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType( - new DestinationIpv4CaseBuilder().setDestinationIpv4(new DestinationIpv4Builder() - .setIpv4Prefixes(Collections.singletonList(prefixes.build())).build()) - .build()).build()).build()).build()); - return attBuilder.build(); + return new AttributesBuilder() + .setOrigin(new OriginBuilder().setValue(BgpOrigin.Egp).build()) + .setAsPath(new AsPathBuilder().setSegments(Collections.emptyList()).build()) + .setMultiExitDisc(new MultiExitDiscBuilder().setMed(Uint32.ZERO).build()) + .setLocalPref(new LocalPrefBuilder().setPref(Uint32.valueOf(100L)).build()) + .setExtendedCommunities(createExtComm(extCom)) + .addAugmentation(new Attributes1Builder() + .setMpReachNlri(new MpReachNlriBuilder() + .setCNextHop(NEXT_HOP) + .setAfi(Ipv4AddressFamily.class) + .setSafi(UnicastSubsequentAddressFamily.class) + .setAdvertizedRoutes(new AdvertizedRoutesBuilder() + .setDestinationType(new DestinationIpv4CaseBuilder() + .setDestinationIpv4(new DestinationIpv4Builder() + .setIpv4Prefixes(Collections.singletonList(prefixes.build())) + .build()) + .build()) + .build()) + .build()) + .build()) + .build(); } } -- 2.36.6