From: Jan Medved <jmedved@cisco.com>
Date: Mon, 14 Dec 2015 05:49:52 +0000 (-0800)
Subject: Adding multiple data store capabilities to the Tx-Chain DOM writer
X-Git-Tag: release/beryllium~61
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=f17bd61891c4808c9b80ca0cc67854b64c7a0886;hp=1d93526ad8d11be87fe89a7667efda42043d8baf

Adding multiple data store capabilities to the Tx-Chain DOM writer

Change-Id: I113ef591c9e2813f4cb32e793e85ff63f585c148
Signed-off-by: Jan Medved <jmedved@cisco.com>
---

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java
index 902397c3b5..97d9222809 100644
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java
@@ -56,6 +56,7 @@ public class TxchainDomWrite extends DatastoreAbstractWriter implements Transact
         int writeCnt = 0;
 
         DOMTransactionChain chain = domDataBroker.createTransactionChain(this);
+        LogicalDatastoreType dsType = getDataStoreType();
         DOMDataWriteTransaction tx = chain.newWriteOnlyTransaction();
 
         YangInstanceIdentifier pid = YangInstanceIdentifier.builder().node(TestExec.QNAME).node(OuterList.QNAME).build();
@@ -63,9 +64,9 @@ public class TxchainDomWrite extends DatastoreAbstractWriter implements Transact
             YangInstanceIdentifier yid = pid.node(new NodeIdentifierWithPredicates(OuterList.QNAME, element.getIdentifier().getKeyValues()));
 
             if (oper == StartTestInput.Operation.PUT) {
-                tx.put(LogicalDatastoreType.CONFIGURATION, yid, element);
+                tx.put(dsType, yid, element);
             } else {
-                tx.merge(LogicalDatastoreType.CONFIGURATION, yid, element);
+                tx.merge(dsType, yid, element);
             }
 
             writeCnt++;
@@ -84,6 +85,7 @@ public class TxchainDomWrite extends DatastoreAbstractWriter implements Transact
                     }
                 });
                 tx = chain.newWriteOnlyTransaction();
+                dsType = getDataStoreType();
                 writeCnt = 0;
             }
         }
@@ -91,6 +93,7 @@ public class TxchainDomWrite extends DatastoreAbstractWriter implements Transact
         // *** Clean up and close the transaction chain ***
         // Submit the outstanding transaction even if it's empty and wait for it to finish
         // We need to empty the transaction chain before closing it
+
         try {
             txSubmitted++;
             tx.submit().checkedGet();