*/
package org.opendaylight.openflowplugin.impl.services;
-import java.math.BigInteger;
+import java.util.Optional;
import java.util.concurrent.Future;
+import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
+import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
+import org.opendaylight.openflowplugin.api.openflow.device.Xid;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.PacketOutConvertor;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.PacketOutConvertorData;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketOutInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.ConnectionCookie;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
import org.opendaylight.yangtools.yang.common.RpcResult;
-public class PacketProcessingServiceImpl extends CommonService implements PacketProcessingService {
+public final class PacketProcessingServiceImpl extends AbstractVoidService<TransmitPacketInput> implements PacketProcessingService {
+
+ private final ConvertorExecutor convertorExecutor;
+
+ public PacketProcessingServiceImpl(final RequestContextStack requestContextStack, final DeviceContext deviceContext, final ConvertorExecutor convertorExecutor) {
+ super(requestContextStack, deviceContext);
+ this.convertorExecutor = convertorExecutor;
+ }
@Override
- //TODO this implementation is incorrect. Handling of exceptional states as in ServiceCallProcessingUtil.handleServiceCall() is missing
public Future<RpcResult<Void>> transmitPacket(final TransmitPacketInput input) {
- final PacketOutInput message = PacketOutConvertor.toPacketOutInput(input, version, deviceContext.getNextXid()
- .getValue(), datapathId);
+ return handleServiceCall(input);
+ }
- BigInteger connectionID = PRIMARY_CONNECTION;
- final ConnectionCookie connectionCookie = input.getConnectionCookie();
- if (connectionCookie != null && connectionCookie.getValue() != null) {
- connectionID = BigInteger.valueOf(connectionCookie.getValue());
- }
+ @Override
+ protected OfHeader buildRequest(final Xid xid, final TransmitPacketInput input) throws ServiceException {
+ final PacketOutConvertorData data = new PacketOutConvertorData(getVersion());
+ data.setDatapathId(getDatapathId());
+ data.setXid(xid.getValue());
- return provideConnectionAdapter(connectionID).packetOut(message);
+ final Optional<PacketOutInput> result = convertorExecutor.convert(input, data);
+ return result.orElse(PacketOutConvertor.defaultResult(getVersion()));
}
}