Adopt 2023.03 Argon upstreams

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / PortConvertorTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java
index 5cb08e2a52b915bb7cc5f43e922692925e1dc3dc..da594e33289b310cb6b45931441f40be3d121f18 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java
@@ -29,19 +29,22 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortModInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.port.desc._case.multipart.reply.port.desc.Ports;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.port.desc._case.multipart.reply.port.desc.PortsBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class PortConvertorTest {
 
     private static final String DEFAULT_MAC_ADDRESS = "01:02:03:04:05:06";
 
-    private final PortFeatures features = new PortFeatures(true, null, null, null, null, null, null, null, null, null,
-            null, null, null, null, null, null);
+    private final PortFeatures features = new PortFeatures(
+        true,  false, false, false, false, false, false, false,
+        false, false, false, false, false, false, false, false);
 
     private final PortConfig config = new PortConfig(false, false, false, false);
 
     private final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures portf31 =
-            new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures(
-                    null, null, null, null, null, null, null, null, null, null, true, null, null, null, null, null);
+        new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures(
+            false, false, false, false, false, false, false, false,
+            false, false, true,  false, false, false, false, false);
 
     private final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig config31 =
             new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig(
@@ -58,16 +61,18 @@ public class PortConvertorTest {
      */
     @Test
     public void testtoPortModInputwithAllParameters() {
-        PortBuilder portBld = new PortBuilder();
-        portBld.setAdvertisedFeatures(features);
-        portBld.setConfiguration(config);
-        portBld.setPortNumber(new PortNumberUni(42L));
-        portBld.setHardwareAddress(new MacAddress(DEFAULT_MAC_ADDRESS));
+        PortBuilder portBld = new PortBuilder()
+            .setPortModOrder(Uint32.ZERO)
+            .setAdvertisedFeatures(features)
+            .setConfiguration(config)
+            .setPortNumber(new PortNumberUni(Uint32.valueOf(42)))
+            .setHardwareAddress(new MacAddress(DEFAULT_MAC_ADDRESS));
 
         VersionConvertorData data = new VersionConvertorData(OFConstants.OFP_VERSION_1_3);
         final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
-        Optional<PortModInput> portOutOptional = convertorManager.convert(portBld.build(), data);
-        final PortModInput portOut = portOutOptional.orElse(PortConvertor.defaultResult(OFConstants.OFP_VERSION_1_3));
+        final Optional<PortModInput> portOutOptional = convertorManager.convert(portBld.build(), data);
+        final PortModInput portOut = portOutOptional
+            .orElse(PortConvertor.defaultResult(EncodeConstants.OF_VERSION_1_3));
 
         PortConfigV10 portConfV10 = new PortConfigV10(false, false, false, false, true, true, false);
 
@@ -75,17 +80,18 @@ public class PortConvertorTest {
 
         portModInputBld.setConfig(config31);
         portModInputBld.setMask(configMask31);
-        portModInputBld.setPortNo(
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber(42L));
+        portModInputBld.setPortNo(new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731
+            .PortNumber(Uint32.valueOf(42)));
         portModInputBld.setHwAddress(new MacAddress(DEFAULT_MAC_ADDRESS));
         portModInputBld.setAdvertise(portf31);
 
         portModInputBld.setConfigV10(portConfV10);
         portModInputBld.setMaskV10(portConfMaskV10);
-        portModInputBld.setAdvertiseV10(
-                new PortFeaturesV10(null, null, null, null, null, null, null, true, null, null, null, null));
+        portModInputBld.setAdvertiseV10(new PortFeaturesV10(
+            false, false, false, false, false, false,
+            false, true,  false, false, false, false));
 
-        portModInputBld.setVersion((short) EncodeConstants.OF13_VERSION_ID);
+        portModInputBld.setVersion(EncodeConstants.OF_VERSION_1_3);
 
         Assert.assertEquals(portModInputBld.build(), portOut);
     }
@@ -103,29 +109,29 @@ public class PortConvertorTest {
         flowCapableNodeConnectorBuilder.setAdvertisedFeatures(features);
         flowCapableNodeConnectorBuilder.setConfiguration(config);
         flowCapableNodeConnectorBuilder.setCurrentFeature(features);
-        flowCapableNodeConnectorBuilder.setCurrentSpeed(null);
+        flowCapableNodeConnectorBuilder.setCurrentSpeed((Uint32) null);
         flowCapableNodeConnectorBuilder.setHardwareAddress(new MacAddress(DEFAULT_MAC_ADDRESS));
-        flowCapableNodeConnectorBuilder.setMaximumSpeed(null);
+        flowCapableNodeConnectorBuilder.setMaximumSpeed((Uint32) null);
         flowCapableNodeConnectorBuilder.setName("foo");
         flowCapableNodeConnectorBuilder.setPeerFeatures(features);
-        flowCapableNodeConnectorBuilder.setPortNumber(new PortNumberUni(42L));
+        flowCapableNodeConnectorBuilder.setPortNumber(new PortNumberUni(Uint32.valueOf(42L)));
         flowCapableNodeConnectorBuilder.setState(state);
         flowCapableNodeConnectorBuilder.setSupported(features);
 
         final Ports portsOut = PortConvertor.toPortDesc(
-                flowCapableNodeConnectorBuilder.build(), EncodeConstants.OF13_VERSION_ID);
+                flowCapableNodeConnectorBuilder.build(), EncodeConstants.OF_VERSION_1_3);
 
         PortsBuilder portsB = new PortsBuilder();
 
         portsB.setAdvertisedFeatures(portf31);
         portsB.setConfig(config31);
         portsB.setCurrentFeatures(portf31);
-        portsB.setCurrSpeed(null);
+        portsB.setCurrSpeed((Uint32) null);
         portsB.setHwAddr(new MacAddress(DEFAULT_MAC_ADDRESS));
-        portsB.setMaxSpeed(null);
+        portsB.setMaxSpeed((Uint32) null);
         portsB.setName("foo");
         portsB.setPeerFeatures(portf31);
-        portsB.setPortNo(42L);
+        portsB.setPortNo(Uint32.valueOf(42));
         portsB.setState(new PortState(false, false, false));
         portsB.setSupportedFeatures(portf31);