Bug 3189: Check consistency of Instance Identifier and Data

Change-Id: If6f5cf8b28eb27cba89faf8a7c9489ed7fdc3dca
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
(cherry picked from commit c567ebbe7ffdb38e88524e710145cab7d3c790bc)

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerWriteOnlyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerWriteOnlyTransaction.java
index 6d00210629a9392524f6b56bbdb2260c4c123bd3..df32a2d54267af7be5eab321845ae72026762129 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerWriteOnlyTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerWriteOnlyTransaction.java
@@ -26,6 +26,7 @@ import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCoh
 import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,13 +62,13 @@ public class DOMBrokerWriteOnlyTransaction<T extends DOMStoreWriteTransaction>
     private volatile Future<?> commitFuture;
 
     protected DOMBrokerWriteOnlyTransaction(final Object identifier,
-                                            Map storeTxFactories, final AbstractDOMTransactionFactory<?> commitImpl) {
+                                            final Map storeTxFactories, final AbstractDOMTransactionFactory<?> commitImpl) {
         super(identifier, storeTxFactories);
         this.commitImpl = Preconditions.checkNotNull(commitImpl, "commitImpl must not be null.");
     }
 
     @Override
-    protected T createTransaction(LogicalDatastoreType key) {
+    protected T createTransaction(final LogicalDatastoreType key) {
         // FIXME : Casting shouldn't be necessary here
         return (T) getTxFactory(key).newWriteOnlyTransaction();
     }
@@ -75,9 +76,18 @@ public class DOMBrokerWriteOnlyTransaction<T extends DOMStoreWriteTransaction>
     @Override
     public void put(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
         checkRunning(commitImpl);
+        checkInstanceIdentifierReferencesData(path,data);
         getSubtransaction(store).write(path, data);
     }
 
+    private static void checkInstanceIdentifierReferencesData(final YangInstanceIdentifier path,
+            final NormalizedNode<?, ?> data) {
+        final PathArgument lastArg = path.getLastPathArgument();
+        Preconditions.checkArgument(
+                (lastArg == data.getIdentifier()) || (lastArg != null && lastArg.equals(data.getIdentifier())),
+                "Instance identifier references %s but data identifier is %s", lastArg, data);
+    }
+
     @Override
     public void delete(final LogicalDatastoreType store, final YangInstanceIdentifier path) {
         checkRunning(commitImpl);
@@ -87,6 +97,7 @@ public class DOMBrokerWriteOnlyTransaction<T extends DOMStoreWriteTransaction>
     @Override
     public void merge(final LogicalDatastoreType store, final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
         checkRunning(commitImpl);
+        checkInstanceIdentifierReferencesData(path, data);
         getSubtransaction(store).merge(path, data);
     }
 
@@ -125,7 +136,7 @@ public class DOMBrokerWriteOnlyTransaction<T extends DOMStoreWriteTransaction>
         final Collection<DOMStoreThreePhaseCommitCohort> cohorts = new ArrayList<>(txns.size());
 
         // FIXME: deal with errors thrown by backed (ready and submit can fail in theory)
-        for (DOMStoreWriteTransaction txn : txns) {
+        for (final DOMStoreWriteTransaction txn : txns) {
             cohorts.add(txn.ready());
         }