Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / messages / FlowMessageDeserializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java
index 3e259c50a48651fd6d98a4f108de1038610ca04c..bce42a8f69c0bcd0b022d610ab7f18cee9d5aae0 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializer.java
@@ -42,7 +42,7 @@ public class FlowMessageDeserializer implements OFDeserializer<FlowMessage>, Des
 
     private static final byte PADDING = 2;
 
-    private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey(EncodeConstants.OF13_VERSION_ID,
+    private static final MessageCodeKey MATCH_KEY = new MessageCodeMatchKey(EncodeConstants.OF_VERSION_1_3,
             EncodeConstants.EMPTY_VALUE, Match.class,
             MatchPath.FLOWS_STATISTICS_UPDATE_MATCH);
 
@@ -86,13 +86,13 @@ public class FlowMessageDeserializer implements OFDeserializer<FlowMessage>, Des
                 if (InstructionConstants.APPLY_ACTIONS_TYPE == type) {
                     deserializer = Preconditions.checkNotNull(registry).getDeserializer(
                             new MessageCodeActionExperimenterKey(
-                                EncodeConstants.OF13_VERSION_ID, type, Instruction.class,
+                                EncodeConstants.OF_VERSION_1_3, type, Instruction.class,
                                 ActionPath.INVENTORY_FLOWNODE_TABLE_APPLY_ACTIONS,
                                 null));
                 } else if (InstructionConstants.WRITE_ACTIONS_TYPE == type) {
                     deserializer = Preconditions.checkNotNull(registry).getDeserializer(
                             new MessageCodeActionExperimenterKey(
-                                EncodeConstants.OF13_VERSION_ID, type, Instruction.class,
+                                EncodeConstants.OF_VERSION_1_3, type, Instruction.class,
                                 ActionPath.INVENTORY_FLOWNODE_TABLE_WRITE_ACTIONS,
                                 null));
                 } else {
@@ -104,7 +104,7 @@ public class FlowMessageDeserializer implements OFDeserializer<FlowMessage>, Des
 
                     deserializer = Preconditions.checkNotNull(registry).getDeserializer(
                             new MessageCodeExperimenterKey(
-                                EncodeConstants.OF13_VERSION_ID, type, Instruction.class, expId));
+                                EncodeConstants.OF_VERSION_1_3, type, Instruction.class, expId));
                 }
 
                 instructions.add(new InstructionBuilder()