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 1c627cee7fb029351e4d2c6c112b23d5f291ea83..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
@@ -35,14 +35,16 @@ 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(
@@ -59,16 +61,18 @@ public class PortConvertorTest {
      */
     @Test
     public void testtoPortModInputwithAllParameters() {
-        PortBuilder portBld = new PortBuilder();
-        portBld.setAdvertisedFeatures(features);
-        portBld.setConfiguration(config);
-        portBld.setPortNumber(new PortNumberUni(Uint32.valueOf(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);
 
@@ -83,8 +87,9 @@ public class PortConvertorTest {
 
         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(EncodeConstants.OF_VERSION_1_3);
 
@@ -114,7 +119,7 @@ public class PortConvertorTest {
         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();