From d23f4be2c62a8fbab984fc7dea8ec2e317b8a662 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Tue, 14 Jun 2016 10:48:26 +0200
Subject: HONEYCOMB-92: Process modifications recursively

+ Fix update subtree, child writer lookup
+ Change initializers operation to merge

Change-Id: I6ece7eb3d17d5a0b4a413189ddd383567d7e2270
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 .../fd/honeycomb/v3po/vpp/data/init/AbstractDataTreeConverter.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/AbstractDataTreeConverter.java')

diff --git a/v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/AbstractDataTreeConverter.java b/v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/AbstractDataTreeConverter.java
index 575f1d860..f0058264e 100644
--- a/v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/AbstractDataTreeConverter.java
+++ b/v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/AbstractDataTreeConverter.java
@@ -97,7 +97,10 @@ public abstract class AbstractDataTreeConverter<O extends DataObject, C extends
 
     private void writeData(final C configData) throws TransactionCommitFailedException {
         final WriteTransaction writeTx = bindingDataBroker.newWriteOnlyTransaction();
-        writeTx.put(LogicalDatastoreType.CONFIGURATION, idConfig, configData);
+        // Merge(instead of put) has to be used due to dynamic start, this might be executed multiple times
+        // and might overwrite config restored from persisted file with the same incomplete config.
+        // Making the entire configuration trigger VPP twice (on second persis ... and VPP does not like that
+        writeTx.merge(LogicalDatastoreType.CONFIGURATION, idConfig, configData);
         writeTx.submit().checkedGet();
     }
 
-- 
cgit 1.2.3-korg