Bug 319: Fixed two-phase commit verification of data.

Change-Id: I0183b2543d8842e485ad118badd14055035a44b0
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java
index 56fbb9a52513c7719d8e156f5319aaeb96996766..ee0b356b006feef48b30e27d3ef8ed58c7c4db88 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java
+++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java
@@ -224,7 +224,7 @@ public class DOMCodecBug01Test extends AbstractDataServiceTest {
         @Override
         public Void call() {
             try {
         @Override
         public Void call() {
             try {

-                //startSyncObject.wait();
+                //startSyncObj          ect.wait();

                 //Thread.sleep(500);
                 createFlow();
                 createFlow2();
                 //Thread.sleep(500);
                 createFlow();
                 createFlow2();

diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index eba096ca5dd8f2204fdea4fbc4650962e20e0082..57ad058c4ec4e859d347579f8fa6b287ce1f7762 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -126,6 +126,7 @@
                             org.opendaylight.controller.sal.dom.broker,
                             org.opendaylight.controller.sal.dom.broker.impl,
                             org.opendaylight.controller.sal.dom.broker.osgi,
                             org.opendaylight.controller.sal.dom.broker,
                             org.opendaylight.controller.sal.dom.broker.impl,
                             org.opendaylight.controller.sal.dom.broker.osgi,

+                            org.opendaylight.controller.sal.dom.broker.util,

                             org.opendaylight.controller.config.yang.md.sal.dom.impl,
                             org.opendaylight.controller.config.yang.md.sal.dom.statistics,
                             org.opendaylight.yangtools.yang.util
                             org.opendaylight.controller.config.yang.md.sal.dom.impl,
                             org.opendaylight.controller.config.yang.md.sal.dom.statistics,
                             org.opendaylight.yangtools.yang.util

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java
index 039bd5d07c8c6e2909da4a1044944b4590a1c90e..0120231f8de8f02a10da51ef1d2b068c36afe147 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java
@@ -11,6 +11,7 @@ import org.opendaylight.controller.md.sal.common.api.data.DataReader;
 import org.opendaylight.controller.md.sal.common.impl.AbstractDataModification;
 import org.opendaylight.controller.md.sal.common.impl.util.AbstractLockableDelegator;
 import org.opendaylight.controller.sal.core.api.data.DataStore;
 import org.opendaylight.controller.md.sal.common.impl.AbstractDataModification;
 import org.opendaylight.controller.md.sal.common.impl.util.AbstractLockableDelegator;
 import org.opendaylight.controller.sal.core.api.data.DataStore;

+import org.opendaylight.controller.sal.dom.broker.util.YangSchemaUtils;

 import org.opendaylight.yangtools.yang.model.api.SchemaServiceListener;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.model.api.SchemaServiceListener;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcResult;


@@ -20,8 +21,7 @@ import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;

-import org.opendaylight.yangtools.yang.util.YangDataOperations;
-import org.opendaylight.yangtools.yang.util.YangSchemaUtils;
+import org.opendaylight.controller.sal.dom.broker.util.YangDataOperations;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangDataOperations.xtend b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataOperations.xtend
similarity index 94%
rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangDataOperations.xtend
rename to opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataOperations.xtend
index f69e00aa3a83bb64f8b44ea0cd8c8074a652415e..f37fb0e5c03e1743b3fefa34ba454ccbe0668d89 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangDataOperations.xtend
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataOperations.xtend
@@ -1,4 +1,4 @@
-package org.opendaylight.yangtools.yang.util
+package org.opendaylight.controller.sal.dom.broker.util

 
 import org.opendaylight.yangtools.yang.data.api.CompositeNode
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode
 
 import org.opendaylight.yangtools.yang.data.api.CompositeNode
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode


@@ -14,14 +14,13 @@ import java.util.List
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode
 import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode
 import java.util.Collections
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode
 import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode
 import java.util.Collections

-import static extension org.opendaylight.yangtools.yang.util.YangDataUtils.*;

 import java.util.HashSet
 import org.opendaylight.yangtools.yang.common.QName
 import java.util.HashSet
 import org.opendaylight.yangtools.yang.common.QName

+import static extension org.opendaylight.controller.sal.dom.broker.util.YangDataUtils.*;

 
 class YangDataOperations {
 
     static def CompositeNode merge(DataSchemaNode schema, CompositeNode stored, CompositeNode modified, boolean config) {
 
 class YangDataOperations {
 
     static def CompositeNode merge(DataSchemaNode schema, CompositeNode stored, CompositeNode modified, boolean config) {

-        checkConfigurational(schema, config);

         if (stored === null) {
             return modified;
         }
         if (stored === null) {
             return modified;
         }


@@ -42,7 +41,7 @@ class YangDataOperations {
         List<Node<?>> modified, boolean configurational) {
         checkArgument(original.size === 1);
         checkArgument(modified.size === 1);
         List<Node<?>> modified, boolean configurational) {
         checkArgument(original.size === 1);
         checkArgument(modified.size === 1);

-        checkConfigurational(node, configurational);
+        

         return modified;
     }
 
         return modified;
     }
 


@@ -61,7 +60,7 @@ class YangDataOperations {
 
     private static dispatch def Iterable<? extends Node<?>> mergeMultiple(ListSchemaNode node, List<Node<?>> original,
         List<Node<?>> modified, boolean configurational) {
 
     private static dispatch def Iterable<? extends Node<?>> mergeMultiple(ListSchemaNode node, List<Node<?>> original,
         List<Node<?>> modified, boolean configurational) {

-        checkConfigurational(node,configurational);
+        

         if(node.keyDefinition === null || node.keyDefinition.empty) {
             return modified;
         } 
         if(node.keyDefinition === null || node.keyDefinition.empty) {
             return modified;
         } 

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangDataUtils.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataUtils.java
similarity index 95%
rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangDataUtils.java
rename to opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataUtils.java
index 687e4d9bf0afe82f22530614d952fdd064152ef6..166fe38328e74bab85eef2d58402db7c40b23ebf 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangDataUtils.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangDataUtils.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yangtools.yang.util;
+package org.opendaylight.controller.sal.dom.broker.util;

 
 import java.util.HashMap;
 import java.util.List;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangSchemaUtils.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java
similarity index 99%
rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangSchemaUtils.java
rename to opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java
index 3b31380afbb5333165062949eafd13378bbbd410..9a862d7a0c1b5cf33a3e63cca0805b9bc44be8dc 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/yangtools/yang/util/YangSchemaUtils.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yangtools.yang.util;
+package org.opendaylight.controller.sal.dom.broker.util;

 
 
 import java.util.Iterator;
 
 
 import java.util.Iterator;