Feature/multiple fixes

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.x
+          python-version: 3.11
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pip

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")

libyang/schema.py

@@ -555,16 +555,27 @@ def typedef(self) -> "Typedef":
                 return import_module.get_typedef(type_name)
         return None
 
-    def union_types(self) -> Iterator["Type"]:
+    def union_types(self, with_typedefs: bool = False) -> Iterator["Type"]:
         if self.cdata.basetype != self.UNION:
             return
 
+        typedef = self.typedef()
         t = ffi.cast("struct lysc_type_union *", self.cdata)
         if self.cdata_parsed and self.cdata_parsed.types != ffi.NULL:
             for union_type, union_type_parsed in zip(
                 ly_array_iter(t.types), ly_array_iter(self.cdata_parsed.types)
             ):
                 yield Type(self.context, union_type, union_type_parsed)
+        elif (
+            with_typedefs
+            and typedef
+            and typedef.cdata
+            and typedef.cdata.type.types != ffi.NULL
+        ):
+            for union_type, union_type_parsed in zip(
+                ly_array_iter(t.types), ly_array_iter(typedef.cdata.type.types)
+            ):
+                yield Type(self.context, union_type, union_type_parsed)
         else:
             for union_type in ly_array_iter(t.types):
                 yield Type(self.context, union_type, None)
@@ -1208,7 +1219,7 @@ def __init__(self, context: "libyang.Context", cdata):
         self.cdata_leaf = ffi.cast("struct lysc_node_leaf *", cdata)
         self.cdata_leaf_parsed = ffi.cast("struct lysp_node_leaf *", self.cdata_parsed)
 
-    def default(self) -> Union[None, bool, int, str]:
+    def default(self) -> Union[None, bool, int, str, float]:
         if not self.cdata_leaf.dflt:
             return None
         val = lib.lyd_value_get_canonical(self.context.cdata, self.cdata_leaf.dflt)
@@ -1220,6 +1231,8 @@ def default(self) -> Union[None, bool, int, str]:
             return val == "true"
         if val_type.base() in Type.NUM_TYPES:
             return int(val)
+        if val_type.base() == Type.DEC64:
+            return float(val)
         return val
 
     def units(self) -> Optional[str]:
@@ -1267,7 +1280,7 @@ def type(self) -> Type:
             self.context, self.cdata_leaflist.type, self.cdata_leaflist_parsed.type
         )
 
-    def defaults(self) -> Iterator[str]:
+    def defaults(self) -> Iterator[Union[None, bool, int, str, float]]:
         if self.cdata_leaflist.dflts == ffi.NULL:
             return
         arr_length = ffi.cast("uint64_t *", self.cdata_leaflist.dflts)[-1]
@@ -1283,6 +1296,8 @@ def defaults(self) -> Iterator[str]:
                 ret = val == "true"
             elif val_type in Type.NUM_TYPES:
                 ret = int(val)
+            elif val_type == Type.DEC64:
+                ret = float(val)
             yield ret
 
     def must_conditions(self) -> Iterator[str]:

tests/test_schema.py

@@ -415,7 +415,9 @@ def test_leaf_type_union(self):
         self.assertEqual(t.name(), "types:number")
         self.assertEqual(t.base(), Type.UNION)
         types = set(u.name() for u in t.union_types())
+        types2 = set(u.name() for u in t.union_types(with_typedefs=True))
         self.assertEqual(types, set(["int16", "int32", "uint16", "uint32"]))
+        self.assertEqual(types2, set(["signed", "unsigned"]))
         for u in t.union_types():
             ext = u.get_extension(
                 "type-desc", prefix="omg-extensions", arg_value=f"<{u.name()}>"