Migrate isFoo() callers

[lispflowmapping.git] / integrationtest / src / test / java / org / opendaylight / lispflowmapping / integrationtest / MappingServiceIntegrationTestUtil.java

diff --git a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTestUtil.java b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTestUtil.java
index a52e42a3adc1e614a1e7a94ed2bffba4b04fcba7..e8acc4000fb5a316996663a23d11960181b46db3 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTestUtil.java
+++ b/integrationtest/src/test/java/org/opendaylight/lispflowmapping/integrationtest/MappingServiceIntegrationTestUtil.java
@@ -66,6 +66,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.ma
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequest.SourceEidBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequestnotification.MapRequestBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
+import org.opendaylight.yangtools.yang.common.Uint8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -304,7 +305,7 @@ final class MappingServiceIntegrationTestUtil {
     static void assertNoMoreSMRs(DatagramSocket datagramSocket, IMappingService mappingService) {
         try {
             MapRequest mr = receiveMapRequest(datagramSocket, SHORT_SOCKET_TIMEOUT);
-            if (mr.isSmr()) {
+            if (mr.getSmr()) {
                 if (mappingService != null) {
                     printMapCacheState(mappingService);
                 }
@@ -378,7 +379,7 @@ final class MappingServiceIntegrationTestUtil {
             while (i < count) {
                 MapRequest mapRequest = receiveMapRequest(datagramSocket, DEFAULT_SOCKET_TIMEOUT);
                 LOG.trace("Solicit Map-Request: {}", mapRequest);
-                assertEquals(true, mapRequest.isSmr());
+                assertEquals(true, mapRequest.getSmr());
                 if (mapRequest.getEidItem().isEmpty()) {
                     fail("Empty SMR received (no EID record)!");
                 }
@@ -500,7 +501,8 @@ final class MappingServiceIntegrationTestUtil {
                 .setSourceEid(new SourceEidBuilder().setEid(DEFAULT_IPV4_EID).build())
                 .setItrRloc(getDefaultItrRlocList(DEFAULT_IPV4_ITR_RLOC));
 
-        mrBuilder.getEidItem().add(new EidItemBuilder().setEid(eid).build());
+        mrBuilder.getEidItem()
+                .add(new EidItemBuilder().setEidItemId(LispAddressStringifier.getString(eid)).setEid(eid).build());
 
         return mrBuilder;
     }
@@ -518,7 +520,7 @@ final class MappingServiceIntegrationTestUtil {
 
         final List<ItrRloc> itrRlocList = new ArrayList<>();
         final ItrRloc itrRloc = new ItrRlocBuilder()
-                .setKey(new ItrRlocKey(LispAddressStringifier.getString(rloc)))
+                .withKey(new ItrRlocKey(LispAddressStringifier.getString(rloc)))
                 .setItrRlocId(LispAddressStringifier.getString(rloc))
                 .setRloc(rloc).build();
         itrRlocList.add(itrRloc);
@@ -575,8 +577,7 @@ final class MappingServiceIntegrationTestUtil {
      */
     static MappingRecordItemBuilder getDefaultMappingRecordItemBuilder(Eid eid, Rloc rloc) {
         return new MappingRecordItemBuilder()
-                .setMappingRecordItemId("mapping-record-item-id")
-                .setKey(new MappingRecordItemKey("mapping-record-item-key"))
+                .withKey(new MappingRecordItemKey(LispAddressStringifier.getString(eid)))
                 .setMappingRecord(getDefaultMappingRecordBuilder(eid, rloc).build());
     }
 
@@ -650,13 +651,13 @@ final class MappingServiceIntegrationTestUtil {
 
         return new LocatorRecordBuilder()
                 .setLocalLocator(true)
-                .setMulticastPriority((short) 255)
-                .setMulticastWeight((short) 0)
-                .setPriority((short) 1)
+                .setMulticastPriority(Uint8.valueOf(255))
+                .setMulticastWeight(Uint8.valueOf(0))
+                .setPriority(Uint8.valueOf(1))
                 .setRlocProbed(false)
                 .setRouted(true)
-                .setWeight((short) 1)
-                .setKey(new LocatorRecordKey(LispAddressStringifier.getString(rloc)))
+                .setWeight(Uint8.valueOf(1))
+                .withKey(new LocatorRecordKey(LispAddressStringifier.getString(rloc)))
                 .setRloc(rloc);
     }