package org.opendaylight.controller.clustering.it.provider;
import com.google.common.base.Stopwatch;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.collect.ImmutableClassToInstanceMap;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
-import java.util.Collection;
-import java.util.concurrent.Future;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.clustering.CandidateAlreadyRegisteredException;
-import org.opendaylight.controller.md.sal.common.api.clustering.Entity;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipChange;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipListener;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeCommitCohortRegistry;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.mdsal.eos.binding.api.Entity;
+import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListener;
+import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
+import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.Cars;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterCommitCohort;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterCommitCohortInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterCommitCohortOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterCommitCohortOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterLoggingDtcl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterLoggingDtclInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterLoggingDtclOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterLoggingDtclOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterOwnership;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterOwnershipInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterOwnershipOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterOwnershipOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StopStressTest;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StopStressTestInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StopStressTestOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StopStressTestOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StressTest;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StressTestInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StressTestOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StressTestOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterCommitCohort;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterCommitCohortInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterCommitCohortOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterCommitCohortOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterLoggingDtcls;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterLoggingDtclsInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterLoggingDtclsOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterLoggingDtclsOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterOwnership;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterOwnershipInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterOwnershipOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterOwnershipOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.cars.CarEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.cars.CarEntryBuilder;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.concepts.Registration;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
+import org.opendaylight.yangtools.yang.binding.Rpc;
+import org.opendaylight.yangtools.yang.common.ErrorType;
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.data.api.YangInstanceIdentifier;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
+ * Implementation of CarService.
+ *
* @author Thomas Pantelis
*/
-public class CarProvider implements CarService {
- private static final Logger log = LoggerFactory.getLogger(PurchaseCarProvider.class);
-
+@Singleton
+@Component(service = { })
+public final class CarProvider {
private static final Logger LOG = LoggerFactory.getLogger(CarProvider.class);
private static final String ENTITY_TYPE = "cars";
- private static final InstanceIdentifier CARS_IID = InstanceIdentifier.builder(Cars.class).build();
- private static final DataTreeIdentifier<Cars> CARS_DTID = new DataTreeIdentifier<>(
+ private static final InstanceIdentifier<Cars> CARS_IID = InstanceIdentifier.builder(Cars.class).build();
+ private static final DataTreeIdentifier<Cars> CARS_DTID = DataTreeIdentifier.create(
LogicalDatastoreType.CONFIGURATION, CARS_IID);
private final DataBroker dataProvider;
private final AtomicLong succcessCounter = new AtomicLong();
private final AtomicLong failureCounter = new AtomicLong();
- private final CarEntityOwnershipListener ownershipListener = new CarEntityOwnershipListener();
+ private final EntityOwnershipListener ownershipListener =
+ ownershipChange -> LOG.info("ownershipChanged: {}", ownershipChange);
+
private final AtomicBoolean registeredListener = new AtomicBoolean();
- private final Collection<ListenerRegistration<DataChangeListener>> carsDclRegistrations =
- Sets.newConcurrentHashSet();
- private final Collection<ListenerRegistration<CarDataTreeChangeListener>> carsDtclRegistrations =
- Sets.newConcurrentHashSet();
+ private final Set<ListenerRegistration<?>> carsDclRegistrations = ConcurrentHashMap.newKeySet();
+
+ private final Set<Registration> regs = new HashSet<>();
+ private final Set<ListenerRegistration<CarDataTreeChangeListener>> carsDtclRegistrations =
+ ConcurrentHashMap.newKeySet();
private volatile Thread testThread;
private volatile boolean stopThread;
private final AtomicReference<DOMDataTreeCommitCohortRegistration<CarEntryDataTreeCommitCohort>> commitCohortReg =
new AtomicReference<>();
- public CarProvider(DataBroker dataProvider, EntityOwnershipService ownershipService,
- DOMDataBroker domDataBroker) {
+ @Inject
+ @Activate
+ public CarProvider(@Reference final DataBroker dataProvider,
+ @Reference final EntityOwnershipService ownershipService, @Reference final DOMDataBroker domDataBroker,
+ @Reference final RpcProviderService rpcProviderService) {
this.dataProvider = dataProvider;
this.ownershipService = ownershipService;
this.domDataBroker = domDataBroker;
+ regs.add(rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
+ .put(StressTest.class, this::stressTest)
+ .put(StopStressTest.class, this::stopStressTest)
+ .put(RegisterOwnership.class, this::registerOwnership)
+ .put(UnregisterOwnership.class, this::unregisterOwnership)
+ .put(RegisterLoggingDtcl.class, this::registerLoggingDtcl)
+ .put(UnregisterLoggingDtcls.class, this::unregisterLoggingDtcls)
+ .put(RegisterCommitCohort.class, this::registerCommitCohort)
+ .put(UnregisterCommitCohort.class, this::unregisterCommitCohort)
+ .build()));
}
+ @PreDestroy
+ @Deactivate
public void close() {
stopThread();
- unregisterCommitCohort();
+ closeCommitCohortRegistration();
+ regs.forEach(Registration::close);
+ regs.clear();
}
private void stopThread() {
- if(testThread != null) {
+ if (testThread != null) {
stopThread = true;
testThread.interrupt();
try {
testThread.join();
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) {
+ // don't care
+ }
testThread = null;
}
}
- @Override
- public Future<RpcResult<Void>> stressTest(StressTestInput input) {
+ private ListenableFuture<RpcResult<StressTestOutput>> stressTest(final StressTestInput input) {
final int inputRate;
final long inputCount;
// If rate is not provided, or given as zero, then just return.
- if (input.getRate() == null || input.getRate() == 0) {
- log.info("Exiting stress test as no rate is given.");
- return Futures.immediateFuture(RpcResultBuilder.<Void>failed()
+ if (input.getRate() == null || input.getRate().toJava() == 0) {
+ LOG.info("Exiting stress test as no rate is given.");
+ return Futures.immediateFuture(RpcResultBuilder.<StressTestOutput>failed()
.withError(ErrorType.PROTOCOL, "invalid rate")
.build());
- } else {
- inputRate = input.getRate();
}
+ inputRate = input.getRate().toJava();
if (input.getCount() != null) {
- inputCount = input.getCount();
+ inputCount = input.getCount().toJava();
} else {
inputCount = 0;
}
- log.info("Stress test starting : rate: {} count: {}", inputRate, inputCount);
+ LOG.info("Stress test starting : rate: {} count: {}", inputRate, inputCount);
stopThread();
// clear counters
failureCounter.set(0);
WriteTransaction tx = dataProvider.newWriteOnlyTransaction();
- InstanceIdentifier<Cars> carsId = InstanceIdentifier.<Cars>builder(Cars.class).build();
+ InstanceIdentifier<Cars> carsId = InstanceIdentifier.create(Cars.class);
tx.merge(LogicalDatastoreType.CONFIGURATION, carsId, new CarsBuilder().build());
try {
- tx.submit().checkedGet(5, TimeUnit.SECONDS);
- } catch (TransactionCommitFailedException | TimeoutException e) {
- log.error("Put Cars failed",e);
- return Futures.immediateFuture(RpcResultBuilder.<Void>success().build());
+ tx.commit().get(5, TimeUnit.SECONDS);
+ } catch (TimeoutException | InterruptedException | ExecutionException e) {
+ LOG.error("Put Cars failed",e);
+ return Futures.immediateFuture(RpcResultBuilder.success(new StressTestOutputBuilder().build()).build());
}
stopThread = false;
testThread = new Thread(() -> {
sw.start();
AtomicLong count = new AtomicLong();
- while(!stopThread) {
+ while (!stopThread) {
long id = count.incrementAndGet();
WriteTransaction tx1 = dataProvider.newWriteOnlyTransaction();
- CarEntry car = new CarEntryBuilder().setId(new CarId("car"+id)).build();
+ CarEntry car = new CarEntryBuilder().setId(new CarId("car" + id)).build();
tx1.put(LogicalDatastoreType.CONFIGURATION,
- InstanceIdentifier.<Cars>builder(Cars.class).child(CarEntry.class, car.getKey()).build(),
- car);
- CheckedFuture<Void, TransactionCommitFailedException> future = tx1.submit();
- Futures.addCallback(future, new FutureCallback<Void>() {
+ InstanceIdentifier.<Cars>builder(Cars.class).child(CarEntry.class, car.key()).build(), car);
+ tx1.commit().addCallback(new FutureCallback<CommitInfo>() {
@Override
- public void onSuccess(final Void result) {
+ public void onSuccess(final CommitInfo result) {
// Transaction succeeded
succcessCounter.getAndIncrement();
}
@Override
- public void onFailure(final Throwable t) {
+ public void onFailure(final Throwable ex) {
// Transaction failed
failureCounter.getAndIncrement();
- LOG.error("Put Cars failed", t);
+ LOG.error("Put Cars failed", ex);
}
- });
+ }, MoreExecutors.directExecutor());
try {
TimeUnit.NANOSECONDS.sleep(sleep);
} catch (InterruptedException e) {
break;
}
- if(count.get() % 1000 == 0) {
- log.info("Cars created {}, time: {}",count.get(),sw.elapsed(TimeUnit.SECONDS));
+ if (count.get() % 1000 == 0) {
+ LOG.info("Cars created {}, time: {}", count.get(), sw.elapsed(TimeUnit.SECONDS));
}
// Check if a count is specified in input and we have created that many cars.
}
}
- log.info("Stress test thread stopping after creating {} cars.", count.get());
+ LOG.info("Stress test thread stopping after creating {} cars.", count.get());
});
testThread.start();
- return Futures.immediateFuture(RpcResultBuilder.<Void>success().build());
+ return Futures.immediateFuture(RpcResultBuilder.success(new StressTestOutputBuilder().build()).build());
}
- @Override
- public Future<RpcResult<StopStressTestOutput>> stopStressTest() {
+ private ListenableFuture<RpcResult<StopStressTestOutput>> stopStressTest(final StopStressTestInput input) {
stopThread();
StopStressTestOutputBuilder stopStressTestOutput;
stopStressTestOutput = new StopStressTestOutputBuilder()
- .setSuccessCount(succcessCounter.longValue())
- .setFailureCount(failureCounter.longValue());
+ .setSuccessCount(Uint32.valueOf(succcessCounter.longValue()))
+ .setFailureCount(Uint32.valueOf(failureCounter.longValue()));
- StopStressTestOutput result = stopStressTestOutput.build();
- log.info("Executed Stop Stress test; No. of cars created {}; " +
- "No. of cars failed {}; ", succcessCounter, failureCounter);
+ final StopStressTestOutput result = stopStressTestOutput.build();
+ LOG.info("Executed Stop Stress test; No. of cars created {}; No. of cars failed {}; ",
+ succcessCounter, failureCounter);
// clear counters
succcessCounter.set(0);
failureCounter.set(0);
return Futures.immediateFuture(RpcResultBuilder.<StopStressTestOutput>success(result).build());
}
-
- @Override
- public Future<RpcResult<Void>> registerOwnership(RegisterOwnershipInput input) {
- if(registeredListener.compareAndSet(false, true)) {
+ private ListenableFuture<RpcResult<RegisterOwnershipOutput>> registerOwnership(final RegisterOwnershipInput input) {
+ if (registeredListener.compareAndSet(false, true)) {
ownershipService.registerListener(ENTITY_TYPE, ownershipListener);
}
try {
ownershipService.registerCandidate(entity);
} catch (CandidateAlreadyRegisteredException e) {
- return RpcResultBuilder.<Void>failed().withError(ErrorType.APPLICATION,
+ return RpcResultBuilder.<RegisterOwnershipOutput>failed().withError(ErrorType.APPLICATION,
"Could not register for car " + input.getCarId(), e).buildFuture();
}
- return RpcResultBuilder.<Void>success().buildFuture();
+ return RpcResultBuilder.success(new RegisterOwnershipOutputBuilder().build()).buildFuture();
}
- @Override
- public Future<RpcResult<Void>> unregisterOwnership(UnregisterOwnershipInput input) {
- return RpcResultBuilder.<Void>success().buildFuture();
- }
-
- private static class CarEntityOwnershipListener implements EntityOwnershipListener {
- @Override
- public void ownershipChanged(EntityOwnershipChange ownershipChange) {
- LOG.info("ownershipChanged: {}", ownershipChange);
- }
- }
-
- @Override
- public Future<RpcResult<java.lang.Void>> registerLoggingDcl() {
- LOG.info("Registering a new CarDataChangeListener");
- final ListenerRegistration carsDclRegistration = dataProvider.registerDataChangeListener(
- LogicalDatastoreType.CONFIGURATION, CARS_IID, new CarDataChangeListener(),
- AsyncDataBroker.DataChangeScope.SUBTREE);
-
- if (carsDclRegistration != null) {
- carsDclRegistrations.add(carsDclRegistration);
- return RpcResultBuilder.<Void>success().buildFuture();
- }
- return RpcResultBuilder.<Void>failed().buildFuture();
+ private ListenableFuture<RpcResult<UnregisterOwnershipOutput>> unregisterOwnership(
+ final UnregisterOwnershipInput input) {
+ return RpcResultBuilder.success(new UnregisterOwnershipOutputBuilder().build()).buildFuture();
}
- @Override
- public Future<RpcResult<java.lang.Void>> registerLoggingDtcl() {
+ private ListenableFuture<RpcResult<RegisterLoggingDtclOutput>> registerLoggingDtcl(
+ final RegisterLoggingDtclInput input) {
LOG.info("Registering a new CarDataTreeChangeListener");
final ListenerRegistration<CarDataTreeChangeListener> carsDtclRegistration =
dataProvider.registerDataTreeChangeListener(CARS_DTID, new CarDataTreeChangeListener());
- if (carsDtclRegistration != null) {
- carsDtclRegistrations.add(carsDtclRegistration);
- return RpcResultBuilder.<Void>success().buildFuture();
- }
- return RpcResultBuilder.<Void>failed().buildFuture();
- }
-
- @Override
- public Future<RpcResult<java.lang.Void>> unregisterLoggingDcls() {
- LOG.info("Unregistering the CarDataChangeListener(s)");
- synchronized (carsDclRegistrations) {
- int numListeners = 0;
- for (ListenerRegistration<DataChangeListener> carsDclRegistration : carsDclRegistrations) {
- carsDclRegistration.close();
- numListeners++;
- }
- carsDclRegistrations.clear();
- LOG.info("Unregistered {} CarDataChangeListener(s)", numListeners);
- }
- return RpcResultBuilder.<Void>success().buildFuture();
+ carsDtclRegistrations.add(carsDtclRegistration);
+ return RpcResultBuilder.success(new RegisterLoggingDtclOutputBuilder().build()).buildFuture();
}
- @Override
- public Future<RpcResult<java.lang.Void>> unregisterLoggingDtcls() {
+ private ListenableFuture<RpcResult<UnregisterLoggingDtclsOutput>> unregisterLoggingDtcls(
+ final UnregisterLoggingDtclsInput input) {
LOG.info("Unregistering the CarDataTreeChangeListener(s)");
synchronized (carsDtclRegistrations) {
int numListeners = 0;
carsDtclRegistrations.clear();
LOG.info("Unregistered {} CaraDataTreeChangeListener(s)", numListeners);
}
- return RpcResultBuilder.<Void>success().buildFuture();
+ return RpcResultBuilder.success(new UnregisterLoggingDtclsOutputBuilder().build()).buildFuture();
}
- @Override
@SuppressWarnings("checkstyle:IllegalCatch")
- public Future<RpcResult<Void>> unregisterCommitCohort() {
+ private ListenableFuture<RpcResult<UnregisterCommitCohortOutput>> unregisterCommitCohort(
+ final UnregisterCommitCohortInput input) {
+ closeCommitCohortRegistration();
+
+ return RpcResultBuilder.success(new UnregisterCommitCohortOutputBuilder().build()).buildFuture();
+ }
+
+ private void closeCommitCohortRegistration() {
final DOMDataTreeCommitCohortRegistration<CarEntryDataTreeCommitCohort> reg = commitCohortReg.getAndSet(null);
if (reg != null) {
- try {
- reg.close();
- LOG.info("Unregistered commit cohort");
- } catch (Exception e) {
- return RpcResultBuilder.<Void>failed().withError(ErrorType.APPLICATION,
- "Error closing commit cohort registration", e).buildFuture();
- }
+ reg.close();
+ LOG.info("Unregistered commit cohort");
}
-
- return RpcResultBuilder.<Void>success().buildFuture();
}
- @Override
- public synchronized Future<RpcResult<Void>> registerCommitCohort() {
+ private synchronized ListenableFuture<RpcResult<RegisterCommitCohortOutput>> registerCommitCohort(
+ final RegisterCommitCohortInput input) {
if (commitCohortReg.get() != null) {
- return RpcResultBuilder.<Void>success().buildFuture();
+ return RpcResultBuilder.success(new RegisterCommitCohortOutputBuilder().build()).buildFuture();
}
- final DOMDataTreeCommitCohortRegistry commitCohortRegistry = (DOMDataTreeCommitCohortRegistry)
- domDataBroker.getSupportedExtensions().get(DOMDataTreeCommitCohortRegistry.class);
+ final DOMDataTreeCommitCohortRegistry commitCohortRegistry = domDataBroker.getExtensions().getInstance(
+ DOMDataTreeCommitCohortRegistry.class);
if (commitCohortRegistry == null) {
// Shouldn't happen
- return RpcResultBuilder.<Void>failed().withError(ErrorType.APPLICATION,
+ return RpcResultBuilder.<RegisterCommitCohortOutput>failed().withError(ErrorType.APPLICATION,
"DOMDataTreeCommitCohortRegistry not found").buildFuture();
}
// to address all list entries, the second path argument is wild-carded by specifying just the CarEntry.QNAME.
final YangInstanceIdentifier carEntryPath = YangInstanceIdentifier.builder(
YangInstanceIdentifier.of(Cars.QNAME)).node(CarEntry.QNAME).node(CarEntry.QNAME).build();
- commitCohortReg.set(commitCohortRegistry.registerCommitCohort(
- new org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier(
- org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION,
- carEntryPath), new CarEntryDataTreeCommitCohort()));
+ commitCohortReg.set(commitCohortRegistry.registerCommitCohort(new DOMDataTreeIdentifier(
+ LogicalDatastoreType.CONFIGURATION, carEntryPath), new CarEntryDataTreeCommitCohort()));
LOG.info("Registered commit cohort");
- return RpcResultBuilder.<Void>success().buildFuture();
+ return RpcResultBuilder.success(new RegisterCommitCohortOutputBuilder().build()).buildFuture();
}
}
Code Review / controller.git / blobdiff