MRI version bump for Aluminium

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

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java
index 586eccf37d82fd04c4eb1643b28b61b8bd6a8ce0..bee35c5ee505451acbb5084219a2785858ff1130 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/cli/TepCommandHelperTest.java
@@ -104,6 +104,14 @@ public class TepCommandHelperTest {
     private TunnelMonitorParams tunnelMonitorParams = null;
     private Vteps vteps = null;
     private Vteps vtepsTest = null;
+    private TransportZone mergeTransportZone = null;
+    private TransportZone mergeTransportZoneGre = null;
+    private TransportZones mergeParentTransportZones = null;
+    private TransportZones mergeParentTransportZonesGre = null;
+    private Vteps mergeVteps = null;
+    private final List<Vteps> mergeVtepsList = new ArrayList<>();
+    private final List<TransportZone> mergeParentTransportZoneList = new ArrayList<>();
+    private final List<TransportZone> mergeParentTransportZoneListGre = new ArrayList<>();
     private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state
             .Interface interfaceTest = null;
     private org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface
@@ -210,6 +218,22 @@ public class TepCommandHelperTest {
         transportZoneList.add(transportZone);
         transportZones = new TransportZonesBuilder().setTransportZone(transportZoneList).build();
         transportZonesNew = new TransportZonesBuilder().setTransportZone(transportZoneListNew).build();
+        mergeVteps = new VtepsBuilder().setDpnId(dpId2)
+                .setIpAddress(ipAddress1).withKey(new VtepsKey(dpId1)).build();
+        mergeVtepsList.add(mergeVteps);
+        mergeTransportZone =
+                new TransportZoneBuilder().withKey(new TransportZoneKey(transportZone1))
+                        .setTunnelType(tunnelType1).setZoneName(transportZone1).setVteps(mergeVtepsList)
+                        .build();
+        mergeParentTransportZoneList.add(mergeTransportZone);
+        mergeParentTransportZones = new TransportZonesBuilder().setTransportZone(mergeParentTransportZoneList).build();
+        mergeTransportZoneGre =
+                new TransportZoneBuilder().withKey(new TransportZoneKey(transportZone1))
+                        .setTunnelType(tunnelType2).setZoneName(transportZone1).setVteps(mergeVtepsList)
+                        .build();
+        mergeParentTransportZoneListGre.add(mergeTransportZoneGre);
+        mergeParentTransportZonesGre = new TransportZonesBuilder().setTransportZone(mergeParentTransportZoneListGre)
+                .build();
         tunnelMonitorInterval = new TunnelMonitorIntervalBuilder().setInterval(10000).build();
         tunnelMonitorParams = new TunnelMonitorParamsBuilder().setEnabled(true).build();
         InternalTunnel internalTunnelTest = new InternalTunnelBuilder().setSourceDPN(dpId1).setDestinationDPN(dpId2)
@@ -330,8 +354,8 @@ public class TepCommandHelperTest {
         tepCommandHelper.configureTunnelMonitorInterval(interval);
 
         verify(mockReadTx).read(LogicalDatastoreType.CONFIGURATION,tunnelMonitorIntervalIdentifier);
-        verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION,tunnelMonitorIntervalIdentifier,
-                tunnelMonitor,true);
+        verify(mockWriteTx).mergeParentStructureMerge(LogicalDatastoreType.CONFIGURATION,
+                tunnelMonitorIntervalIdentifier, tunnelMonitor);
     }
 
     @Test
@@ -386,8 +410,8 @@ public class TepCommandHelperTest {
         tepCommandHelper.buildTeps();
 
         verify(mockReadTx, times(2)).read(LogicalDatastoreType.CONFIGURATION,transportZoneIdentifier);
-        verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION,transportZonesIdentifier,transportZonesNew,true);
-
+        verify(mockWriteTx).mergeParentStructureMerge(LogicalDatastoreType.CONFIGURATION,transportZonesIdentifier,
+                mergeParentTransportZones);
     }
 
     @Test
@@ -404,7 +428,8 @@ public class TepCommandHelperTest {
         tepCommandHelper.buildTeps();
 
         verify(mockReadTx, times(2)).read(LogicalDatastoreType.CONFIGURATION,transportZoneIdentifier);
-        verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION,transportZonesIdentifier,transportZonesNew,true);
+        verify(mockWriteTx).mergeParentStructureMerge(LogicalDatastoreType.CONFIGURATION,transportZonesIdentifier,
+                mergeParentTransportZonesGre);
 
     }
 
@@ -419,7 +444,8 @@ public class TepCommandHelperTest {
         tepCommandHelper.buildTeps();
 
         verify(mockReadTx, times(2)).read(LogicalDatastoreType.CONFIGURATION,transportZoneIdentifier);
-        verify(mockWriteTx).merge(LogicalDatastoreType.CONFIGURATION,transportZonesIdentifier,transportZonesNew,true);
+        verify(mockWriteTx).mergeParentStructureMerge(LogicalDatastoreType.CONFIGURATION,transportZonesIdentifier,
+                mergeParentTransportZones);
 
     }