Fix for Bug 280.

Allowed to augment node with same name as existing node but with different namespace.

Change-Id: I5430eb85a42d30f0b3a4185c4a6b9c958e3b9cdd
Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
index 28936646d523e407e73e681e3d2f65222f9094ea..575af04dbbbdcb761bc904840300b757048b0e18 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/api/AbstractDataNodeContainerBuilder.java
@@ -67,9 +67,9 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
 
     @Override
     public void addChildNode(DataSchemaNodeBuilder child) {
-        String childName = child.getQName().getLocalName();
+        QName childName = child.getQName();
         for (DataSchemaNodeBuilder addedChildNode : addedChildNodes) {
-            if (addedChildNode.getQName().getLocalName().equals(childName)) {
+            if (addedChildNode.getQName().equals(childName)) {
                 throw new YangParseException(child.getModuleName(), child.getLine(), "Can not add '" + child + "' to '"
                         + this + "' in module '" + moduleName + "': node with same name already declared at line "
                         + addedChildNode.getLine());
@@ -109,9 +109,9 @@ public abstract class AbstractDataNodeContainerBuilder extends AbstractBuilder i
 
     @Override
     public void addGrouping(GroupingBuilder grouping) {
-        String groupingName = grouping.getQName().getLocalName();
+        QName groupingName = grouping.getQName();
         for (GroupingBuilder addedGrouping : addedGroupings) {
-            if (addedGrouping.getQName().getLocalName().equals(groupingName)) {
+            if (addedGrouping.getQName().equals(groupingName)) {
                 throw new YangParseException(grouping.getModuleName(), grouping.getLine(), "Can not add '" + grouping
                         + "': grouping with same name already declared in module '" + moduleName + "' at line "
                         + addedGrouping.getLine());

diff --git a/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang
index 6afb493a5bfac64849a8c3035695c7abddaef971..d08ea8f062f9b9b0092d495272cde33bf73958b4 100644 (file)
--- a/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang
+++ b/yang/yang-parser-impl/src/test/resources/negative-scenario/duplicity/augment1.yang
@@ -1,6 +1,6 @@
 module augment1 {
     yang-version 1;
-    namespace "urn:simple.augment1.demo";
+    namespace "urn:simple.augment0.demo";
     prefix "a1";
 
     import augment0 {