Fix delete operation for leaf nodes

[netconf.git] / netconf / sal-netconf-connector / src / test / java / org / opendaylight / netconf / sal / connect / netconf / util / NetconfBaseOpsTest.java

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java
index 9bfbe7223bd56fc7c2d9b442686580230820d23d..567fa744d767dffe5e4eda1f9594ca7412f3f119 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java
@@ -251,12 +251,37 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest {
                 .node(CONTAINER_C_QNAME)
                 .node(LEAF_A_NID)
                 .build();
-        final DataContainerChild structure = baseOps.createEditConfigStrcture(Optional.of(leaf),
+        final DataContainerChild structure = baseOps.createEditConfigStructure(Optional.of(leaf),
                 Optional.of(ModifyAction.REPLACE), leafId);
         baseOps.editConfigCandidate(callback, structure, true);
         verifyMessageSent("edit-config-test-module", NetconfMessageTransformUtil.NETCONF_EDIT_CONFIG_QNAME);
     }
 
+    @Test
+    public void testDeleteContainerNodeCandidate() throws Exception {
+        final YangInstanceIdentifier containerId = YangInstanceIdentifier.builder()
+                .node(CONTAINER_C_QNAME)
+                .build();
+        final DataContainerChild structure = baseOps.createEditConfigStructure(Optional.empty(),
+                Optional.of(ModifyAction.DELETE), containerId);
+        baseOps.editConfigCandidate(callback, structure, true);
+        verifyMessageSent("edit-config-delete-container-node-candidate",
+                NetconfMessageTransformUtil.NETCONF_EDIT_CONFIG_QNAME);
+    }
+
+    @Test
+    public void testDeleteLeafNodeCandidate() throws Exception {
+        final YangInstanceIdentifier leafId = YangInstanceIdentifier.builder()
+                .node(CONTAINER_C_QNAME)
+                .node(LEAF_A_NID)
+                .build();
+        final DataContainerChild structure = baseOps.createEditConfigStructure(Optional.empty(),
+                Optional.of(ModifyAction.DELETE), leafId);
+        baseOps.editConfigCandidate(callback, structure, true);
+        verifyMessageSent("edit-config-delete-leaf-node-candidate",
+                NetconfMessageTransformUtil.NETCONF_EDIT_CONFIG_QNAME);
+    }
+
     @Test
     public void testEditConfigRunning() throws Exception {
         final LeafNode<Object> leaf = Builders.leafBuilder()
@@ -267,7 +292,7 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest {
                 .node(CONTAINER_C_NID)
                 .node(LEAF_A_NID)
                 .build();
-        final DataContainerChild structure = baseOps.createEditConfigStrcture(Optional.of(leaf),
+        final DataContainerChild structure = baseOps.createEditConfigStructure(Optional.of(leaf),
                 Optional.of(ModifyAction.REPLACE), leafId);
         baseOps.editConfigRunning(callback, structure, ModifyAction.MERGE, true);
         verifyMessageSent("edit-config-test-module-running", NetconfMessageTransformUtil.NETCONF_EDIT_CONFIG_QNAME);