+/**
+ * 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.Collections;
import java.util.concurrent.Future;
- import org.opendaylight.controller.sal.common.util.Rpcs;
+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.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.FlowModInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetAsyncInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetAsyncOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetQueueConfigInput;
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.GroupModInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MeterModInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MeterModInputBuilder;
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.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;
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;
}
/**
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<UpdateFlowOutput>> flowMod(FlowModInput input, SwitchConnectionDistinguisher cookie) {
-
- // Set Xid before invoking RPC on OFLibrary
- // TODO : Cleaner approach is to use a copy constructor once it is implemented
- Long Xid = session.getNextXid();
- FlowModInputBuilder mdInput = new FlowModInputBuilder();
- mdInput.setXid(Xid);
- mdInput.setBufferId(input.getBufferId());
- mdInput.setCommand(input.getCommand());
- mdInput.setCookie(input.getCookie());
- mdInput.setCookieMask(input.getCookieMask());
- mdInput.setFlags(input.getFlags());
- mdInput.setHardTimeout(input.getHardTimeout());
- mdInput.setIdleTimeout(input.getHardTimeout());
- mdInput.setMatch(input.getMatch());
- mdInput.setOutGroup(input.getOutGroup());
- mdInput.setOutPort(input.getOutPort());
- mdInput.setPriority(input.getPriority());
- mdInput.setTableId(input.getTableId());
- mdInput.setVersion(input.getVersion());
LOG.debug("Calling OFLibrary flowMod");
- Future<RpcResult<Void>> response = getConnectionAdapter(cookie).flowMod(mdInput.build());
+ Future<RpcResult<Void>> response = getConnectionAdapter(cookie).flowMod(input);
// Send the same Xid back to caller - MessageDrivenSwitch
- UpdateFlowOutputBuilder flowModOutput = new UpdateFlowOutputBuilder();
- String stringXid =Xid.toString();
- BigInteger bigIntXid = new BigInteger( stringXid );
+ UpdateFlowOutputBuilder flowModOutput = new UpdateFlowOutputBuilder();
+ BigInteger bigIntXid = BigInteger.valueOf(input.getXid()) ;
flowModOutput.setTransactionId(new TransactionId(bigIntXid));
UpdateFlowOutput result = flowModOutput.build();
}
@Override
- public Future<RpcResult<UpdateGroupOutput>> groupMod(GroupModInput input, SwitchConnectionDistinguisher cookie) {
-
- // Set Xid before invoking RPC on OFLibrary
- // TODO : Cleaner approach is to use a copy constructor once it is implemented
- Long Xid = session.getNextXid();
- GroupModInputBuilder mdInput = new GroupModInputBuilder();
- mdInput.setXid(Xid);
- mdInput.setBucketsList(input.getBucketsList());
- mdInput.setCommand(input.getCommand());
- mdInput.setGroupId(input.getGroupId());
- mdInput.setType(input.getType());
- mdInput.setVersion(input.getVersion());
+ public Future<RpcResult<UpdateGroupOutput>> groupMod(GroupModInput input, SwitchConnectionDistinguisher cookie) {
LOG.debug("Calling OFLibrary groupMod");
- Future<RpcResult<Void>> response = getConnectionAdapter(cookie).groupMod(mdInput.build());
+ Future<RpcResult<Void>> response = getConnectionAdapter(cookie).groupMod(input);
// Send the same Xid back to caller - MessageDrivenSwitch
- UpdateGroupOutputBuilder groupModOutput = new UpdateGroupOutputBuilder();
- String stringXid =Xid.toString();
- BigInteger bigIntXid = new BigInteger( stringXid );
+ 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);
@Override
public Future<RpcResult<UpdateMeterOutput>> meterMod(MeterModInput input, SwitchConnectionDistinguisher cookie) {
-
- // Set Xid before invoking RPC on OFLibrary
- // TODO : Cleaner approach is to use a copy constructor once it is implemented
- Long Xid = session.getNextXid();
- MeterModInputBuilder mdInput = new MeterModInputBuilder();
- mdInput.setXid(Xid);
- mdInput.setBands(input.getBands());
- mdInput.setCommand(input.getCommand());
- mdInput.setFlags(input.getFlags());
- mdInput.setMeterId(input.getMeterId());
- mdInput.setVersion(input.getVersion());
- mdInput.setVersion(input.getVersion());
LOG.debug("Calling OFLibrary meterMod");
- Future<RpcResult<Void>> response = getConnectionAdapter(cookie).meterMod(mdInput.build());
+ Future<RpcResult<Void>> response = getConnectionAdapter(cookie).meterMod(input);
// Send the same Xid back to caller - MessageDrivenSwitch
- UpdateMeterOutputBuilder meterModOutput = new UpdateMeterOutputBuilder();
- String stringXid =Xid.toString();
- BigInteger bigIntXid = new BigInteger( stringXid );
+ 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);
}
@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