Cleanup deprecation warnings in bgp/rib-impl

Eliminate some leftovers from codegen change.

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

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java
index 60cb6fd7af2c0bb4725a0d18101f3bd64a809e75..6d7562dfd58c1d3e0d4f5878b67ae5363fd6582f 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java
@@ -142,8 +142,8 @@ public final class CodecsImpl implements Codecs {
     public ContainerNode serializeAttributes(final Attributes pathAttr) {
         Preconditions.checkState(this.attributesCodec != null, "Attributes codec not available");
         final AttributesBuilder a = new AttributesBuilder(pathAttr);
-        a.addAugmentation(Attributes1.class, null);
-        a.addAugmentation(Attributes2.class, null);
+        a.removeAugmentation(Attributes1.class);
+        a.removeAugmentation(Attributes2.class);
         return (ContainerNode) this.attributesCodec.serialize(a.build());
     }
 }

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
index 5bf5a1cc1250c33b1e2e141731454ee26802e3b6..84e78b7b7d7dad59d6839cfa8a5201afdccdac7b 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
@@ -57,7 +57,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.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.BgpTableType;
-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.mp.capabilities.AddPathCapabilityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.MultiprotocolCapabilityBuilder;
@@ -105,10 +104,14 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
             tableTypeRegistry);
         if (!addPathCapability.isEmpty()) {
             caps.add(new OptionalCapabilitiesBuilder()
-                    .setCParameters(new CParametersBuilder().addAugmentation(CParameters1.class,
-                            new CParameters1Builder().setAddPathCapability(
-                                    new AddPathCapabilityBuilder()
-                                            .setAddressFamilies(addPathCapability).build()).build()).build()).build());
+                .setCParameters(new CParametersBuilder()
+                    .addAugmentation(new CParameters1Builder()
+                        .setAddPathCapability(new AddPathCapabilityBuilder()
+                            .setAddressFamilies(addPathCapability)
+                            .build())
+                        .build())
+                    .build())
+                .build());
         }
 
         final List<BgpTableType> tableTypes = OpenConfigMappingUtil.toTableTypes(afiSafi, tableTypeRegistry);
@@ -118,10 +121,13 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
                     tableType);
             }
 
-            caps.add(new OptionalCapabilitiesBuilder().setCParameters(
-                    new CParametersBuilder().addAugmentation(CParameters1.class,
-                            new CParameters1Builder().setMultiprotocolCapability(
-                                    new MultiprotocolCapabilityBuilder(tableType).build()).build()).build()).build());
+            caps.add(new OptionalCapabilitiesBuilder()
+                .setCParameters(new CParametersBuilder()
+                    .addAugmentation(new CParameters1Builder()
+                        .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder(tableType).build())
+                        .build())
+                    .build())
+                .build());
         }
         return caps;
     }

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java
index 9b2c108a0f842141963c6d3013cbc4f393922700..a8e34c89033a87759d03f2084a90ae8ab6bba4e1 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractAddPathTest.java
@@ -74,7 +74,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.OriginatorIdBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.as.path.SegmentsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.update.message.WithdrawnRoutesBuilder;
-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.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlriBuilder;
@@ -352,21 +351,26 @@ public abstract class AbstractAddPathTest extends DefaultRibPoliciesMockTest {
 
     private static void addAttributeAugmentation(final AttributesBuilder attBuilder, final Ipv4Prefix prefix,
         final PathId pathId) {
-        attBuilder.setUnrecognizedAttributes(Collections.emptyList());
-        attBuilder.addAugmentation(Attributes1.class,
-            new Attributes1Builder().setMpReachNlri(
-                new MpReachNlriBuilder()
-                    .setCNextHop(new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(NH1)
-                        .build()).build())
-                    .setAfi(Ipv4AddressFamily.class)
-                    .setSafi(UnicastSubsequentAddressFamily.class)
-                    .setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType(
-                        new DestinationIpv4CaseBuilder().setDestinationIpv4(
-                            new DestinationIpv4Builder().setIpv4Prefixes(Collections.singletonList(
-                                new Ipv4PrefixesBuilder().setPathId(pathId).setPrefix(new Ipv4Prefix(prefix)).build()))
-                                .build())
-                            .build()).build())
-                    .build()).build());
+        attBuilder.setUnrecognizedAttributes(Collections.emptyMap());
+        attBuilder.addAugmentation(new Attributes1Builder()
+            .setMpReachNlri(new MpReachNlriBuilder()
+                .setCNextHop(new Ipv4NextHopCaseBuilder()
+                    .setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(NH1).build())
+                    .build())
+                .setAfi(Ipv4AddressFamily.class)
+                .setSafi(UnicastSubsequentAddressFamily.class)
+                .setAdvertizedRoutes(new AdvertizedRoutesBuilder()
+                    .setDestinationType(new DestinationIpv4CaseBuilder()
+                        .setDestinationIpv4(new DestinationIpv4Builder()
+                            .setIpv4Prefixes(Collections.singletonList(new Ipv4PrefixesBuilder()
+                                .setPathId(pathId)
+                                .setPrefix(new Ipv4Prefix(prefix))
+                                .build()))
+                            .build())
+                        .build())
+                    .build())
+                .build())
+            .build());
     }
 
     private static Update createSimpleWithdrawalUpdate(final Ipv4Prefix prefix, final long localPreference) {

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPDispatcherTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPDispatcherTest.java
index 8cdbccc9f306d6556024eb7529edd2655db00fe1..7241d62e31ddea51738f1b0cd54102794d26281a 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPDispatcherTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPDispatcherTest.java
@@ -39,7 +39,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.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.BgpTableType;
-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.mp.capabilities.MultiprotocolCapabilityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.BgpId;
@@ -97,7 +96,7 @@ public class AbstractBGPDispatcherTest {
         final List<OptionalCapabilities> capas = new ArrayList<>();
         capas.add(new OptionalCapabilitiesBuilder()
             .setCParameters(new CParametersBuilder()
-                .addAugmentation(CParameters1.class, new CParameters1Builder()
+                .addAugmentation(new CParameters1Builder()
                         .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
                                 .setAfi(IPV_4_TT.getAfi())
                                 .setSafi(IPV_4_TT.getSafi())
@@ -111,7 +110,7 @@ public class AbstractBGPDispatcherTest {
         capas.add(new OptionalCapabilitiesBuilder()
                 .setCParameters(BgpExtendedMessageUtil.EXTENDED_MESSAGE_CAPABILITY).build());
         tlvs.add(new BgpParametersBuilder().setOptionalCapabilities(capas).build());
-        final BgpId bgpId = new BgpId(IetfInetUtil.INSTANCE.ipv4AddressNoZoneFor(socketAddress.getAddress()));
+        final BgpId bgpId = new BgpId(IetfInetUtil.INSTANCE.ipv4AddressFor(socketAddress.getAddress()));
         return new BGPSessionPreferences(AS_NUMBER, HOLD_TIMER, bgpId, AS_NUMBER, tlvs);
     }
 

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
index 5eb9aff779ac4c1e5380f440c0d28dd19b620360..8070fde1641dee3b10e7c842da1590082d22aebc 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
@@ -57,7 +57,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.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.BgpTableType;
-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.mp.capabilities.GracefulRestartCapabilityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.MultiprotocolCapabilityBuilder;
@@ -98,15 +97,25 @@ public class FSMTest {
         final List<OptionalCapabilities> capas = new ArrayList<>();
 
         capas.add(new OptionalCapabilitiesBuilder()
-                .setCParameters(new CParametersBuilder().addAugmentation(CParameters1.class,
-                        new CParameters1Builder().setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
-                                .setAfi(this.ipv4tt.getAfi()).setSafi(this.ipv4tt.getSafi()).build()).build())
-                        .build()).build());
-        capas.add(new OptionalCapabilitiesBuilder().setCParameters(new CParametersBuilder()
-                .addAugmentation(CParameters1.class,
-                        new CParameters1Builder().setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
-                                .setAfi(this.linkstatett.getAfi()).setSafi(this.linkstatett.getSafi())
-                                .build()).build()).build()).build());
+            .setCParameters(new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
+                        .setAfi(this.ipv4tt.getAfi())
+                        .setSafi(this.ipv4tt.getSafi())
+                        .build())
+                    .build())
+                .build())
+            .build());
+        capas.add(new OptionalCapabilitiesBuilder()
+            .setCParameters(new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
+                        .setAfi(this.linkstatett.getAfi())
+                        .setSafi(this.linkstatett.getSafi())
+                        .build())
+                    .build())
+                .build())
+            .build());
         capas.add(new OptionalCapabilitiesBuilder()
             .setCParameters(new CParametersBuilder()
                 .setAs4BytesCapability(new As4BytesCapabilityBuilder()
@@ -117,9 +126,12 @@ public class FSMTest {
         capas.add(new OptionalCapabilitiesBuilder()
                 .setCParameters(BgpExtendedMessageUtil.EXTENDED_MESSAGE_CAPABILITY).build());
         capas.add(new OptionalCapabilitiesBuilder()
-                .setCParameters(new CParametersBuilder().addAugmentation(CParameters1.class,
-                        new CParameters1Builder().setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
-                                .build()).build()).build()).build());
+                .setCParameters(new CParametersBuilder()
+                    .addAugmentation(new CParameters1Builder()
+                        .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder().build())
+                        .build())
+                    .build())
+                .build());
 
 
         tlvs.add(new BgpParametersBuilder().setOptionalCapabilities(capas).build());
@@ -212,11 +224,16 @@ public class FSMTest {
 
         final List<BgpParameters> tlvs = new ArrayList<>();
         final List<OptionalCapabilities> capas = new ArrayList<>();
-        capas.add(new OptionalCapabilitiesBuilder().setCParameters(new CParametersBuilder()
-                .addAugmentation(CParameters1.class,
-                        new CParameters1Builder().setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
-                                .setAfi(this.ipv4tt.getAfi()).setSafi(this.ipv4tt.getSafi())
-                                .build()).build()).build()).build());
+        capas.add(new OptionalCapabilitiesBuilder()
+            .setCParameters(new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
+                        .setAfi(this.ipv4tt.getAfi())
+                        .setSafi(this.ipv4tt.getSafi())
+                        .build())
+                    .build())
+                .build())
+            .build());
         capas.add(new OptionalCapabilitiesBuilder()
                 .setCParameters(BgpExtendedMessageUtil.EXTENDED_MESSAGE_CAPABILITY).build());
         tlvs.add(new BgpParametersBuilder().setOptionalCapabilities(capas).build());
@@ -246,7 +263,7 @@ public class FSMTest {
         final List<OptionalCapabilities> capas = new ArrayList<>();
         capas.add(new OptionalCapabilitiesBuilder()
             .setCParameters(new CParametersBuilder()
-                .addAugmentation(CParameters1.class, new CParameters1Builder()
+                .addAugmentation(new CParameters1Builder()
                     .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
                         .setAfi(this.ipv4tt.getAfi())
                         .setSafi(this.ipv4tt.getSafi())

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerTest.java
index b3a71083acf2d381cd50552af03671040f3728bf..6316613adfb92518507a30f882f8470d573e577d 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerTest.java
@@ -60,9 +60,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.update.message.NlriBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.update.message.WithdrawnRoutes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.update.message.WithdrawnRoutesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2Builder;
-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.RouteRefreshBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.MultiprotocolCapabilityBuilder;
@@ -199,14 +197,13 @@ public class PeerTest extends AbstractRIBTestSetup {
         this.classic.onMessage(this.session, ub.build());
         assertEquals(2, this.routes.size());
         this.classic.onMessage(this.session, new KeepaliveBuilder().build());
-        this.classic.onMessage(this.session, new UpdateBuilder().setAttributes(
-                new AttributesBuilder().addAugmentation(
-                        Attributes2.class,
-                        new Attributes2Builder().setMpUnreachNlri(
-                                new MpUnreachNlriBuilder()
-                                        .setAfi(IPV4_AFI)
-                                        .setSafi(SAFI)
-                                        .build()).build()).build()).build());
+        this.classic.onMessage(this.session, new UpdateBuilder()
+            .setAttributes(new AttributesBuilder()
+                .addAugmentation(new Attributes2Builder()
+                    .setMpUnreachNlri(new MpUnreachNlriBuilder().setAfi(IPV4_AFI).setSafi(SAFI).build())
+                    .build())
+                .build())
+            .build());
         this.classic.onMessage(this.session, new RouteRefreshBuilder().setAfi(IPV4_AFI).setSafi(SAFI).build());
         this.classic.onMessage(this.session, new RouteRefreshBuilder()
                 .setAfi(Ipv6AddressFamily.class)
@@ -229,14 +226,18 @@ public class PeerTest extends AbstractRIBTestSetup {
         doReturn(new DefaultChannelPromise(channel)).when(channel).writeAndFlush(any(Notification.class));
         doReturn(new InetSocketAddress("localhost", 12345)).when(channel).remoteAddress();
         doReturn(new InetSocketAddress("localhost", 12345)).when(channel).localAddress();
-        final List<BgpParameters> params = Lists.newArrayList(new BgpParametersBuilder().setOptionalCapabilities(
-                Lists.newArrayList(new OptionalCapabilitiesBuilder().setCParameters(
-                        new CParametersBuilder().addAugmentation(
-                                CParameters1.class, new CParameters1Builder().setMultiprotocolCapability(
-                                        new MultiprotocolCapabilityBuilder()
-                                                .setAfi(Ipv4AddressFamily.class)
-                                                .setSafi(UnicastSubsequentAddressFamily.class)
-                                                .build()).build()).build()).build())).build());
+        final List<BgpParameters> params = Lists.newArrayList(new BgpParametersBuilder()
+            .setOptionalCapabilities(Lists.newArrayList(new OptionalCapabilitiesBuilder()
+                .setCParameters(new CParametersBuilder()
+                    .addAugmentation(new CParameters1Builder()
+                        .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
+                            .setAfi(Ipv4AddressFamily.class)
+                            .setSafi(UnicastSubsequentAddressFamily.class)
+                            .build())
+                        .build())
+                    .build())
+                .build()))
+            .build());
         final Open openObj = new OpenBuilder()
                 .setBgpIdentifier(new Ipv4AddressNoZone("1.1.1.1"))
                 .setHoldTimer(Uint16.valueOf(50))

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java
index 527aa4c8ff34d9c7300df38686a4eae3529b1e0e..51546155c16256108ef6fdbb3504f8b9cb051191 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerUtil.java
@@ -37,11 +37,8 @@ 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.Origin;
 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.message.rev200120.path.attributes.attributes.as.path.Segments;
-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.Attributes2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2Builder;
-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.destination.DestinationType;
@@ -125,15 +122,11 @@ final class PeerUtil {
                 .setOrigin(origin).setAsPath(asPath).setLocalPref(localPref);
 
         if (mpReach != null) {
-            attributeBuilder.addAugmentation(Attributes1.class, new Attributes1Builder()
-                    .setMpReachNlri(mpReach)
-                    .build());
+            attributeBuilder.addAugmentation(new Attributes1Builder().setMpReachNlri(mpReach).build());
         }
 
         if (mpUnreach != null) {
-            attributeBuilder.addAugmentation(Attributes2.class, new Attributes2Builder()
-                    .setMpUnreachNlri(mpUnreach)
-                    .build());
+            attributeBuilder.addAugmentation(new Attributes2Builder().setMpUnreachNlri(mpUnreach).build());
         }
 
         return new UpdateBuilder()
@@ -141,9 +134,7 @@ final class PeerUtil {
                         .setOrigin(origin)
                         .setAsPath(asPath)
                         .setLocalPref(localPref)
-                        .addAugmentation(Attributes1.class, new Attributes1Builder()
-                                .setMpReachNlri(mpReach)
-                                .build())
+                        .addAugmentation(new Attributes1Builder().setMpReachNlri(mpReach).build())
                         .build()).build();
     }
 
@@ -163,44 +154,54 @@ final class PeerUtil {
     }
 
     private static OptionalCapabilities createMultiprotocolCapability(final TablesKey key) {
-        return new OptionalCapabilitiesBuilder().setCParameters(
-            new CParametersBuilder().addAugmentation(
-                CParameters1.class, new CParameters1Builder().setMultiprotocolCapability(
-                    new MultiprotocolCapabilityBuilder()
-                    .setAfi(key.getAfi())
-                    .setSafi(key.getSafi())
-                    .build()).build()).build()).build();
+        return new OptionalCapabilitiesBuilder()
+                .setCParameters(new CParametersBuilder()
+                    .addAugmentation(new CParameters1Builder()
+                        .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
+                            .setAfi(key.getAfi())
+                            .setSafi(key.getSafi())
+                            .build())
+                        .build())
+                    .build())
+                .build();
     }
 
     private static OptionalCapabilities createGracefulRestartCapability(final Map<TablesKey, Boolean> gracefulTables,
                                                                         final int restartTime) {
-        return new OptionalCapabilitiesBuilder().setCParameters(
-            new CParametersBuilder().addAugmentation(
-                CParameters1.class, new CParameters1Builder()
-                .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
-                    .setRestartFlags(new GracefulRestartCapability.RestartFlags(false))
-                    .setRestartTime(restartTime)
-                    .setTables(gracefulTables.keySet().stream()
-                        .map(key -> new TablesBuilder()
-                            .setAfi(key.getAfi())
-                            .setSafi(key.getSafi())
-                            .setAfiFlags(new Tables.AfiFlags(gracefulTables.get(key)))
+        return new OptionalCapabilitiesBuilder()
+                .setCParameters(new CParametersBuilder()
+                    .addAugmentation(new CParameters1Builder()
+                        .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
+                            .setRestartFlags(new GracefulRestartCapability.RestartFlags(false))
+                            .setRestartTime(restartTime)
+                            .setTables(gracefulTables.keySet().stream()
+                                .map(key -> new TablesBuilder()
+                                    .setAfi(key.getAfi())
+                                    .setSafi(key.getSafi())
+                                    .setAfiFlags(new Tables.AfiFlags(gracefulTables.get(key)))
+                                    .build())
+                                .collect(Collectors.toList()))
                             .build())
-                        .collect(Collectors.toList()))
-                    .build()).build()).build()).build();
+                        .build())
+                    .build())
+                .build();
     }
 
     private static OptionalCapabilities createAddPathCapability(final List<TablesKey> keys) {
-        return new OptionalCapabilitiesBuilder().setCParameters(
-                new CParametersBuilder().addAugmentation(CParameters1.class,
-                        new CParameters1Builder().setAddPathCapability(
-                                new AddPathCapabilityBuilder().setAddressFamilies(keys.stream()
-                                        .map(key -> new AddressFamiliesBuilder()
-                                                .setAfi(key.getAfi())
-                                                .setSafi(key.getSafi())
-                                                .setSendReceive(SendReceive.Both)
-                                                .build())
-                                        .collect(Collectors.toList()))
-                                        .build()).build()).build()).build();
+        return new OptionalCapabilitiesBuilder()
+                .setCParameters(new CParametersBuilder()
+                    .addAugmentation(new CParameters1Builder()
+                        .setAddPathCapability(new AddPathCapabilityBuilder()
+                            .setAddressFamilies(keys.stream()
+                                .map(key -> new AddressFamiliesBuilder()
+                                    .setAfi(key.getAfi())
+                                    .setSafi(key.getSafi())
+                                    .setSendReceive(SendReceive.Both)
+                                    .build())
+                                .collect(Collectors.toList()))
+                            .build())
+                        .build())
+                    .build())
+                .build();
     }
 }

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java
index fc86c06ea7ff3220c044c4690686d05a6cab4a75..13c9f7e5b08dc1e18689b078f933a4058256ff25 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java
@@ -10,6 +10,13 @@ package org.opendaylight.protocol.bgp.rib.impl;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Futures;
@@ -18,7 +25,6 @@ import java.util.Collections;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Mockito;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPError;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
@@ -68,15 +74,15 @@ public class StrictBGPPeerRegistryTest {
     }
 
     private static BGPSessionListener getMockSession() {
-        final BGPSessionListener mock = Mockito.mock(BGPSessionListener.class);
-        Mockito.doReturn(Futures.immediateFuture(null)).when(mock).releaseConnection();
+        final BGPSessionListener mock = mock(BGPSessionListener.class);
+        doReturn(Futures.immediateFuture(null)).when(mock).releaseConnection();
         return mock;
     }
 
     private static PeerRegistrySessionListener getMockSessionListener() {
-        final PeerRegistrySessionListener mock = Mockito.mock(PeerRegistrySessionListener.class);
-        Mockito.doNothing().when(mock).onSessionCreated(Mockito.any(IpAddressNoZone.class));
-        Mockito.doNothing().when(mock).onSessionRemoved(Mockito.any(IpAddressNoZone.class));
+        final PeerRegistrySessionListener mock = mock(PeerRegistrySessionListener.class);
+        doNothing().when(mock).onSessionCreated(any(IpAddressNoZone.class));
+        doNothing().when(mock).onSessionRemoved(any(IpAddressNoZone.class));
         return mock;
     }
 
@@ -124,8 +130,8 @@ public class StrictBGPPeerRegistryTest {
         final BGPSessionListener returnedSession2 = this.peerRegistry.getPeer(remoteIp2, FROM, to2, this.classicOpen);
         assertSame(session2, returnedSession2);
 
-        Mockito.verifyZeroInteractions(this.peer1);
-        Mockito.verifyZeroInteractions(session2);
+        verifyNoMoreInteractions(this.peer1);
+        verifyNoMoreInteractions(session2);
     }
 
     @Test
@@ -156,7 +162,7 @@ public class StrictBGPPeerRegistryTest {
 
         this.peerRegistry.getPeer(remoteIp, lower, higher, createOpen(higher, LOCAL_AS));
         this.peerRegistry.getPeer(remoteIp, higher, lower, createOpen(lower, LOCAL_AS));
-        Mockito.verify(this.peer1).releaseConnection();
+        verify(this.peer1).releaseConnection();
     }
 
     @Test
@@ -179,7 +185,7 @@ public class StrictBGPPeerRegistryTest {
 
         this.peerRegistry.getPeer(REMOTE_IP, FROM, TO, this.classicOpen);
         this.peerRegistry.getPeer(REMOTE_IP, FROM, TO, createOpen(TO, REMOTE_AS));
-        Mockito.verify(this.peer1).releaseConnection();
+        verify(this.peer1).releaseConnection();
     }
 
     @Test
@@ -222,12 +228,12 @@ public class StrictBGPPeerRegistryTest {
 
         this.peerRegistry.addPeer(REMOTE_IP, this.peer1, this.mockPreferences);
         this.peerRegistry.getPeer(REMOTE_IP, FROM, TO, this.classicOpen);
-        Mockito.verify(sessionListener1, Mockito.times(1)).onSessionCreated(REMOTE_IP);
-        Mockito.verify(sessionListener2, Mockito.times(1)).onSessionCreated(REMOTE_IP);
+        verify(sessionListener1, times(1)).onSessionCreated(REMOTE_IP);
+        verify(sessionListener2, times(1)).onSessionCreated(REMOTE_IP);
 
         this.peerRegistry.removePeerSession(REMOTE_IP);
-        Mockito.verify(sessionListener1, Mockito.times(1)).onSessionRemoved(REMOTE_IP);
-        Mockito.verify(sessionListener2, Mockito.times(1)).onSessionRemoved(REMOTE_IP);
+        verify(sessionListener1, times(1)).onSessionRemoved(REMOTE_IP);
+        verify(sessionListener2, times(1)).onSessionRemoved(REMOTE_IP);
     }
 
     @Test
@@ -246,9 +252,9 @@ public class StrictBGPPeerRegistryTest {
         this.peerRegistry.getPeer(REMOTE_IP, FROM, TO, this.classicOpen);
         this.peerRegistry.removePeerSession(REMOTE_IP);
 
-        Mockito.verify(sessionListener1, Mockito.times(1)).onSessionCreated(REMOTE_IP);
-        Mockito.verify(sessionListener2, Mockito.times(2)).onSessionCreated(REMOTE_IP);
-        Mockito.verify(sessionListener1, Mockito.times(1)).onSessionRemoved(REMOTE_IP);
-        Mockito.verify(sessionListener2, Mockito.times(2)).onSessionRemoved(REMOTE_IP);
+        verify(sessionListener1, times(1)).onSessionCreated(REMOTE_IP);
+        verify(sessionListener2, times(2)).onSessionCreated(REMOTE_IP);
+        verify(sessionListener1, times(1)).onSessionRemoved(REMOTE_IP);
+        verify(sessionListener2, times(2)).onSessionRemoved(REMOTE_IP);
     }
 }

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationTest.java
index 0903de47574f62cc671fcf780f1b45c5b6af9250..92697527551eb01584848c3f8fb4a014581508db 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationTest.java
@@ -22,7 +22,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.UpdateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.update.message.NlriBuilder;
-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.rib.rev180329.rib.TablesKey;
@@ -61,8 +60,8 @@ public class SynchronizationTest {
         mpBuilder.setAfi(Ipv6AddressFamily.class);
         mpBuilder.setSafi(UnicastSubsequentAddressFamily.class);
 
-        AttributesBuilder paBuilder = new AttributesBuilder().addAugmentation(Attributes1.class,
-                new Attributes1Builder().setMpReachNlri(mpBuilder.build()).build());
+        AttributesBuilder paBuilder = new AttributesBuilder()
+                .addAugmentation(new Attributes1Builder().setMpReachNlri(mpBuilder.build()).build());
 
         this.ipv6m = new UpdateBuilder().setAttributes(paBuilder.build()).build();
 
@@ -70,8 +69,8 @@ public class SynchronizationTest {
         mpBuilder.setAfi(LinkstateAddressFamily.class);
         mpBuilder.setSafi(LinkstateSubsequentAddressFamily.class);
 
-        paBuilder = new AttributesBuilder().addAugmentation(Attributes1.class,
-                new Attributes1Builder().setMpReachNlri(mpBuilder.build()).build());
+        paBuilder = new AttributesBuilder()
+                .addAugmentation(new Attributes1Builder().setMpReachNlri(mpBuilder.build()).build());
 
         this.lsm = new UpdateBuilder().setAttributes(paBuilder.build()).build();
 

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeerTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeerTest.java
index 4999c1e3a1a9be80fbb5641575ba65ab9c7a7b1c..abcd9740f8f1da43be36b947279ae5c9a3e58108 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeerTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AppPeerTest.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.bgp.rib.impl.config;
 
 import static org.junit.Assert.assertFalse;
@@ -22,15 +21,16 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.n
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbors.NeighborBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborPeerGroupConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborPeerGroupConfigBuilder;
 
 public class AppPeerTest extends AbstractConfig {
     private static final AppPeer APP_PEER = new AppPeer();
     private final Neighbor neighbor = new NeighborBuilder()
-            .setConfig(new ConfigBuilder().addAugmentation(NeighborPeerGroupConfig.class,
-                    new NeighborPeerGroupConfigBuilder().setPeerGroup(OpenConfigMappingUtil.APPLICATION_PEER_GROUP_NAME)
-                            .build()).build())
+            .setConfig(new ConfigBuilder()
+                .addAugmentation(new NeighborPeerGroupConfigBuilder()
+                    .setPeerGroup(OpenConfigMappingUtil.APPLICATION_PEER_GROUP_NAME)
+                    .build())
+                .build())
             .setNeighborAddress(new IpAddress(new Ipv4Address("127.0.0.1"))).build();
 
     @Override

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeerTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeerTest.java
index 58887cd3a18ff8dab1ba23ee4e631f8573bf440d..f9e18879d9e72853b643993b02951bdc12ac38dd 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeerTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeerTest.java
@@ -50,9 +50,7 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborAddPathsConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborAddPathsConfigBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborTransportConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborTransportConfigBuilder;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint8;
@@ -63,8 +61,8 @@ public class BgpPeerTest extends AbstractConfig {
     static final String MD5_PASSWORD = "123";
     static final PortNumber PORT = new PortNumber(Uint16.valueOf(179));
     static final AfiSafi AFI_SAFI_IPV4 = new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
-            .addAugmentation(NeighborAddPathsConfig.class, new NeighborAddPathsConfigBuilder()
-                       .setReceive(true).setSendMax(Uint8.ZERO).build()).build();
+            .addAugmentation(new NeighborAddPathsConfigBuilder().setReceive(true).setSendMax(Uint8.ZERO).build())
+            .build();
     static final Map<AfiSafiKey, AfiSafi> AFI_SAFI = Collections.singletonMap(AFI_SAFI_IPV4.key(), AFI_SAFI_IPV4);
     private static final BigDecimal DEFAULT_TIMERS = BigDecimal.valueOf(30);
     private BgpPeer bgpPeer;
@@ -83,9 +81,12 @@ public class BgpPeerTest extends AbstractConfig {
 
     static Transport createTransport() {
         return new TransportBuilder().setConfig(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp
-                .rev151009.bgp.neighbor.group.transport.ConfigBuilder().setMtuDiscovery(false)
-                .setPassiveMode(false).addAugmentation(NeighborTransportConfig.class,
-                        new NeighborTransportConfigBuilder().setRemotePort(PORT).build()).build()).build();
+                .rev151009.bgp.neighbor.group.transport.ConfigBuilder()
+                    .setMtuDiscovery(false)
+                    .setPassiveMode(false)
+                    .addAugmentation(new NeighborTransportConfigBuilder().setRemotePort(PORT).build())
+                    .build())
+                .build();
     }
 
     static Timers createTimers() {

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtilTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtilTest.java
index 4c27092594a5636c72959792d2442109b5e795da..515cf05cded128c5c27ed9a5dbeb651561277b1c 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtilTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/GracefulRestartUtilTest.java
@@ -36,7 +36,6 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.r
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4LABELLEDUNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV6UNICAST;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.ll.graceful.restart.rev181112.Config1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.ll.graceful.restart.rev181112.Config1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.ll.graceful.restart.rev181112.afi.safi.ll.graceful.restart.LlGracefulRestartBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.BgpParameters;
@@ -188,7 +187,7 @@ public class GracefulRestartUtilTest {
             .setAfiSafiName(IPV4UNICAST.class)
             .setGracefulRestart(new GracefulRestartBuilder()
                 .setConfig(new ConfigBuilder()
-                    .addAugmentation(Config1.class, new Config1Builder()
+                    .addAugmentation(new Config1Builder()
                         .setLlGracefulRestart(new LlGracefulRestartBuilder()
                             .setConfig(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.ll
                                 .graceful.restart.rev181112.afi.safi.ll.graceful.restart.ll.graceful.restart

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtilTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtilTest.java
index ca8b4dfb341f8123668a04c5e957f8a429c4c88f..1b62ac4af83153af06deb3fa4e685a99b0bbf941 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtilTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/OpenConfigMappingUtilTest.java
@@ -87,16 +87,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.add.path.capability.AddressFamilies;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.add.path.capability.AddressFamiliesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfigBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalConfigAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalConfigAugmentationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborAddPathsConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborAddPathsConfigBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborPeerGroupConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborPeerGroupConfigBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborTransportConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborTransportConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NetworkInstanceProtocol;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.PeerGroupTransportConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.PeerGroupTransportConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerRole;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv4AddressFamily;
@@ -293,8 +288,8 @@ public class OpenConfigMappingUtilTest {
                         .group.transport.ConfigBuilder().build()).build()).build(), null));
         final PortNumber newPort = new PortNumber(Uint16.valueOf(111));
         final Config portConfig = new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor
-                .group.transport.ConfigBuilder().addAugmentation(NeighborTransportConfig.class,
-                new NeighborTransportConfigBuilder().setRemotePort(newPort).build()).build();
+                .group.transport.ConfigBuilder()
+                    .addAugmentation(new NeighborTransportConfigBuilder().setRemotePort(newPort).build()).build();
         assertEquals(newPort, OpenConfigMappingUtil.getPort(new NeighborBuilder().setTransport(
                 transport.setConfig(portConfig).build()).build(), null));
 
@@ -302,8 +297,8 @@ public class OpenConfigMappingUtilTest {
                 .setTransport(transport.setConfig(portConfig).build()).build(), new PeerGroupBuilder().build()));
 
         final Config portConfigGroup = new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp
-                .neighbor.group.transport.ConfigBuilder().addAugmentation(PeerGroupTransportConfig.class,
-                new PeerGroupTransportConfigBuilder().setRemotePort(newPort).build()).build();
+                .neighbor.group.transport.ConfigBuilder()
+                    .addAugmentation(new PeerGroupTransportConfigBuilder().setRemotePort(newPort).build()).build();
         assertEquals(newPort, OpenConfigMappingUtil.getPort(new NeighborBuilder().build(), new PeerGroupBuilder()
                 .setTransport(transport.setConfig(portConfigGroup).build()).build()));
     }
@@ -331,8 +326,8 @@ public class OpenConfigMappingUtilTest {
         assertEquals(defaultValue, OpenConfigMappingUtil.getAfiSafiWithDefault(afiSafi, true));
 
         final AfiSafi afiSafiIpv6 = new AfiSafiBuilder().setAfiSafiName(IPV6UNICAST.class)
-                .addAugmentation(NeighborAddPathsConfig.class,
-            new NeighborAddPathsConfigBuilder().setReceive(true).setSendMax(SHORT).build()).build();
+                .addAugmentation(new NeighborAddPathsConfigBuilder().setReceive(true).setSendMax(SHORT).build())
+                .build();
         final List<AfiSafi> afiSafiIpv6List = new ArrayList<>();
         afiSafiIpv6List.add(afiSafiIpv6);
 
@@ -362,7 +357,7 @@ public class OpenConfigMappingUtilTest {
         assertEquals(ROUTER_ID.getValue(),
                 OpenConfigMappingUtil.getGlobalClusterIdentifier(configBuilder.build()).getValue());
 
-        configBuilder.addAugmentation(GlobalConfigAugmentation.class, new GlobalConfigAugmentationBuilder()
+        configBuilder.addAugmentation(new GlobalConfigAugmentationBuilder()
                 .setRouteReflectorClusterId(new RrClusterIdType(CLUSTER_ID)).build()).build();
         assertEquals(CLUSTER_ID.getValue(),
                 OpenConfigMappingUtil.getGlobalClusterIdentifier(configBuilder.build()).getValue());
@@ -394,7 +389,7 @@ public class OpenConfigMappingUtilTest {
         assertFalse(OpenConfigMappingUtil.isApplicationPeer(new NeighborBuilder()
                 .setConfig(new ConfigBuilder().build()).build()));
         final Neighbor neighbor = new NeighborBuilder().setConfig(new ConfigBuilder()
-                .addAugmentation(NeighborPeerGroupConfig.class, new NeighborPeerGroupConfigBuilder()
+                .addAugmentation(new NeighborPeerGroupConfigBuilder()
                         .setPeerGroup(OpenConfigMappingUtil.APPLICATION_PEER_GROUP_NAME).build()).build()).build();
         assertTrue(OpenConfigMappingUtil.isApplicationPeer(neighbor));
     }
@@ -441,16 +436,13 @@ public class OpenConfigMappingUtilTest {
     public void toAddPathCapability() {
         final List<AfiSafi> families = new ArrayList<>();
         families.add(new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
-            .addAugmentation(NeighborAddPathsConfig.class,
-                new NeighborAddPathsConfigBuilder()
-                    .setReceive(Boolean.TRUE).setSendMax(ALL_PATHS).build()).build());
+            .addAugmentation(new NeighborAddPathsConfigBuilder()
+                .setReceive(Boolean.TRUE).setSendMax(ALL_PATHS).build()).build());
         families.add(new AfiSafiBuilder().setAfiSafiName(IPV6UNICAST.class)
-            .addAugmentation(NeighborAddPathsConfig.class,
-                new NeighborAddPathsConfigBuilder()
-                    .setReceive(Boolean.FALSE).setSendMax(N_PATHS).build()).build());
+            .addAugmentation(new NeighborAddPathsConfigBuilder()
+                .setReceive(Boolean.FALSE).setSendMax(N_PATHS).build()).build());
         families.add(new AfiSafiBuilder().setAfiSafiName(IPV6LABELLEDUNICAST.class)
-            .addAugmentation(NeighborAddPathsConfig.class,
-                new NeighborAddPathsConfigBuilder().setReceive(Boolean.FALSE).build()).build());
+            .addAugmentation(new NeighborAddPathsConfigBuilder().setReceive(Boolean.FALSE).build()).build());
         final List<AddressFamilies> result = OpenConfigMappingUtil
                 .toAddPathCapability(families, this.tableTypeRegistry);
         assertEquals(FAMILIES, result);

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RIBTestsUtil.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RIBTestsUtil.java
index 31ce30a66ab149fe8b9e0cdae97f643cce3910e9..8ecd87b001bcb7ac53a46199ff322ba86f356c37 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RIBTestsUtil.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RIBTestsUtil.java
@@ -33,7 +33,6 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.t
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV6UNICAST;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAddPathsConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.BgpId;
 import org.opendaylight.yangtools.yang.common.Uint8;
@@ -45,14 +44,14 @@ final class RIBTestsUtil {
 
     static {
         AFISAFIS_IPV4.add(new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
-                .addAugmentation(GlobalAddPathsConfig.class, new GlobalAddPathsConfigBuilder().setReceive(true)
-                        .setSendMax(Uint8.ZERO).build()).build());
+                .addAugmentation(new GlobalAddPathsConfigBuilder().setReceive(true).setSendMax(Uint8.ZERO).build())
+                .build());
     }
 
     static {
         AFISAFIS_IPV6.add(new AfiSafiBuilder().setAfiSafiName(IPV6UNICAST.class)
-                .addAugmentation(GlobalAddPathsConfig.class, new GlobalAddPathsConfigBuilder().setReceive(true)
-                        .setSendMax(Uint8.ZERO).build()).build());
+                .addAugmentation(new GlobalAddPathsConfigBuilder().setReceive(true).setSendMax(Uint8.ZERO).build())
+                .build());
     }
 
     private RIBTestsUtil() {