* 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.impl.device.initialization;
-import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
-import java.util.List;
-import java.util.concurrent.Future;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import com.google.common.util.concurrent.MoreExecutors;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartReply;
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.PortGrouping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData;
import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsDataBuilder;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.slf4j.Logger;
private static final Logger LOG = LoggerFactory.getLogger(OF10DeviceInitializer.class);
@Override
- protected Future<Void> initializeNodeInformation(@Nonnull final DeviceContext deviceContext,
+ protected ListenableFuture<Void> initializeNodeInformation(@NonNull final DeviceContext deviceContext,
final boolean switchFeaturesMandatory,
+ final boolean skipTableFeatures,
@Nullable final MultipartWriterProvider multipartWriterProvider,
@Nullable final ConvertorExecutor convertorExecutor) {
- final ConnectionContext connectionContext = Preconditions.checkNotNull(deviceContext.getPrimaryConnectionContext());
+ final ConnectionContext connectionContext =
+ Preconditions.checkNotNull(deviceContext.getPrimaryConnectionContext());
final DeviceState deviceState = Preconditions.checkNotNull(deviceContext.getDeviceState());
final DeviceInfo deviceInfo = Preconditions.checkNotNull(deviceContext.getDeviceInfo());
final CapabilitiesV10 capabilitiesV10 = connectionContext.getFeatures().getCapabilitiesV10();
// Set capabilities for this device based on capabilities of connection context
- LOG.debug("Setting capabilities for device {}", deviceInfo.getLOGValue());
+ LOG.debug("Setting capabilities for device {}", deviceInfo);
DeviceStateUtil.setDeviceStateBasedOnV10Capabilities(deviceState, capabilitiesV10);
final ListenableFuture<Boolean> future = requestMultipart(MultipartType.OFPMPDESC, deviceContext);
Futures.addCallback(future, new FutureCallback<Boolean>() {
@Override
- public void onSuccess(@Nullable final Boolean result) {
+ public void onSuccess(final Boolean result) {
if (Boolean.TRUE.equals(result)) {
- LOG.debug("Creating empty flow capable node: {}", deviceInfo.getLOGValue());
+ LOG.debug("Creating empty flow capable node: {}", deviceInfo);
makeEmptyFlowCapableNode(deviceContext, deviceInfo);
- LOG.debug("Creating empty tables for {}", deviceInfo.getLOGValue());
+ LOG.debug("Creating empty tables for {}", deviceInfo);
DeviceInitializationUtil.makeEmptyTables(
deviceContext,
deviceInfo,
- deviceContext.getPrimaryConnectionContext().getFeatures().getTables());
+ deviceContext.getPrimaryConnectionContext().getFeatures().getTables().toJava());
}
}
@Override
- public void onFailure(@Nonnull final Throwable t) {
- LOG.warn("Error occurred in preparation node {} for protocol 1.0", deviceInfo.getLOGValue());
- LOG.trace("Error for node {} : ", deviceInfo.getLOGValue(), t);
+ public void onFailure(final Throwable throwable) {
+ LOG.warn("Error occurred in preparation node {} for protocol 1.0", deviceInfo);
+ LOG.trace("Error for node {} : ", deviceInfo, throwable);
}
- });
+ }, MoreExecutors.directExecutor());
- return Futures.transform(future, new Function<Boolean, Void>() {
- @Nullable
- @Override
- public Void apply(@Nullable final Boolean input) {
- writePhyPortInformation(deviceContext);
- return null;
- }
- });
+ return Futures.transform(future, input -> {
+ LOG.debug("Writing physical port information for {}", deviceInfo);
+ writePhyPortInformation(deviceContext);
+ return null;
+ }, MoreExecutors.directExecutor());
}
+ @SuppressWarnings("checkstyle:IllegalCatch")
private static void writePhyPortInformation(final DeviceContext deviceContext) {
final DeviceInfo deviceInfo = deviceContext.getDeviceInfo();
final ConnectionContext connectionContext = deviceContext.getPrimaryConnectionContext();
port.getPortNo(),
OpenflowVersion.get(deviceInfo.getVersion()));
+ final NodeConnectorBuilder connectorBuilder = new NodeConnectorBuilder()
+ .setId(nodeConnectorId)
+ .addAugmentation(new FlowCapableNodeConnectorStatisticsDataBuilder().build());
+ final FlowCapableNodeConnector augment = translator.translate(port, deviceInfo, null);
+ if (augment != null) {
+ connectorBuilder.addAugmentation(augment);
+ }
+
try {
deviceContext.writeToTransaction(LogicalDatastoreType.OPERATIONAL,
deviceInfo
.getNodeInstanceIdentifier()
.child(NodeConnector.class, new NodeConnectorKey(nodeConnectorId)),
- new NodeConnectorBuilder()
- .setId(nodeConnectorId)
- .addAugmentation(
- FlowCapableNodeConnector.class,
- translator.translate(port, deviceInfo, null))
- .addAugmentation(
- FlowCapableNodeConnectorStatisticsData.class,
- new FlowCapableNodeConnectorStatisticsDataBuilder().build())
- .build());
+ connectorBuilder.build());
} catch (final Exception e) {
- LOG.debug("Failed to write node {} to DS ", deviceInfo.getLOGValue(), e);
+ LOG.debug("Failed to write node {} to DS ", deviceInfo, e);
}
});
}
+ @SuppressWarnings("checkstyle:IllegalCatch")
private static void makeEmptyFlowCapableNode(final TxFacade txFacade, final DeviceInfo deviceInfo) {
try {
txFacade.writeToTransaction(LogicalDatastoreType.OPERATIONAL,
.augmentation(FlowCapableNode.class),
new FlowCapableNodeBuilder().build());
} catch (final Exception e) {
- LOG.debug("Failed to write empty node {} to DS ", deviceInfo.getLOGValue(), e);
+ LOG.debug("Failed to write empty node {} to DS ", deviceInfo, e);
}
}
final DeviceContext deviceContext) {
if (deviceContext.canUseSingleLayerSerialization()) {
final SingleLayerMultipartCollectorService service =
- new SingleLayerMultipartCollectorService(deviceContext, deviceContext);
+ new SingleLayerMultipartCollectorService(deviceContext, deviceContext);
- return Futures.transform(service.handleServiceCall(multipartType), new Function<RpcResult<List<MultipartReply>>, Boolean>() {
- @Nullable
- @Override
- public Boolean apply(final RpcResult<List<MultipartReply>> input) {
- return input.isSuccessful();
- }
- });
+ return Futures.transform(service.handleServiceCall(multipartType),
+ RpcResult::isSuccessful, MoreExecutors.directExecutor());
}
final MultiLayerMultipartCollectorService service =
- new MultiLayerMultipartCollectorService(deviceContext, deviceContext);
+ new MultiLayerMultipartCollectorService(deviceContext, deviceContext);
- return Futures.transform(service.handleServiceCall(multipartType), new Function<RpcResult<List<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply>>, Boolean>() {
- @Nullable
- @Override
- public Boolean apply(final RpcResult<List<org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply>> input) {
- return input.isSuccessful();
- }
- });
+ return Futures.transform(service.handleServiceCall(multipartType),
+ RpcResult::isSuccessful, MoreExecutors.directExecutor());
}
}
Code Review / openflowplugin.git / blobdiff