data: expose lyd_merge()

rwestphal · rjarry · commit e1a0175adea9 · 2020-06-30T13:11:21.000+02:00
Signed-off-by: Renato Westphal &lt;renato@opensourcerouting.org&gt;
diff --git a/cffi/cdefs.h b/cffi/cdefs.h
@@ -402,6 +402,9 @@ typedef enum {
 #define LYD_OPT_TRUSTED ...
 #define LYD_OPT_DATA_NO_YANGLIB ...
 #define LYD_OPT_RPC ...
+#define LYD_OPT_EXPLICIT ...
+#define LYD_OPT_DESTRUCT ...
+#define LYD_OPT_NOSIBLINGS ...
 
 typedef union lyd_value_u {
 	int8_t bln;
@@ -442,6 +445,7 @@ double lyd_dec64_to_double(const struct lyd_node *);
 void lyd_free(struct lyd_node *);
 void lyd_free_withsiblings(struct lyd_node *);
 int lyd_validate(struct lyd_node **, int, void *);
+int lyd_merge(struct lyd_node *, const struct lyd_node *, int);
 
 /* from libc, needed to free allocated strings */
 void free(void *);
diff --git a/libyang/data.py b/libyang/data.py
@@ -58,7 +58,8 @@ def path_flags(update=False, rpc_output=False, no_parent_ret=False):
 
 #------------------------------------------------------------------------------
 def parser_flags(data=False, config=False, get=False, strict=False,
-                 trusted=False, no_yanglib=False, rpc=False):
+                 trusted=False, no_yanglib=False, rpc=False, destruct=False,
+                 no_siblings=False, explicit=False):
     flags = 0
     if data:
         flags |= lib.LYD_OPT_DATA
@@ -74,6 +75,12 @@ def parser_flags(data=False, config=False, get=False, strict=False,
         flags |= lib.LYD_OPT_DATA_NO_YANGLIB
     if rpc:
         flags |= lib.LYD_OPT_RPC
+    if destruct:
+        flags |= lib.LYD_OPT_DESTRUCT
+    if no_siblings:
+        flags |= lib.LYD_OPT_NOSIBLINGS
+    if explicit:
+        flags |= lib.LYD_OPT_EXPLICIT
     return flags
 
 
@@ -165,6 +172,13 @@ def validate(self, data=False, config=False, get=False, strict=False,
         if ret != 0:
             self.context.error('validation failed')
 
+    def merge(self, source, destruct=False, no_siblings=False, explicit=False):
+        flags = parser_flags(destruct=destruct, no_siblings=no_siblings,
+                             explicit=explicit)
+        ret = lib.lyd_merge(self._node, source._node, flags)
+        if ret != 0:
+            raise self.context.error('merge failed')
+
     def print_mem(self, fmt,
                   with_siblings=False,
                   pretty=False,
