Added support for data store type (OPERATIONAL or CONFIG or BOTH)

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

diff --git a/benchmark/api/src/main/yang/dsbenchmark.yang b/benchmark/api/src/main/yang/dsbenchmark.yang
index 062cc8548616fc01201de2474d8dd04236faeb36..d56c1852c1a5170e0894499ae039377cab5df341 100644 (file)
--- a/benchmark/api/src/main/yang/dsbenchmark.yang
+++ b/benchmark/api/src/main/yang/dsbenchmark.yang
@@ -125,6 +125,20 @@ module dsbenchmark {
                     "Data format:-binding-aware or binding-independent";
             }
 
                     "Data format:-binding-aware or binding-independent";
             }
 

+            leaf data-store {
+                mandatory true;
+                type enumeration {
+                    enum "CONFIG" {
+                        value 1;
+                    }
+                    enum "OPERATIONAL" {
+                        value 2;
+                    }
+                    enum "BOTH" {
+                        value 3;
+                    }
+                }
+            }

             leaf outerElements {
                 type uint32;
                 default 100000;
             leaf outerElements {
                 type uint32;
                 default 100000;

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DatastoreAbstractWriter.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DatastoreAbstractWriter.java
index 93a4876340bf85e5e7fd6b9659aada5865144861..db17cdb7661a09a890bf2ec4e54d34574cc97a43 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DatastoreAbstractWriter.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DatastoreAbstractWriter.java
@@ -8,24 +8,37 @@
 
 package org.opendaylight.dsbenchmark;
 
 
 package org.opendaylight.dsbenchmark;
 

+import java.util.Random;
+
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 public abstract class DatastoreAbstractWriter {
 
 public abstract class DatastoreAbstractWriter {

+    private static final Logger LOG = LoggerFactory.getLogger(DatastoreAbstractWriter.class);
+

     protected final int outerListElem;
     protected final int innerListElem;
     protected final long writesPerTx;
     protected final StartTestInput.Operation oper;
     protected final int outerListElem;
     protected final int innerListElem;
     protected final long writesPerTx;
     protected final StartTestInput.Operation oper;

+    protected final StartTestInput.DataStore dataStore;
+    protected final Random rn = new Random();
+

 
     protected int txOk = 0;
     protected int txError = 0;
 
 
     public DatastoreAbstractWriter(StartTestInput.Operation oper,
 
     protected int txOk = 0;
     protected int txError = 0;
 
 
     public DatastoreAbstractWriter(StartTestInput.Operation oper,

-                                   int outerListElem, int innerListElem, long writesPerTx) {
+                                   int outerListElem, int innerListElem, long writesPerTx, DataStore dataStore) {

         this.outerListElem = outerListElem;
         this.innerListElem = innerListElem;
         this.writesPerTx = writesPerTx;
         this.oper = oper;
         this.outerListElem = outerListElem;
         this.innerListElem = innerListElem;
         this.writesPerTx = writesPerTx;
         this.oper = oper;

+        this.dataStore = dataStore;
+        LOG.info("DatastoreAbstractWriter created: {}", this);

     }
 
     public abstract void createList();
     }
 
     public abstract void createList();


@@ -39,4 +52,22 @@ public abstract class DatastoreAbstractWriter {
         return txOk;
     }
 
         return txOk;
     }
 

+    protected LogicalDatastoreType getDataStoreType() {
+        final LogicalDatastoreType dsType;
+        if (dataStore == DataStore.CONFIG) {
+            dsType = LogicalDatastoreType.CONFIGURATION;
+        }
+        else if (dataStore == DataStore.OPERATIONAL) {
+            dsType = LogicalDatastoreType.OPERATIONAL;
+        }
+        else
+        {
+            if (rn.nextInt() % 2 != 0) {
+                dsType = LogicalDatastoreType.OPERATIONAL;
+            } else {
+                dsType = LogicalDatastoreType.CONFIGURATION;
+            }
+        }
+        return dsType;
+    }

 }
 }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java
index 56e3899d2dc172df03933216d006efa10717db94..92ac69c0ecc498025c0eae1a2e07c254b78564ff 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java
@@ -176,9 +176,19 @@ public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkSer
         tx.put(LogicalDatastoreType.CONFIGURATION, TEST_EXEC_IID, data);
         try {
             tx.submit().checkedGet();
         tx.put(LogicalDatastoreType.CONFIGURATION, TEST_EXEC_IID, data);
         try {
             tx.submit().checkedGet();

-            LOG.info("DataStore test data cleaned up");
+            LOG.info("DataStore config test data cleaned up");

         } catch (TransactionCommitFailedException e) {
         } catch (TransactionCommitFailedException e) {

-            LOG.info("Failed to cleanup DataStore test data");
+            LOG.info("Failed to cleanup DataStore configtest data");
+            throw new IllegalStateException(e);
+        }
+        
+        tx = dataBroker.newWriteOnlyTransaction();
+        tx.put(LogicalDatastoreType.OPERATIONAL, TEST_EXEC_IID, data);
+        try {
+            tx.submit().checkedGet();
+            LOG.info("DataStore operational test data cleaned up");
+        } catch (TransactionCommitFailedException e) {
+            LOG.info("Failed to cleanup DataStore operational test data");

             throw new IllegalStateException(e);
         }
 
             throw new IllegalStateException(e);
         }
 


@@ -191,6 +201,7 @@ public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkSer
         StartTestInput.TransactionType txType = input.getTransactionType();
         StartTestInput.Operation oper = input.getOperation();
         StartTestInput.DataFormat dataFormat = input.getDataFormat();
         StartTestInput.TransactionType txType = input.getTransactionType();
         StartTestInput.Operation oper = input.getOperation();
         StartTestInput.DataFormat dataFormat = input.getDataFormat();

+        StartTestInput.DataStore dataStore = input.getDataStore();

         int outerListElem = input.getOuterElements().intValue();
         int innerListElem = input.getInnerElements().intValue();
         int writesPerTx = input.getPutsPerTx().intValue();
         int outerListElem = input.getOuterElements().intValue();
         int innerListElem = input.getInnerElements().intValue();
         int writesPerTx = input.getPutsPerTx().intValue();


@@ -200,49 +211,49 @@ public class DsbenchmarkProvider implements BindingAwareProvider, DsbenchmarkSer
                 if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) {
                     if (StartTestInput.Operation.DELETE == oper) {
                         retVal = new SimpletxBaDelete(this.dataBroker, outerListElem,
                 if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) {
                     if (StartTestInput.Operation.DELETE == oper) {
                         retVal = new SimpletxBaDelete(this.dataBroker, outerListElem,

-                                innerListElem,writesPerTx);
+                                innerListElem,writesPerTx, dataStore);

                     } else if (StartTestInput.Operation.READ == oper) {
                         retVal = new SimpletxBaRead(this.dataBroker, outerListElem,
                     } else if (StartTestInput.Operation.READ == oper) {
                         retVal = new SimpletxBaRead(this.dataBroker, outerListElem,

-                                innerListElem,writesPerTx);
+                                innerListElem, writesPerTx, dataStore);

                     } else {
                         retVal = new SimpletxBaWrite(this.dataBroker, oper, outerListElem,
                     } else {
                         retVal = new SimpletxBaWrite(this.dataBroker, oper, outerListElem,

-                                innerListElem,writesPerTx);
+                                innerListElem, writesPerTx, dataStore);

                     }
                 } else {
                     if (StartTestInput.Operation.DELETE == oper) {
                         retVal = new SimpletxDomDelete(this.domDataBroker, outerListElem,
                     }
                 } else {
                     if (StartTestInput.Operation.DELETE == oper) {
                         retVal = new SimpletxDomDelete(this.domDataBroker, outerListElem,

-                                innerListElem, writesPerTx);
+                                innerListElem, writesPerTx, dataStore);

                     } else if (StartTestInput.Operation.READ == oper) {
                         retVal = new SimpletxDomRead(this.domDataBroker, outerListElem,
                     } else if (StartTestInput.Operation.READ == oper) {
                         retVal = new SimpletxDomRead(this.domDataBroker, outerListElem,

-                                innerListElem, writesPerTx);
+                                innerListElem, writesPerTx, dataStore);

                     } else {
                         retVal = new SimpletxDomWrite(this.domDataBroker, oper, outerListElem,
                     } else {
                         retVal = new SimpletxDomWrite(this.domDataBroker, oper, outerListElem,

-                                innerListElem,writesPerTx);
+                                innerListElem, writesPerTx, dataStore);

                     }
                 }
             } else {
                 if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) {
                     if (StartTestInput.Operation.DELETE == oper) {
                         retVal = new TxchainBaDelete(this.bindingDataBroker, outerListElem,
                     }
                 }
             } else {
                 if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) {
                     if (StartTestInput.Operation.DELETE == oper) {
                         retVal = new TxchainBaDelete(this.bindingDataBroker, outerListElem,

-                                innerListElem, writesPerTx);
+                                innerListElem, writesPerTx, dataStore);

                     } else if (StartTestInput.Operation.READ == oper) {
                         retVal = new TxchainBaRead(this.bindingDataBroker,outerListElem,
                     } else if (StartTestInput.Operation.READ == oper) {
                         retVal = new TxchainBaRead(this.bindingDataBroker,outerListElem,

-                                innerListElem,writesPerTx);
+                                innerListElem,writesPerTx, dataStore);

                     } else {
                         retVal = new TxchainBaWrite(this.bindingDataBroker, oper, outerListElem,
                     } else {
                         retVal = new TxchainBaWrite(this.bindingDataBroker, oper, outerListElem,

-                                innerListElem,writesPerTx);
+                                innerListElem, writesPerTx, dataStore);

                     }
                 } else {
                     if (StartTestInput.Operation.DELETE == oper) {
                         retVal = new TxchainDomDelete(this.domDataBroker, outerListElem,
                     }
                 } else {
                     if (StartTestInput.Operation.DELETE == oper) {
                         retVal = new TxchainDomDelete(this.domDataBroker, outerListElem,

-                                innerListElem, writesPerTx);
+                                innerListElem, writesPerTx, dataStore);

                     } else if (StartTestInput.Operation.READ == oper) {
                         retVal = new TxchainDomRead(this.domDataBroker, outerListElem,
                     } else if (StartTestInput.Operation.READ == oper) {
                         retVal = new TxchainDomRead(this.domDataBroker, outerListElem,

-                                innerListElem, writesPerTx);
+                                innerListElem, writesPerTx, dataStore);

 
                     } else {
                         retVal = new TxchainDomWrite(this.domDataBroker, oper, outerListElem,
 
                     } else {
                         retVal = new TxchainDomWrite(this.domDataBroker, oper, outerListElem,

-                                innerListElem,writesPerTx);
+                                innerListElem,writesPerTx, dataStore);

                     }
                 }
             }
                     }
                 }
             }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaDelete.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaDelete.java
index 976623fd99ad3c551f7342a0c9d8436132699004..45cd66e189b455f5ae2d1e70164c3d215d1d0167 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaDelete.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaDelete.java
@@ -15,6 +15,7 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterListKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterListKey;


@@ -26,8 +27,9 @@ public class SimpletxBaDelete extends DatastoreAbstractWriter {
     private static final Logger LOG = (Logger) LoggerFactory.getLogger(SimpletxBaDelete.class);
     private DataBroker dataBroker;
 
     private static final Logger LOG = (Logger) LoggerFactory.getLogger(SimpletxBaDelete.class);
     private DataBroker dataBroker;
 

-    public SimpletxBaDelete(DataBroker dataBroker, int outerListElem, int innerListElem, long writesPerTx) {
-        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx);
+    public SimpletxBaDelete(DataBroker dataBroker, int outerListElem, int innerListElem,
+            long writesPerTx, DataStore dataStore) {
+        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx, dataStore);

         this.dataBroker = dataBroker;
         LOG.info("Created SimpletxBaDelete");
     }
         this.dataBroker = dataBroker;
         LOG.info("Created SimpletxBaDelete");
     }


@@ -41,7 +43,8 @@ public class SimpletxBaDelete extends DatastoreAbstractWriter {
                                                  StartTestInput.Operation.PUT,
                                                  outerListElem,
                                                  innerListElem,
                                                  StartTestInput.Operation.PUT,
                                                  outerListElem,
                                                  innerListElem,

-                                                 outerListElem);
+                                                 outerListElem,
+                                                 dataStore);

         dd.createList();
         dd.executeList();
     }
         dd.createList();
         dd.executeList();
     }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaRead.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaRead.java
index b64726932e6146284b3b9aee893040d56949e1d9..bc43d46012a7b898be69bd027cea2f2000e1f3e6 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaRead.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaRead.java
@@ -11,12 +11,14 @@ package org.opendaylight.dsbenchmark.simpletx;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;

+

 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterListKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterListKey;


@@ -30,8 +32,9 @@ public class SimpletxBaRead extends DatastoreAbstractWriter {
     private static final Logger LOG = (Logger) LoggerFactory.getLogger(SimpletxBaRead.class);
     private DataBroker dataBroker;
 
     private static final Logger LOG = (Logger) LoggerFactory.getLogger(SimpletxBaRead.class);
     private DataBroker dataBroker;
 

-    public SimpletxBaRead(DataBroker dataBroker, int outerListElem, int innerListElem, long writesPerTx) {
-        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx);
+    public SimpletxBaRead(DataBroker dataBroker, int outerListElem, int innerListElem, 
+            long writesPerTx, DataStore dataStore) {
+        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx, dataStore);

         this.dataBroker = dataBroker;
         LOG.info("Created SimpletxBaRead");
     }
         this.dataBroker = dataBroker;
         LOG.info("Created SimpletxBaRead");
     }


@@ -45,7 +48,8 @@ public class SimpletxBaRead extends DatastoreAbstractWriter {
                 StartTestInput.Operation.PUT,
                 outerListElem,
                 innerListElem,
                 StartTestInput.Operation.PUT,
                 outerListElem,
                 innerListElem,

-                outerListElem);
+                outerListElem,
+                dataStore);

         dd.createList();
         dd.executeList();
     }
         dd.createList();
         dd.executeList();
     }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaWrite.java
index f811c4b6b63160e41d7065c50d3743620f914728..5357311e40a8704906f3aa33c10ef9a9458dab64 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaWrite.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaWrite.java
@@ -17,6 +17,7 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFaile
 import org.opendaylight.dsbenchmark.BaListBuilder;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.dsbenchmark.BaListBuilder;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 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.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;


@@ -29,8 +30,8 @@ public class SimpletxBaWrite extends DatastoreAbstractWriter {
     private List<OuterList> list;
 
     public SimpletxBaWrite(DataBroker dataBroker, StartTestInput.Operation oper,
     private List<OuterList> list;
 
     public SimpletxBaWrite(DataBroker dataBroker, StartTestInput.Operation oper,

-            int outerListElem, int innerListElem, long writesPerTx) {
-        super(oper, outerListElem, innerListElem, writesPerTx);
+            int outerListElem, int innerListElem, long writesPerTx, DataStore dataStore) {
+        super(oper, outerListElem, innerListElem, writesPerTx, dataStore);

         this.dataBroker = dataBroker;
         LOG.info("Created SimpletxBaWrite");
     }
         this.dataBroker = dataBroker;
         LOG.info("Created SimpletxBaWrite");
     }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomDelete.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomDelete.java
index ab7590cdac6b65eb048412d99b6a3cd60315cfd9..aa0a2aceea7f6747a99fde52305c59f67110f126 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomDelete.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomDelete.java
@@ -14,6 +14,7 @@ import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.common.QName;


@@ -26,8 +27,8 @@ public class SimpletxDomDelete extends DatastoreAbstractWriter {
     private final DOMDataBroker domDataBroker;
 
     public SimpletxDomDelete(DOMDataBroker domDataBroker, int outerListElem,
     private final DOMDataBroker domDataBroker;
 
     public SimpletxDomDelete(DOMDataBroker domDataBroker, int outerListElem,

-            int innerListElem, long writesPerTx) {
-        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx);
+            int innerListElem, long writesPerTx, DataStore dataStore) {
+        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx, dataStore);

         this.domDataBroker = domDataBroker;
         LOG.info("Created simpleTxDomDelete");
    }
         this.domDataBroker = domDataBroker;
         LOG.info("Created simpleTxDomDelete");
    }


@@ -41,7 +42,8 @@ public class SimpletxDomDelete extends DatastoreAbstractWriter {
                                                    StartTestInput.Operation.PUT,
                                                    outerListElem,
                                                    innerListElem,
                                                    StartTestInput.Operation.PUT,
                                                    outerListElem,
                                                    innerListElem,

-                                                   outerListElem);
+                                                   outerListElem,
+                                                   dataStore);

         dd.createList();
         dd.executeList();
     }
         dd.createList();
         dd.executeList();
     }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomRead.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomRead.java
index 98f8c9f7a7daa686b5faa43bd6380c02276a531f..4c0eb02768f771412823e48f215b145b019cbd4f 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomRead.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomRead.java
@@ -11,12 +11,14 @@ package org.opendaylight.dsbenchmark.simpletx;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;

+

 import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.common.QName;


@@ -31,8 +33,8 @@ public class SimpletxDomRead extends DatastoreAbstractWriter {
     private final DOMDataBroker domDataBroker;
 
     public SimpletxDomRead(DOMDataBroker domDataBroker, int outerListElem,
     private final DOMDataBroker domDataBroker;
 
     public SimpletxDomRead(DOMDataBroker domDataBroker, int outerListElem,

-                           int innerListElem, long writesPerTx) {
-        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx);
+                           int innerListElem, long writesPerTx, DataStore dataStore) {
+        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx, dataStore);

         this.domDataBroker = domDataBroker;
         LOG.info("Created simpleTxDomRead");
 
         this.domDataBroker = domDataBroker;
         LOG.info("Created simpleTxDomRead");
 


@@ -44,10 +46,11 @@ public class SimpletxDomRead extends DatastoreAbstractWriter {
         // Dump the whole list into the data store in a single transaction
         // with <outerListElem> PUTs on the transaction
         SimpletxDomWrite dd = new SimpletxDomWrite(domDataBroker,
         // Dump the whole list into the data store in a single transaction
         // with <outerListElem> PUTs on the transaction
         SimpletxDomWrite dd = new SimpletxDomWrite(domDataBroker,

-                StartTestInput.Operation.PUT,
-                outerListElem,
-                innerListElem,
-                outerListElem);
+                                                   StartTestInput.Operation.PUT,
+                                                   outerListElem,
+                                                   innerListElem,
+                                                   outerListElem,
+                                                   dataStore);

         dd.createList();
         dd.executeList();
     }
         dd.createList();
         dd.executeList();
     }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java
index 97dc900d00b094c7a4ce2c0b72fc66f920568ce5..f367b8359849825130951cd7a7b7b9b5cb4de23f 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java
@@ -17,6 +17,7 @@ import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.dsbenchmark.DomListBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.dsbenchmark.DomListBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;


@@ -31,8 +32,8 @@ public class SimpletxDomWrite extends DatastoreAbstractWriter {
     private List<MapEntryNode> list;
 
     public SimpletxDomWrite(DOMDataBroker domDataBroker, StartTestInput.Operation oper,
     private List<MapEntryNode> list;
 
     public SimpletxDomWrite(DOMDataBroker domDataBroker, StartTestInput.Operation oper,

-                                    int outerListElem, int innerListElem, long putsPerTx ) {
-        super(oper, outerListElem, innerListElem, putsPerTx);
+                                    int outerListElem, int innerListElem, long putsPerTx, DataStore dataStore ) {
+        super(oper, outerListElem, innerListElem, putsPerTx, dataStore);

         this.domDataBroker = domDataBroker;
         LOG.info("Created SimpletxDomWrite");
     }
         this.domDataBroker = domDataBroker;
         LOG.info("Created SimpletxDomWrite");
     }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaDelete.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaDelete.java
index dd565fb945130dcee3c3d832a0444d01809da1ba..b30b38b6144cf905a1281402786d6d87e3b97ae3 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaDelete.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaDelete.java
@@ -18,6 +18,7 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListen
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterListKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterListKey;


@@ -32,8 +33,8 @@ public class TxchainBaDelete extends DatastoreAbstractWriter implements Transact
     private static final Logger LOG = (Logger) LoggerFactory.getLogger(TxchainBaDelete.class);
     private DataBroker bindingDataBroker;
 
     private static final Logger LOG = (Logger) LoggerFactory.getLogger(TxchainBaDelete.class);
     private DataBroker bindingDataBroker;
 

-    public TxchainBaDelete(DataBroker bindingDataBroker, int outerListElem, int innerListElem, long writesPerTx) {
-        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx);
+    public TxchainBaDelete(DataBroker bindingDataBroker, int outerListElem, int innerListElem, long writesPerTx, DataStore dataStore) {
+        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx, dataStore);

         this.bindingDataBroker = bindingDataBroker;
         LOG.info("Created TxchainBaDelete");
     }
         this.bindingDataBroker = bindingDataBroker;
         LOG.info("Created TxchainBaDelete");
     }


@@ -48,7 +49,8 @@ public class TxchainBaDelete extends DatastoreAbstractWriter implements Transact
                                                StartTestInput.Operation.PUT,
                                                outerListElem,
                                                innerListElem,
                                                StartTestInput.Operation.PUT,
                                                outerListElem,
                                                innerListElem,

-                                               outerListElem);
+                                               outerListElem,
+                                               dataStore);

         dd.createList();
         dd.executeList();
     }
         dd.createList();
         dd.executeList();
     }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java
index 3763b89c74e0bb304b3d28669fb66efbc7fd1532..2a53deaa560de19c72fe32122577eb1302c922ba 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java
@@ -10,12 +10,14 @@ package org.opendaylight.dsbenchmark.txchain;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;

+

 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.*;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.*;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterListKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterListKey;


@@ -28,8 +30,8 @@ public class TxchainBaRead extends DatastoreAbstractWriter implements Transactio
     private static final Logger LOG = (Logger) LoggerFactory.getLogger(TxchainBaRead.class);
     private DataBroker bindingDataBroker;
 
     private static final Logger LOG = (Logger) LoggerFactory.getLogger(TxchainBaRead.class);
     private DataBroker bindingDataBroker;
 

-    public TxchainBaRead(DataBroker bindingDataBroker, int outerListElem, int innerListElem, long writesPerTx) {
-        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx);
+    public TxchainBaRead(DataBroker bindingDataBroker, int outerListElem, int innerListElem, long writesPerTx, DataStore dataStore) {
+        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx, dataStore);

         this.bindingDataBroker = bindingDataBroker;
         LOG.info("Created TxchainBaRead");
     }
         this.bindingDataBroker = bindingDataBroker;
         LOG.info("Created TxchainBaRead");
     }


@@ -41,10 +43,11 @@ public class TxchainBaRead extends DatastoreAbstractWriter implements Transactio
         // Dump the whole list into the data store in a single transaction
         // with <outerListElem> PUTs on the transaction
         TxchainBaWrite dd = new TxchainBaWrite(bindingDataBroker,
         // Dump the whole list into the data store in a single transaction
         // with <outerListElem> PUTs on the transaction
         TxchainBaWrite dd = new TxchainBaWrite(bindingDataBroker,

-                StartTestInput.Operation.PUT,
-                outerListElem,
-                innerListElem,
-                outerListElem);
+                                               StartTestInput.Operation.PUT,
+                                               outerListElem,
+                                               innerListElem,
+                                               outerListElem,
+                                               dataStore);

         dd.createList();
         dd.executeList();
     }
         dd.createList();
         dd.executeList();
     }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java
index 3c78de4b1adb3e64615707f9365ad9aee6b6465c..64efbd9af7b1afe006c5a4e1236e2771626f5119 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java
@@ -9,6 +9,7 @@
 package org.opendaylight.dsbenchmark.txchain;
 
 import java.util.List;
 package org.opendaylight.dsbenchmark.txchain;
 
 import java.util.List;

+import java.util.Random;

 
 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 
 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;


@@ -20,6 +21,7 @@ import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListen
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.dsbenchmark.BaListBuilder;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.dsbenchmark.BaListBuilder;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.Operation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.Operation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;


@@ -37,8 +39,8 @@ public class TxchainBaWrite extends DatastoreAbstractWriter implements Transacti
     private List<OuterList> list;
 
     public TxchainBaWrite(DataBroker bindingDataBroker, Operation oper,
     private List<OuterList> list;
 
     public TxchainBaWrite(DataBroker bindingDataBroker, Operation oper,

-                          int outerListElem, int innerListElem, long writesPerTx) {
-        super(oper, outerListElem, innerListElem, writesPerTx);
+                          int outerListElem, int innerListElem, long writesPerTx, DataStore dataStore) {
+        super(oper, outerListElem, innerListElem, writesPerTx, dataStore);

         this.bindingDataBroker = bindingDataBroker;
         LOG.info("Created TxchainBaWrite");
     }
         this.bindingDataBroker = bindingDataBroker;
         LOG.info("Created TxchainBaWrite");
     }


@@ -55,14 +57,16 @@ public class TxchainBaWrite extends DatastoreAbstractWriter implements Transacti
 
         BindingTransactionChain chain = bindingDataBroker.createTransactionChain(this);
         WriteTransaction tx = chain.newWriteOnlyTransaction();
 
         BindingTransactionChain chain = bindingDataBroker.createTransactionChain(this);
         WriteTransaction tx = chain.newWriteOnlyTransaction();

+        LogicalDatastoreType dsType = getDataStoreType();

 
         for (OuterList element : this.list) {
             InstanceIdentifier<OuterList> iid = InstanceIdentifier.create(TestExec.class)
                                                     .child(OuterList.class, element.getKey());
 
         for (OuterList element : this.list) {
             InstanceIdentifier<OuterList> iid = InstanceIdentifier.create(TestExec.class)
                                                     .child(OuterList.class, element.getKey());

+

             if (oper == StartTestInput.Operation.PUT) {
             if (oper == StartTestInput.Operation.PUT) {

-                tx.put(LogicalDatastoreType.CONFIGURATION, iid, element);
+                tx.put(dsType, iid, element);

             } else {
             } else {

-                tx.merge(LogicalDatastoreType.CONFIGURATION, iid, element);
+                tx.merge(dsType, iid, element);

             }
 
             writeCnt++;
             }
 
             writeCnt++;


@@ -81,6 +85,7 @@ public class TxchainBaWrite extends DatastoreAbstractWriter implements Transacti
                     }
                 });
                 tx = chain.newWriteOnlyTransaction();
                     }
                 });
                 tx = chain.newWriteOnlyTransaction();

+                dsType = getDataStoreType();

                 writeCnt = 0;
             }
         }
                 writeCnt = 0;
             }
         }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java
index b1df83e46e03d186013fd826439ad3fb73c90ba5..f1f4e441dc6f57f532e0b986534e4085ffe873c0 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java
@@ -18,6 +18,7 @@ import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
 import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.common.QName;


@@ -33,8 +34,9 @@ public class TxchainDomDelete extends DatastoreAbstractWriter implements Transac
     private static final Logger LOG = LoggerFactory.getLogger(TxchainBaWrite.class);
     private final DOMDataBroker domDataBroker;
 
     private static final Logger LOG = LoggerFactory.getLogger(TxchainBaWrite.class);
     private final DOMDataBroker domDataBroker;
 

-    public TxchainDomDelete(DOMDataBroker domDataBroker, int outerListElem, int innerListElem, long writesPerTx) {
-        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx);
+    public TxchainDomDelete(DOMDataBroker domDataBroker, int outerListElem, int innerListElem, 
+            long writesPerTx, DataStore dataStore) {
+        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx, dataStore);

         this.domDataBroker = domDataBroker;
         LOG.info("Created TxchainDomDelete");
     }
         this.domDataBroker = domDataBroker;
         LOG.info("Created TxchainDomDelete");
     }


@@ -49,7 +51,8 @@ public class TxchainDomDelete extends DatastoreAbstractWriter implements Transac
                                                  StartTestInput.Operation.PUT,
                                                  outerListElem,
                                                  innerListElem,
                                                  StartTestInput.Operation.PUT,
                                                  outerListElem,
                                                  innerListElem,

-                                                 outerListElem);
+                                                 outerListElem,
+                                                 dataStore);

         dd.createList();
         dd.executeList();
     }
         dd.createList();
         dd.executeList();
     }

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomRead.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomRead.java
index 208d21774fe66c93d547995ec3385d51c3068c03..09d2aacdb1ca4b4b6da8cd99468c5c7e47047dd9 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomRead.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomRead.java
@@ -10,12 +10,14 @@ package org.opendaylight.dsbenchmark.txchain;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
 
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;

+

 import org.opendaylight.controller.md.sal.common.api.data.*;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.controller.md.sal.common.api.data.*;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.common.QName;


@@ -29,8 +31,9 @@ public class TxchainDomRead extends DatastoreAbstractWriter implements Transacti
     private static final Logger LOG = LoggerFactory.getLogger(TxchainDomRead.class);
     private final DOMDataBroker domDataBroker;
 
     private static final Logger LOG = LoggerFactory.getLogger(TxchainDomRead.class);
     private final DOMDataBroker domDataBroker;
 

-    public TxchainDomRead(DOMDataBroker domDataBroker, int outerListElem, int innerListElem, long writesPerTx) {
-        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx);
+    public TxchainDomRead(DOMDataBroker domDataBroker, int outerListElem, int innerListElem, 
+            long writesPerTx, DataStore dataStore) {
+        super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx, dataStore);

         this.domDataBroker = domDataBroker;
         LOG.info("Created TxchainDomDelete");
     }
         this.domDataBroker = domDataBroker;
         LOG.info("Created TxchainDomDelete");
     }


@@ -42,10 +45,11 @@ public class TxchainDomRead extends DatastoreAbstractWriter implements Transacti
         // Dump the whole list into the data store in a single transaction
         // with <outerListElem> PUTs on the transaction
         TxchainDomWrite dd = new TxchainDomWrite(domDataBroker,
         // Dump the whole list into the data store in a single transaction
         // with <outerListElem> PUTs on the transaction
         TxchainDomWrite dd = new TxchainDomWrite(domDataBroker,

-                StartTestInput.Operation.PUT,
-                outerListElem,
-                innerListElem,
-                outerListElem);
+                                                 StartTestInput.Operation.PUT,
+                                                     outerListElem,
+                                                     innerListElem,
+                                                     outerListElem,
+                                                     dataStore);

         dd.createList();
         dd.executeList();
     }
         dd.createList();
         dd.executeList();
     }

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 f7a44d5f58b36e13106c9da622da552568349f46..902397c3b5a9776c5e8bcbe5df80bcb86f6a18e1 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java
@@ -21,6 +21,7 @@ import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.dsbenchmark.DomListBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;
 import org.opendaylight.dsbenchmark.DatastoreAbstractWriter;
 import org.opendaylight.dsbenchmark.DomListBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput;

+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore;

 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;


@@ -38,8 +39,8 @@ public class TxchainDomWrite extends DatastoreAbstractWriter implements Transact
     private List<MapEntryNode> list;
 
     public TxchainDomWrite(DOMDataBroker domDataBroker, StartTestInput.Operation oper, int outerListElem,
     private List<MapEntryNode> list;
 
     public TxchainDomWrite(DOMDataBroker domDataBroker, StartTestInput.Operation oper, int outerListElem,

-            int innerListElem, long writesPerTx) {
-        super(oper, outerListElem, innerListElem, writesPerTx);
+            int innerListElem, long writesPerTx, DataStore dataStore) {
+        super(oper, outerListElem, innerListElem, writesPerTx, dataStore);

         this.domDataBroker = domDataBroker;
         LOG.info("Created TxchainDomWrite");
     }
         this.domDataBroker = domDataBroker;
         LOG.info("Created TxchainDomWrite");
     }