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=7542174e2a3acafaf6478f8d5371243d7cc69ff0;hb=a19846506c0789d64a543884713df0ae1cab2a23;hp=98555e5fcb9cd945e44dd137cca37e884ced68f1;hpb=bde541b0e897faf9f0e189b31b2cb9507aeb17cf;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 98555e5fcb..7542174e2a 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 @@ -4,19 +4,21 @@ * 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 - * - * Contributor: usha.m.s@ericsson.com */ 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.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress; +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.CommonPort.PortNumber; +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; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.flow.capable.port.State; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.flow.capable.port.StateBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.port.mod.port.PortBuilder; @@ -30,96 +32,103 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 public class PortConvertorTest { - - private PortFeatures features = new PortFeatures(true, null, null, null, null, null, null, null, null, null, null, - null, null, null, null, null); - - private PortConfig config = new PortConfig(false, false, false, false); - - private org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures portf31= + private static final String DEFAULT_MAC_ADDRESS = "01:02:03:04:05:06"; + + private final PortFeatures features = new PortFeatures(true, null, null, null, null, null, null, null, null, null, + null, null, null, null, null, null); + + private final PortConfig config = new PortConfig(false, false, false, false); + + 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( null, null, null, null, null, null, null, null, null, null, true, null, null, null, null, null); - - 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() - { - + public void testtoPortModInputwithAllParameters() { PortBuilder portBld = new PortBuilder(); portBld.setAdvertisedFeatures(features); portBld.setConfiguration(config); - portBld.setPortNumber(new PortNumber(42L)); - portBld.setHardwareAddress(new MacAddress("")); - - PortModInput portOut = PortConvertor.toPortModInput(portBld.build(), EncodeConstants.OF13_VERSION_ID); - + portBld.setPortNumber(new PortNumberUni(42L)); + portBld.setHardwareAddress(new MacAddress(DEFAULT_MAC_ADDRESS)); + + VersionConvertorData data = new VersionConvertorData(OFConstants.OFP_VERSION_1_3); + final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager(); + Optional portOutOptional = convertorManager.convert(portBld.build(), data); + final PortModInput portOut = portOutOptional.orElse(PortConvertor.defaultResult(OFConstants.OFP_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.setMask(configMask31); portModInputBld.setPortNo( new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber(42L)); - portModInputBld.setHwAddress(new MacAddress("")); + portModInputBld.setHwAddress(new MacAddress(DEFAULT_MAC_ADDRESS)); portModInputBld.setAdvertise(portf31); - + portModInputBld.setConfigV10(portConfV10); - portModInputBld.setMaskV10(portConfV10); + portModInputBld.setMaskV10(portConfMaskV10); portModInputBld.setAdvertiseV10( new PortFeaturesV10(null, null, null, null, null, null, null, true, null, null, null, null)); - + portModInputBld.setVersion((short) EncodeConstants.OF13_VERSION_ID); - + 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.setHardwareAddress(new MacAddress("")); + flowCapableNodeConnectorBuilder.setHardwareAddress(new MacAddress(DEFAULT_MAC_ADDRESS)); flowCapableNodeConnectorBuilder.setMaximumSpeed(null); flowCapableNodeConnectorBuilder.setName("foo"); flowCapableNodeConnectorBuilder.setPeerFeatures(features); - flowCapableNodeConnectorBuilder.setPortNumber(new PortNumber(42L)); + flowCapableNodeConnectorBuilder.setPortNumber(new PortNumberUni(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.OF13_VERSION_ID); + PortsBuilder portsB = new PortsBuilder(); - + portsB.setAdvertisedFeatures(portf31); portsB.setConfig(config31); portsB.setCurrentFeatures(portf31); portsB.setCurrSpeed(null); - portsB.setHwAddr(new MacAddress("")); + portsB.setHwAddr(new MacAddress(DEFAULT_MAC_ADDRESS)); portsB.setMaxSpeed(null); portsB.setName("foo"); portsB.setPeerFeatures(portf31); portsB.setPortNo(42L); - portsB.setState(state31); + portsB.setState(new PortState(false, false, false)); portsB.setSupportedFeatures(portf31); - + Assert.assertEquals(portsB.build(), portsOut); } - }