wip

mbj4668 · Nov 2, 2023 · 3333b21 · 3333b21
1 parent 7abd337
commit 3333b21
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/pyang/plugins/jsonxsl.py b/pyang/plugins/jsonxsl.py
@@ -155,7 +155,7 @@ def process_children(self, node, path, level, parent=None):
             tmpl = self.xsl_template(p)
             ct = self.xsl_calltemplate(ch.keyword, tmpl)
             self.xsl_withparam("level", "%d" % level, ct)
-            if (data_parent.i_module is None or
+            if (data_parent.parent is None or
                 ch.i_module.i_modulename != data_parent.i_module.i_modulename):
                 self.xsl_withparam("nsid", ch.i_module.i_modulename + ":", ct)
             if ch.keyword in ["leaf", "leaf-list"]:

diff --git a/pyang/plugins/sid.py b/pyang/plugins/sid.py
@@ -658,18 +658,18 @@ def collect_in_substmts(self, substmts):
     def get_path(self, statement, prefix=""):
         path = ""
 
-        while statement.i_module is not None:
+        while statement.parent is not None:
             if (statement.keyword not in self.grouping_keywords
                     and not self.has_yang_data_extension(statement)):
                 # Locate the data node parent
                 parent = statement.parent
-                while parent.i_module is not None:
+                while parent.parent is not None:
                     if parent.keyword in self.module_keywords:
                         break
                     parent = parent.parent
 
                 if (prefix != "" or
-                    (parent.i_module is not None and parent.i_module == statement.i_module)):
+                    (parent.parent is not None and parent.i_module == statement.i_module)):
                     path = "/" + statement.arg + path
                 else:
                     path = "/" + statement.i_module.arg + ":" + statement.arg + path

diff --git a/test/test_xpath/expect/a.yang.out b/test/test_xpath/expect/a.yang.out
@@ -4,4 +4,4 @@ a.yang:32: warning: XPATH_NODE_NOT_FOUND2
 a.yang:58: error: XPATH_SYNTAX_ERROR
 a.yang:63 (at a.yang:59): warning: XPATH_NODE_NOT_FOUND1
 a.yang:60: error: XPATH_SYNTAX_ERROR
-as.yang:9 (at b.yang:7): warning: XPATH_NODE_NOT_FOUND2
+as.yang:9 (at b.yang:7): warning: XPATH_NODE_NOT_FOUND1
diff --git a/test/test_xpath/expect/as.yang.out b/test/test_xpath/expect/as.yang.out
@@ -1 +1 @@
-as.yang:9 (at b.yang:7): warning: XPATH_NODE_NOT_FOUND2
+as.yang:9 (at b.yang:7): warning: XPATH_NODE_NOT_FOUND1
diff --git a/test/test_xpath/expect/bugs-from-ietf-modules.yang.out b/test/test_xpath/expect/bugs-from-ietf-modules.yang.out
@@ -1,3 +1,3 @@
-bugs-from-ietf-modules.yang:12: warning: XPATH_NODE_NOT_FOUND2
+bugs-from-ietf-modules.yang:12: warning: XPATH_NODE_NOT_FOUND1
 bugs-from-ietf-modules.yang:27: warning: XPATH_NODE_NOT_FOUND1
 bugs-from-ietf-modules.yang:27: warning: XPATH_NODE_NOT_FOUND1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		as.yang:9 (at b.yang:7): warning: XPATH_NODE_NOT_FOUND2
		as.yang:9 (at b.yang:7): warning: XPATH_NODE_NOT_FOUND1