Bump upstreams for 2022.09 Chlorine

[openflowplugin.git] / openflowjava / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / util / ActionsDeserializerTest.java

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java
index 942070676f378ee7d3f5a137079089cca89fe79f..5861cb89dff9811e4db603f832500bbfa1c54b7a 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java
@@ -83,7 +83,7 @@ public class ActionsDeserializerTest {
         message.skipBytes(4); // skip XID
         LOG.info("bytes: {}", message.readableBytes());
 
-        CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID);
+        CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF_VERSION_1_3);
         List<Action> actions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID,
                 message.readableBytes(), message, keyMaker, registry);
         Assert.assertTrue("Wrong action type", actions.get(0).getActionChoice() instanceof OutputActionCase);
@@ -129,10 +129,10 @@ public class ActionsDeserializerTest {
                 .getSetFieldAction().getMatchEntry();
         Assert.assertEquals("Wrong number of fields", 1, entries.size());
         Assert.assertEquals("Wrong match entry class", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow."
-                + "oxm.rev150225.OpenflowBasicClass", entries.get(0).getOxmClass().getName());
+                + "oxm.rev150225.OpenflowBasicClass", entries.get(0).getOxmClass().implementedInterface().getName());
         Assert.assertEquals("Wrong match entry field", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow."
-                + "oxm.rev150225.InPhyPort", entries.get(0).getOxmMatchField().getName());
-        Assert.assertEquals("Wrong match entry mask", false, entries.get(0).isHasMask());
+                + "oxm.rev150225.InPhyPort", entries.get(0).getOxmMatchField().implementedInterface().getName());
+        Assert.assertEquals("Wrong match entry mask", false, entries.get(0).getHasMask());
         Assert.assertEquals("Wrong match entry value", 11,
                 ((InPhyPortCase) entries.get(0).getMatchEntryValue()).getInPhyPort().getPortNumber()
                 .getValue().intValue());
@@ -152,7 +152,7 @@ public class ActionsDeserializerTest {
         ByteBuf message = BufferHelper.buildBuffer("00 00 00 04 00 19 00 04");
 
         message.skipBytes(4); // skip XID
-        CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID);
+        CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF_VERSION_1_3);
         List<Action> actions = ListDeserializer.deserializeHeaders(EncodeConstants.OF13_VERSION_ID,
                 message.readableBytes(), message, keyMaker, registry);