Require parent topology to have been created

[netconf.git] / apps / netconf-topology / src / test / java / org / opendaylight / netconf / topology / spi / NetconfDeviceTopologyAdapterTest.java

diff --git a/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/NetconfDeviceTopologyAdapterTest.java b/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/NetconfDeviceTopologyAdapterTest.java
index 488ef954df4354dfa98f31d5afb7797706ad7fc8..38dcac2ceb3179a1c0cda78feef0eed4439c50f0 100644 (file)
--- a/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/NetconfDeviceTopologyAdapterTest.java
+++ b/apps/netconf-topology/src/test/java/org/opendaylight/netconf/topology/spi/NetconfDeviceTopologyAdapterTest.java
@@ -89,8 +89,8 @@ public class NetconfDeviceTopologyAdapterTest {
     @Test
     public void testFailedDevice() {
         // FIXME: exact match
-        doNothing().when(mockTx).mergeParentStructurePut(eq(LogicalDatastoreType.OPERATIONAL),
-            any(InstanceIdentifier.class), any(NetconfNode.class));
+        doNothing().when(mockTx).put(eq(LogicalDatastoreType.OPERATIONAL), any(InstanceIdentifier.class),
+            any(NetconfNode.class));
 
         adapter.setDeviceAsFailed(null);
 
@@ -102,8 +102,9 @@ public class NetconfDeviceTopologyAdapterTest {
 
     @Test
     public void testDeviceUpdate() throws Exception {
-        doNothing().when(mockTx).mergeParentStructurePut(eq(LogicalDatastoreType.OPERATIONAL),
-            any(InstanceIdentifier.class), any(NetconfNode.class));
+        // FIXME: exact match
+        doNothing().when(mockTx).put(eq(LogicalDatastoreType.OPERATIONAL), any(InstanceIdentifier.class),
+            any(NetconfNode.class));
         adapter.updateDeviceData(true, NetconfDeviceCapabilities.empty(), new SessionIdType(Uint32.ONE));
 
         verify(mockChain, times(2)).newWriteOnlyTransaction();
@@ -134,7 +135,6 @@ public class NetconfDeviceTopologyAdapterTest {
         assertSame(Empty.value(), Futures.getDone(future));
     }
 
-
     @Test
     public void testShutdownCompletion() throws Exception {
         // FIXME: exact match