Make default strategy for edit-config netconf operation MERGE in config-persister...

Replace strategy, deletes default modules

Change-Id: Ie6e09dbdeb12aa4201af09852d4a4c6eee4e29a2
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

diff --git a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java
index 18c8ce5d1546d974f9b8fe11ac62298ba342217b..123c03e9a18fb4daff3aa8201df8e31f8e135111 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java
+++ b/opendaylight/netconf/config-netconf-connector/src/test/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditConfigTest.java
@@ -67,6 +67,8 @@ public class EditConfigTest {
         doNothing().when(provider).abortTestTransaction(any(ObjectName.class));
         doReturn(mockOn).when(provider).getOrCreateTransaction();
 
+        doNothing().when(provider).wipeTestTransaction(any(ObjectName.class));
+
         doReturn(configTransactionClient).when(configRegistry).getConfigTransactionClient(any(ObjectName.class));
         doReturn("mockConfigTransactionClient").when(configTransactionClient).toString();
 

diff --git a/opendaylight/netconf/config-persister-impl/src/main/resources/netconfOp/editConfig.xml b/opendaylight/netconf/config-persister-impl/src/main/resources/netconfOp/editConfig.xml
index 8ec1c8c069201f648f09bcaa1adcf87e0d9567dc..8f6ec9c4c2b710cb95a9f7faaf92951c583d4b2a 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/src/main/resources/netconfOp/editConfig.xml
+++ b/opendaylight/netconf/config-persister-impl/src/main/resources/netconfOp/editConfig.xml
@@ -3,7 +3,7 @@
         <target>
             <candidate/>
         </target>
-        <default-operation>replace</default-operation>
+        <default-operation>merge</default-operation>
 
         <config>
         </config>