Change BarrierReq/Res factories to version assignable

  - made BarrierRequest/BarrierReply factories version assignable
  - removed OF10 factories duplicates
  - registered new deserializers
  - update tests
  - fix typo

Resolves: Bug 4255

Change-Id: I248941b94ea6974679a27313cd6634baaa0fc034
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>

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 3dfc98827008a4370b274e3d7c98f9635d2e65d4..10ec3f06d792addb7c10bbc88a68488babe7b023 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
@@ -18,7 +18,6 @@ import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.Get
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.GroupModInputMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.MeterModInputMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.MultipartRequestInputMessageFactory;
-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.OF10GetQueueConfigInputMessageFactory;
@@ -49,8 +48,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.TableModInput;
 
 /**
+ * Util class for init registration of additional deserializers.
  * @author giuseppex.petralia@intel.com
- *
  */
 public class AdditionalMessageDeserializerInitializer {
     private AdditionalMessageDeserializerInitializer() {
@@ -74,7 +73,7 @@ public class AdditionalMessageDeserializerInitializer {
         helper.registerDeserializer(14, null, FlowModInput.class, new OF10FlowModInputMessageFactory());
         helper.registerDeserializer(15, null, PortModInput.class, new OF10PortModInputMessageFactory());
         helper.registerDeserializer(16, null, MultipartRequestInput.class, new OF10StatsRequestInputFactory());
-        helper.registerDeserializer(18, null, BarrierInput.class, new OF10BarrierInputMessageFactory());
+        helper.registerDeserializer(18, null, BarrierInput.class, new BarrierInputMessageFactory());
         helper.registerDeserializer(20, null, GetQueueConfigInput.class, new OF10GetQueueConfigInputMessageFactory());
 
         // register OF v1.3 message deserializers
@@ -99,11 +98,13 @@ public class AdditionalMessageDeserializerInitializer {
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF14_VERSION_ID, registry);
         helper.registerDeserializer(7, null, GetConfigInput.class, new GetConfigInputMessageFactory());
         helper.registerDeserializer(9, null, SetConfigInput.class, new SetConfigInputMessageFactory());
+        helper.registerDeserializer(20, null, BarrierInput.class, new BarrierInputMessageFactory());
 
         // 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());
+        helper.registerDeserializer(20, null, BarrierInput.class, new BarrierInputMessageFactory());
     }
 
 }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDeserializerInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDeserializerInitializer.java
index d924bc1f0da05c09320c08091aa9c0a03077c0b9..c20f63dfe513a7a6cf698e1246fe6eb06dd873e0 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDeserializerInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDeserializerInitializer.java
@@ -20,7 +20,6 @@ import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.Get
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.GetConfigReplyMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.HelloMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.MultipartReplyMessageFactory;
-import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10BarrierReplyMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10ErrorMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10FeaturesReplyMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10FlowRemovedMessageFactory;
@@ -81,7 +80,7 @@ public final class MessageDeserializerInitializer {
         helper.registerDeserializer(11, null, FlowRemovedMessage.class, new OF10FlowRemovedMessageFactory());
         helper.registerDeserializer(12, null, PortStatusMessage.class, new OF10PortStatusMessageFactory());
         helper.registerDeserializer(17, null, MultipartReplyMessage.class, new OF10StatsReplyMessageFactory());
-        helper.registerDeserializer(19, null, BarrierOutput.class, new OF10BarrierReplyMessageFactory());
+        helper.registerDeserializer(19, null, BarrierOutput.class, new BarrierReplyMessageFactory());
         helper.registerDeserializer(21, null, GetQueueConfigOutput.class, new OF10QueueGetConfigReplyMessageFactory());
 
         // register OF v1.3 message deserializers
@@ -108,6 +107,7 @@ public final class MessageDeserializerInitializer {
         helper.registerDeserializer(2, null, EchoRequestMessage.class, new EchoRequestMessageFactory());
         helper.registerDeserializer(3, null, EchoOutput.class, new EchoReplyMessageFactory());
         helper.registerDeserializer(8, null, GetConfigOutput.class, new GetConfigReplyMessageFactory());
+        helper.registerDeserializer(21, null, BarrierOutput.class, new BarrierReplyMessageFactory());
 
         // register OF v1.5 message deserializers
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF15_VERSION_ID, registry);
@@ -115,5 +115,6 @@ public final class MessageDeserializerInitializer {
         helper.registerDeserializer(2, null, EchoRequestMessage.class, new EchoRequestMessageFactory());
         helper.registerDeserializer(3, null, EchoOutput.class, new EchoReplyMessageFactory());
         helper.registerDeserializer(8, null, GetConfigOutput.class, new GetConfigReplyMessageFactory());
+        helper.registerDeserializer(21, null, BarrierOutput.class, new BarrierReplyMessageFactory());
     }
 }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java
index d8ca8c8a27f0d1b03e7cab8986e3d133e19e226c..61cce25dd0ca60485200606fc438245c91943312 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java
@@ -100,6 +100,7 @@ public final class TypeToClassMapInitializer {
         helper.registerTypeToClass((short) 2, EchoRequestMessage.class);
         helper.registerTypeToClass((short) 3, EchoOutput.class);
         helper.registerTypeToClass((short) 8, GetConfigOutput.class);
+        helper.registerTypeToClass((short) 21, BarrierOutput.class);
 
         // init OF v1.5 mapping
         helper = new TypeToClassInitHelper(EncodeConstants.OF15_VERSION_ID, messageClassMap);
@@ -107,6 +108,7 @@ public final class TypeToClassMapInitializer {
         helper.registerTypeToClass((short) 2, EchoRequestMessage.class);
         helper.registerTypeToClass((short) 3, EchoOutput.class);
         helper.registerTypeToClass((short) 8, GetConfigOutput.class);
+        helper.registerTypeToClass((short) 21, BarrierOutput.class);
     }
 
     /**
@@ -150,10 +152,12 @@ public final class TypeToClassMapInitializer {
         helper = new TypeToClassInitHelper(EncodeConstants.OF14_VERSION_ID, messageClassMap);
         helper.registerTypeToClass((short) 7, GetConfigInput.class);
         helper.registerTypeToClass((short) 9, SetConfigInput.class);
+        helper.registerTypeToClass((short) 20, BarrierInput.class);
 
         // init OF v1.5 mapping
         helper = new TypeToClassInitHelper(EncodeConstants.OF15_VERSION_ID, messageClassMap);
         helper.registerTypeToClass((short) 7, GetConfigInput.class);
         helper.registerTypeToClass((short) 9, SetConfigInput.class);
+        helper.registerTypeToClass((short) 20, BarrierInput.class);
     }
 }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactory.java
index fd3af02e7e6f3e758895e79d429532482bb27a79..2af6be440da4b0b6c14b6084d7a95646939a00e6 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactory.java
@@ -9,20 +9,21 @@ package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.impl.util.VersionAssignableFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInputBuilder;
 
 /**
+ * Translates BarrierRequest messages.
+ * OF protocol versions: 1.0, 1.3, 1.4, 1.5.
  * @author giuseppex.petralia@intel.com
- *
  */
-public class BarrierInputMessageFactory implements OFDeserializer<BarrierInput>{
+public class BarrierInputMessageFactory extends VersionAssignableFactory implements OFDeserializer<BarrierInput>{
 
     @Override
     public BarrierInput deserialize(ByteBuf rawMessage) {
         BarrierInputBuilder builder = new BarrierInputBuilder();
-        builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
+        builder.setVersion(getVersion());
         builder.setXid(rawMessage.readUnsignedInt());
         return builder.build();
     }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactory.java
index 4c109ca6624e908840e1ac9ab1f417bd16ad2094..4d5cf784bb66a63dfc05cbe3eeee2dfee3e11644 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactory.java
@@ -9,23 +9,23 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
-
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.impl.util.VersionAssignableFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutputBuilder;
 
 /**
- * Translates BarrierReply messages (both OpenFlow v1.0 and OpenFlow v1.3)
+ * Translates BarrierReply messages.
+ * OF protocol versions: 1.0, 1.3, 1.4, 1.5.
  * @author michal.polkorab
  * @author timotej.kubas
  */
-public class BarrierReplyMessageFactory implements OFDeserializer<BarrierOutput> {
+public class BarrierReplyMessageFactory extends VersionAssignableFactory implements OFDeserializer<BarrierOutput> {
 
     @Override
     public BarrierOutput deserialize(ByteBuf rawMessage) {
         BarrierOutputBuilder builder = new BarrierOutputBuilder();
-        builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
+        builder.setVersion(getVersion());
         builder.setXid(rawMessage.readUnsignedInt());
         return builder.build();
     }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierInputMessageFactory.java
deleted file mode 100644 (file)
index ab08ea3..0000000
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierInputMessageFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2015 NetIDE Consortium and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
-
-import io.netty.buffer.ByteBuf;
-import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInputBuilder;
-
-/**
- * @author giuseppex.petralia@intel.com
- *
- */
-public class OF10BarrierInputMessageFactory implements OFDeserializer<BarrierInput> {
-
-    @Override
-    public BarrierInput deserialize(ByteBuf rawMessage) {
-        BarrierInputBuilder builder = new BarrierInputBuilder();
-        builder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
-        builder.setXid(rawMessage.readUnsignedInt());
-        return builder.build();
-    }
-
-}

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierReplyMessageFactory.java
deleted file mode 100644 (file)
index 5912281..0000000
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierReplyMessageFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2013 Pantheon Technologies s.r.o. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
-
-import io.netty.buffer.ByteBuf;
-
-import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutputBuilder;
-
-/**
- * Translates BarrierReply messages (both OpenFlow v1.0 and OpenFlow v1.3)
- * @author michal.polkorab
- * @author timotej.kubas
- */
-public class OF10BarrierReplyMessageFactory implements OFDeserializer<BarrierOutput> {
-
-    @Override
-    public BarrierOutput deserialize(ByteBuf rawMessage) {
-        BarrierOutputBuilder builder = new BarrierOutputBuilder();
-        builder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
-        builder.setXid(rawMessage.readUnsignedInt());
-        return builder.build();
-    }
-}

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializerTest.java
index 513bc29adf6da653d2dafbc08efb3592c6525ceb..9ff6e9e7d75d6a3021b19dfdc3e4418b57618db0 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializerTest.java
@@ -97,12 +97,14 @@ public class TypeToClassMapInitializerTest {
         assertEquals("Wrong class", EchoRequestMessage.class, messageClassMap.get(new TypeToClassKey(version, 2)));
         assertEquals("Wrong class", EchoOutput.class, messageClassMap.get(new TypeToClassKey(version, 3)));
         assertEquals("Wrong class", GetConfigOutput.class, messageClassMap.get(new TypeToClassKey(version, 8)));
+        assertEquals("Wrong class", BarrierOutput.class, messageClassMap.get(new TypeToClassKey(version, 21)));
 
         version = EncodeConstants.OF15_VERSION_ID;
         assertEquals("Wrong class", HelloMessage.class, messageClassMap.get(new TypeToClassKey(version, 0)));
         assertEquals("Wrong class", EchoRequestMessage.class, messageClassMap.get(new TypeToClassKey(version, 2)));
         assertEquals("Wrong class", EchoOutput.class, messageClassMap.get(new TypeToClassKey(version, 3)));
         assertEquals("Wrong class", GetConfigOutput.class, messageClassMap.get(new TypeToClassKey(version, 8)));
+        assertEquals("Wrong class", BarrierOutput.class, messageClassMap.get(new TypeToClassKey(version, 21)));
     }
 
     @Test
@@ -141,10 +143,12 @@ public class TypeToClassMapInitializerTest {
         version = EncodeConstants.OF14_VERSION_ID;
         assertEquals("Wrong class", GetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 7)));
         assertEquals("Wrong class", SetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 9)));
+        assertEquals("Wrong class", BarrierInput.class, messageClassMap.get(new TypeToClassKey(version, 20)));
 
         version = EncodeConstants.OF15_VERSION_ID;
         assertEquals("Wrong class", GetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 7)));
         assertEquals("Wrong class", SetConfigInput.class, messageClassMap.get(new TypeToClassKey(version, 9)));
+        assertEquals("Wrong class", BarrierInput.class, messageClassMap.get(new TypeToClassKey(version, 20)));
     }
 
 }
\ No newline at end of file

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactoryTest.java
index 1fbcfc1c02a80dee5bce6308d7c47520c3852aeb..5e63639be1fdd1f799f653b0da04d6bc749dcde9 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierInputMessageFactoryTest.java
@@ -8,35 +8,46 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
-import org.junit.Before;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import org.junit.Test;
-import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
-import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
-import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
+import org.opendaylight.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
 
 /**
+ * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.BarrierInputMessageFactory}.
  * @author giuseppex.petralia@intel.com
- *
  */
-public class BarrierInputMessageFactoryTest {
-    private OFDeserializer<BarrierInput> factory;
+public class BarrierInputMessageFactoryTest extends DefaultDeserializerFactoryTest<BarrierInput> {
+
 
-    @Before
-    public void startUp() {
-        DeserializerRegistry desRegistry = new DeserializerRegistryImpl();
-        desRegistry.init();
-        factory = desRegistry
-                .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 20, BarrierInput.class));
+    /**
+     * Initializes deserializer registry and lookups OF13 deserializer.
+     */
+    public BarrierInputMessageFactoryTest() {
+        super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 20, BarrierInput.class));
     }
 
+    /**
+     * Testing of {@link BarrierInputMessageFactory} for correct header version.
+     */
     @Test
-    public void test() {
+    public void testVersions() {
+        List<Byte> versions = new ArrayList<>(Arrays.asList(
+                EncodeConstants.OF13_VERSION_ID,
+                EncodeConstants.OF14_VERSION_ID,
+                EncodeConstants.OF15_VERSION_ID
+        ));
         ByteBuf bb = BufferHelper.buildBuffer();
-        BarrierInput deserializedMessage = BufferHelper.deserialize(factory, bb);
-        BufferHelper.checkHeaderV13(deserializedMessage);
+        testHeaderVersions(versions, bb);
+
+        // OFP v1.0 need to be tested separately cause of different message type value
+        messageCodeKey = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 18, BarrierInput.class);
+        testHeaderVersions(Collections.singletonList(EncodeConstants.OF10_VERSION_ID), bb);
     }
 }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactoryTest.java
index a938d5cb06afb19874a8eca649e90833b7451929..7edff8ed4361fd0cb196e193394b29831808836e 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/BarrierReplyMessageFactoryTest.java
@@ -9,45 +9,46 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
-
-import org.junit.Before;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import org.junit.Test;
-import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
-import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
-import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl;
-import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
+import org.opendaylight.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutput;
 
 /**
+ * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.BarrierReplyMessageFactory}.
  * @author michal.polkorab
  * @author timotej.kubas
  */
-public class BarrierReplyMessageFactoryTest {
-
-    private OFDeserializer<BarrierOutput> barrierFactory;
+public class BarrierReplyMessageFactoryTest extends DefaultDeserializerFactoryTest<BarrierOutput> {
 
     /**
-     * Initializes deserializer registry and lookups correct deserializer
+     * Initializes deserializer registry and lookups OF13 deserializer.
      */
-    @Before
-    public void startUp() {
-        DeserializerRegistry registry = new DeserializerRegistryImpl();
-        registry.init();
-        barrierFactory = registry.getDeserializer(
-                new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 21, BarrierOutput.class));
+    public BarrierReplyMessageFactoryTest() {
+       super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 21, BarrierOutput.class));
     }
 
     /**
-     * Testing of {@link BarrierReplyMessageFactory} for correct translation into POJO
+     * Testing of {@link BarrierReplyMessageFactory} for correct header version.
      */
     @Test
-    public void test() {
+    public void testVersions() {
+        List<Byte> versions = new ArrayList<>(Arrays.asList(
+                EncodeConstants.OF13_VERSION_ID,
+                EncodeConstants.OF14_VERSION_ID,
+                EncodeConstants.OF15_VERSION_ID
+        ));
         ByteBuf bb = BufferHelper.buildBuffer();
-        BarrierOutput builtByFactory = BufferHelper.deserialize(
-                barrierFactory, bb);
+        testHeaderVersions(versions, bb);
 
-        BufferHelper.checkHeaderV13(builtByFactory);
+        // OFP v1.0 need to be tested separately cause of different message type value
+        messageCodeKey = new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 19, BarrierOutput.class);
+        testHeaderVersions(Collections.singletonList(EncodeConstants.OF10_VERSION_ID), bb);
     }
 }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierInputMessageFactoryTest.java
deleted file mode 100644 (file)
index 01f5184..0000000
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierInputMessageFactoryTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2015 NetIDE Consortium and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
-
-import io.netty.buffer.ByteBuf;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
-import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
-import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl;
-import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
-
-/**
- * @author giuseppex.petralia@intel.com
- *
- */
-public class OF10BarrierInputMessageFactoryTest {
-    private OFDeserializer<BarrierInput> factory;
-
-    @Before
-    public void startUp() {
-        DeserializerRegistry desRegistry = new DeserializerRegistryImpl();
-        desRegistry.init();
-        factory = desRegistry
-                .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 18, BarrierInput.class));
-    }
-
-    @Test
-    public void test() {
-        ByteBuf bb = BufferHelper.buildBuffer();
-        BarrierInput deserializedMessage = BufferHelper.deserialize(factory, bb);
-        BufferHelper.checkHeaderV10(deserializedMessage);
-    }
-}

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierReplyMessageFactoryTest.java
deleted file mode 100644 (file)
index ca1db52..0000000
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10BarrierReplyMessageFactoryTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2013 Pantheon Technologies s.r.o. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
-
-import io.netty.buffer.ByteBuf;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
-import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
-import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl;
-import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutput;
-
-/**
- * @author michal.polkorab
- * @author timotej.kubas
- */
-public class OF10BarrierReplyMessageFactoryTest {
-
-    private OFDeserializer<BarrierOutput> barrierFactory;
-
-    /**
-     * Initializes deserializer registry and lookups correct deserializer
-     */
-    @Before
-    public void startUp() {
-        DeserializerRegistry registry = new DeserializerRegistryImpl();
-        registry.init();
-        barrierFactory = registry.getDeserializer(
-                new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 19, BarrierOutput.class));
-    }
-
-    /**
-     * Testing of {@link OF10BarrierReplyMessageFactory} for correct translation into POJO
-     */
-    @Test
-    public void testV10() {
-        ByteBuf bb = BufferHelper.buildBuffer();
-        BarrierOutput builtByFactory = BufferHelper.deserialize(
-                barrierFactory, bb);
-
-        BufferHelper.checkHeaderV10(builtByFactory);
-    }
-}

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/DefaultDeserializerFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/DefaultDeserializerFactoryTest.java
index 2d424cdef5cc354956f793c56302519c83e7d75e..b5eead74b0f8f50cf87689831af1b9fb98e1decb 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/DefaultDeserializerFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/DefaultDeserializerFactoryTest.java
@@ -24,7 +24,7 @@ public abstract class DefaultDeserializerFactoryTest<T extends DataContainer> {
 
     private DeserializerRegistry registry;
     protected OFDeserializer<T> factory;
-    private MessageCodeKey messageCodeKey;
+    protected MessageCodeKey messageCodeKey;
 
     public DefaultDeserializerFactoryTest(final MessageCodeKey key) {
         this.registry = new DeserializerRegistryImpl();