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;
/**
* 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) {
// 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());
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());
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());
}
}
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;
-import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10GetConfigReplyMessageFactory;
import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10HelloMessageFactory;
import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10PacketInMessageFactory;
import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.OF10PortStatusMessageFactory;
helper.registerDeserializer(3, null, EchoOutput.class, new EchoReplyMessageFactory());
helper.registerDeserializer(4, null, ExperimenterMessage.class, new VendorMessageFactory());
helper.registerDeserializer(6, null, GetFeaturesOutput.class, new OF10FeaturesReplyMessageFactory());
- helper.registerDeserializer(8, null, GetConfigOutput.class, new OF10GetConfigReplyMessageFactory());
+ helper.registerDeserializer(8, null, GetConfigOutput.class, new GetConfigReplyMessageFactory());
helper.registerDeserializer(10, null, PacketInMessage.class, new OF10PacketInMessageFactory());
helper.registerDeserializer(11, null, FlowRemovedMessage.class, new OF10FlowRemovedMessageFactory());
helper.registerDeserializer(12, null, PortStatusMessage.class, new OF10PortStatusMessageFactory());
helper.registerDeserializer(0, null, HelloMessage.class, new HelloMessageFactory());
helper.registerDeserializer(2, null, EchoRequestMessage.class, new EchoRequestMessageFactory());
helper.registerDeserializer(3, null, EchoOutput.class, new EchoReplyMessageFactory());
+ helper.registerDeserializer(8, null, GetConfigOutput.class, new GetConfigReplyMessageFactory());
// register OF v1.5 message deserializers
helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF15_VERSION_ID, registry);
helper.registerDeserializer(0, null, HelloMessage.class, new HelloMessageFactory());
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.registerTypeToClass((short) 0, HelloMessage.class);
helper.registerTypeToClass((short) 2, EchoRequestMessage.class);
helper.registerTypeToClass((short) 3, EchoOutput.class);
+ helper.registerTypeToClass((short) 8, GetConfigOutput.class);
// init OF v1.5 mapping
helper = new TypeToClassInitHelper(EncodeConstants.OF15_VERSION_ID, messageClassMap);
helper.registerTypeToClass((short) 0, HelloMessage.class);
helper.registerTypeToClass((short) 2, EchoRequestMessage.class);
helper.registerTypeToClass((short) 3, EchoOutput.class);
+ helper.registerTypeToClass((short) 8, GetConfigOutput.class);
}
/**
helper.registerTypeToClass((short) 26, GetAsyncInput.class);
helper.registerTypeToClass((short) 28, SetAsyncInput.class);
helper.registerTypeToClass((short) 29, MeterModInput.class);
+
+ // init OF v1.4 mapping
+ helper = new TypeToClassInitHelper(EncodeConstants.OF14_VERSION_ID, messageClassMap);
+ helper.registerTypeToClass((short) 7, GetConfigInput.class);
+ helper.registerTypeToClass((short) 9, SetConfigInput.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);
}
}
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.GetConfigInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigInputBuilder;
/**
+ * Translates GetConfigRequest messages.
+ * OF protocol versions: 1.0, 1.3, 1.4, 1.5.
* @author giuseppex.petralia@intel.com
- *
*/
-public class GetConfigInputMessageFactory implements OFDeserializer<GetConfigInput> {
+public class GetConfigInputMessageFactory extends VersionAssignableFactory implements OFDeserializer<GetConfigInput> {
@Override
public GetConfigInput deserialize(ByteBuf rawMessage) {
GetConfigInputBuilder builder = new GetConfigInputBuilder();
- builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
+ builder.setVersion(getVersion());
builder.setXid(rawMessage.readUnsignedInt());
return builder.build();
}
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.common.types.rev130731.SwitchConfigFlag;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigOutputBuilder;
/**
- * Translates GetConfigReply messages (both OpenFlow v1.0 and OpenFlow v1.3)
+ * Translates GetConfigReply messages.
+ * OF protocol versions: 1.0, 1.3, 1.4, 1.5.
* @author michal.polkorab
* @author timotej.kubas
*/
-public class GetConfigReplyMessageFactory implements OFDeserializer<GetConfigOutput> {
+public class GetConfigReplyMessageFactory extends VersionAssignableFactory implements OFDeserializer<GetConfigOutput> {
@Override
public GetConfigOutput deserialize(ByteBuf rawMessage) {
GetConfigOutputBuilder builder = new GetConfigOutputBuilder();
- builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
+ builder.setVersion(getVersion());
builder.setXid(rawMessage.readUnsignedInt());
builder.setFlags(SwitchConfigFlag.forValue(rawMessage.readUnsignedShort()));
builder.setMissSendLen(rawMessage.readUnsignedShort());
+++ /dev/null
-/*
- * 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.GetConfigInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigInputBuilder;
-
-/**
- * @author giuseppex.petralia@intel.com
- *
- */
-public class OF10GetConfigInputMessageFactory implements OFDeserializer<GetConfigInput> {
-
- @Override
- public GetConfigInput deserialize(ByteBuf rawMessage) {
- GetConfigInputBuilder builder = new GetConfigInputBuilder();
- builder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
- builder.setXid(rawMessage.readUnsignedInt());
- return builder.build();
- }
-}
+++ /dev/null
-/*
- * 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.common.types.rev130731.SwitchConfigFlag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigOutputBuilder;
-
-/**
- * Translates GetConfigReply messages (both OpenFlow v1.0 and OpenFlow v1.3)
- * @author michal.polkorab
- * @author timotej.kubas
- */
-public class OF10GetConfigReplyMessageFactory implements OFDeserializer<GetConfigOutput> {
-
- @Override
- public GetConfigOutput deserialize(ByteBuf rawMessage) {
- GetConfigOutputBuilder builder = new GetConfigOutputBuilder();
- builder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
- builder.setXid(rawMessage.readUnsignedInt());
- builder.setFlags(SwitchConfigFlag.forValue(rawMessage.readUnsignedShort()));
- builder.setMissSendLen(rawMessage.readUnsignedShort());
- return builder.build();
- }
-}
+++ /dev/null
-/*
- * 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.common.types.rev130731.SwitchConfigFlag;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInputBuilder;
-
-/**
- * @author giuseppex.petralia@intel.com
- *
- */
-public class OF10SetConfigMessageFactory implements OFDeserializer<SetConfigInput> {
-
- @Override
- public SetConfigInput deserialize(ByteBuf rawMessage) {
- SetConfigInputBuilder builder = new SetConfigInputBuilder();
- builder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
- builder.setXid(rawMessage.readUnsignedInt());
- builder.setFlags(SwitchConfigFlag.forValue(rawMessage.readUnsignedShort()));
- builder.setMissSendLen(rawMessage.readUnsignedShort());
- return builder.build();
- }
-}
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.common.types.rev130731.SwitchConfigFlag;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInputBuilder;
/**
+ * Translates SetConfig messages.
+ * OF protocol versions: 1.0, 1.3, 1.4, 1.5.
* @author giuseppex.petralia@intel.com
- *
*/
-public class SetConfigInputMessageFactory implements OFDeserializer<SetConfigInput> {
+public class SetConfigInputMessageFactory extends VersionAssignableFactory implements OFDeserializer<SetConfigInput> {
@Override
public SetConfigInput deserialize(ByteBuf rawMessage) {
SetConfigInputBuilder builder = new SetConfigInputBuilder();
- builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
+ builder.setVersion(getVersion());
builder.setXid(rawMessage.readUnsignedInt());
builder.setFlags(SwitchConfigFlag.forValue(rawMessage.readUnsignedShort()));
builder.setMissSendLen(rawMessage.readUnsignedShort());
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)));
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)));
}
@Test
assertEquals("Wrong class", GetAsyncInput.class, messageClassMap.get(new TypeToClassKey(version, 26)));
assertEquals("Wrong class", SetAsyncInput.class, messageClassMap.get(new TypeToClassKey(version, 28)));
assertEquals("Wrong class", MeterModInput.class, messageClassMap.get(new TypeToClassKey(version, 29)));
+
+ 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)));
+
+ 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)));
}
}
\ No newline at end of file
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.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.GetConfigInput;
/**
+ * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.GetConfigInputMessageFactory}.
* @author giuseppex.petralia@intel.com
- *
*/
-public class GetConfigInputMessageFactoryTest {
- private OFDeserializer<GetConfigInput> factory;
+public class GetConfigInputMessageFactoryTest extends DefaultDeserializerFactoryTest<GetConfigInput> {
- @Before
- public void startUp() {
- DeserializerRegistry desRegistry = new DeserializerRegistryImpl();
- desRegistry.init();
- factory = desRegistry
- .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 7, GetConfigInput.class));
+ /**
+ * Initializes deserializer registry and lookups OF13 deserializer.
+ */
+ public GetConfigInputMessageFactoryTest() {
+ super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 7, GetConfigInput.class));
}
+ /**
+ * Testing {@link GetConfigInputMessageFactory} for correct header version.
+ */
@Test
- public void test() {
+ public void testVersions() {
+ List<Byte> versions = new ArrayList<>(Arrays.asList(
+ EncodeConstants.OF10_VERSION_ID,
+ EncodeConstants.OF13_VERSION_ID,
+ EncodeConstants.OF14_VERSION_ID,
+ EncodeConstants.OF15_VERSION_ID
+ ));
ByteBuf bb = BufferHelper.buildBuffer();
- GetConfigInput deserializedMessage = BufferHelper.deserialize(factory, bb);
- BufferHelper.checkHeaderV13(deserializedMessage);
+ testHeaderVersions(versions, bb);
}
}
package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
import io.netty.buffer.ByteBuf;
-
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.junit.Assert;
-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.openflowjava.protocol.impl.util.BufferHelper;
+import org.opendaylight.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigOutput;
/**
+ * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.GetConfigReplyMessageFactory}.
* @author michal.polkorab
* @author timotej.kubas
*/
-public class GetConfigReplyMessageFactoryTest {
+public class GetConfigReplyMessageFactoryTest extends DefaultDeserializerFactoryTest<GetConfigOutput> {
- private OFDeserializer<GetConfigOutput> configFactory;
+ /**
+ * Initializes deserializer registry and lookups OF13 deserializer.
+ */
+ public GetConfigReplyMessageFactoryTest() {
+ super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 8, GetConfigOutput.class));
+ }
/**
- * Initializes deserializer registry and lookups correct deserializer
+ * Testing {@link GetConfigReplyMessageFactory} for correct header version.
*/
- @Before
- public void startUp() {
- DeserializerRegistry registry = new DeserializerRegistryImpl();
- registry.init();
- configFactory = registry.getDeserializer(
- new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 8, GetConfigOutput.class));
+ @Test
+ public void testVersions() {
+ List<Byte> versions = new ArrayList<>(Arrays.asList(
+ EncodeConstants.OF10_VERSION_ID,
+ EncodeConstants.OF13_VERSION_ID,
+ EncodeConstants.OF14_VERSION_ID,
+ EncodeConstants.OF15_VERSION_ID
+ ));
+ ByteBuf bb = BufferHelper.buildBuffer("00 01 00 03");
+ testHeaderVersions(versions, bb);
}
/**
- * Testing {@link GetConfigReplyMessageFactory} for correct translation into POJO
+ * Testing {@link GetConfigReplyMessageFactory} for correct translation into POJO.
*/
@Test
public void test() {
ByteBuf bb = BufferHelper.buildBuffer("00 01 00 03");
- GetConfigOutput builtByFactory = BufferHelper.deserialize(configFactory, bb);
-
- BufferHelper.checkHeaderV13(builtByFactory);
+ GetConfigOutput builtByFactory = BufferHelper.deserialize(factory, bb);
Assert.assertEquals("Wrong switchConfigFlag", 0x01, builtByFactory.getFlags().getIntValue());
Assert.assertEquals("Wrong missSendLen", 0x03, builtByFactory.getMissSendLen().intValue());
}
+++ /dev/null
-/*
- * 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.GetConfigInput;
-
-/**
- * @author giuseppex.petralia@intel.com
- *
- */
-public class OF10GetConfigInputMessageFactoryTest {
- private OFDeserializer<GetConfigInput> factory;
-
- @Before
- public void startUp() {
- DeserializerRegistry desRegistry = new DeserializerRegistryImpl();
- desRegistry.init();
- factory = desRegistry
- .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 7, GetConfigInput.class));
- }
-
- @Test
- public void test() {
- ByteBuf bb = BufferHelper.buildBuffer();
- GetConfigInput deserializedMessage = BufferHelper.deserialize(factory, bb);
- BufferHelper.checkHeaderV10(deserializedMessage);
- }
-}
+++ /dev/null
-/*
- * 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.Assert;
-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.GetConfigOutput;
-
-/**
- * @author michal.polkorab
- * @author timotej.kubas
- */
-public class OF10GetConfigReplyMessageFactoryTest {
-
- private OFDeserializer<GetConfigOutput> configFactory;
-
- /**
- * Initializes deserializer registry and lookups correct deserializer
- */
- @Before
- public void startUp() {
- DeserializerRegistry registry = new DeserializerRegistryImpl();
- registry.init();
- configFactory = registry.getDeserializer(
- new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 8, GetConfigOutput.class));
- }
-
- /**
- * Testing {@link OF10GetConfigReplyMessageFactory} for correct translation into POJO
- */
- @Test
- public void test() {
- ByteBuf bb = BufferHelper.buildBuffer("00 01 00 03");
- GetConfigOutput builtByFactory = BufferHelper.deserialize(configFactory, bb);
-
- BufferHelper.checkHeaderV10(builtByFactory);
- Assert.assertEquals("Wrong switchConfigFlag", 0x01, builtByFactory.getFlags().getIntValue());
- Assert.assertEquals("Wrong missSendLen", 0x03, builtByFactory.getMissSendLen().intValue());
- }
-
-}
+++ /dev/null
-/*
- * 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.Assert;
-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.SetConfigInput;
-
-/**
- * @author giuseppex.petralia@intel.com
- *
- */
-public class OF10SetConfigMessageFactoryTest {
- private OFDeserializer<SetConfigInput> factory;
-
- @Before
- public void startUp() {
- DeserializerRegistry desRegistry = new DeserializerRegistryImpl();
- desRegistry.init();
- factory = desRegistry
- .getDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID, 9, SetConfigInput.class));
- }
-
- @Test
- public void test() {
- ByteBuf bb = BufferHelper.buildBuffer("00 01 00 03");
- SetConfigInput deserializedMessage = BufferHelper.deserialize(factory, bb);
- BufferHelper.checkHeaderV10(deserializedMessage);
- Assert.assertEquals("Wrong switchConfigFlag", 0x01, deserializedMessage.getFlags().getIntValue());
- Assert.assertEquals("Wrong missSendLen", 0x03, deserializedMessage.getMissSendLen().intValue());
- }
-}
package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
import io.netty.buffer.ByteBuf;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.junit.Assert;
-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.openflowjava.protocol.impl.util.DefaultDeserializerFactoryTest;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.SwitchConfigFlag;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInput;
/**
+ * Test for {@link org.opendaylight.openflowjava.protocol.impl.deserialization.factories.SetConfigInputMessageFactory}.
* @author giuseppex.petralia@intel.com
- *
*/
-public class SetConfigMessageFactoryTest {
- private OFDeserializer<SetConfigInput> factory;
+public class SetConfigInputMessageFactoryTest extends DefaultDeserializerFactoryTest<SetConfigInput> {
+
+ /**
+ * Initializes deserializer registry and lookups OF13 deserializer.
+ */
+ public SetConfigInputMessageFactoryTest() {
+ super(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 9, SetConfigInput.class));
+ }
- @Before
- public void startUp() {
- DeserializerRegistry desRegistry = new DeserializerRegistryImpl();
- desRegistry.init();
- factory = desRegistry
- .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 9, SetConfigInput.class));
+ /**
+ * Testing {@link SetConfigInputMessageFactory} for correct header version.
+ */
+ @Test
+ public void testVersions() {
+ List<Byte> versions = new ArrayList<>(Arrays.asList(
+ EncodeConstants.OF10_VERSION_ID,
+ EncodeConstants.OF13_VERSION_ID,
+ EncodeConstants.OF14_VERSION_ID,
+ EncodeConstants.OF15_VERSION_ID
+ ));
+ ByteBuf bb = BufferHelper.buildBuffer("00 02 " + "00 0a");
+ testHeaderVersions(versions, bb);
}
@Test
public void test() {
ByteBuf bb = BufferHelper.buildBuffer("00 02 " + "00 0a");
SetConfigInput deserializedMessage = BufferHelper.deserialize(factory, bb);
- BufferHelper.checkHeaderV13(deserializedMessage);
// Test Message
Assert.assertEquals("Wrong flags ", SwitchConfigFlag.forValue(2), deserializedMessage.getFlags());
Code Review / openflowjava.git / commitdiff