import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.ExecutionException;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue;
import org.opendaylight.openflowplugin.impl.common.MultipartRequestInputFactory;
import org.opendaylight.openflowplugin.impl.common.NodeStaticReplyTranslatorUtil;
import org.opendaylight.openflowplugin.impl.rpc.AbstractRequestContext;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.SwitchFeaturesUtil;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.Capabilities;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.CapabilitiesV10;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping;
final ConnectionContext connectionContext = Preconditions.checkNotNull(deviceContext.getPrimaryConnectionContext());
final short version = deviceInfo.getVersion();
LOG.trace("initalizeNodeInformation for node {}", deviceInfo.getNodeId());
- final SettableFuture<Void> returnFuture = SettableFuture.<Void>create();
+ final SettableFuture<Void> returnFuture = SettableFuture.create();
addNodeToOperDS(deviceContext, returnFuture);
final ListenableFuture<List<RpcResult<List<MultipartReply>>>> deviceFeaturesFuture;
if (OFConstants.OFP_VERSION_1_0 == version) {
private static void addNodeToOperDS(final DeviceContext deviceContext, final SettableFuture<Void> future) {
Preconditions.checkArgument(deviceContext != null);
final NodeBuilder nodeBuilder = new NodeBuilder().setId(deviceContext.getDeviceInfo().getNodeId()).setNodeConnector(
- Collections.<NodeConnector>emptyList());
+ Collections.emptyList());
try {
deviceContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, deviceContext.getDeviceInfo().getNodeInstanceIdentifier(),
nodeBuilder.build());
createSuccessProcessingCallback(MultipartType.OFPMPGROUPFEATURES, deviceContext,
deviceContext.getDeviceInfo().getNodeInstanceIdentifier(), replyGroupFeatures, convertorExecutor);
- final ListenableFuture<RpcResult<List<MultipartReply>>> replyTableFeatures = getNodeStaticInfo(
- MultipartType.OFPMPTABLEFEATURES, deviceContext,
- deviceContext.getDeviceInfo().getNodeInstanceIdentifier(), deviceContext.getDeviceInfo().getVersion());
+ final ListenableFuture<RpcResult<List<MultipartReply>>> replyTableFeatures;
+
+ if (deviceContext.isSkipTableFeatures()) {
+ replyTableFeatures = RpcResultBuilder.<List<MultipartReply>>success().buildFuture();
+ } else {
+ replyTableFeatures = getNodeStaticInfo(
+ MultipartType.OFPMPTABLEFEATURES, deviceContext,
+ deviceContext.getDeviceInfo().getNodeInstanceIdentifier(), deviceContext.getDeviceInfo().getVersion());
+ }
createSuccessProcessingCallback(MultipartType.OFPMPTABLEFEATURES, deviceContext,
deviceContext.getDeviceInfo().getNodeInstanceIdentifier(), replyTableFeatures, convertorExecutor);
static void translateAndWriteReply(final MultipartType type, final DeviceContext dContext,
final InstanceIdentifier<Node> nodeII, final Collection<MultipartReply> result,
final ConvertorExecutor convertorExecutor) {
- try {
- result.stream()
- .map(MultipartReply::getMultipartReplyBody)
- .forEach(multipartReplyBody -> {
- if (!(writeDesc(type, multipartReplyBody, dContext, nodeII)
- || writeTableFeatures(type, multipartReplyBody, dContext, nodeII, convertorExecutor)
- || writeMeterFeatures(type, multipartReplyBody, dContext, nodeII)
- || writeGroupFeatures(type, multipartReplyBody, dContext, nodeII)
- || writePortDesc(type, multipartReplyBody, dContext, nodeII))) {
- throw new IllegalArgumentException("Unexpected MultipartType " + type);
- }
- });
- } catch (final Exception e) {
- LOG.debug("translateAndWriteReply: Failed to write node {} to DS ", dContext.getDeviceInfo().getNodeId().toString(), e);
+ if (Objects.nonNull(result)) {
+ try {
+ result.stream()
+ .map(MultipartReply::getMultipartReplyBody)
+ .forEach(multipartReplyBody -> {
+ if (!(writeDesc(type, multipartReplyBody, dContext, nodeII)
+ || writeTableFeatures(type, multipartReplyBody, dContext, nodeII, convertorExecutor)
+ || writeMeterFeatures(type, multipartReplyBody, dContext, nodeII)
+ || writeGroupFeatures(type, multipartReplyBody, dContext, nodeII)
+ || writePortDesc(type, multipartReplyBody, dContext, nodeII))) {
+ throw new IllegalArgumentException("Unexpected MultipartType " + type);
+ }
+ });
+ } catch (final Exception e) {
+ LOG.debug("translateAndWriteReply: Failed to write node {} to DS ", dContext.getDeviceInfo().getNodeId().toString(), e);
+ }
+ } else {
+ LOG.debug("translateAndWriteReply: Failed to write node {} to DS because we failed to gather device" +
+ "info.",
+ dContext.getDeviceInfo().getNodeId().toString());
}
}
Preconditions.checkArgument(body instanceof MultipartReplyDescCase);
final MultipartReplyDesc replyDesc = ((MultipartReplyDescCase) body).getMultipartReplyDesc();
- final FlowCapableNode fcNode = NodeStaticReplyTranslatorUtil.nodeDescTranslator(replyDesc,
- getIpAddressOf(dContext));
+ final FlowCapableNode fcNode = NodeStaticReplyTranslatorUtil
+ .nodeDescTranslator(replyDesc, getIpAddressOf(dContext))
+ .setSwitchFeatures(SwitchFeaturesUtil.getInstance().buildSwitchFeatures(
+ new GetFeaturesOutputBuilder(dContext.getPrimaryConnectionContext().getFeatures()).build()))
+ .build();
+
final InstanceIdentifier<FlowCapableNode> fNodeII = nodeII.augmentation(FlowCapableNode.class);
dContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL, fNodeII, fcNode);
return true;
// FIXME : remove after ovs tableFeatures fix
private static void makeEmptyTables(final DeviceContext dContext, final InstanceIdentifier<Node> nodeII,
final Short nrOfTables) {
- LOG.debug("About to create {} empty tables.", nrOfTables);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("About to create {} empty tables.", nrOfTables);
+ }
for (int i = 0; i < nrOfTables; i++) {
final short tId = (short) i;
final InstanceIdentifier<Table> tableII = nodeII.augmentation(FlowCapableNode.class).child(Table.class,
} else {
for (RpcError rpcError : rpcResult.getErrors()) {
LOG.info("Failed to retrieve static node {} info: {}", type, rpcError.getMessage());
- if (null != rpcError.getCause()) {
+ if (LOG.isTraceEnabled() && Objects.nonNull(rpcError.getCause())) {
LOG.trace("Detailed error:", rpcError.getCause());
}
}
}
private static ListenableFuture<RpcResult<List<MultipartReply>>> getNodeStaticInfo(final MultipartType type,
- final DeviceContext deviceContext, final InstanceIdentifier<Node> nodeII, final short version) {
+ final DeviceContext deviceContext,
+ final InstanceIdentifier<Node> nodeII,
+ final short version) {
final OutboundQueue queue = deviceContext.getPrimaryConnectionContext().getOutboundQueueProvider();
final Xid xid = requestContext.getXid();
+ if (Objects.isNull(xid)) {
+ LOG.debug("Xid is not present, so cancelling node static info gathering.");
+ return Futures.immediateCancelledFuture();
+ }
+
LOG.trace("Hooking xid {} to device context - precaution.", reserved);
final MultiMsgCollector multiMsgCollector = deviceContext.getMultiMsgCollector(requestContext);
final ListenableFuture<List<RpcResult<List<MultipartReply>>>> deviceFeaturesFuture) {
try {
- LOG.trace("Waiting for protocol version 1.0");
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Waiting for protocol version 1.0");
+ }
List<RpcResult<List<MultipartReply>>> results = deviceFeaturesFuture.get();
boolean allSucceeded = true;
for (final RpcResult<List<MultipartReply>> rpcResult : results) {
allSucceeded &= rpcResult.isSuccessful();
}
if (allSucceeded) {
- LOG.debug("Creating emtpy flow capable node: {}", deviceContext.getDeviceInfo().getNodeId().getValue());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Creating empty flow capable node: {}", deviceContext.getDeviceInfo().getLOGValue());
+ }
createEmptyFlowCapableNodeInDs(deviceContext);
- LOG.debug("Creating emtpy tables for {}", deviceContext.getDeviceInfo().getNodeId().getValue());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Creating empty tables for {}", deviceContext.getDeviceInfo().getLOGValue());
+ }
makeEmptyTables(deviceContext, deviceContext.getDeviceInfo().getNodeInstanceIdentifier(),
deviceContext.getPrimaryConnectionContext().getFeatures().getTables());
}
} catch (InterruptedException | ExecutionException e) {
- LOG.warn("Error occurred in preparation node {} for protocol 1.0", deviceContext.getDeviceInfo().getNodeId().getValue());
+ LOG.warn("Error occurred in preparation node {} for protocol 1.0", deviceContext.getDeviceInfo().getLOGValue());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Error for node {} : ", deviceContext.getDeviceInfo().getLOGValue(), e);
+ }
}
}
}
Code Review / openflowplugin.git / blobdiff