Ensure termination points are correctly deleted

[unimgr.git] / impl / src / main / java / org / opendaylight / unimgr / impl / UnimgrUtils.java

diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java
index ddba37f0ac733de229d31a342b4c355c89b7124e..ead901f81303575bf6e92dfd47cb3bcc77b816a4 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java
@@ -320,6 +320,23 @@ public class UnimgrUtils {
         transaction.submit();
     }
 
+    public <D extends org.opendaylight.yangtools.yang.binding.DataObject> boolean delete(
+            DataBroker dataBroker,
+            final LogicalDatastoreType store,
+            final InstanceIdentifier<D> path)  {
+        boolean result = false;
+        final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
+        transaction.delete(store, path);
+        CheckedFuture<Void, TransactionCommitFailedException> future = transaction.submit();
+        try {
+            future.checkedGet();
+            result = true;
+        } catch (TransactionCommitFailedException e) {
+            LOG.warn("Failed to delete {} ", path, e);
+        }
+        return result;
+    }
+
     public static CheckedFuture<Void,
                                 TransactionCommitFailedException>
                                 deleteTerminationPoint(DataBroker dataBroker,
@@ -347,6 +364,7 @@ public class UnimgrUtils {
                                 deleteNode(DataBroker dataBroker,
                                            InstanceIdentifier<?> genericNode,
                                            LogicalDatastoreType store) {
+        LOG.info("Received a request to delete node {}", genericNode);
         WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
         transaction.delete(store, genericNode);
         return transaction.submit();