Switch PCEP to no-zone ip addresses

[bgpcep.git] / pcep / topology / topology-provider / src / test / java / org / opendaylight / bgpcep / pcep / topology / provider / Stateful07TopologySessionListenerTest.java

diff --git a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
index 655d8e66756958110e7f2ac6cae5b7c22a4219f3..ebc8ae2911fcdda44de84315a5d81d1a6b99504f 100755 (executable)
--- a/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
+++ b/pcep/topology/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java
@@ -39,7 +39,7 @@ import org.opendaylight.protocol.pcep.pcc.mock.spi.MsgBuilderUtil;
 import org.opendaylight.protocol.pcep.spi.AbstractMessageParser;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.protocol.util.CheckUtil;
-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.Ipv4AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.topology.rev140113.NetworkTopologyRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev171025.Pcinitiate;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.crabbe.initiated.rev171025.Stateful1;
@@ -179,13 +179,13 @@ public class Stateful07TopologySessionListenerTest
         checkEquals(() -> assertEquals(1, listenerState.getDelegatedLspsCount().intValue()));
         checkEquals(() -> assertTrue(this.listener.isSessionSynchronized()));
         checkEquals(() -> assertTrue(listenerState.getMessages()
-                .getAugmentation(StatefulMessagesStatsAug.class).getLastReceivedRptMsgTimestamp() > 0));
+                .augmentation(StatefulMessagesStatsAug.class).getLastReceivedRptMsgTimestamp() > 0));
         checkEquals(() -> assertEquals(2, listenerState.getMessages()
-                .getAugmentation(StatefulMessagesStatsAug.class).getReceivedRptMsgCount().intValue()));
+                .augmentation(StatefulMessagesStatsAug.class).getReceivedRptMsgCount().intValue()));
         checkEquals(() -> assertEquals(1, listenerState.getMessages()
-                .getAugmentation(StatefulMessagesStatsAug.class).getSentInitMsgCount().intValue()));
+                .augmentation(StatefulMessagesStatsAug.class).getSentInitMsgCount().intValue()));
         checkEquals(() -> assertEquals(0, listenerState.getMessages()
-                .getAugmentation(StatefulMessagesStatsAug.class).getSentUpdMsgCount().intValue()));
+                .augmentation(StatefulMessagesStatsAug.class).getSentUpdMsgCount().intValue()));
 
         // update-lsp
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev171025.update.lsp.args
@@ -223,7 +223,7 @@ public class Stateful07TopologySessionListenerTest
             assertEquals(1, listenerState.getDelegatedLspsCount().intValue());
             assertTrue(this.listener.isSessionSynchronized());
             final StatefulMessagesStatsAug statefulstate = listenerState.getMessages()
-                    .getAugmentation(StatefulMessagesStatsAug.class);
+                    .augmentation(StatefulMessagesStatsAug.class);
             assertTrue(statefulstate.getLastReceivedRptMsgTimestamp() > 0);
             assertEquals(3, statefulstate.getReceivedRptMsgCount().intValue());
             assertEquals(1, statefulstate.getSentInitMsgCount().intValue());
@@ -232,7 +232,7 @@ public class Stateful07TopologySessionListenerTest
             assertTrue(replyTime.getAverageTime() > 0);
             assertTrue(replyTime.getMaxTime() > 0);
             final StatefulCapabilitiesStatsAug statefulCapabilities = listenerState
-                    .getPeerCapabilities().getAugmentation(StatefulCapabilitiesStatsAug.class);
+                    .getPeerCapabilities().augmentation(StatefulCapabilitiesStatsAug.class);
             assertFalse(statefulCapabilities.isActive());
             assertTrue(statefulCapabilities.isInstantiation());
             assertTrue(statefulCapabilities.isStateful());
@@ -277,13 +277,13 @@ public class Stateful07TopologySessionListenerTest
         checkEquals(() -> assertEquals(0, listenerState.getDelegatedLspsCount().intValue()));
         checkEquals(() -> assertTrue(this.listener.isSessionSynchronized()));
         checkEquals(() -> assertTrue(listenerState.getMessages()
-                .getAugmentation(StatefulMessagesStatsAug.class).getLastReceivedRptMsgTimestamp() > 0));
+                .augmentation(StatefulMessagesStatsAug.class).getLastReceivedRptMsgTimestamp() > 0));
         checkEquals(() -> assertEquals(4, listenerState.getMessages()
-                .getAugmentation(StatefulMessagesStatsAug.class).getReceivedRptMsgCount().intValue()));
+                .augmentation(StatefulMessagesStatsAug.class).getReceivedRptMsgCount().intValue()));
         checkEquals(() -> assertEquals(2, listenerState.getMessages()
-                .getAugmentation(StatefulMessagesStatsAug.class).getSentInitMsgCount().intValue()));
+                .augmentation(StatefulMessagesStatsAug.class).getSentInitMsgCount().intValue()));
         checkEquals(() -> assertEquals(1, listenerState.getMessages()
-                .getAugmentation(StatefulMessagesStatsAug.class).getSentUpdMsgCount().intValue()));
+                .augmentation(StatefulMessagesStatsAug.class).getSentUpdMsgCount().intValue()));
     }
 
     @Test
@@ -648,8 +648,8 @@ public class Stateful07TopologySessionListenerTest
     private AddLspInput createAddLspInput() {
         final ArgumentsBuilder argsBuilder = new ArgumentsBuilder();
         final Ipv4CaseBuilder ipv4Builder = new Ipv4CaseBuilder();
-        ipv4Builder.setIpv4(new Ipv4Builder().setSourceIpv4Address(new Ipv4Address(this.testAddress))
-                .setDestinationIpv4Address(new Ipv4Address(this.testAddress)).build());
+        ipv4Builder.setIpv4(new Ipv4Builder().setSourceIpv4Address(new Ipv4AddressNoZone(this.testAddress))
+                .setDestinationIpv4Address(new Ipv4AddressNoZone(this.testAddress)).build());
         argsBuilder.setEndpointsObj(new EndpointsObjBuilder().setAddressFamily(ipv4Builder.build()).build());
         argsBuilder.setEro(createEroWithIpPrefixes(Lists.newArrayList(this.eroIpPrefix)));
         argsBuilder.addAugmentation(Arguments2.class, new Arguments2Builder().setLsp(new LspBuilder()