schema: fix of SLeafList defaults API

This patch fixes defaults API of SLeafList. The returned values are now correctly converted to python types. Closes: #119 Signed-off-by: Stefan Gula <[email protected]> Signed-off-by: Samuel Gauthier <[email protected]>
CESNET · Aug 2, 2024 · 32165ef · 32165ef
1 parent e1cefcf
commit 32165ef
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/libyang/schema.py b/libyang/schema.py
@@ -1420,9 +1420,9 @@ def defaults(self) -> Iterator[Union[None, bool, int, str, float]]:
                 yield None
             val = c2str(val)
             val_type = Type(self.context, dflt.realtype, None)
-            if val_type == Type.BOOL:
+            if val_type.base() == Type.BOOL:
                 yield val == "true"
-            elif val_type in Type.NUM_TYPES:
+            elif val_type.base() in Type.NUM_TYPES:
                 yield int(val)
             elif val_type.base() == Type.DEC64:
                 yield float(val)

diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -756,6 +756,12 @@ def test_leaflist_defaults(self):
         leaflist = next(self.ctx.find_path("/yolo-nodetypes:conf/ratios"))
         for d in leaflist.defaults():
             self.assertIsInstance(d, float)
+        leaflist = next(self.ctx.find_path("/yolo-nodetypes:conf/bools"))
+        for d in leaflist.defaults():
+            self.assertIsInstance(d, bool)
+        leaflist = next(self.ctx.find_path("/yolo-nodetypes:conf/integers"))
+        for d in leaflist.defaults():
+            self.assertIsInstance(d, int)
 
     def test_leaf_list_min_max(self):
         leaflist1 = next(self.ctx.find_path("/yolo-nodetypes:conf/leaf-list1"))

diff --git a/tests/yang/yolo/yolo-nodetypes.yang b/tests/yang/yolo/yolo-nodetypes.yang
@@ -45,6 +45,17 @@ module yolo-nodetypes {
       default 2.6;
     }
 
+    leaf-list bools {
+      type boolean;
+      default true;
+    }
+
+    leaf-list integers {
+      type uint32;
+      default 10;
+      default 20;
+    }
+
     list list1 {
       key leaf1;
       unique "leaf2 leaf3";