Use Uint types in openflowjava-extension-eric

A few tests are referencing old type-widened data types, fix that
up.

JIRA: OPNFLWPLUG-1099
Change-Id: Ifab04353aac232a0f17800c377d0752611981f24
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodecTest.java b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodecTest.java
index 0e3ebe5da2c7e34a50e8af77b69200f97bf70688..7eb82bf8bbb4c91fe0f56c9794bd1eb3be708adc 100644 (file)
--- a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodecTest.java
+++ b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDOptionsTypeCodecTest.java
@@ -21,6 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.icmpv6.nd.options.type.grouping.Icmpv6NdOptionsTypeValuesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdOptionsTypeCaseValue;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdOptionsTypeCaseValueBuilder;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 public class Icmpv6NDOptionsTypeCodecTest {
 
@@ -73,7 +74,7 @@ public class Icmpv6NDOptionsTypeCodecTest {
         matchEntryBuilder.setOxmMatchField(Icmpv6NdOptionsType.class);
         matchEntryBuilder.setHasMask(false);
 
-        valuesBuilder.setIcmpv6NdOptionsType((short)1);
+        valuesBuilder.setIcmpv6NdOptionsType(Uint8.ONE);
 
         caseBuilder.setIcmpv6NdOptionsTypeValues(valuesBuilder.build());
         matchEntryBuilder.setMatchEntryValue(caseBuilder.build());

diff --git a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodecTest.java b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodecTest.java
index e3ae5dc098bf45f0e26caad1822fac243d701de3..5138344400e237af934b15afe03bba57f65a5ab1 100644 (file)
--- a/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodecTest.java
+++ b/extension/openflowjava-extension-eric/src/test/java/org/opendaylight/openflowjava/eric/codec/match/Icmpv6NDReservedCodecTest.java
@@ -21,6 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.icmpv6.nd.reserved.grouping.Icmpv6NdReservedValuesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdReservedCaseValue;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.eric.match.rev180730.oxm.container.match.entry.value.Icmpv6NdReservedCaseValueBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class Icmpv6NDReservedCodecTest {
 
@@ -72,7 +73,7 @@ public class Icmpv6NDReservedCodecTest {
         matchEntryBuilder.setOxmMatchField(Icmpv6NdReserved.class);
         matchEntryBuilder.setHasMask(false);
 
-        valuesBuilder.setIcmpv6NdReserved(1L);
+        valuesBuilder.setIcmpv6NdReserved(Uint32.ONE);
         caseBuilder.setIcmpv6NdReservedValues(valuesBuilder.build());
         matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
         return matchEntryBuilder.build();