data: option to allow json int/bool as strings

Depends on CESNET/libyang#2344 Add support for new option to python bindings. Signed-off-by: Brad House <[email protected]>
CESNET · Feb 16, 2025 · b829165 · b829165
1 parent 8534053
commit b829165
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/cffi/cdefs.h b/cffi/cdefs.h
@@ -321,6 +321,7 @@ LY_ERR lyd_print_all(struct ly_out *, const struct lyd_node *, LYD_FORMAT, uint3
 #define LYD_PARSE_OPTS_MASK ...
 #define LYD_PARSE_ORDERED ...
 #define LYD_PARSE_STRICT ...
+#define LYD_PARSE_JSON_STRING_DATATYPES ...
 
 #define LYD_VALIDATE_NO_STATE ...
 #define LYD_VALIDATE_PRESENT ...

diff --git a/libyang/context.py b/libyang/context.py
@@ -524,6 +524,7 @@ def parse_data(
         validate_multi_error: bool = False,
         store_only: bool = False,
         json_null: bool = False,
+        json_string_datatypes: bool = False,
     ) -> Optional[DNode]:
         if self.cdata is None:
             raise RuntimeError("context already destroyed")
@@ -536,6 +537,7 @@ def parse_data(
             strict=strict,
             store_only=store_only,
             json_null=json_null,
+            json_string_datatypes=json_string_datatypes,
         )
         validation_flgs = validation_flags(
             no_state=no_state,
@@ -595,6 +597,7 @@ def parse_data_mem(
         validate_multi_error: bool = False,
         store_only: bool = False,
         json_null: bool = False,
+        json_string_datatypes: bool = False,
     ) -> Optional[DNode]:
         return self.parse_data(
             fmt,
@@ -611,6 +614,7 @@ def parse_data_mem(
             validate_multi_error=validate_multi_error,
             store_only=store_only,
             json_null=json_null,
+            json_string_datatypes=json_string_datatypes,
         )
 
     def parse_data_file(
@@ -628,6 +632,7 @@ def parse_data_file(
         validate_multi_error: bool = False,
         store_only: bool = False,
         json_null: bool = False,
+        json_string_datatypes: bool = False,
     ) -> Optional[DNode]:
         return self.parse_data(
             fmt,
@@ -644,6 +649,7 @@ def parse_data_file(
             validate_multi_error=validate_multi_error,
             store_only=store_only,
             json_null=json_null,
+            json_string_datatypes=json_string_datatypes,
         )
 
     def __iter__(self) -> Iterator[Module]:

diff --git a/libyang/data.py b/libyang/data.py
@@ -117,6 +117,7 @@ def parser_flags(
     strict: bool = False,
     store_only: bool = False,
     json_null: bool = False,
+    json_string_datatypes: bool = False,
 ) -> int:
     flags = 0
     if lyb_mod_update:
@@ -135,6 +136,8 @@ def parser_flags(
         flags |= lib.LYD_PARSE_STORE_ONLY
     if json_null:
         flags |= lib.LYD_PARSE_JSON_NULL
+    if json_string_datatypes:
+        flags |= lib.LYD_PARSE_JSON_STRING_DATATYPES
     return flags