+/**
+ * Copyright IBM Corporation, 2013. 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.session;
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.Collections;
import java.util.concurrent.Future;
+import org.opendaylight.controller.sal.common.util.Rpcs;
import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
import org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductor;
import org.opendaylight.openflowplugin.openflow.md.core.SwitchConnectionDistinguisher;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.UpdateGroupOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeterOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.UpdateMeterOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetQueueConfigOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupModInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MeterModInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketOutInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortModInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.RoleRequestInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetAsyncInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.TableModInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.UpdatePortOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.port.service.rev131107.UpdatePortOutputBuilder;
+import org.opendaylight.yangtools.yang.common.RpcError;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.util.concurrent.Futures;
+
/**
* message dispatch service to send the message to switch.
*
private static final Logger LOG = LoggerFactory.getLogger(MessageDispatchServiceImpl.class);
- private SessionContext session;
+ private SessionContext session;
/**
* constructor
* - MessageDispatchService for this session
*/
public MessageDispatchServiceImpl(SessionContext session) {
- this.session = session;
+ this.session = session;
}
/**
* get proper connection adapter to send the message to switch.
*
- * @param - cookie to identify the right connection, it can be null also.
+ * @param cookie to identify the right connection, it can be null also.
* @return connectionAdapter associated with cookie, otherwise return best
* suitable connection.
*
if (!session.isValid()) {
LOG.warn("Session for the cookie {} is invalid.", cookie);
- throw new IllegalArgumentException("Session for the cookie is invalid.");
+ throw new IllegalArgumentException("Session for the cookie is invalid. Reason: "
+ + "the switch has been recently disconnected OR inventory provides outdated information.");
}
LOG.debug("finding connecton for cookie value {}. ", cookie);
// set main connection as default
}
@Override
- public Future<RpcResult<BarrierOutput>> barrier(BarrierInput input, SwitchConnectionDistinguisher cookie) {
+ public Future<RpcResult<BarrierOutput>> barrier(BarrierInput input, SwitchConnectionDistinguisher cookie) {
return getConnectionAdapter(cookie).barrier(input);
}
}
@Override
- public Future<RpcResult<Void>> flowMod(FlowModInput input, SwitchConnectionDistinguisher cookie) {
- return getConnectionAdapter(cookie).flowMod(input);
+ public Future<RpcResult<UpdateFlowOutput>> flowMod(FlowModInput input, SwitchConnectionDistinguisher cookie) {
+ LOG.debug("Calling OFLibrary flowMod");
+ Future<RpcResult<Void>> response = getConnectionAdapter(cookie).flowMod(input);
+
+ // Send the same Xid back to caller - MessageDrivenSwitch
+ UpdateFlowOutputBuilder flowModOutput = new UpdateFlowOutputBuilder();
+ BigInteger bigIntXid = BigInteger.valueOf(input.getXid()) ;
+ flowModOutput.setTransactionId(new TransactionId(bigIntXid));
+
+ UpdateFlowOutput result = flowModOutput.build();
+ Collection<RpcError> errors = Collections.emptyList();
+ RpcResult<UpdateFlowOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
+
+ // solution 1: sending directly and hooking listener to get error
+ // hookup listener to catch the possible error with no reference to returned future-object
+ LOG.debug("Returning to ModelDrivenSwitch for flowMod RPC");
+ return Futures.immediateFuture(rpcResult);
+
}
@Override
}
@Override
- public Future<RpcResult<Void>> groupMod(GroupModInput input, SwitchConnectionDistinguisher cookie) {
- return getConnectionAdapter(cookie).groupMod(input);
+ public Future<RpcResult<UpdateGroupOutput>> groupMod(GroupModInput input, SwitchConnectionDistinguisher cookie) {
+ LOG.debug("Calling OFLibrary groupMod");
+ Future<RpcResult<Void>> response = getConnectionAdapter(cookie).groupMod(input);
+
+ // Send the same Xid back to caller - MessageDrivenSwitch
+ UpdateGroupOutputBuilder groupModOutput = new UpdateGroupOutputBuilder();
+ BigInteger bigIntXid = BigInteger.valueOf(input.getXid());
+ groupModOutput.setTransactionId(new TransactionId(bigIntXid));
+
+ UpdateGroupOutput result = groupModOutput.build();
+ Collection<RpcError> errors = Collections.emptyList();
+ RpcResult<UpdateGroupOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
+
+ // solution 1: sending directly and hooking listener to get error
+ // hookup listener to catch the possible error with no reference to returned future-object
+ LOG.debug("Returning to ModelDrivenSwitch for groupMod RPC");
+ return Futures.immediateFuture(rpcResult);
+
}
@Override
- public Future<RpcResult<Void>> meterMod(MeterModInput input, SwitchConnectionDistinguisher cookie) {
- return getConnectionAdapter(cookie).meterMod(input);
+ public Future<RpcResult<UpdateMeterOutput>> meterMod(MeterModInput input, SwitchConnectionDistinguisher cookie) {
+ LOG.debug("Calling OFLibrary meterMod");
+ Future<RpcResult<Void>> response = getConnectionAdapter(cookie).meterMod(input);
+
+ // Send the same Xid back to caller - MessageDrivenSwitch
+ UpdateMeterOutputBuilder meterModOutput = new UpdateMeterOutputBuilder();
+ BigInteger bigIntXid =BigInteger.valueOf(input.getXid());
+ meterModOutput.setTransactionId(new TransactionId(bigIntXid));
+
+ UpdateMeterOutput result = meterModOutput.build();
+ Collection<RpcError> errors = Collections.emptyList();
+ RpcResult<UpdateMeterOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
+
+ // solution 1: sending directly and hooking listener to get error
+ // hookup listener to catch the possible error with no reference to returned future-object
+ LOG.debug("Returning to ModelDrivenSwitch for meterMod RPC");
+ return Futures.immediateFuture(rpcResult);
+
+ }
+
+ @Override
+ public Future<RpcResult<java.lang.Void>> multipartRequest(MultipartRequestInput input, SwitchConnectionDistinguisher cookie) {
+ return getConnectionAdapter(cookie).multipartRequest(input);
}
@Override
}
@Override
- public Future<RpcResult<Void>> portMod(PortModInput input, SwitchConnectionDistinguisher cookie) {
- return getConnectionAdapter(cookie).portMod(input);
+ public Future<RpcResult<UpdatePortOutput>> portMod(PortModInput input, SwitchConnectionDistinguisher cookie) {
+
+ LOG.debug("Calling OFLibrary portMod");
+ Future<RpcResult<Void>> response = getConnectionAdapter(cookie).portMod(input);
+
+ // Send the same Xid back to caller - ModelDrivenSwitch
+ UpdatePortOutputBuilder portModOutput = new UpdatePortOutputBuilder();
+ String stringXid =input.getXid().toString();
+ BigInteger bigIntXid = new BigInteger( stringXid );
+ portModOutput.setTransactionId(new TransactionId(bigIntXid));
+ UpdatePortOutput result = portModOutput.build();
+ Collection<RpcError> errors = Collections.emptyList();
+ RpcResult<UpdatePortOutput> rpcResult = Rpcs.getRpcResult(true, result, errors);
+
+ LOG.debug("Returning to ModelDrivenSwitch for portMod RPC");
+ return Futures.immediateFuture(rpcResult);
}
@Override
public Future<RpcResult<Void>> tableMod(TableModInput input, SwitchConnectionDistinguisher cookie) {
return getConnectionAdapter(cookie).tableMod(input);
}
-
}
Code Review / openflowplugin.git / blobdiff