Change GetConfigReq/Res and SetConfig factories to version assignable

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / deserialization / AdditionalMessageDeserializerInitializer.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/AdditionalMessageDeserializerInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/AdditionalMessageDeserializerInitializer.java
index adbec25c6e207f3c27064e07c5618f61a2b38e5a..3dfc98827008a4370b274e3d7c98f9635d2e65d4 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/AdditionalMessageDeserializerInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/AdditionalMessageDeserializerInitializer.java
@@ -21,11 +21,9 @@ import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.Mul
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10BarrierInputMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10FeaturesRequestMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10FlowModInputMessageFactory;
-import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10GetConfigInputMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10GetQueueConfigInputMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10PacketOutInputMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10PortModInputMessageFactory;
-import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10SetConfigMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10StatsRequestInputFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.PacketOutInputMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.PortModInputMessageFactory;
@@ -61,9 +59,7 @@ public class AdditionalMessageDeserializerInitializer {
 
     /**
      * Registers additional message deserializers.
-     *
-     * @param registry
-     *            registry to be filled with deserializers
+     * @param registry registry to be filled with deserializers
      */
     public static void registerMessageDeserializers(DeserializerRegistry registry) {
 
@@ -72,8 +68,8 @@ public class AdditionalMessageDeserializerInitializer {
 
         // register OF v1.0 message deserializers
         helper.registerDeserializer(5, null, GetFeaturesInput.class, new OF10FeaturesRequestMessageFactory());
-        helper.registerDeserializer(7, null, GetConfigInput.class, new OF10GetConfigInputMessageFactory());
-        helper.registerDeserializer(9, null, SetConfigInput.class, new OF10SetConfigMessageFactory());
+        helper.registerDeserializer(7, null, GetConfigInput.class, new GetConfigInputMessageFactory());
+        helper.registerDeserializer(9, null, SetConfigInput.class, new SetConfigInputMessageFactory());
         helper.registerDeserializer(13, null, PacketOutInput.class, new OF10PacketOutInputMessageFactory());
         helper.registerDeserializer(14, null, FlowModInput.class, new OF10FlowModInputMessageFactory());
         helper.registerDeserializer(15, null, PortModInput.class, new OF10PortModInputMessageFactory());
@@ -81,7 +77,7 @@ public class AdditionalMessageDeserializerInitializer {
         helper.registerDeserializer(18, null, BarrierInput.class, new OF10BarrierInputMessageFactory());
         helper.registerDeserializer(20, null, GetQueueConfigInput.class, new OF10GetQueueConfigInputMessageFactory());
 
-        // register Of v1.3 message deserializers
+        // register OF v1.3 message deserializers
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF13_VERSION_ID, registry);
         helper.registerDeserializer(5, null, GetFeaturesInput.class, new GetFeaturesInputMessageFactory());
         helper.registerDeserializer(7, null, GetConfigInput.class, new GetConfigInputMessageFactory());
@@ -98,6 +94,16 @@ public class AdditionalMessageDeserializerInitializer {
         helper.registerDeserializer(26, null, GetAsyncInput.class, new GetAsyncRequestMessageFactory());
         helper.registerDeserializer(28, null, SetAsyncInput.class, new SetAsyncInputMessageFactory());
         helper.registerDeserializer(29, null, MeterModInput.class, new MeterModInputMessageFactory());
+
+        // register OF v1.4 message deserializers
+        helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF14_VERSION_ID, registry);
+        helper.registerDeserializer(7, null, GetConfigInput.class, new GetConfigInputMessageFactory());
+        helper.registerDeserializer(9, null, SetConfigInput.class, new SetConfigInputMessageFactory());
+
+        // register OF v1.5 message deserializers
+        helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF15_VERSION_ID, registry);
+        helper.registerDeserializer(7, null, GetConfigInput.class, new GetConfigInputMessageFactory());
+        helper.registerDeserializer(9, null, SetConfigInput.class, new SetConfigInputMessageFactory());
     }
 
 }