Use uint types in interfacemanager tests

Convert constants and similar production-independent call sites
to use uint types, eliminating associated warnings.

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

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelperTest.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelperTest.java
index 3c97cd67dda4f264f2fe2108986db33f36ce9063..ed8cce88181dadf0ed1cc377864a3c43de281a67 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelperTest.java
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelperTest.java
@@ -12,6 +12,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 /**
  * Unit tests for {@link OvsVlanMemberConfigUpdateHelper}.
@@ -19,8 +20,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
 public class OvsVlanMemberConfigUpdateHelperTest {
     @Test
     public void testVlanIdModified() {
-        VlanId vlanId1 = new VlanId(1);
-        VlanId vlanId2 = new VlanId(2);
+        VlanId vlanId1 = new VlanId(Uint16.ONE);
+        VlanId vlanId2 = new VlanId(Uint16.TWO);
         assertFalse(OvsVlanMemberConfigUpdateHelper.vlanIdModified(null, null));
         assertTrue(OvsVlanMemberConfigUpdateHelper.vlanIdModified(null, vlanId2));
         assertTrue(OvsVlanMemberConfigUpdateHelper.vlanIdModified(vlanId1, null));

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java
index 7260481b13047db6c2810862430832a0db382fec..bf125f42c5cfc9e9b28e8045833147a68c60e3c4 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java
@@ -10,7 +10,6 @@ package org.opendaylight.genius.interfacemanager.test;
 import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION;
 import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -74,7 +73,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint64;
+import org.opendaylight.yangtools.yang.common.Uint8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -177,13 +178,15 @@ public final class InterfaceManagerTestUtil {
                 .setDescription(desc).setEnabled(enabled).setType((Class<? extends InterfaceType>) ifType);
         builder.addAugmentation(new ParentRefsBuilder().setParentInterface(parentInterface).build());
         if (ifType.equals(L2vlan.class)) {
-            IfL2vlanBuilder ifL2vlanBuilder = new IfL2vlanBuilder().setL2vlanMode(l2vlanMode);
+            final Uint16 vlanId;
             if (IfL2vlan.L2vlanMode.TrunkMember.equals(l2vlanMode)) {
-                ifL2vlanBuilder.setVlanId(new VlanId(100));
+                vlanId = Uint16.valueOf(100);
             } else {
-                ifL2vlanBuilder.setVlanId(VlanId.getDefaultInstance("0"));
+                vlanId = Uint16.ZERO;
             }
-            builder.addAugmentation(ifL2vlanBuilder.build());
+            builder.addAugmentation(new IfL2vlanBuilder()
+                    .setL2vlanMode(l2vlanMode)
+                    .setVlanId(new VlanId(vlanId)).build());
         } else if (ifType.equals(IfTunnel.class)) {
             builder.addAugmentation(new IfTunnelBuilder().setTunnelDestination(null).setTunnelGateway(null)
                     .setTunnelSource(null).setTunnelInterfaceType(null).build());
@@ -191,7 +194,7 @@ public final class InterfaceManagerTestUtil {
         return builder.build();
     }
 
-    static Interface buildTunnelInterface(BigInteger dpn, String ifName, String desc, boolean enabled,
+    static Interface buildTunnelInterface(Uint64 dpn, String ifName, String desc, boolean enabled,
                                           Class<? extends TunnelTypeBase> tunType, String remoteIpStr,
                                           String localIpStr) {
         IpAddress remoteIp = new IpAddress(Ipv4Address.getDefaultInstance(remoteIpStr));
@@ -264,7 +267,7 @@ public final class InterfaceManagerTestUtil {
             interfaceInfo = InterfaceManagerTestUtil.buildInterface(ifaceName, ifaceName, true, ifType,
                     parentRefs.getParentInterface(), IfL2vlan.L2vlanMode.Trunk);
         } else {
-            interfaceInfo = buildTunnelInterface(parentRefs.getDatapathNodeIdentifier().toJava(),ifaceName, ifaceName,
+            interfaceInfo = buildTunnelInterface(parentRefs.getDatapathNodeIdentifier(), ifaceName, ifaceName,
                     true, TunnelTypeVxlan.class, "1.1.1.1", "2.2.2.2");
         }
         InstanceIdentifier<Interface> interfaceInstanceIdentifier = IfmUtil.buildId(ifaceName);
@@ -369,7 +372,7 @@ public final class InterfaceManagerTestUtil {
             .addAugmentation(augBuilder.build()).build();
     }
 
-    static InstanceIdentifier<BoundServices> buildServiceId(String vpnInterfaceName, short serviceIndex) {
+    static InstanceIdentifier<BoundServices> buildServiceId(String vpnInterfaceName, Uint8 serviceIndex) {
         return InstanceIdentifier.builder(ServiceBindings.class)
             .child(ServicesInfo.class, new ServicesInfoKey(vpnInterfaceName, ServiceModeIngress.class))
             .child(BoundServices.class, new BoundServicesKey(serviceIndex)).build();

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java
index 6b63554da78de0c785241312642029c65a927db0..32f0d64107c1ef6048ad287e94585e3f27a97ad6 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/OvsdbSouthboundTestUtil.java
@@ -71,6 +71,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -267,7 +268,7 @@ public class OvsdbSouthboundTestUtil {
         }
 
         IpAddress address = createIpAddress(inetAddress);
-        PortNumber port = new PortNumber(Integer.parseInt(portStr));
+        PortNumber port = new PortNumber(Uint16.valueOf(portStr));
 
         LOG.info("connectionInfo: {}", new ConnectionInfoBuilder().setRemoteIp(address).setRemotePort(port).build());
         return new ConnectionInfoBuilder().setRemoteIp(address).setRemotePort(port).build();

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedBoundServiceState.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedBoundServiceState.xtend
index 0776628bdf61b48da14d47ff788df055f4960e81..481032463c4e63c23649db8f38768a5ce6983da0 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedBoundServiceState.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedBoundServiceState.xtend
@@ -10,17 +10,19 @@ package org.opendaylight.genius.interfacemanager.test.xtend
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceModeIngress
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.bound.services.state.list.BoundServicesStateBuilder
+import org.opendaylight.yangtools.yang.common.Uint32
+import org.opendaylight.yangtools.yang.common.Uint64
 
 import static extension org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions.operator_doubleGreaterThan
 
 class ExpectedBoundServiceState {
     static def newBoundServiceState() {
         new BoundServicesStateBuilder >> [
-            dpid = 1bi
+            dpid = Uint64.ONE
             ifIndex = 1
             interfaceName = "23701c04-7e58-4c65-9425-78a80d49a218"
             interfaceType = L2vlan
-            portNo = 2L
+            portNo = Uint32.TWO
             serviceMode = ServiceModeIngress
         ]
     }

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedDpIdFromInterfaceOutput.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedDpIdFromInterfaceOutput.xtend
index 6eb8aac86a149b7be31be2c4d6b85614a52038a8..0a09baf138a6453aaff74ab0202f2f89db01d163 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedDpIdFromInterfaceOutput.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedDpIdFromInterfaceOutput.xtend
@@ -8,6 +8,7 @@
 package org.opendaylight.genius.interfacemanager.test.xtend
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetDpidFromInterfaceOutputBuilder
+import org.opendaylight.yangtools.yang.common.Uint64
 
 import static extension org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions.operator_doubleGreaterThan
 
@@ -15,7 +16,7 @@ class DpnFromInterfaceOutput {
 
     static def newDpnFromInterfaceOutput() {
         new GetDpidFromInterfaceOutputBuilder >> [
-            dpid = 1bi
+            dpid = Uint64.ONE
         ]
     }
 

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedEgressActionsForInterface.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedEgressActionsForInterface.xtend
index 4d7e911f00903cba76b27ac2af3128c22c6b7aff..3fb9fbf9eef39cc32926591d2142f80c75cca755 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedEgressActionsForInterface.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedEgressActionsForInterface.xtend
@@ -16,6 +16,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.^extension.n
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.^extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoadBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.^extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.DstBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.^extension.nicira.action.rev140714.nx.action.resubmit.grouping.NxResubmitBuilder
+import org.opendaylight.yangtools.yang.common.Uint16
+import org.opendaylight.yangtools.yang.common.Uint64
+import org.opendaylight.yangtools.yang.common.Uint8
 
 import static extension org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions.operator_doubleGreaterThan
 
@@ -31,10 +34,10 @@ class EgressActionsForInterfaceOutput {
                                 dstChoice = new DstNxRegCaseBuilder >> [
                                     nxReg = NxmNxReg6
                                 ]
-                                end = 31
-                                start = 0
+                                end = Uint16.valueOf(31)
+                                start = Uint16.ZERO
                             ]
-                            value = 256bi
+                            value = Uint64.valueOf(256)
                         ]
                     ]
                     order = 0
@@ -42,7 +45,7 @@ class EgressActionsForInterfaceOutput {
                 new ActionBuilder >> [
                     action = new NxActionResubmitRpcAddGroupCaseBuilder >> [
                         nxResubmit = new NxResubmitBuilder >> [
-                            table = 220 as short
+                            table = Uint8.valueOf(220)
                         ]
                     ]
                     order = 1

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedEgressInstructionsForInterface.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedEgressInstructionsForInterface.xtend
index 86ef6ce2f5599e57f6ac5c0d7d66f5a14e842149..1ad12e0b005119d327e48c5fbf47654d345e86f4 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedEgressInstructionsForInterface.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedEgressInstructionsForInterface.xtend
@@ -19,6 +19,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.^extension.n
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.^extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoadBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.^extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.DstBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.^extension.nicira.action.rev140714.nx.action.resubmit.grouping.NxResubmitBuilder
+import org.opendaylight.yangtools.yang.common.Uint16
+import org.opendaylight.yangtools.yang.common.Uint64
+import org.opendaylight.yangtools.yang.common.Uint8
 
 import static extension org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions.operator_doubleGreaterThan
 
@@ -38,10 +41,10 @@ class EgressInstructionsForInterfaceOutput {
                                                 dstChoice = new DstNxRegCaseBuilder >> [
                                                     nxReg = NxmNxReg6
                                                 ]
-                                                end = 31
-                                                start = 0
+                                                end = Uint16.valueOf(31)
+                                                start = Uint16.ZERO
                                             ]
-                                            value = 256bi
+                                            value = Uint64.valueOf(256)
                                         ]
                                     ]
                                     order = 0
@@ -49,7 +52,7 @@ class EgressInstructionsForInterfaceOutput {
                                 new ActionBuilder >> [
                                     action = new NxActionResubmitRpcAddGroupCaseBuilder >> [
                                         nxResubmit = new NxResubmitBuilder >> [
-                                            table = 220 as short
+                                            table = Uint8.valueOf(220)
                                         ]
                                     ]
                                     order = 1

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedFlowEntries.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedFlowEntries.xtend
index 9eec27c57c20b04d91e8de0bf428cbb7fc6254b3..6906cc58ad122c3344d09f7703abbe224af287d0 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedFlowEntries.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedFlowEntries.xtend
@@ -24,6 +24,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.MetadataBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.VlanMatchBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.vlan.match.fields.VlanIdBuilder
+import org.opendaylight.yangtools.yang.common.Uint16
+import org.opendaylight.yangtools.yang.common.Uint64
+import org.opendaylight.yangtools.yang.common.Uint8
 
 import static extension org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions.operator_doubleGreaterThan
 
@@ -31,17 +34,17 @@ class ExpectedFlowEntries {
 
     static def newIngressFlow() {
         new FlowBuilder >> [
-            cookie = new FlowCookie(134217728bi)
+            cookie = new FlowCookie(Uint64.valueOf(134217728))
             flowName = "0:1:23701c04-7e58-4c65-9425-78a80d49a218"
-            hardTimeout = 0
+            hardTimeout = Uint16.ZERO
             id = new FlowId("0:1:23701c04-7e58-4c65-9425-78a80d49a218")
-            idleTimeout = 0
+            idleTimeout = Uint16.ZERO
             instructions = new InstructionsBuilder >> [
                 instruction = #[
                     new InstructionBuilder >> [
                         instruction = new GoToTableCaseBuilder >> [
                             goToTable = new GoToTableBuilder >> [
-                                tableId = 17 as short
+                                tableId = Uint8.valueOf(17)
                             ]
                         ]
                         order = 1
@@ -49,8 +52,8 @@ class ExpectedFlowEntries {
                     new InstructionBuilder >> [
                         instruction = new WriteMetadataCaseBuilder >> [
                             writeMetadata = new WriteMetadataBuilder >> [
-                                metadata = 1099511627776bi
-                                metadataMask = 18446742974197923841bi
+                                metadata = Uint64.valueOf(1099511627776L)
+                                metadataMask = Uint64.valueOf(18446742974197923841bi)
                             ]
                         ]
                         order = 0
@@ -61,28 +64,28 @@ class ExpectedFlowEntries {
                 inPort = new NodeConnectorId("openflow:1:2")
                 vlanMatch = new VlanMatchBuilder >> [
                     vlanId = new VlanIdBuilder >> [
-                        vlanId = new VlanId(0)
+                        vlanId = new VlanId(Uint16.ZERO)
                     ]
                 ]
             ]
-            priority = 4
-            tableId = 0 as short
+            priority = Uint16.valueOf(4)
+            tableId = Uint8.ZERO
         ]
     }
 
     static def newLportDispatcherFlow(){
         new FlowBuilder >> [
-            cookie = new FlowCookie(134479872bi)
+            cookie = new FlowCookie(Uint64.valueOf(134479872))
             flowName = "ELAN"
-            hardTimeout = 0
+            hardTimeout = Uint16.ZERO
             id = new FlowId("1.17.23701c04-7e58-4c65-9425-78a80d49a218.0")
-            idleTimeout = 0
+            idleTimeout = Uint16.ZERO
             instructions = new InstructionsBuilder >> [
                 instruction = #[
                     new InstructionBuilder >> [
                         instruction = new GoToTableCaseBuilder >> [
                             goToTable = new GoToTableBuilder >> [
-                                tableId = 48 as short
+                                tableId = Uint8.valueOf(48)
                             ]
                         ]
                         order = 3
@@ -90,8 +93,8 @@ class ExpectedFlowEntries {
                     new InstructionBuilder >> [
                         instruction = new WriteMetadataCaseBuilder >> [
                             writeMetadata = new WriteMetadataBuilder >> [
-                                metadata = 12682137650203721728bi
-                                metadataMask = 18446744073709551614bi
+                                metadata = Uint64.valueOf(12682137650203721728bi)
+                                metadataMask = Uint64.valueOf(18446744073709551614bi)
                             ]
                         ]
                         order = 4
@@ -109,12 +112,12 @@ class ExpectedFlowEntries {
             ]
             match = new MatchBuilder >> [
                 metadata = new MetadataBuilder >> [
-                    metadata = 1099511627776bi
-                    metadataMask = 18446742974197923840bi
+                    metadata = Uint64.valueOf(1099511627776L)
+                    metadataMask = Uint64.valueOf(18446742974197923840bi)
                 ]
             ]
-            priority = 10
-            tableId = 17 as short
+            priority = Uint16.TEN
+            tableId = Uint8.valueOf(17)
         ]
     }
 }
\ No newline at end of file

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend
index e7d4fafadaa5b7762671fb15716fbdd805edfb60..973d93ab8262c8aa7055ffddb962adbe99d6624c 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend
@@ -14,6 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlanBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefsBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId
+import org.opendaylight.yangtools.yang.common.Uint16
 
 import static extension org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions.operator_doubleGreaterThan
 
@@ -27,7 +28,7 @@ class ExpectedInterfaceConfig {
                 parentInterface = "tap23701c04-7e"
             ])addAugmentation(new IfL2vlanBuilder >> [
                 l2vlanMode = L2vlanMode.Trunk
-                vlanId = new VlanId(0)
+                vlanId = new VlanId(Uint16.ZERO)
             ])
         ]
     }
@@ -69,7 +70,7 @@ class ExpectedInterfaceConfig {
                 type = L2vlan
                 addAugmentation(new IfL2vlanBuilder >> [
                     l2vlanMode = L2vlanMode.Trunk
-                    vlanId = new VlanId(0)
+                    vlanId = new VlanId(Uint16.ZERO)
                 ])addAugmentation(new ParentRefsBuilder >> [
                     parentInterface = parentRefs
                 ])

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedServicesInfo.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedServicesInfo.xtend
index 9a72f05e4705557246f1c7ab786dbd6eff7d95fb..475777b62bf43d3160fe73ba38a9da1e5303f069 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedServicesInfo.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedServicesInfo.xtend
@@ -17,6 +17,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceTypeFlowBased
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.StypeOpenflowBuilder
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServicesBuilder
+import org.opendaylight.yangtools.yang.common.Uint16
+import org.opendaylight.yangtools.yang.common.Uint64
+import org.opendaylight.yangtools.yang.common.Uint8
 
 import static extension org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions.operator_doubleGreaterThan
 
@@ -25,11 +28,11 @@ class ExpectedServicesInfo {
     static def newboundService() {
         new BoundServicesBuilder >> [
             serviceName = "default.23701c04-7e58-4c65-9425-78a80d49a218"
-            servicePriority = 9 as short
+            servicePriority = Uint8.valueOf(9)
             serviceType = ServiceTypeFlowBased
             addAugmentation(new StypeOpenflowBuilder >> [
-                flowCookie = 134217735bi
-                flowPriority = 9
+                flowCookie = Uint64.valueOf(134217735)
+                flowPriority = Uint16.valueOf(9)
                 instruction = #[
                     new InstructionBuilder >> [
                         instruction = new ApplyActionsCaseBuilder >> [
@@ -38,7 +41,7 @@ class ExpectedServicesInfo {
                                     new ActionBuilder >> [
                                         action = new OutputActionCaseBuilder >> [
                                             outputAction = new OutputActionBuilder >> [
-                                                maxLength = 0
+                                                maxLength = Uint16.ZERO
                                                 outputNodeConnector = new Uri("2")
                                             ]
                                         ]

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/PortFromInterfaceOutput.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/PortFromInterfaceOutput.xtend
index 5789528fd2dccde01e3c7d4e9bb2931ee21780c5..b94b999949571d74f90f13c9c168f98821c1a977 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/PortFromInterfaceOutput.xtend
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/PortFromInterfaceOutput.xtend
@@ -8,6 +8,7 @@
 package org.opendaylight.genius.interfacemanager.test.xtend
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetPortFromInterfaceOutputBuilder
+import org.opendaylight.yangtools.yang.common.Uint32
 import org.opendaylight.yangtools.yang.common.Uint64
 
 import static extension org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions.operator_doubleGreaterThan
@@ -19,7 +20,7 @@ class PortFromInterfaceOutput {
             dpid = Uint64.ONE
             phyAddress = "AA:AA:AA:AA:AA:AA"
             portname = "23701c04-7e58-4c65-9425-78a80d49a218"
-            portno = 2L
+            portno = Uint32.TWO
         ]
     }
 }