data: add anydata and anyxml support to print_dict

print_dict() skips anydata and anyxml nodes, so data created by
dict_to_dnode() since the previous commit does not show up.

Follow the libyang JSON printer: content stored as a tree becomes a
dict, a string value stays a string, and an empty node becomes an
empty dict. The output can then be given back to dict_to_dnode().

Note that the content is printed as is, so strip_prefixes does not
apply inside it. Also, anyxml XML content is parsed into a tree by
libyang, so it comes back as a dict and not as the XML string.

Signed-off-by: Samuel Gauthier <samuel.gauthier@6wind.com>

Author: samuel-gauthier

cffi/cdefs.h

@@ -1174,6 +1174,7 @@ struct lyd_node_any {
         };
     };
     struct lyd_node *child;
+    const char *value;
     ...;
 };
 

libyang/data.py

@@ -900,6 +900,16 @@ def _init_yang_list(snode):
 
             return KeyedList(key_name=list_keys_cache[snode])
 
+        def _any_value(node):
+            # same as the libyang JSON printer: a tree is an object, a string
+            # value stays a string, and no content is an empty object
+            any_node = ffi.cast("struct lyd_node_any *", node)
+            if any_node.child:
+                return json.loads(DNode.new(self.context, node).value("json"))
+            if any_node.value:
+                return c2str(any_node.value)
+            return {}
+
         def _to_dict(node, parent_dic):
             if not lib.lyd_node_should_print(node, flags):
                 return
@@ -929,6 +939,8 @@ def _to_dict(node, parent_dic):
                 parent_dic[name].append(DLeaf.cdata_leaf_value(node, self.context))
             elif node.schema.nodetype == SNode.LEAF:
                 parent_dic[name] = DLeaf.cdata_leaf_value(node, self.context)
+            elif node.schema.nodetype & (SNode.ANYDATA | SNode.ANYXML):
+                parent_dic[name] = _any_value(node)
 
         dic = {}
         dnode = self

tests/test_data.py

@@ -1209,3 +1209,30 @@ def test_dict_to_dnode_anydata_bad_type(self):
         module = self.ctx.load_module("yolo-nodetypes")
         with self.assertRaises(TypeError):
             dict_to_dnode({"yolo-nodetypes:any1": 42}, module, validate=False)
+
+    def test_print_dict_anydata(self):
+        module = self.ctx.load_module("yolo-nodetypes")
+        for value in ({"key1": "val1", "l": [1, 2], "c": {"x": True}}, {}):
+            dic = {"any1": value}
+            dnode = dict_to_dnode(
+                {"yolo-nodetypes:any1": value}, module, validate=False
+            )
+            try:
+                self.assertEqual(dnode.print_dict(), dic)
+            finally:
+                dnode.free()
+
+    def test_print_dict_anyxml(self):
+        module = self.ctx.get_module("yolo-system")
+        for value, expected in (
+            ("<p>text</p>", {"p": "text"}),
+            ("plain text", "plain text"),
+        ):
+            dic = {"format-disk": {"html-info": value}}
+            dnode = dict_to_dnode(dic, module, rpc=True)
+            try:
+                self.assertEqual(
+                    dnode.print_dict(), {"format-disk": {"html-info": expected}}
+                )
+            finally:
+                dnode.free()