Update MRI projects for Aluminium

[ovsdb.git] / hwvtepsouthbound / hwvtepsouthbound-impl / src / test / java / org / opendaylight / ovsdb / hwvtepsouthbound / DataChangeListenerTestBase.java

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DataChangeListenerTestBase.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DataChangeListenerTestBase.java
index 8c7b29122354ca3dceb838fca4518e03598c269c..32419e0b22af93a775f1ac7be343f6178bd6447a 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DataChangeListenerTestBase.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DataChangeListenerTestBase.java
@@ -231,7 +231,7 @@ public class DataChangeListenerTestBase extends AbstractDataBrokerTest {
         HwvtepGlobalAugmentationBuilder builder = new HwvtepGlobalAugmentationBuilder();
         nodeBuilder.addAugmentation(HwvtepGlobalAugmentation.class, builder.build());
         WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
-        transaction.put(logicalDatastoreType, nodeIid, nodeBuilder.build(), WriteTransaction.CREATE_MISSING_PARENTS);
+        transaction.mergeParentStructurePut(logicalDatastoreType, nodeIid, nodeBuilder.build());
         transaction.commit();
     }
 
@@ -261,6 +261,14 @@ public class DataChangeListenerTestBase extends AbstractDataBrokerTest {
         return mergeNode(logicalDatastoreType, nodeIid, nodeBuilder);
     }
 
+    void deleteData(final LogicalDatastoreType datastoreType, InstanceIdentifier<?>... iids) {
+        WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
+        for (InstanceIdentifier<?> id : iids) {
+            transaction.delete(datastoreType, id);
+        }
+        transaction.commit();
+    }
+
     void deleteData(final LogicalDatastoreType logicalDatastoreType, final Class<? extends DataObject> dataObject,
             final String[]... data) {
         NodeBuilder nodeBuilder = prepareNode(nodeIid);
@@ -307,7 +315,7 @@ public class DataChangeListenerTestBase extends AbstractDataBrokerTest {
             final NodeBuilder nodeBuilder) {
         Node node = nodeBuilder.build();
         WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
-        transaction.merge(datastoreType, id, node, WriteTransaction.CREATE_MISSING_PARENTS);
+        transaction.mergeParentStructureMerge(datastoreType, id, node);
         transaction.commit();
         return node;
     }