Cleanup deprecation warnings in bgp/cli

Eliminate some leftovers from codegen change.

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

diff --git a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtilsTest.java b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtilsTest.java
index 6eed4e49d6fe0629b65fc8881b13116e5d5072ed..f4253309aeb0420a5e2ac89df96b77e07744598e 100644 (file)
--- a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtilsTest.java
+++ b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtilsTest.java
@@ -23,7 +23,6 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.g
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.GlobalBuilder;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAfiSafiStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.GlobalAfiSafiStateAugmentationBuilder;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
@@ -63,17 +62,18 @@ public class GlobalStateCliUtilsTest {
                 new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp
                         .common.afi.safi.list.afi.safi.StateBuilder();
         if (withStateAug) {
-            stateBuilder.addAugmentation(GlobalAfiSafiStateAugmentation.class,
-                    new GlobalAfiSafiStateAugmentationBuilder()
-                        .setTotalPaths(Uint32.valueOf(3))
-                        .setTotalPrefixes(Uint32.valueOf(4))
-                        .build());
+            stateBuilder.addAugmentation(new GlobalAfiSafiStateAugmentationBuilder()
+                .setTotalPaths(Uint32.valueOf(3))
+                .setTotalPrefixes(Uint32.valueOf(4))
+                .build());
         }
 
-
-        builder.setAfiSafis(new AfiSafisBuilder()
-                .setAfiSafi(Collections.singletonList(new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
-                        .setState(stateBuilder.build()).build())).build());
-        return builder;
+        return builder
+                .setAfiSafis(new AfiSafisBuilder()
+                    .setAfiSafi(Collections.singletonList(new AfiSafiBuilder()
+                        .setAfiSafiName(IPV4UNICAST.class)
+                        .setState(stateBuilder.build())
+                        .build()))
+                    .build());
     }
 }
\ No newline at end of file

diff --git a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtilsTest.java b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtilsTest.java
index fcd6e773185f8eac2c4ff96e1ef6b59e3fbaae0c..e7a106d1ead3a7c5d5e9e28db77c7787e7bb130c 100644 (file)
--- a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtilsTest.java
+++ b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtilsTest.java
@@ -16,6 +16,7 @@ import java.io.PrintStream;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
+import java.util.Map;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafi;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafiBuilder;
@@ -35,15 +36,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.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.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Timeticks;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.BgpNeighborStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.BgpNeighborStateAugmentationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborAfiSafiStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborAfiSafiStateAugmentationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborStateAugmentationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborTimersStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborTimersStateAugmentationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborTransportStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.NeighborTransportStateAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.network.instances.network.instance.protocols.protocol.bgp.neighbors.neighbor.state.MessagesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.network.instances.network.instance.protocols.protocol.bgp.neighbors.neighbor.state.messages.Received;
@@ -67,15 +63,14 @@ public class NeighborStateCliUtilsTest {
                 .list.afi.safi.StateBuilder builder = new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp
                 .multiprotocol.rev151009.bgp.common.afi.safi.list.afi.safi.StateBuilder();
 
-        builder.addAugmentation(NeighborAfiSafiStateAugmentation.class, new NeighborAfiSafiStateAugmentationBuilder()
-                .setActive(false).build());
+        builder.addAugmentation(new NeighborAfiSafiStateAugmentationBuilder().setActive(false).build());
         final AfiSafi afiSafi = new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
                 .setState(builder.build()).build();
 
         return new NeighborBuilder()
                 .setNeighborAddress(NEIGHBOR_IP_ADDRESS)
                 .setState(new StateBuilder().build())
-                .setAfiSafis(new AfiSafisBuilder().setAfiSafi(Collections.singletonList(afiSafi)).build())
+                .setAfiSafis(new AfiSafisBuilder().setAfiSafi(Map.of(afiSafi.key(), afiSafi)).build())
                 .build();
     }
 
@@ -89,8 +84,7 @@ public class NeighborStateCliUtilsTest {
     @Test
     public void testEmptyNeighborStateCli() throws IOException {
         final Neighbor neighbor = createBasicNeighbor();
-        NeighborStateCliUtils.displayNeighborOperationalState(NEIGHBOR_ADDRESS,
-                neighbor, this.stream);
+        NeighborStateCliUtils.displayNeighborOperationalState(NEIGHBOR_ADDRESS, neighbor, this.stream);
 
         final String expected = Resources.toString(getClass().getClassLoader().getResource("empty-neighbor.txt"),
             StandardCharsets.UTF_8);
@@ -99,26 +93,26 @@ public class NeighborStateCliUtilsTest {
 
     @Test
     public void testFullNeighborStateCli() throws IOException {
-        final org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi
-                .list.afi.safi.StateBuilder builder = new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp
-                .multiprotocol.rev151009.bgp.common.afi.safi.list.afi.safi.StateBuilder();
-
-        builder.addAugmentation(NeighborAfiSafiStateAugmentation.class, new NeighborAfiSafiStateAugmentationBuilder()
-                .setActive(Boolean.TRUE)
-                .setPrefixes(new PrefixesBuilder()
-                    .setInstalled(Uint32.ONE)
-                    .setReceived(Uint32.ONE)
-                    .setSent(Uint32.TWO).build())
-                .build());
-        final AfiSafi afiSafi = new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
-                .setState(builder.build()).build();
+        final AfiSafi afiSafi = new AfiSafiBuilder()
+                .setAfiSafiName(IPV4UNICAST.class)
+                .setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp
+                    .common.afi.safi.list.afi.safi.StateBuilder()
+                        .addAugmentation(new NeighborAfiSafiStateAugmentationBuilder()
+                            .setActive(Boolean.TRUE)
+                            .setPrefixes(new PrefixesBuilder()
+                                .setInstalled(Uint32.ONE)
+                                .setReceived(Uint32.ONE)
+                                .setSent(Uint32.TWO).build())
+                            .build())
+                    .build())
+                .build();
 
 
-        final StateBuilder stateBuilder = new StateBuilder();
-        stateBuilder.addAugmentation(NeighborStateAugmentation.class,
-                new NeighborStateAugmentationBuilder()
-                        .setSupportedCapabilities(Collections.singletonList(ADDPATHS.class))
-                        .setSessionState(BgpNeighborState.SessionState.ACTIVE).build());
+        final StateBuilder stateBuilder = new StateBuilder()
+                .addAugmentation(new NeighborStateAugmentationBuilder()
+                    .setSupportedCapabilities(Collections.singletonList(ADDPATHS.class))
+                    .setSessionState(BgpNeighborState.SessionState.ACTIVE)
+                    .build());
 
         final Received received = new ReceivedBuilder()
                 .setNOTIFICATION(Uint64.ONE)
@@ -130,34 +124,35 @@ public class NeighborStateCliUtilsTest {
                 .setUPDATE(Uint64.ONE)
                 .build();
 
-        stateBuilder.addAugmentation(BgpNeighborStateAugmentation.class,
-                new BgpNeighborStateAugmentationBuilder()
-                        .setMessages(new MessagesBuilder()
-                                .setReceived(received)
-                                .setSent(sent)
-                                .build())
-                        .build());
-
-        final Transport transport = new TransportBuilder().setState(new org.opendaylight.yang.gen.v1.http.openconfig.net
-                .yang.bgp.rev151009.bgp.neighbor.group.transport.StateBuilder()
-                .addAugmentation(NeighborTransportStateAugmentation.class,
-                        new NeighborTransportStateAugmentationBuilder()
-                                .setRemoteAddress(NEIGHBOR_IP_ADDRESS)
-                                .setLocalPort(new PortNumber(Uint16.valueOf(1234)))
-                                .setRemotePort(new PortNumber(Uint16.valueOf(4321)))
-                                .build())
-                .build()).build();
-        final Timers timers = new TimersBuilder().setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang
-                .bgp.rev151009.bgp.neighbor.group.timers.StateBuilder()
-                .addAugmentation(NeighborTimersStateAugmentation.class,
-                        new NeighborTimersStateAugmentationBuilder()
-                                .setNegotiatedHoldTime(BigDecimal.TEN)
-                                .setUptime(new Timeticks(Uint32.valueOf(600)))
-                                .build())
-                .build()).build();
+        stateBuilder.addAugmentation(new BgpNeighborStateAugmentationBuilder()
+            .setMessages(new MessagesBuilder()
+                .setReceived(received)
+                .setSent(sent)
+                .build())
+            .build());
+
+        final Transport transport = new TransportBuilder()
+                .setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group
+                    .transport.StateBuilder()
+                        .addAugmentation(new NeighborTransportStateAugmentationBuilder()
+                            .setRemoteAddress(NEIGHBOR_IP_ADDRESS)
+                            .setLocalPort(new PortNumber(Uint16.valueOf(1234)))
+                            .setRemotePort(new PortNumber(Uint16.valueOf(4321)))
+                            .build())
+                        .build())
+                .build();
+        final Timers timers = new TimersBuilder()
+                .setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group
+                    .timers.StateBuilder()
+                        .addAugmentation(new NeighborTimersStateAugmentationBuilder()
+                            .setNegotiatedHoldTime(BigDecimal.TEN)
+                            .setUptime(new Timeticks(Uint32.valueOf(600)))
+                            .build())
+                        .build())
+                .build();
         final Neighbor neighbor = new NeighborBuilder()
                 .setState(stateBuilder.build())
-                .setAfiSafis(new AfiSafisBuilder().setAfiSafi(Collections.singletonList(afiSafi)).build())
+                .setAfiSafis(new AfiSafisBuilder().setAfiSafi(Map.of(afiSafi.key(), afiSafi)).build())
                 .setTransport(transport)
                 .setTimers(timers)
                 .build();

diff --git a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtilsTest.java b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtilsTest.java
index 6d37d05bd94b70dd762687f3470c8b07ab8868c3..af1c10df10ce1ed19e6838e3936539241d907c92 100644 (file)
--- a/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtilsTest.java
+++ b/bgp/cli/src/test/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtilsTest.java
@@ -17,7 +17,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.peer.group.PeerGroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.PeerGroupStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180329.PeerGroupStateAugmentationBuilder;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
@@ -39,16 +38,16 @@ public final class PeerGroupStateCliUtilsTest {
 
     @Test
     public void testPeerGroupStateCli() throws IOException {
-        final PeerGroupBuilder peerGroup = new PeerGroupBuilder().setPeerGroupName(TEST_GROUP);
-
-        final PeerGroupStateAugmentation groupState = new PeerGroupStateAugmentationBuilder()
-                .setTotalPrefixes(Uint32.ONE)
-                .setTotalPaths(Uint32.TWO)
-                .build();
-
-        peerGroup.setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group
-                .StateBuilder().addAugmentation(PeerGroupStateAugmentation.class, groupState).build());
-        PeerGroupStateCliUtils.displayPeerOperationalState(Collections.singletonList(peerGroup.build()), this.stream);
+        PeerGroupStateCliUtils.displayPeerOperationalState(Collections.singletonList(new PeerGroupBuilder()
+            .setPeerGroupName(TEST_GROUP)
+            .setState(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group
+                .StateBuilder()
+                    .addAugmentation(new PeerGroupStateAugmentationBuilder()
+                        .setTotalPrefixes(Uint32.ONE)
+                        .setTotalPaths(Uint32.TWO)
+                        .build())
+                    .build())
+            .build()), this.stream);
 
         final String expected = Resources.toString(getClass().getClassLoader().getResource("peer-group.txt"),
             StandardCharsets.UTF_8);