Yangutils - uses statement can be root

- Bug https://bugs.opendaylight.org/show_bug.cgi?id=6440

Change-Id: Ib9e9783b6be5853196749ea6bd4418f9c048a7ba
Signed-off-by: Stanislav Jamrich <sjamrich@cisco.com>

diff --git a/modules/common-yangutils-resources/src/main/resources/yangutils/services/module-connector.services.js b/modules/common-yangutils-resources/src/main/resources/yangutils/services/module-connector.services.js
index 4c505322474d547c70ada2b4d7f397ce5a335668..43837b09d2fba159bd0a063636089250e6e76601 100644 (file)
--- a/modules/common-yangutils-resources/src/main/resources/yangutils/services/module-connector.services.js
+++ b/modules/common-yangutils-resources/src/main/resources/yangutils/services/module-connector.services.js
@@ -47,7 +47,12 @@ define([], function () {
                     changed = false;
 
                 if (node && module) {
                     changed = false;
 
                 if (node && module) {

-                    usesNode.parent.children.splice(usesNode.parent.children.indexOf(usesNode), 1); // delete uses node
+                    if (usesNode.parent.children) { // if parent is node
+                        usesNode.parent.children.splice(usesNode.parent.children.indexOf(usesNode), 1); // delete uses node
+                    }
+                    else if (usesNode.parent._roots) { // if parent is module
+                        usesNode.parent._roots.splice(usesNode.parent._roots.indexOf(usesNode), 1);
+                    }

                     for (var i = 0; i < node.children.length; i++) {
                         applyLinks(node.children[i], module, modules);
                     }
                     for (var i = 0; i < node.children.length; i++) {
                         applyLinks(node.children[i], module, modules);
                     }

diff --git a/modules/common-yangutils-resources/src/main/resources/yangutils/services/node-utils.services.js b/modules/common-yangutils-resources/src/main/resources/yangutils/services/node-utils.services.js
index c16a5b8bb579985ce3a055d3826c497fc7fc1476..120921ebbb9f6257d1e709f660d7c0153403ad02 100644 (file)
--- a/modules/common-yangutils-resources/src/main/resources/yangutils/services/node-utils.services.js
+++ b/modules/common-yangutils-resources/src/main/resources/yangutils/services/node-utils.services.js
@@ -12,7 +12,7 @@ define([], function () {
 
         // TODO: add service's description
         function isRootNode(type) {
 
         // TODO: add service's description
         function isRootNode(type) {

-            return type === 'container' || type === 'list' || type === 'rpc';
+            return type === 'container' || type === 'list' || type === 'uses' || type === 'rpc';

         }
 
         // TODO: add service's description
         }
 
         // TODO: add service's description