Code Review / bgpcep.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump upstreams to 2022.09
[bgpcep.git] / bgp / rib-impl / src / test / java / org / opendaylight / protocol / bgp / rib / impl / SynchronizationTest.java
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 7cb1c7ad181b7b24aee4a62ae3e0aaa406d8ef5c..353d79fa0aab8d59e0209c42e7b3b56044833ba7 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
@@ -11,31 +11,30 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.google.common.collect.Sets;
-import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkstateAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkstateSubsequentAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.UpdateBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.path.attributes.AttributesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.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.linkstate.rev200120.LinkstateAddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.LinkstateSubsequentAddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.Update;
+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.AttributesReachBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.attributes.reach.MpReachNlriBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv6AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.UnicastSubsequentAddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv4AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv6AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.UnicastSubsequentAddressFamily;
 
 public class SynchronizationTest {
 
     private final TablesKey ipv4
-            = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
+            = new TablesKey(Ipv4AddressFamily.VALUE, UnicastSubsequentAddressFamily.VALUE);
     private final TablesKey linkstate
-            = new TablesKey(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class);
+            = new TablesKey(LinkstateAddressFamily.VALUE, LinkstateSubsequentAddressFamily.VALUE);
 
     private BGPSynchronization bs;
 
@@ -51,65 +50,64 @@ public class SynchronizationTest {
 
     @Before
     public void setUp() {
-        this.listener = new SimpleSessionListener();
-        this.ipv4m = new UpdateBuilder()
-                .setNlri(Collections.singletonList(new NlriBuilder()
-                .setPrefix(new Ipv4Prefix("1.1.1.1/32")).build()))
+        listener = new SimpleSessionListener();
+        ipv4m = new UpdateBuilder()
+                .setNlri(List.of(new NlriBuilder().setPrefix(new Ipv4Prefix("1.1.1.1/32")).build()))
                 .build();
 
-        MpReachNlriBuilder mpBuilder = new MpReachNlriBuilder();
-        mpBuilder.setAfi(Ipv6AddressFamily.class);
-        mpBuilder.setSafi(UnicastSubsequentAddressFamily.class);
+        MpReachNlriBuilder mpBuilder = new MpReachNlriBuilder()
+            .setAfi(Ipv6AddressFamily.VALUE)
+            .setSafi(UnicastSubsequentAddressFamily.VALUE);
 
-        AttributesBuilder paBuilder = new AttributesBuilder().addAugmentation(Attributes1.class,
-                new Attributes1Builder().setMpReachNlri(mpBuilder.build()).build());
+        AttributesBuilder paBuilder = new AttributesBuilder()
+                .addAugmentation(new AttributesReachBuilder().setMpReachNlri(mpBuilder.build()).build());
 
-        this.ipv6m = new UpdateBuilder().setAttributes(paBuilder.build()).build();
+        ipv6m = new UpdateBuilder().setAttributes(paBuilder.build()).build();
 
-        mpBuilder = new MpReachNlriBuilder();
-        mpBuilder.setAfi(LinkstateAddressFamily.class);
-        mpBuilder.setSafi(LinkstateSubsequentAddressFamily.class);
+        mpBuilder = new MpReachNlriBuilder()
+            .setAfi(LinkstateAddressFamily.VALUE)
+            .setSafi(LinkstateSubsequentAddressFamily.VALUE);
 
-        paBuilder = new AttributesBuilder().addAugmentation(Attributes1.class,
-                new Attributes1Builder().setMpReachNlri(mpBuilder.build()).build());
+        paBuilder = new AttributesBuilder()
+                .addAugmentation(new AttributesReachBuilder().setMpReachNlri(mpBuilder.build()).build());
 
-        this.lsm = new UpdateBuilder().setAttributes(paBuilder.build()).build();
+        lsm = new UpdateBuilder().setAttributes(paBuilder.build()).build();
 
-        this.eorm = new UpdateBuilder().build();
+        eorm = new UpdateBuilder().build();
 
-        this.bs = new BGPSynchronization(this.listener, Sets.newHashSet(this.ipv4, this.linkstate));
+        bs = new BGPSynchronization(listener, Set.of(ipv4, linkstate));
     }
 
     @Test
     public void testSynchronize() {
         // simulate sync
-        this.bs.updReceived(this.ipv6m);
-        this.bs.updReceived(this.ipv4m);
-        this.bs.updReceived(this.lsm);
-        this.bs.kaReceived(); // nothing yet
-        assertFalse(this.bs.syncStorage.get(this.linkstate).getEor());
-        assertFalse(this.bs.syncStorage.get(this.ipv4).getEor());
-        this.bs.updReceived(this.ipv4m);
-        this.bs.kaReceived(); // linkstate
-        assertTrue(this.bs.syncStorage.get(this.linkstate).getEor());
-        this.bs.kaReceived(); // ipv4 sync
-        assertTrue(this.bs.syncStorage.get(this.ipv4).getEor());
+        bs.updReceived(ipv6m);
+        bs.updReceived(ipv4m);
+        bs.updReceived(lsm);
+        bs.kaReceived(); // nothing yet
+        assertFalse(bs.syncStorage.get(linkstate).getEor());
+        assertFalse(bs.syncStorage.get(ipv4).getEor());
+        bs.updReceived(ipv4m);
+        bs.kaReceived(); // linkstate
+        assertTrue(bs.syncStorage.get(linkstate).getEor());
+        bs.kaReceived(); // ipv4 sync
+        assertTrue(bs.syncStorage.get(ipv4).getEor());
     }
 
     @Test
     public void testSynchronizeWithEOR() {
-        this.bs.updReceived(this.ipv4m);
-        this.bs.updReceived(this.lsm);
+        bs.updReceived(ipv4m);
+        bs.updReceived(lsm);
         // Ipv4 Unicast synchronized by EOR message
-        assertFalse(this.bs.syncStorage.get(this.ipv4).getEor());
-        this.bs.updReceived(this.eorm);
-        assertTrue(this.bs.syncStorage.get(this.ipv4).getEor());
+        assertFalse(bs.syncStorage.get(ipv4).getEor());
+        bs.updReceived(eorm);
+        assertTrue(bs.syncStorage.get(ipv4).getEor());
         // Linkstate not synchronized yet
-        assertFalse(this.bs.syncStorage.get(this.linkstate).getEor());
-        this.bs.kaReceived();
+        assertFalse(bs.syncStorage.get(linkstate).getEor());
+        bs.kaReceived();
         // no message sent by BGPSychchronization
-        assertEquals(0, this.listener.getListMsg().size());
-        this.bs.kaReceived();
-        assertTrue(this.bs.syncStorage.get(this.linkstate).getEor());
+        assertEquals(0, listener.getListMsg().size());
+        bs.kaReceived();
+        assertTrue(bs.syncStorage.get(linkstate).getEor());
     }
 }
BGP/PCEP protocol library