package org.opendaylight.openflowplugin.openflow.md.core.sal;
import com.google.common.base.Optional;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
-
import java.math.BigInteger;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
import org.opendaylight.openflowplugin.api.OFConstants;
import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.PacketOutConvertor;
import org.opendaylight.openflowplugin.api.openflow.md.core.session.IMessageDispatchService;
-import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.PacketOutConvertor;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.PacketOutConvertorData;
+import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
import org.opendaylight.openflowplugin.openflow.md.core.session.SwitchConnectionCookieOFImpl;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowOutput;
public Future<RpcResult<Void>> transmitPacket(final TransmitPacketInput input) {
LOG.debug("TransmitPacket - {}", input);
// Convert TransmitPacket to PacketOutInput
- PacketOutInput message = PacketOutConvertor.toPacketOutInput(input, version, sessionContext.getNextXid(),
- sessionContext.getFeatures().getDatapathId());
+ final PacketOutConvertorData data = new PacketOutConvertorData(version);
+ data.setDatapathId(sessionContext.getFeatures().getDatapathId());
+ data.setXid(sessionContext.getNextXid());
+
+ final java.util.Optional<PacketOutInput> message = ConvertorManager.getInstance().convert(input, data);
SwitchConnectionDistinguisher cookie = null;
ConnectionCookie connectionCookie = input.getConnectionCookie();
}
LOG.debug("Calling the transmitPacket RPC method");
- return messageService.packetOut(message, cookie);
+ return messageService.packetOut(message
+ .orElse(PacketOutConvertor.defaultResult(version)), cookie);
}
@Override
-/**
+/*
* Copyright (c) 2013 Cisco Systems, Inc. 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.openflowplugin.openflow.md.core.sal.convertor;
import com.google.common.collect.Iterables;
-import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.opendaylight.openflowplugin.api.OFConstants;
import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ParametrizedConvertor;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.PacketOutConvertorData;
import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public final class PacketOutConvertor {
+/**
+ * Converts a MD-SAL packet out data into the OF library packet out input.
+ *
+ * Example usage:
+ * <pre>
+ * {@code
+ * PacketOutConvertorData data = new PacketOutConvertorData(version);
+ * data.setDatapathId(datapathId);
+ * data.setXid(xid);
+ * Optional<PacketOutInput> ofPacketInput = ConvertorManager.getInstance().convert(salPacket, data);
+ * }
+ * </pre>
+ */
+public class PacketOutConvertor implements ParametrizedConvertor<TransmitPacketInput, PacketOutInput, PacketOutConvertorData> {
private static final Logger LOG = LoggerFactory.getLogger(PacketOutConvertor.class);
- private PacketOutConvertor() {
-
+ /**
+ * Create default empty meter mot input builder.
+ * Use this method, if result from convertor is empty.
+ *
+ * @param version Openflow version
+ * @return default empty meter mod input builder
+ */
+ public static PacketOutInput defaultResult(short version) {
+ return new PacketOutInputBuilder()
+ .setVersion(version)
+ .build();
}
- // Get all the data for the PacketOut from the Yang/SAL-Layer
+ private static PortNumber getPortNumber(final PathArgument pathArgument, final Short ofVersion) {
+ // FIXME VD P! find InstanceIdentifier helper
+ InstanceIdentifier.IdentifiableItem<?, ?> item = Arguments.checkInstanceOf(pathArgument,
+ InstanceIdentifier.IdentifiableItem.class);
+ NodeConnectorKey key = Arguments.checkInstanceOf(item.getKey(), NodeConnectorKey.class);
+ Long port = InventoryDataServiceUtil.portNumberfromNodeConnectorId(
+ OpenflowVersion.get(ofVersion), key.getId());
+ return new PortNumber(port);
+ }
- /**
- * @param version openflow version
- * @param inputPacket input packet
- * @param datapathid datapath id
- * @param xid tx id
- * @return PacketOutInput required by OF Library
- */
- public static PacketOutInput toPacketOutInput(final TransmitPacketInput inputPacket, final short version, final Long xid,
- final BigInteger datapathid) {
+ @Override
+ public Class<?> getType() {
+ return TransmitPacketInput.class;
+ }
- LOG.trace("toPacketOutInput for datapathId:{}, xid:{}", datapathid, xid);
+ @Override
+ public PacketOutInput convert(TransmitPacketInput source, PacketOutConvertorData data) {
+ LOG.trace("toPacketOutInput for datapathId:{}, xid:{}", data.getDatapathId(), data.getXid());
// Build Port ID from TransmitPacketInput.Ingress
- PortNumber inPortNr = null;
+ PortNumber inPortNr;
Long bufferId = OFConstants.OFP_NO_BUFFER;
Iterable<PathArgument> inArgs = null;
PacketOutInputBuilder builder = new PacketOutInputBuilder();
- if (inputPacket.getIngress() != null) {
- inArgs = inputPacket.getIngress().getValue().getPathArguments();
+
+ if (source.getIngress() != null) {
+ inArgs = source.getIngress().getValue().getPathArguments();
}
+
if (inArgs != null && Iterables.size(inArgs) >= 3) {
- inPortNr = getPortNumber(Iterables.get(inArgs, 2), version);
+ inPortNr = getPortNumber(Iterables.get(inArgs, 2), data.getVersion());
} else {
// The packetOut originated from the controller
inPortNr = new PortNumber(0xfffffffdL);
}
// Build Buffer ID to be NO_OFP_NO_BUFFER
- if (inputPacket.getBufferId() != null) {
- bufferId = inputPacket.getBufferId();
+ if (source.getBufferId() != null) {
+ bufferId = source.getBufferId();
}
PortNumber outPort = null;
- NodeConnectorRef outRef = inputPacket.getEgress();
+ NodeConnectorRef outRef = source.getEgress();
Iterable<PathArgument> outArgs = outRef.getValue().getPathArguments();
+
if (Iterables.size(outArgs) >= 3) {
- outPort = getPortNumber(Iterables.get(outArgs, 2), version);
+ outPort = getPortNumber(Iterables.get(outArgs, 2), data.getVersion());
} else {
// TODO : P4 search for some normal exception
- new Exception("PORT NR not exist in Egress");
+ // new Exception("PORT NR not exist in Egress");
+ LOG.error("PORT NR not exist in Egress");
}
- List<Action> actions = null;
- List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action> inputActions =
- inputPacket.getAction();
+ List<Action> actions = new ArrayList<>();
+ List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action> inputActions = source.getAction();
+
if (inputActions != null) {
- final ActionConvertorData actionConvertorData = new ActionConvertorData(version);
- actionConvertorData.setDatapathId(datapathid);
+ final ActionConvertorData actionConvertorData = new ActionConvertorData(data.getVersion());
+ actionConvertorData.setDatapathId(data.getDatapathId());
final Optional<List<Action>> convertedActions = ConvertorManager.getInstance().convert(
inputActions, actionConvertorData);
actions = convertedActions.orElse(Collections.emptyList());
} else {
- actions = new ArrayList<>();
// TODO VD P! wait for way to move Actions (e.g. augmentation)
ActionBuilder aBuild = new ActionBuilder();
-
- OutputActionCaseBuilder outputActionCaseBuilder =
- new OutputActionCaseBuilder();
-
- OutputActionBuilder outputActionBuilder =
- new OutputActionBuilder();
-
+ OutputActionCaseBuilder outputActionCaseBuilder = new OutputActionCaseBuilder();
+ OutputActionBuilder outputActionBuilder = new OutputActionBuilder();
outputActionBuilder.setPort(outPort);
outputActionBuilder.setMaxLength(OFConstants.OFPCML_NO_BUFFER);
-
outputActionCaseBuilder.setOutputAction(outputActionBuilder.build());
-
aBuild.setActionChoice(outputActionCaseBuilder.build());
-
actions.add(aBuild.build());
}
builder.setAction(actions);
- builder.setData(inputPacket.getPayload());
- builder.setVersion(version);
- builder.setXid(xid);
+ builder.setData(source.getPayload());
+ builder.setVersion(data.getVersion());
+ builder.setXid(data.getXid());
builder.setInPort(inPortNr);
builder.setBufferId(bufferId);
- // --------------------------------------------------------
return builder.build();
}
-
- private static PortNumber getPortNumber(final PathArgument pathArgument, final Short ofVersion) {
- // FIXME VD P! find InstanceIdentifier helper
- InstanceIdentifier.IdentifiableItem<?, ?> item = Arguments.checkInstanceOf(pathArgument,
- InstanceIdentifier.IdentifiableItem.class);
- NodeConnectorKey key = Arguments.checkInstanceOf(item.getKey(), NodeConnectorKey.class);
- Long port = InventoryDataServiceUtil.portNumberfromNodeConnectorId(
- OpenflowVersion.get(ofVersion), key.getId());
- return new PortNumber(port);
- }
-}
+}
\ No newline at end of file
import org.opendaylight.openflowplugin.api.OFConstants;\r
import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion;\r
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.action.data.ActionConvertorData;\r
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.PacketOutConvertorData;\r
import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;\r
import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;\r
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;\r
\r
Short version = (short) 0x04;\r
Long xid = null;\r
- PacketOutInput message = PacketOutConvertor.toPacketOutInput(\r
- transmitPacketInput, version, null, null);\r
+ PacketOutConvertorData data = new PacketOutConvertorData(version);\r
+ PacketOutInput message = convert(transmitPacketInput, data);\r
\r
//FIXME : this has to be fixed along with actions changed in openflowjava\r
\r
- Assert.assertEquals(PacketOutConvertorTest.buildActionForNullTransmitPacketInputAction(nodeConnKey,\r
- version), message.getAction());\r
+ Assert.assertEquals(buildActionForNullTransmitPacketInputAction(nodeConnKey, version), message.getAction());\r
\r
Assert.assertEquals(OFConstants.OFP_NO_BUFFER, message.getBufferId());\r
Assert.assertEquals(new PortNumber(0xfffffffdL), message.getInPort());\r
\r
OpenflowPortsUtil.init();\r
\r
- PacketOutInput message = PacketOutConvertor.toPacketOutInput(\r
- transmitPacketInput, version, xid, datapathId);\r
+ PacketOutConvertorData data = new PacketOutConvertorData(version);\r
+ data.setXid(xid);\r
+ data.setDatapathId(datapathId);\r
+ PacketOutInput message = convert(transmitPacketInput, data);\r
\r
Assert.assertEquals(transmitPacketInput.getBufferId(),\r
message.getBufferId());\r
Assert.assertEquals((Object) version,\r
Short.valueOf(message.getVersion()));\r
Assert.assertEquals(xid, message.getXid());\r
+\r
ActionConvertorData actionConvertorData = new ActionConvertorData(version);\r
actionConvertorData.setDatapathId(datapathId);\r
\r
.<Node, NodeKey>child(Node.class, key).build();\r
return new NodeRef(path);\r
}\r
+\r
+ private PacketOutInput convert(TransmitPacketInput transmitPacketInput, PacketOutConvertorData data) {\r
+ Optional<PacketOutInput> messageOptional = ConvertorManager.getInstance().convert(transmitPacketInput, data);\r
+ return messageOptional.orElse(PacketOutConvertor.defaultResult(data.getVersion()));\r
+ }\r
}\r
Code Review / openflowplugin.git / commitdiff