MRI version bump for Aluminium

[genius.git] / itm / itm-impl / src / test / java / org / opendaylight / genius / itm / impl / ItmManagerRpcServiceTest.java

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmManagerRpcServiceTest.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmManagerRpcServiceTest.java
index 4bba968f068067dcc78994ac20b27de2406da3aa..06981acabbaeb9142c9c4335f6d392984f2ef13d 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmManagerRpcServiceTest.java
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmManagerRpcServiceTest.java
@@ -332,23 +332,25 @@ public class ItmManagerRpcServiceTest {
 
         itmManagerRpcService.addExternalTunnelEndpoint(addExternalTunnelEndpointInput);
 
-        verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION, interfaceIdentifier, iface, true);
-        verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION, externalTunnelIdentifierNew,
-                externalTunnelNew,true);
+        verify(mockWriteTx).mergeParentStructureMerge(LogicalDatastoreType.CONFIGURATION, interfaceIdentifier, iface);
+        verify(mockWriteTx).mergeParentStructureMerge(LogicalDatastoreType.CONFIGURATION, externalTunnelIdentifierNew,
+                externalTunnelNew);
     }
 
     @Test
     public void testAddL2GwDevice() {
         itmManagerRpcService.addL2GwDevice(addL2GwDeviceInput);
 
-        verify(mockWriteTx).put(LogicalDatastoreType.CONFIGURATION, deviceVtepsIdentifier, deviceVteps, true);
+        verify(mockWriteTx).mergeParentStructurePut(LogicalDatastoreType.CONFIGURATION, deviceVtepsIdentifier,
+                deviceVteps);
     }
 
     @Test
     public void testAddL2GwMlagDevice() {
         itmManagerRpcService.addL2GwMlagDevice(addL2GwMlagDeviceInput);
 
-        verify(mockWriteTx).put(LogicalDatastoreType.CONFIGURATION, deviceVtepsIdentifier, deviceVteps, true);
+        verify(mockWriteTx).mergeParentStructurePut(LogicalDatastoreType.CONFIGURATION, deviceVtepsIdentifier,
+                deviceVteps);
     }
 
     @Test
@@ -373,9 +375,9 @@ public class ItmManagerRpcServiceTest {
 
         itmManagerRpcService.buildExternalTunnelFromDpns(buildExternalTunnelFromDpnsInput);
 
-        verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION,interfaceIdentifier,iface,true);
-        verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION,externalTunnelIdentifierNew,
-                externalTunnelNew,true);
+        verify(mockWriteTx).mergeParentStructureMerge(LogicalDatastoreType.CONFIGURATION,interfaceIdentifier,iface);
+        verify(mockWriteTx).mergeParentStructureMerge(LogicalDatastoreType.CONFIGURATION,externalTunnelIdentifierNew,
+                externalTunnelNew);
     }
 
     @Ignore