* 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.applications.arbitratorreconciliation.impl;
+import static java.util.Objects.requireNonNull;
+
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.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicLong;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.apache.aries.blueprint.annotation.service.Reference;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
import org.opendaylight.openflowplugin.api.OFConstants;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
import org.opendaylight.openflowplugin.applications.reconciliation.NotificationRegistration;
import org.opendaylight.openflowplugin.applications.reconciliation.ReconciliationNotificationListener;
import org.opendaylight.serviceutils.upgrade.UpgradeState;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeContext;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.arbitrator.reconcile.service.rev180227.GetActiveBundleOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.arbitrator.reconcile.service.rev180227.GetActiveBundleOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.rf.state.rev170713.ResultState;
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.opendaylight.yangtools.util.concurrent.FluentFutures;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.RpcService;
+import org.opendaylight.yangtools.yang.common.ErrorType;
import org.opendaylight.yangtools.yang.common.RpcError;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.common.Uint64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static final String SEPARATOR = ":";
private static final BundleRemoveFlowCase DELETE_ALL_FLOW = new BundleRemoveFlowCaseBuilder()
- .setRemoveFlowCaseData(
- new RemoveFlowCaseDataBuilder(new FlowBuilder().setTableId(OFConstants.OFPTT_ALL).build()).build())
+ .setRemoveFlowCaseData(new RemoveFlowCaseDataBuilder()
+ .setTableId(OFConstants.OFPTT_ALL)
+ .build())
.build();
private static final BundleRemoveGroupCase DELETE_ALL_GROUP = new BundleRemoveGroupCaseBuilder()
.setRemoveGroupCaseData(new RemoveGroupCaseDataBuilder(new GroupBuilder()
- .setGroupType(GroupTypes.GroupAll)
- .setGroupId(new GroupId(OFConstants.OFPG_ALL))
- .build()).build())
+ .setGroupType(GroupTypes.GroupAll)
+ .setGroupId(new GroupId(OFConstants.OFPG_ALL))
+ .build()).build())
.build();
private final SalBundleService salBundleService;
private final ReconciliationManager reconciliationManager;
- private final RoutedRpcRegistration routedRpcReg;
+ private final RpcProviderService rpcProviderService;
private final UpgradeState upgradeState;
private NotificationRegistration registration;
private final ListeningExecutorService executor = MoreExecutors.listeningDecorator(
Executors.newFixedThreadPool(THREAD_POOL_SIZE));
private final Map<Uint64, BundleDetails> bundleIdMap = new ConcurrentHashMap<>();
+ private final ConcurrentMap<String,
+ ObjectRegistration<? extends RpcService>> rpcRegistrations = new ConcurrentHashMap<>();
@Inject
- public ArbitratorReconciliationManagerImpl(@Reference RpcProviderRegistry rpcRegistry,
- @Reference ReconciliationManager reconciliationManager, @Reference UpgradeState upgradeState) {
+ public ArbitratorReconciliationManagerImpl(final ReconciliationManager reconciliationManager,
+ final RpcProviderService rpcProviderService, final RpcConsumerRegistry rpcRegistry,
+ final UpgradeState upgradeState) {
Preconditions.checkArgument(rpcRegistry != null, "RpcConsumerRegistry cannot be null !");
- this.reconciliationManager = Preconditions.checkNotNull(reconciliationManager,
- "ReconciliationManager cannot be null!");
- this.salBundleService = Preconditions.checkNotNull(rpcRegistry.getRpcService(SalBundleService.class),
- "RPC SalBundlService not found.");
- this.routedRpcReg = rpcRegistry.addRoutedRpcImplementation(ArbitratorReconcileService.class,
- this);
- this.upgradeState = Preconditions.checkNotNull(upgradeState, "UpgradeState cannot be null!");
+ this.reconciliationManager = requireNonNull(reconciliationManager, "ReconciliationManager cannot be null!");
+ salBundleService = requireNonNull(rpcRegistry.getRpcService(SalBundleService.class),
+ "RPC SalBundleService not found.");
+ this.rpcProviderService = rpcProviderService;
+ this.upgradeState = requireNonNull(upgradeState, "UpgradeState cannot be null!");
}
@PostConstruct
@Override
public ListenableFuture<RpcResult<CommitActiveBundleOutput>> commitActiveBundle(
- CommitActiveBundleInput input) {
+ final CommitActiveBundleInput input) {
Uint64 nodeId = input.getNodeId();
if (bundleIdMap.containsKey(nodeId)) {
BundleId bundleId = bundleIdMap.get(nodeId).getBundleId();
MoreExecutors.directExecutor());
return Futures.transform(
rpcResult,
- this.createRpcResultCondenser("committed active bundle"),
+ createRpcResultCondenser("committed active bundle"),
MoreExecutors.directExecutor());
}
}
return RpcResultBuilder.success(new CommitActiveBundleOutputBuilder()
.setResult(null).build())
- .withRpcErrors(Collections.singleton(RpcResultBuilder.newError(RpcError.ErrorType.APPLICATION,
- null, "No active bundle found for the node" + nodeId.toString()))).buildFuture();
+ .withRpcErrors(List.of(RpcResultBuilder.newError(ErrorType.APPLICATION,
+ null, "No active bundle found for the node" + nodeId))).buildFuture();
}
@Override
.setResult(bundleDetails.getBundleId())
.build())
.buildFuture();
- } catch (InterruptedException | ExecutionException | NullPointerException e) {
+ } catch (InterruptedException | ExecutionException e) {
return RpcResultBuilder.<GetActiveBundleOutput>failed()
- .withRpcErrors(Collections.singleton(RpcResultBuilder.newError(RpcError.ErrorType.APPLICATION,
+ .withRpcErrors(List.of(RpcResultBuilder.newError(ErrorType.APPLICATION,
null, e.getMessage()))).buildFuture();
}
}
}
@Override
- public ListenableFuture<Boolean> startReconciliation(DeviceInfo node) {
+ public ListenableFuture<Boolean> startReconciliation(final DeviceInfo node) {
registerRpc(node);
if (upgradeState.isUpgradeInProgress()) {
LOG.trace("Starting arbitrator reconciliation for node {}", node.getDatapathId());
}
@Override
- public ListenableFuture<Boolean> endReconciliation(DeviceInfo node) {
+ public ListenableFuture<Boolean> endReconciliation(final DeviceInfo node) {
Uint64 datapathId = node.getDatapathId();
LOG.trace("Stopping arbitrator reconciliation for node {}", datapathId);
bundleIdMap.remove(datapathId);
return ResultState.DONOTHING;
}
- private ListenableFuture<Boolean> reconcileConfiguration(DeviceInfo node) {
+ private ListenableFuture<Boolean> reconcileConfiguration(final DeviceInfo node) {
LOG.info("Triggering arbitrator reconciliation for device {}", node.getDatapathId());
ArbitratorReconciliationTask upgradeReconTask = new ArbitratorReconciliationTask(node);
return executor.submit(upgradeReconTask);
}
- @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
- justification = "https://github.com/spotbugs/spotbugs/issues/811")
- private Messages createMessages(final NodeRef nodeRef) {
+ private static Messages createMessages(final NodeRef nodeRef) {
final List<Message> messages = new ArrayList<>();
messages.add(new MessageBuilder()
.setNode(nodeRef)
InstanceIdentifier<FlowCapableNode> nodeIdentity = deviceInfo.getNodeInstanceIdentifier()
.augmentation(FlowCapableNode.class);
String node = nodeIdentity.firstKeyOf(Node.class).getId().getValue();
- BundleId bundleIdValue = new BundleId(BUNDLE_ID.getAndIncrement());
+ BundleId bundleIdValue = new BundleId(Uint32.valueOf(BUNDLE_ID.getAndIncrement()));
LOG.debug("Triggering arbitrator reconciliation for device :{}", node);
final NodeRef nodeRef = new NodeRef(nodeIdentity.firstIdentifierOf(Node.class));
}
@Override
- public void onSuccess(RpcResult<?> rpcResult) {
+ public void onSuccess(final RpcResult<?> rpcResult) {
LOG.debug("Completed arbitrator reconciliation for device:{}", nodeId);
bundleIdMap.remove(nodeId);
}
@Override
- public void onFailure(Throwable throwable) {
+ public void onFailure(final Throwable throwable) {
LOG.error("Error while performing arbitrator reconciliation for device {}", nodeId, throwable);
}
}
- private <D> Function<RpcResult<D>,
+ private static <D> Function<RpcResult<D>,
RpcResult<CommitActiveBundleOutput>> createRpcResultCondenser(final String action) {
return input -> {
final RpcResultBuilder<CommitActiveBundleOutput> resultSink;
}
} else {
resultSink = RpcResultBuilder.<CommitActiveBundleOutput>failed()
- .withError(RpcError.ErrorType.APPLICATION, "action of " + action + " failed");
+ .withError(ErrorType.APPLICATION, "action of " + action + " failed");
}
return resultSink.build();
};
}
- private void registerRpc(DeviceInfo node) {
+ private void registerRpc(final DeviceInfo node) {
KeyedInstanceIdentifier<Node, NodeKey> path = InstanceIdentifier.create(Nodes.class)
.child(Node.class, new NodeKey(node.getNodeId()));
LOG.debug("The path is registered : {}", path);
- routedRpcReg.registerPath(NodeContext.class, path);
+ ObjectRegistration<? extends RpcService> rpcRegistration =
+ rpcProviderService.registerRpcImplementation(ArbitratorReconcileService.class, this, Set.of(path));
+ rpcRegistrations.put(node.getNodeId().getValue(), rpcRegistration);
}
- private void deregisterRpc(DeviceInfo node) {
+ private void deregisterRpc(final DeviceInfo node) {
KeyedInstanceIdentifier<Node, NodeKey> path = InstanceIdentifier.create(Nodes.class)
.child(Node.class, new NodeKey(node.getNodeId()));
LOG.debug("The path is unregistered : {}", path);
- routedRpcReg.unregisterPath(NodeContext.class, path);
+ ObjectRegistration<? extends RpcService> rpcRegistration = rpcRegistrations.get(node.getNodeId().getValue());
+ if (rpcRegistration != null) {
+ rpcRegistration.close();
+ rpcRegistrations.remove(node.getNodeId().getValue());
+ }
}
private static class BundleDetails {
private final BundleId bundleId;
private final ListenableFuture<RpcResult<ControlBundleOutput>> result;
- BundleDetails(BundleId bundleId, ListenableFuture<RpcResult<ControlBundleOutput>> result) {
+ BundleDetails(final BundleId bundleId, final ListenableFuture<RpcResult<ControlBundleOutput>> result) {
this.bundleId = bundleId;
this.result = result;
}
}
}
- @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
- justification = "https://github.com/spotbugs/spotbugs/issues/811")
- private Uint64 getDpnIdFromNodeName(String nodeName) {
+ private static Uint64 getDpnIdFromNodeName(final String nodeName) {
String dpnId = nodeName.substring(nodeName.lastIndexOf(SEPARATOR) + 1);
return Uint64.valueOf(dpnId);
}
Code Review / openflowplugin.git / blobdiff