import com.google.common.base.Stopwatch;
import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.Collection;
-import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
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 org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration;
+import org.opendaylight.mdsal.eos.binding.api.Entity;
+import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipChange;
+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.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.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.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.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.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.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.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.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.slf4j.LoggerFactory;
/**
+ * Implementation of CarService.
+ *
* @author Thomas Pantelis
*/
public class CarProvider implements CarService {
public void close() {
stopThread();
- unregisterCommitCohort();
+ closeCommitCohortRegistration();
}
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(final StressTestInput input) {
+ public 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_PURCHASE_CAR.info("Exiting stress test as no rate is given.");
- return Futures.immediateFuture(RpcResultBuilder.<Void>failed()
+ return Futures.immediateFuture(RpcResultBuilder.<StressTestOutput>failed()
.withError(ErrorType.PROTOCOL, "invalid rate")
.build());
}
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_PURCHASE_CAR.error("Put Cars failed",e);
- return Futures.immediateFuture(RpcResultBuilder.<Void>success().build());
+ 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);
+ Futures.addCallback(tx1.submit(), new FutureCallback<Void>() {
@Override
public void onSuccess(final Void result) {
}
@Override
- public void onFailure(final Throwable t) {
+ public void onFailure(final Throwable ex) {
// Transaction failed
failureCounter.getAndIncrement();
- LOG_CAR_PROVIDER.error("Put Cars failed", t);
+ LOG_CAR_PROVIDER.error("Put Cars failed", ex);
}
- });
+ }, MoreExecutors.directExecutor());
try {
TimeUnit.NANOSECONDS.sleep(sleep);
} catch (InterruptedException e) {
break;
}
- if(count.get() % 1000 == 0) {
- LOG_PURCHASE_CAR.info("Cars created {}, time: {}",count.get(),sw.elapsed(TimeUnit.SECONDS));
+ if (count.get() % 1000 == 0) {
+ LOG_PURCHASE_CAR.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.
});
testThread.start();
- return Futures.immediateFuture(RpcResultBuilder.<Void>success().build());
+ return Futures.immediateFuture(RpcResultBuilder.success(new StressTestOutputBuilder().build()).build());
}
@Override
- public Future<RpcResult<StopStressTestOutput>> stopStressTest() {
+ public ListenableFuture<RpcResult<StopStressTestOutput>> stopStressTest(final StopStressTestInput input) {
stopThread();
StopStressTestOutputBuilder stopStressTestOutput;
stopStressTestOutput = new StopStressTestOutputBuilder()
.setSuccessCount(succcessCounter.longValue())
.setFailureCount(failureCounter.longValue());
- StopStressTestOutput result = stopStressTestOutput.build();
- LOG_PURCHASE_CAR.info("Executed Stop Stress test; No. of cars created {}; " +
- "No. of cars failed {}; ", succcessCounter, failureCounter);
+ final StopStressTestOutput result = stopStressTestOutput.build();
+ LOG_PURCHASE_CAR.info("Executed Stop Stress test; No. of cars created {}; "
+ + "No. of cars failed {}; ", succcessCounter, failureCounter);
// clear counters
succcessCounter.set(0);
failureCounter.set(0);
@Override
- public Future<RpcResult<Void>> registerOwnership(final RegisterOwnershipInput input) {
- if(registeredListener.compareAndSet(false, true)) {
+ public 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(final UnregisterOwnershipInput input) {
- return RpcResultBuilder.<Void>success().buildFuture();
+ public ListenableFuture<RpcResult<UnregisterOwnershipOutput>> unregisterOwnership(
+ final UnregisterOwnershipInput input) {
+ return RpcResultBuilder.success(new UnregisterOwnershipOutputBuilder().build()).buildFuture();
}
private static class CarEntityOwnershipListener implements EntityOwnershipListener {
}
@Override
- public Future<RpcResult<java.lang.Void>> registerLoggingDcl() {
- LOG_CAR_PROVIDER.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();
- }
-
- @Override
- public Future<RpcResult<java.lang.Void>> registerLoggingDtcl() {
+ public ListenableFuture<RpcResult<RegisterLoggingDtclOutput>> registerLoggingDtcl(
+ final RegisterLoggingDtclInput input) {
LOG_CAR_PROVIDER.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_CAR_PROVIDER.info("Unregistering the CarDataChangeListener(s)");
- synchronized (carsDclRegistrations) {
- int numListeners = 0;
- for (ListenerRegistration<?> carsDclRegistration : carsDclRegistrations) {
- carsDclRegistration.close();
- numListeners++;
- }
- carsDclRegistrations.clear();
- LOG_CAR_PROVIDER.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() {
+ public ListenableFuture<RpcResult<UnregisterLoggingDtclsOutput>> unregisterLoggingDtcls(
+ final UnregisterLoggingDtclsInput input) {
LOG_CAR_PROVIDER.info("Unregistering the CarDataTreeChangeListener(s)");
synchronized (carsDtclRegistrations) {
int numListeners = 0;
carsDtclRegistrations.clear();
LOG_CAR_PROVIDER.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() {
+ public 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_CAR_PROVIDER.info("Unregistered commit cohort");
- } catch (Exception e) {
- return RpcResultBuilder.<Void>failed().withError(ErrorType.APPLICATION,
- "Error closing commit cohort registration", e).buildFuture();
- }
+ reg.close();
+ LOG_CAR_PROVIDER.info("Unregistered commit cohort");
}
-
- return RpcResultBuilder.<Void>success().buildFuture();
}
@Override
- public synchronized Future<RpcResult<Void>> registerCommitCohort() {
+ public 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)
if (commitCohortRegistry == null) {
// Shouldn't happen
- return RpcResultBuilder.<Void>failed().withError(ErrorType.APPLICATION,
+ return RpcResultBuilder.<RegisterCommitCohortOutput>failed().withError(ErrorType.APPLICATION,
"DOMDataTreeCommitCohortRegistry not found").buildFuture();
}
LOG_CAR_PROVIDER.info("Registered commit cohort");
- return RpcResultBuilder.<Void>success().buildFuture();
+ return RpcResultBuilder.success(new RegisterCommitCohortOutputBuilder().build()).buildFuture();
}
}
Code Review / controller.git / blobdiff