Migrate openflowplugin-extension-nicira to use Uint types

There are a few references to old methods in the tests, migrate
them. We do not migrate production code yet, so we have
cross-testing.

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

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java
index 88bcbf27a2655cfea8c26d4d292c763dbcede8f9..04cf1e3f247bd535bd0dc4ce3ae6c9af5662870a 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/action/ConntrackConvertorTest.java
@@ -33,6 +33,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.ofpact.actions.ofpact.actions.NxActionNatCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.ofpact.actions.ofpact.actions.nx.action.nat._case.NxActionNat;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.ofpact.actions.ofpact.actions.nx.action.nat._case.NxActionNatBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Test for {@link ConntrackConvertor}.
@@ -50,21 +53,21 @@ public class ConntrackConvertorTest {
     public void testConvertToOfJava() {
 
         final NxActionNatBuilder nxActionNatBuilder = new NxActionNatBuilder()
-                .setFlags(1)
-                .setRangePresent(2)
+                .setFlags(Uint16.ONE)
+                .setRangePresent(Uint16.TWO)
                 .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"))
                 .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.10.0"))
-                .setPortMin(3000)
-                .setPortMax(4000);
+                .setPortMin(Uint16.valueOf(3000))
+                .setPortMax(Uint16.valueOf(4000));
         final CtActionsBuilder ctActionsBuilder = new CtActionsBuilder().setOfpactActions(new NxActionNatCaseBuilder()
                 .setNxActionNat(nxActionNatBuilder.build()).build());
         List<CtActions> ctAction = new ArrayList<>();
         ctAction.add(ctActionsBuilder.build());
         final NxConntrackBuilder nxConntrackBuilder = new NxConntrackBuilder()
-                .setConntrackZone(1)
-                .setFlags(1)
-                .setRecircTable((short) 1)
-                .setZoneSrc(1L)
+                .setConntrackZone(Uint16.ONE)
+                .setFlags(Uint16.ONE)
+                .setRecircTable(Uint8.ONE)
+                .setZoneSrc(Uint32.ONE)
                 .setCtActions(ctAction);
 
         final NxActionConntrackNodesNodeTableFlowWriteActionsCaseBuilder nxActionConntrackBuilder =
@@ -108,12 +111,12 @@ public class ConntrackConvertorTest {
             .nx.action.nat._case.NxActionNatBuilder nxActionNatBuilder = new org.opendaylight.yang.gen.v1.urn
             .opendaylight.openflowjava.nx.action.rev140421.ofpact.actions.ofpact.actions.nx.action.nat._case
             .NxActionNatBuilder()
-            .setFlags(1)
-            .setRangePresent(2)
+            .setFlags(Uint16.ONE)
+            .setRangePresent(Uint16.TWO)
             .setIpAddressMin(IpAddressBuilder.getDefaultInstance("192.168.0.0"))
             .setIpAddressMax(IpAddressBuilder.getDefaultInstance("192.168.10.0"))
-            .setPortMin(3000)
-            .setPortMax(4000);
+            .setPortMin(Uint16.valueOf(3000))
+            .setPortMax(Uint16.valueOf(4000));
         org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping
             .nx.action.conntrack.CtActionsBuilder ctActionsBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight
             .openflowjava.nx.action.rev140421.ofj.nx.action.conntrack.grouping.nx.action.conntrack.CtActionsBuilder()
@@ -124,10 +127,10 @@ public class ConntrackConvertorTest {
             .grouping.nx.action.conntrack.CtActions> ctActions = new ArrayList<>();
         ctActions.add(ctActionsBuilder.build());
         final NxActionConntrackBuilder nxActionConntrackBuilder = new NxActionConntrackBuilder()
-                .setConntrackZone(1)
-                .setFlags(1)
-                .setRecircTable((short) 1)
-                .setZoneSrc(1L)
+                .setConntrackZone(Uint16.ONE)
+                .setFlags(Uint16.ONE)
+                .setRecircTable(Uint8.ONE)
+                .setZoneSrc(Uint32.ONE)
                 .setCtActions(ctActions);
 
         final ActionConntrackBuilder actionConntrackBuilder = new ActionConntrackBuilder()

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertorTest.java
index e76d64a4602ee5e1862daeddc99bb760a257581d..da097b0857b20989fe95df7743cfa85b124fe150 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/ArpOpConvertorTest.java
@@ -32,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmOfArpOpKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of.arp.op.grouping.NxmOfArpOpBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,7 +59,7 @@ public class ArpOpConvertorTest {
     @Test
     public void testConvertToOFJava() {
         final NxmOfArpOpBuilder nxmOfArpOpBuilder = new NxmOfArpOpBuilder()
-                .setValue(2);
+                .setValue(Uint16.TWO);
         final NxAugMatchRpcAddFlowBuilder nxAugMatchRpcAddFlowBuilder = new NxAugMatchRpcAddFlowBuilder();
         nxAugMatchRpcAddFlowBuilder.setNxmOfArpOp(nxmOfArpOpBuilder.build());
 
@@ -74,7 +75,7 @@ public class ArpOpConvertorTest {
     @Test
     public void testConvertFromOFJava() {
         final ArpOpBuilder arpOpBuilder = new ArpOpBuilder()
-                .setOpCode(2);
+                .setOpCode(Uint16.TWO);
         final ArpOpCaseBuilder arpOpCaseBuilder = new ArpOpCaseBuilder()
                 .setArpOp(arpOpBuilder.build());
         final ArpOpCase arpOpCase = arpOpCaseBuilder.build();

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertorTest.java
index 13387fcfc9a0cdbc78646380828c385c2b166a87..5f3d6928cfffd8de1fdac8a2725a26af480ca359 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtStateConvertorTest.java
@@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxCtStateKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.ct.state.grouping.NxmNxCtStateBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Test for {@link CtStateConvertor}.
@@ -49,8 +50,8 @@ public class CtStateConvertorTest {
     public void setUp() {
 
         final NxmNxCtStateBuilder nxmNxCtStateBuilder = new NxmNxCtStateBuilder()
-                .setCtState(1L)
-                .setMask(2L);
+                .setCtState(Uint32.ONE)
+                .setMask(Uint32.TWO);
         final NxAugMatchNodesNodeTableFlowBuilder nxAugMatchNotifUpdateFlowStatsBuilder =
                 new NxAugMatchNodesNodeTableFlowBuilder();
         nxAugMatchNotifUpdateFlowStatsBuilder.setNxmNxCtState(nxmNxCtStateBuilder.build());
@@ -75,8 +76,8 @@ public class CtStateConvertorTest {
     public void testConvert1() {
 
         final CtStateValuesBuilder ctStateValuesBuilder = new CtStateValuesBuilder()
-                .setCtState(3L)
-                .setMask(4L);
+                .setCtState(Uint32.valueOf(3))
+                .setMask(Uint32.valueOf(4));
         final CtStateCaseValueBuilder ctStateCaseValueBuilder = new CtStateCaseValueBuilder()
                 .setCtStateValues(ctStateValuesBuilder.build());
 

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertorTest.java
index c728c2998856d83ae97c7372ff0308895ab844bf..adfb9867f08264049180341a43480338ab35f2ac 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/CtZoneConvertorTest.java
@@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmNxCtZoneKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.nx.ct.zone.grouping.NxmNxCtZoneBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 /**
  * Test for {@link CtZoneConvertor}.
@@ -49,7 +50,7 @@ public class CtZoneConvertorTest {
     public void setUp() {
 
         final NxmNxCtZoneBuilder nxmNxCtZoneBuilder = new NxmNxCtZoneBuilder()
-                .setCtZone(1);
+                .setCtZone(Uint16.ONE);
         final NxAugMatchNodesNodeTableFlowBuilder nxAugMatchNotifUpdateFlowStatsBuilder =
                 new NxAugMatchNodesNodeTableFlowBuilder();
         nxAugMatchNotifUpdateFlowStatsBuilder.setNxmNxCtZone(nxmNxCtZoneBuilder.build());
@@ -72,7 +73,7 @@ public class CtZoneConvertorTest {
     @Test
     public void testConvert1() {
         final CtZoneValuesBuilder ctZoneValuesBuilder = new CtZoneValuesBuilder()
-                .setCtZone(2);
+                .setCtZone(Uint16.TWO);
         final CtZoneCaseValueBuilder ctZoneCaseValueBuilder = new CtZoneCaseValueBuilder()
                 .setCtZoneValues(ctZoneValuesBuilder.build());
 

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertorTest.java
index 33aa2f0ddd19ab858d6032278b433a3a4c826637..11275dbe47f6004816e1165f9f62b065d8d0be52 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/EthTypeConvertorTest.java
@@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmOfEthTypeKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of.eth.type.grouping.NxmOfEthTypeBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 /**
  * Test for {@link EthTypeConvertor}.
@@ -49,7 +50,7 @@ public class EthTypeConvertorTest {
     public void setUp() {
 
         final NxmOfEthTypeBuilder nxmOfEthTypeBuilder = new NxmOfEthTypeBuilder()
-                .setValue(1);
+                .setValue(Uint16.ONE);
         final NxAugMatchNodesNodeTableFlowBuilder nxAugMatchNotifUpdateFlowStatsBuilder =
                 new NxAugMatchNodesNodeTableFlowBuilder();
         nxAugMatchNotifUpdateFlowStatsBuilder.setNxmOfEthType(nxmOfEthTypeBuilder.build());
@@ -72,7 +73,7 @@ public class EthTypeConvertorTest {
     @Test
     public void testConvert1() {
         final EthTypeValuesBuilder ethTypeValuesBuilder = new EthTypeValuesBuilder()
-                .setValue(Integer.valueOf(1));
+                .setValue(Uint16.ONE);
         final EthTypeCaseValueBuilder ethTypeCaseValueBuilder = new EthTypeCaseValueBuilder()
                 .setEthTypeValues(ethTypeValuesBuilder.build());
 

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertorTest.java
index b98efa45e90090d1143317a56b0393cfe2a91ccf..990f9120336fc7a35a2e7b9a90be731006e5dc55 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpDstConvertorTest.java
@@ -32,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmOfTcpDstKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of.tcp.dst.grouping.NxmOfTcpDstBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 /**
  * Test for {@link TcpDstConvertor}.
@@ -43,14 +44,14 @@ public class TcpDstConvertorTest {
     @Mock
     private MatchEntry matchEntry;
 
-    private static final PortNumber DEFAULT_PORT = new PortNumber(9999);
+    private static final PortNumber DEFAULT_PORT = new PortNumber(Uint16.valueOf(9999));
 
     private TcpDstConvertor tcpDstConvertor;
 
     @Before
     public void setUp() {
         final NxmOfTcpDstBuilder nxmOfTcpDstBuilder = new NxmOfTcpDstBuilder()
-                .setMask(1)
+                .setMask(Uint16.ONE)
                 .setPort(DEFAULT_PORT);
         final NxAugMatchNodesNodeTableFlowBuilder nxAugMatchNotifUpdateFlowStatsBuilder =
                 new NxAugMatchNodesNodeTableFlowBuilder();
@@ -75,7 +76,7 @@ public class TcpDstConvertorTest {
     @Test
     public void testConvert1() {
         final TcpDstValuesBuilder tcpDstValuesBuilder = new TcpDstValuesBuilder()
-                .setMask(2)
+                .setMask(Uint16.TWO)
                 .setPort(DEFAULT_PORT);
         final TcpDstCaseValueBuilder tcpDstCaseValueBuilder = new TcpDstCaseValueBuilder()
                 .setTcpDstValues(tcpDstValuesBuilder.build());

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertorTest.java
index 625dbcce6cd2de594b9c9fa57c7ef983bfe363fb..d526c64890b401f538813aec9c195cdb54da67de 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/TcpSrcConvertorTest.java
@@ -32,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxmOfTcpSrcKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.nxm.of.tcp.src.grouping.NxmOfTcpSrcBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 /**
  * Test for {@link TcpSrcConvertor}.
@@ -43,14 +44,14 @@ public class TcpSrcConvertorTest {
     @Mock
     private MatchEntry matchEntry;
 
-    private static final PortNumber DEFAULT_PORT = new PortNumber(9999);
+    private static final PortNumber DEFAULT_PORT = new PortNumber(Uint16.valueOf(9999));
 
     private TcpSrcConvertor tcpSrcConvertor;
 
     @Before
     public void setUp() {
         final NxmOfTcpSrcBuilder nxmOfTcpSrcBuilder = new NxmOfTcpSrcBuilder()
-                .setMask(1)
+                .setMask(Uint16.ONE)
                 .setPort(DEFAULT_PORT);
         final NxAugMatchNodesNodeTableFlowBuilder nxAugMatchNotifUpdateFlowStatsBuilder =
                 new NxAugMatchNodesNodeTableFlowBuilder();
@@ -75,7 +76,7 @@ public class TcpSrcConvertorTest {
     @Test
     public void testConvert1() {
         final TcpSrcValuesBuilder tcpSrcValuesBuilder = new TcpSrcValuesBuilder()
-                .setMask(2)
+                .setMask(Uint16.TWO)
                 .setPort(DEFAULT_PORT);
         final TcpSrcCaseValueBuilder tcpSrcCaseValueBuilder = new TcpSrcCaseValueBuilder()
                 .setTcpSrcValues(tcpSrcValuesBuilder.build());

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertorTest.java
index 8a4d9193d4791d369ddeca6aa57d307b355883e3..e3f5efd20555d13dd9bce0586e43b0cc0d77a847 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpDstConvertorTest.java
@@ -44,14 +44,14 @@ public class UdpDstConvertorTest {
     @Mock
     private MatchEntry matchEntry;
 
-    private static final PortNumber DEFAULT_PORT = new PortNumber(9999);
+    private static final PortNumber DEFAULT_PORT = new PortNumber(Uint16.valueOf(9999));
 
     private UdpDstConvertor udpDstConvertor;
 
     @Before
     public void setUp() {
         final NxmOfUdpDstBuilder nxmOfUdpDstBuilder = new NxmOfUdpDstBuilder()
-                .setMask(1)
+                .setMask(Uint16.ONE)
                 .setPort(DEFAULT_PORT);
         final NxAugMatchNodesNodeTableFlowBuilder nxAugMatchNotifUpdateFlowStatsBuilder =
                 new NxAugMatchNodesNodeTableFlowBuilder();
@@ -76,7 +76,7 @@ public class UdpDstConvertorTest {
     @Test
     public void testConvert1() {
         final UdpDstValuesBuilder udpDstValuesBuilder = new UdpDstValuesBuilder()
-                .setMask(2)
+                .setMask(Uint16.TWO)
                 .setPort(DEFAULT_PORT);
         final UdpDstCaseValueBuilder udpDstCaseValueBuilder = new UdpDstCaseValueBuilder()
                 .setUdpDstValues(udpDstValuesBuilder.build());

diff --git a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertorTest.java b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertorTest.java
index a02aefdcf36a22c42156d66c2979aff2b1e1592f..336448a5689a4825c87268dc3b18f92c4d3ba046 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertorTest.java
+++ b/extension/openflowplugin-extension-nicira/src/test/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/UdpSrcConvertorTest.java
@@ -44,14 +44,14 @@ public class UdpSrcConvertorTest {
     @Mock
     private MatchEntry matchEntry;
 
-    private static final PortNumber DEFAULT_PORT = new PortNumber(9999);
+    private static final PortNumber DEFAULT_PORT = new PortNumber(Uint16.valueOf(9999));
 
     private UdpSrcConvertor udpSrcConvertor;
 
     @Before
     public void setUp() {
         final NxmOfUdpSrcBuilder nxmOfUdpSrcBuilder = new NxmOfUdpSrcBuilder()
-                .setMask(1)
+                .setMask(Uint16.ONE)
                 .setPort(DEFAULT_PORT);
         final NxAugMatchNodesNodeTableFlowBuilder nxAugMatchNotifUpdateFlowStatsBuilder =
                 new NxAugMatchNodesNodeTableFlowBuilder();
@@ -76,7 +76,7 @@ public class UdpSrcConvertorTest {
     @Test
     public void testConvert1() {
         final UdpSrcValuesBuilder udpSrcValuesBuilder = new UdpSrcValuesBuilder()
-                .setMask(2)
+                .setMask(Uint16.TWO)
                 .setPort(DEFAULT_PORT);
         final UdpSrcCaseValueBuilder udpSrcCaseValueBuilder = new UdpSrcCaseValueBuilder()
                 .setUdpSrcValues(udpSrcValuesBuilder.build());