*/
package org.opendaylight.openflowplugin.impl.statistics;
-import com.google.common.base.Preconditions;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
import java.util.concurrent.Semaphore;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.mdsal.binding.api.RpcProviderService;
import org.opendaylight.openflowplugin.impl.datastore.MultipartWriterProviderFactory;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.ChangeStatisticsWorkMode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.ChangeStatisticsWorkModeInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.ChangeStatisticsWorkModeOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.GetStatisticsWorkMode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.GetStatisticsWorkModeInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.GetStatisticsWorkModeOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.GetStatisticsWorkModeOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.StatisticsManagerControlService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.sm.control.rev150812.StatisticsWorkMode;
-import org.opendaylight.yangtools.concepts.ObjectRegistration;
-import org.opendaylight.yangtools.yang.common.RpcError;
+import org.opendaylight.yangtools.concepts.Registration;
+import org.opendaylight.yangtools.yang.common.ErrorType;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class StatisticsManagerImpl implements StatisticsManager, StatisticsManagerControlService {
-
+public final class StatisticsManagerImpl implements StatisticsManager {
private static final Logger LOG = LoggerFactory.getLogger(StatisticsManagerImpl.class);
+ @VisibleForTesting
+ final ConcurrentMap<DeviceInfo, StatisticsContext> contexts = new ConcurrentHashMap<>();
+
private final OpenflowProviderConfig config;
private final ConvertorExecutor converterExecutor;
- private final ConcurrentMap<DeviceInfo, StatisticsContext> contexts = new ConcurrentHashMap<>();
+ private final Executor executor;
private final Semaphore workModeGuard = new Semaphore(1, true);
- private final ObjectRegistration<StatisticsManagerControlService> controlServiceRegistration;
- private final ListeningExecutorService executorService;
+ private final Registration controlServiceRegistration;
private final StatisticsWorkMode workMode = StatisticsWorkMode.COLLECTALL;
private boolean isStatisticsFullyDisabled;
public StatisticsManagerImpl(@NonNull final OpenflowProviderConfig config,
@NonNull final RpcProviderService rpcProviderRegistry,
final ConvertorExecutor convertorExecutor,
- @NonNull final ListeningExecutorService executorService) {
+ @NonNull final Executor executor) {
this.config = config;
- this.converterExecutor = convertorExecutor;
- this.controlServiceRegistration = Preconditions.checkNotNull(rpcProviderRegistry
- .registerRpcImplementation(StatisticsManagerControlService.class, this));
- this.executorService = executorService;
+ this.executor = executor;
+ converterExecutor = convertorExecutor;
+ controlServiceRegistration = rpcProviderRegistry.registerRpcImplementations(
+ (GetStatisticsWorkMode) this::getStatisticsWorkMode,
+ (ChangeStatisticsWorkMode) this::changeStatisticsWorkMode);
}
- @Override
- public ListenableFuture<RpcResult<GetStatisticsWorkModeOutput>> getStatisticsWorkMode(
- GetStatisticsWorkModeInput input) {
+ @VisibleForTesting
+ ListenableFuture<RpcResult<GetStatisticsWorkModeOutput>> getStatisticsWorkMode(
+ final GetStatisticsWorkModeInput input) {
return RpcResultBuilder.success(new GetStatisticsWorkModeOutputBuilder()
.setMode(workMode)
.build()).buildFuture();
}
- @Override
- public ListenableFuture<RpcResult<ChangeStatisticsWorkModeOutput>> changeStatisticsWorkMode(
- ChangeStatisticsWorkModeInput input) {
+ @VisibleForTesting
+ ListenableFuture<RpcResult<ChangeStatisticsWorkModeOutput>> changeStatisticsWorkMode(
+ final ChangeStatisticsWorkModeInput input) {
if (workModeGuard.tryAcquire()) {
final StatisticsWorkMode targetWorkMode = input.getMode();
isStatisticsFullyDisabled = StatisticsWorkMode.FULLYDISABLED.equals(targetWorkMode);
}
return RpcResultBuilder.<ChangeStatisticsWorkModeOutput>failed()
- .withError(RpcError.ErrorType.APPLICATION,
- "Statistics work mode change is already in progress")
+ .withError(ErrorType.APPLICATION, "Statistics work mode change is already in progress")
.buildFuture();
}
deviceContext,
converterExecutor,
statisticsWriterProvider,
- executorService,
+ executor,
config,
- !isStatisticsFullyDisabled && config.isIsStatisticsPollingOn(),
+ !isStatisticsFullyDisabled && config.getIsStatisticsPollingOn(),
useReconciliationFramework);
contexts.put(deviceContext.getDeviceInfo(), statisticsContext);