From 08cdbdf2c0b0d903481cb591ae0170627ded09cc Mon Sep 17 00:00:00 2001
From: Stefan Gula <steweg@gmail.com>
Date: Sat, 11 Nov 2023 23:42:12 +0100
Subject: [PATCH] Fixed/Extended context find_path function

This patch enhances context find_path function to
allow using releative paths as well, by adding optional
root_node, from which the relative path is being evaluated
---
 libyang/context.py    | 14 ++++++++++++--
 tests/test_context.py |  8 +++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/libyang/context.py b/libyang/context.py
index 57432941..0d8d0a67 100644
--- a/libyang/context.py
+++ b/libyang/context.py
@@ -175,17 +175,27 @@ def get_module(self, name: str) -> Module:
 
         return Module(self, mod)
 
-    def find_path(self, path: str, output: bool = False) -> Iterator[SNode]:
+    def find_path(
+        self,
+        path: str,
+        output: bool = False,
+        root_node: Optional["libyang.SNode"] = None,
+    ) -> Iterator[SNode]:
         if self.cdata is None:
             raise RuntimeError("context already destroyed")
 
+        if root_node is not None:
+            ctx_node = root_node.cdata
+        else:
+            ctx_node = ffi.NULL
+
         flags = 0
         if output:
             flags |= lib.LYS_FIND_XP_OUTPUT
 
         node_set = ffi.new("struct ly_set **")
         if (
-            lib.lys_find_xpath(self.cdata, ffi.NULL, str2c(path), 0, node_set)
+            lib.lys_find_xpath(self.cdata, ctx_node, str2c(path), 0, node_set)
             != lib.LY_SUCCESS
         ):
             raise self.error("cannot find path")
diff --git a/tests/test_context.py b/tests/test_context.py
index 6e88a261..5650ecde 100644
--- a/tests/test_context.py
+++ b/tests/test_context.py
@@ -4,7 +4,7 @@
 import os
 import unittest
 
-from libyang import Context, LibyangError, Module, SRpc
+from libyang import Context, LibyangError, Module, SLeaf, SLeafList
 
 
 YANG_DIR = os.path.join(os.path.dirname(__file__), "yang")
@@ -82,8 +82,10 @@ def test_ctx_load_invalid_module(self):
     def test_ctx_find_path(self):
         with Context(YANG_DIR) as ctx:
             ctx.load_module("yolo-system")
-            node = next(ctx.find_path("/yolo-system:format-disk"))
-            self.assertIsInstance(node, SRpc)
+            node = next(ctx.find_path("/yolo-system:conf/offline"))
+            self.assertIsInstance(node, SLeaf)
+            node2 = next(ctx.find_path("../number", root_node=node))
+            self.assertIsInstance(node2, SLeafList)
 
     def test_ctx_iter_modules(self):
         with Context(YANG_DIR) as ctx: