X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fopenflow%2Fmd%2Fcore%2Fsal%2Fconvertor%2FPortConvertorTest.java;h=da594e33289b310cb6b45931441f40be3d121f18;hb=refs%2Fchanges%2F39%2F104039%2F6;hp=d5a2cc0486f5c84a31b37a9bb44b2e355dc501f1;hpb=843dd38b699e94cc34c32306819ecb57c7351985;p=openflowplugin.git diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java index d5a2cc0486..da594e3328 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PortConvertorTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2014 Ericsson India Global Services Pvt Ltd. and others. All rights reserved. * * This program and the accompanying materials are made available under the @@ -7,11 +7,15 @@ */ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor; +import java.util.Optional; import org.junit.Assert; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; +import org.opendaylight.openflowplugin.api.OFConstants; +import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.FlowCapablePort; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortNumberUni; @@ -25,101 +29,112 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortModInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.port.desc._case.multipart.reply.port.desc.Ports; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.port.desc._case.multipart.reply.port.desc.PortsBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; public class PortConvertorTest { - /** defautl mac address */ private static final String DEFAULT_MAC_ADDRESS = "01:02:03:04:05:06"; - private PortFeatures features = new PortFeatures(true, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null); + private final PortFeatures features = new PortFeatures( + true, false, false, false, false, false, false, false, + false, false, false, false, false, false, false, false); - private PortConfig config = new PortConfig(false, false, false, false); + private final PortConfig config = new PortConfig(false, false, false, false); - private org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures portf31= - new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures( - null, null, null, null, null, null, null, null, null, null, true, null, null, null, null, null); + private final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures portf31 = + new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures( + false, false, false, false, false, false, false, false, + false, false, true, false, false, false, false, false); - private org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig config31 = + private final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig config31 = new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig( false, false, false, false); + private final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig + configMask31 = new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig( + true, true, true, true); + + private final PortConfigV10 portConfMaskV10 = new PortConfigV10(true, true, true, true, true, true, true); + /** - * test of {@link PortConvertor#toPortModInput(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.port.mod.port.Port, short)} + * test of {@link PortConvertor#convert(Port, VersionConvertorData)} }. */ @Test - public void testtoPortModInputwithAllParameters() - { - - PortBuilder portBld = new PortBuilder(); - portBld.setAdvertisedFeatures(features); - portBld.setConfiguration(config); - portBld.setPortNumber(new PortNumberUni(42L)); - portBld.setHardwareAddress(new MacAddress(DEFAULT_MAC_ADDRESS)); - - PortModInput portOut = PortConvertor.toPortModInput(portBld.build(), EncodeConstants.OF13_VERSION_ID); + public void testtoPortModInputwithAllParameters() { + PortBuilder portBld = new PortBuilder() + .setPortModOrder(Uint32.ZERO) + .setAdvertisedFeatures(features) + .setConfiguration(config) + .setPortNumber(new PortNumberUni(Uint32.valueOf(42))) + .setHardwareAddress(new MacAddress(DEFAULT_MAC_ADDRESS)); + + VersionConvertorData data = new VersionConvertorData(OFConstants.OFP_VERSION_1_3); + final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager(); + final Optional portOutOptional = convertorManager.convert(portBld.build(), data); + final PortModInput portOut = portOutOptional + .orElse(PortConvertor.defaultResult(EncodeConstants.OF_VERSION_1_3)); PortConfigV10 portConfV10 = new PortConfigV10(false, false, false, false, true, true, false); PortModInputBuilder portModInputBld = new PortModInputBuilder(); portModInputBld.setConfig(config31); - portModInputBld.setMask(config31); - portModInputBld.setPortNo( - new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber(42L)); + portModInputBld.setMask(configMask31); + portModInputBld.setPortNo(new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731 + .PortNumber(Uint32.valueOf(42))); portModInputBld.setHwAddress(new MacAddress(DEFAULT_MAC_ADDRESS)); portModInputBld.setAdvertise(portf31); portModInputBld.setConfigV10(portConfV10); - portModInputBld.setMaskV10(portConfV10); - portModInputBld.setAdvertiseV10( - new PortFeaturesV10(null, null, null, null, null, null, null, true, null, null, null, null)); + portModInputBld.setMaskV10(portConfMaskV10); + portModInputBld.setAdvertiseV10(new PortFeaturesV10( + false, false, false, false, false, false, + false, true, false, false, false, false)); - portModInputBld.setVersion((short) EncodeConstants.OF13_VERSION_ID); + portModInputBld.setVersion(EncodeConstants.OF_VERSION_1_3); Assert.assertEquals(portModInputBld.build(), portOut); } /** - * test of {@link PortConvertor#toPortDesc(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.FlowCapablePort , short)} + * test of {@link PortConvertor#toPortDesc(FlowCapablePort , short)}. */ @Test - public void testtoPortDescwithAllParameters(){ + public void testtoPortDescwithAllParameters() { State state = new StateBuilder().setBlocked(false).setLinkDown(false).setLive(false).build(); - PortState state31= new PortState(false, false, false); FlowCapableNodeConnectorBuilder flowCapableNodeConnectorBuilder = new FlowCapableNodeConnectorBuilder(); flowCapableNodeConnectorBuilder.setAdvertisedFeatures(features); flowCapableNodeConnectorBuilder.setConfiguration(config); flowCapableNodeConnectorBuilder.setCurrentFeature(features); - flowCapableNodeConnectorBuilder.setCurrentSpeed(null); + flowCapableNodeConnectorBuilder.setCurrentSpeed((Uint32) null); flowCapableNodeConnectorBuilder.setHardwareAddress(new MacAddress(DEFAULT_MAC_ADDRESS)); - flowCapableNodeConnectorBuilder.setMaximumSpeed(null); + flowCapableNodeConnectorBuilder.setMaximumSpeed((Uint32) null); flowCapableNodeConnectorBuilder.setName("foo"); flowCapableNodeConnectorBuilder.setPeerFeatures(features); - flowCapableNodeConnectorBuilder.setPortNumber(new PortNumberUni(42L)); + flowCapableNodeConnectorBuilder.setPortNumber(new PortNumberUni(Uint32.valueOf(42L))); flowCapableNodeConnectorBuilder.setState(state); flowCapableNodeConnectorBuilder.setSupported(features); - Ports portsOut = PortConvertor.toPortDesc(flowCapableNodeConnectorBuilder.build(), EncodeConstants.OF13_VERSION_ID); + final Ports portsOut = PortConvertor.toPortDesc( + flowCapableNodeConnectorBuilder.build(), EncodeConstants.OF_VERSION_1_3); PortsBuilder portsB = new PortsBuilder(); portsB.setAdvertisedFeatures(portf31); portsB.setConfig(config31); portsB.setCurrentFeatures(portf31); - portsB.setCurrSpeed(null); + portsB.setCurrSpeed((Uint32) null); portsB.setHwAddr(new MacAddress(DEFAULT_MAC_ADDRESS)); - portsB.setMaxSpeed(null); + portsB.setMaxSpeed((Uint32) null); portsB.setName("foo"); portsB.setPeerFeatures(portf31); - portsB.setPortNo(42L); - portsB.setState(state31); + portsB.setPortNo(Uint32.valueOf(42)); + portsB.setState(new PortState(false, false, false)); portsB.setSupportedFeatures(portf31); Assert.assertEquals(portsB.build(), portsOut); } - }