import java.util.Collections;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicReference;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
import org.opendaylight.dsbenchmark.listener.DsbenchmarkListenerProvider;
import org.opendaylight.dsbenchmark.simpletx.SimpletxBaDelete;
import org.opendaylight.dsbenchmark.simpletx.SimpletxBaRead;
import org.opendaylight.dsbenchmark.txchain.TxchainDomDelete;
import org.opendaylight.dsbenchmark.txchain.TxchainDomRead;
import org.opendaylight.dsbenchmark.txchain.TxchainDomWrite;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMDataBroker;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.CleanupStoreInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.CleanupStoreOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.CleanupStoreOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestStatus.ExecStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestStatusBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private final AtomicReference<ExecStatus> execStatus = new AtomicReference<>(ExecStatus.Idle);
private final DsbenchmarkListenerProvider listenerProvider = new DsbenchmarkListenerProvider();
private final DOMDataBroker domDataBroker; // Async DOM Broker for use with all DOM operations
- private final DataBroker txChainDataBroker; // Async Binding-Aware Broker for use in tx chains; initialized to
- // ping-pong broker in default config (see default-config.xml and
- // dsbenchmark-impl.yang)
- private final DataBroker simpleTxDataBroker; // "Legacy" OSGI Data Broker for use in simple transactions
+ private final DataBroker dataBroker; // Async Binding-Aware Broker for use in tx chains
private long testsCompleted = 0;
- public DsbenchmarkProvider(final DOMDataBroker domDataBroker, final DataBroker txChainDataBroker,
- final DataBroker simpleTxDataBroker) {
+ public DsbenchmarkProvider(final DOMDataBroker domDataBroker, final DataBroker dataBroker) {
this.domDataBroker = domDataBroker;
- this.txChainDataBroker = txChainDataBroker;
- this.simpleTxDataBroker = simpleTxDataBroker;
+ this.dataBroker = dataBroker;
}
+ @SuppressWarnings("checkstyle:illegalCatch")
public void init() {
- listenerProvider.setDataBroker(simpleTxDataBroker);
+ listenerProvider.setDataBroker(dataBroker);
try {
// We want to set the initial operation status so users can detect we are ready to start test.
setTestOperData(this.execStatus.get(), testsCompleted);
} catch (final Exception e) {
// TODO: Use a singleton service to make sure the initial write is performed only once.
- LOG.warn("Working around Bugs 8829 and 6793 by ignoring exception from setTestOperData: {}", e);
+ LOG.warn("Working around Bugs 8829 and 6793 by ignoring exception from setTestOperData", e);
}
LOG.info("DsbenchmarkProvider initiated");
}
@Override
+ @SuppressWarnings("checkstyle:illegalCatch")
public ListenableFuture<RpcResult<StartTestOutput>> startTest(final StartTestInput input) {
LOG.info("Starting the data store benchmark test, input: {}", input);
// Create listeners on OPERATIONAL and CONFIG test data subtrees
listenerProvider.createAndRegisterListeners(input.getListeners().intValue());
- long startTime, endTime, listCreateTime, execTime;
- startTime = System.nanoTime();
+ long startTime = System.nanoTime();
dsWriter.createList();
- endTime = System.nanoTime();
- listCreateTime = (endTime - startTime) / 1000;
+ long endTime = System.nanoTime();
+ final long listCreateTime = (endTime - startTime) / 1000;
// Run the test and measure the execution time
+ long execTime;
try {
startTime = System.nanoTime();
dsWriter.executeList();
.setStatus(StartTestOutput.Status.OK)
.setListBuildTime(listCreateTime)
.setExecTime(execTime)
- .setTxOk((long)dsWriter.getTxOk())
- .setNtfOk(numEvents)
- .setDataChangeEventsOk(numDataChanges)
- .setTxError((long)dsWriter.getTxError())
+ .setTxOk(Uint32.valueOf(dsWriter.getTxOk()))
+ .setNtfOk(Uint32.valueOf(numEvents))
+ .setDataChangeEventsOk(Uint32.valueOf(numDataChanges))
+ .setTxError(Uint32.valueOf(dsWriter.getTxError()))
.build();
return RpcResultBuilder.success(output).buildFuture();
private void setTestOperData(final ExecStatus sts, final long tstCompl) {
TestStatus status = new TestStatusBuilder()
.setExecStatus(sts)
- .setTestsCompleted(tstCompl)
+ .setTestsCompleted(Uint32.valueOf(tstCompl))
.build();
- WriteTransaction tx = simpleTxDataBroker.newWriteOnlyTransaction();
+ WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
tx.put(LogicalDatastoreType.OPERATIONAL, TEST_STATUS_IID, status);
try {
}
private void cleanupTestStore() {
- TestExec data = new TestExecBuilder()
- .setOuterList(Collections.<OuterList>emptyList())
- .build();
+ TestExec data = new TestExecBuilder().setOuterList(Collections.emptyMap()).build();
- WriteTransaction tx = simpleTxDataBroker.newWriteOnlyTransaction();
+ WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
tx.put(LogicalDatastoreType.CONFIGURATION, TEST_EXEC_IID, data);
try {
tx.commit().get();
throw new IllegalStateException(e);
}
- tx = simpleTxDataBroker.newWriteOnlyTransaction();
+ tx = dataBroker.newWriteOnlyTransaction();
tx.put(LogicalDatastoreType.OPERATIONAL, TEST_EXEC_IID, data);
try {
tx.commit().get();
if (txType == StartTestInput.TransactionType.SIMPLETX) {
if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) {
if (StartTestInput.Operation.DELETE == oper) {
- retVal = new SimpletxBaDelete(this.simpleTxDataBroker, outerListElem,
+ retVal = new SimpletxBaDelete(this.dataBroker, outerListElem,
innerListElem,writesPerTx, dataStore);
} else if (StartTestInput.Operation.READ == oper) {
- retVal = new SimpletxBaRead(this.simpleTxDataBroker, outerListElem,
+ retVal = new SimpletxBaRead(this.dataBroker, outerListElem,
innerListElem, writesPerTx, dataStore);
} else {
- retVal = new SimpletxBaWrite(this.simpleTxDataBroker, oper, outerListElem,
+ retVal = new SimpletxBaWrite(this.dataBroker, oper, outerListElem,
innerListElem, writesPerTx, dataStore);
}
} else {
} else {
if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) {
if (StartTestInput.Operation.DELETE == oper) {
- retVal = new TxchainBaDelete(this.txChainDataBroker, outerListElem,
+ retVal = new TxchainBaDelete(this.dataBroker, outerListElem,
innerListElem, writesPerTx, dataStore);
} else if (StartTestInput.Operation.READ == oper) {
- retVal = new TxchainBaRead(this.txChainDataBroker,outerListElem,
+ retVal = new TxchainBaRead(this.dataBroker, outerListElem,
innerListElem,writesPerTx, dataStore);
} else {
- retVal = new TxchainBaWrite(this.txChainDataBroker, oper, outerListElem,
+ retVal = new TxchainBaWrite(this.dataBroker, oper, outerListElem,
innerListElem, writesPerTx, dataStore);
}
} else {