Skip to content

Fixed/Extended context find_path function #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixed/Extended context find_path function #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions libyang/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 5 additions & 3 deletions tests/test_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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:
Expand Down