From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 29 Sep 2020 10:20:47 +0000 (+0200)
Subject: Use uint types in arputil-impl tests
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6beffdbfb74e75f617b6d545f084abc17f388115;p=genius.git

Use uint types in arputil-impl tests

Fix deprecation warnings by using proper uint types.

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

diff --git a/arputil/arputil-impl/src/test/java/org/opendaylight/genius/arputil/test/ArpUtilTest.java b/arputil/arputil-impl/src/test/java/org/opendaylight/genius/arputil/test/ArpUtilTest.java
index 377d6dce0..220493b34 100644
--- a/arputil/arputil-impl/src/test/java/org/opendaylight/genius/arputil/test/ArpUtilTest.java
+++ b/arputil/arputil-impl/src/test/java/org/opendaylight/genius/arputil/test/ArpUtilTest.java
@@ -9,8 +9,7 @@ package org.opendaylight.genius.arputil.test;
 
 import static org.opendaylight.genius.arputil.test.ArpUtilTestUtil.INTERFACE_NAME;
 
-import java.util.Collections;
-import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Future;
 import javax.inject.Inject;
 import org.junit.Assert;
@@ -50,11 +49,9 @@ public class ArpUtilTest extends AbstractConcurrentDataBrokerTest {
                 .setIpAddress(new IpAddress(Ipv4Address.getDefaultInstance("192.168.0.1")))
                 .setMacaddress(new PhysAddress("1F:1F:1F:1F:1F:1F")).build();
 
-        final List<InterfaceAddress> itf = Collections.singletonList(interfaceAddress);
-
         GetMacInput getMacInput = new GetMacInputBuilder()
                 .setIpaddress(new IpAddress(Ipv4Address.getDefaultInstance("192.168.0.2")))
-                .setInterfaceAddress(itf).build();
+                .setInterfaceAddress(Map.of(interfaceAddress.key(), interfaceAddress)).build();
 
         PacketReceived packetReceived = ArpUtilTestUtil.createPayload(0); //request payload
 
diff --git a/arputil/arputil-impl/src/test/java/org/opendaylight/genius/arputil/test/ArpUtilTestUtil.java b/arputil/arputil-impl/src/test/java/org/opendaylight/genius/arputil/test/ArpUtilTestUtil.java
index 2c6566d63..44e385483 100644
--- a/arputil/arputil-impl/src/test/java/org/opendaylight/genius/arputil/test/ArpUtilTestUtil.java
+++ b/arputil/arputil-impl/src/test/java/org/opendaylight/genius/arputil/test/ArpUtilTestUtil.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.genius.arputil.test;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef;
@@ -22,12 +21,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Se
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.packet.received.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 public final class ArpUtilTestUtil {
 
-    public static final BigInteger DPN_ID = BigInteger.ONE;
-    public static final BigInteger META_DATA = BigInteger.TEN;
-    public static final long PORT_NUMBER = 2;
+    public static final Uint64 DPN_ID = Uint64.ONE;
+    public static final Uint64 META_DATA = Uint64.TEN;
+    public static final Uint32 PORT_NUMBER = Uint32.TWO;
     public static final String URI = "2";
     public static final String INTERFACE_NAME = "23701c04-7e58-4c65-9425-78a80d49a218";
     private static final String[] OP_CODE = new String[]{"0 1", "0 2"}; //array to store opCodes
@@ -37,7 +39,6 @@ public final class ArpUtilTestUtil {
 
     public static PacketReceived createPayload(int oc) {
 
-        final short ID = 2;
         byte[] payload = bytePayload("1F 1F 1F 1F 1F 1F",                               // Destination MAC
                                      "00 01 02 03 04 05",                               // Source MAC
                                      "08 06",                                           // Ethernet type
@@ -54,7 +55,7 @@ public final class ArpUtilTestUtil {
         InstanceIdentifier<Node> iid = InstanceIdentifier.builder(Nodes.class)
                 .child(Node.class, new NodeKey(new NodeId("openflow:12345"))).build();
 
-        return new PacketReceivedBuilder().setPacketInReason(SendToController.class).setTableId(new TableId(ID))
+        return new PacketReceivedBuilder().setPacketInReason(SendToController.class).setTableId(new TableId(Uint8.TWO))
                 .setPayload(payload).setIngress(new NodeConnectorRef(iid))
                 .setMatch(new MatchBuilder().setMetadata(new MetadataBuilder().setMetadata(META_DATA).build()).build())
                 .build();