resolve BUGFIX do not delete false when data when not possible to check when

Author: michalvasko

src/parser_xml.c

@@ -618,6 +618,10 @@ lyd_parse_xml(struct ly_ctx *ctx, struct lyxml_elem **root, int options, ...)
                 LOGERR(LY_EINVAL, "%s: invalid parameter (variable arg const struct lyd_node *data_tree with LYD_OPT_NOSIBLINGS).", __func__);
                 goto error;
             }
+        } else if (options & LYD_OPT_NOEXTDEPS) {
+            LOGERR(LY_EINVAL, "%s: invalid parameter (no variable arg const struct lyd_node *data_tree but LYD_OPT_NOEXTDEPS set).",
+                   __func__);
+            goto error;
         }
     }
 

src/resolve.c

@@ -5974,6 +5974,8 @@ resolve_applies_when(const struct lys_node *schema, int mode, const struct lys_n
  * Logs directly.
  *
  * @param[in] node Data node, whose conditional reference, if such, is being decided.
+ * @param[in] ignore_fail 1 if when does not have to be satisfied, 2 if it does not have to be satisfied
+ * only when requiring external dependencies.
  *
  * @return
  *  -1 - error, ly_errno is set
@@ -5982,7 +5984,7 @@ resolve_applies_when(const struct lys_node *schema, int mode, const struct lys_n
  *   1, ly_vecode = LYVE_INWHEN - nodes needed to resolve are conditional and not yet resolved (under another "when")
  */
 int
-resolve_when(struct lyd_node *node, int *result, int ignore_fail)
+resolve_when(struct lyd_node *node, int ignore_fail)
 {
     struct lyd_node *ctx_node = NULL, *unlinked_nodes, *tmp_node;
     struct lys_node *sparent;
@@ -6139,15 +6141,6 @@ resolve_when(struct lyd_node *node, int *result, int ignore_fail)
 cleanup:
     /* free xpath set content */
     lyxp_set_cast(&set, LYXP_SET_EMPTY, ctx_node ? ctx_node : node, NULL, 0);
-
-    if (result) {
-        if (node->when_status & LYD_WHEN_TRUE) {
-            *result = 1;
-        } else {
-            *result = 0;
-        }
-    }
-
     return rc;
 }
 
@@ -7668,7 +7661,7 @@ resolve_unres_data_item(struct lyd_node *node, enum UNRES_ITEM type, int ignore_
         return resolve_union(leaf, &sleaf->type, 1, ignore_fail, NULL);
 
     case UNRES_WHEN:
-        if ((rc = resolve_when(node, NULL, ignore_fail))) {
+        if ((rc = resolve_when(node, ignore_fail))) {
             return rc;
         }
         break;
@@ -7786,7 +7779,7 @@ resolve_unres_data(struct unres_data *unres, struct lyd_node **root, int options
                  parent = parent->parent) {
                 if (!parent->parent && (parent->when_status & LYD_WHEN_FALSE)) {
                     /* the parent node was already unlinked, do not resolve this node,
-                     *  it will be removed anyway, so just mark it as resolved
+                     * it will be removed anyway, so just mark it as resolved
                      */
                     unres->node[i]->when_status |= LYD_WHEN_FALSE;
                     unres->type[i] = UNRES_RESOLVED;
@@ -7800,7 +7793,10 @@ resolve_unres_data(struct unres_data *unres, struct lyd_node **root, int options
 
             rc = resolve_unres_data_item(unres->node[i], unres->type[i], ignore_fail);
             if (!rc) {
-                if (unres->node[i]->when_status & LYD_WHEN_FALSE) {
+                /* finish with error/delete the node only if when was false, an external dependency was required,
+                 * and it was not provided (the flag would not be passed down otherwise, checked in upper fucntions) */
+                if ((unres->node[i]->when_status & LYD_WHEN_FALSE)
+                        && (!(unres->node[i]->schema->flags & LYS_XPATH_DEP) || !(options & LYD_OPT_NOEXTDEPS))) {
                     if ((options & LYD_OPT_NOAUTODEL) && !unres->node[i]->dflt) {
                         /* false when condition */
                         ly_vlog_hide(0);

src/resolve.h

@@ -208,7 +208,7 @@ struct lys_ident *resolve_identref(struct lys_type *type, const char *ident_name
 
 int resolve_unres_schema(struct lys_module *mod, struct unres_schema *unres);
 
-int resolve_when(struct lyd_node *node, int *result, int ignore_fail);
+int resolve_when(struct lyd_node *node, int ignore_fail);
 
 int unres_schema_add_str(struct lys_module *mod, struct unres_schema *unres, void *item, enum UNRES_ITEM type,
                          const char *str);

src/tree_data.c

@@ -76,7 +76,6 @@ lyd_check_mandatory_data(struct lyd_node *root, struct lyd_node *last_parent,
                          struct ly_set *instances, struct lys_node *schema, int options)
 {
     struct lyd_node *dummy, *current;
-    int state;
     uint32_t limit;
 
     if (!instances->number) {
@@ -104,9 +103,9 @@ lyd_check_mandatory_data(struct lyd_node *root, struct lyd_node *last_parent,
                 }
                 for (current = dummy; current; current = current->child) {
                     ly_vlog_hide(1);
-                    resolve_when(current, &state, 0);
+                    resolve_when(current, 0);
                     ly_vlog_hide(0);
-                    if (!state) {
+                    if (current->when_status & LYD_WHEN_FALSE) {
                         /* when evaluates to false */
                         lyd_free(dummy);
                         ly_err_clean(1);
@@ -479,6 +478,10 @@ lyd_parse_data_(struct ly_ctx *ctx, const char *data, LYD_FORMAT format, int opt
                 LOGERR(LY_EINVAL, "%s: invalid parameter (variable arg const struct lyd_node *data_tree with LYD_OPT_NOSIBLINGS).", __func__);
                 return NULL;
             }
+        } else if (options & LYD_OPT_NOEXTDEPS) {
+            LOGERR(LY_EINVAL, "%s: invalid parameter (no variable arg const struct lyd_node *data_tree but LYD_OPT_NOEXTDEPS set).",
+                   __func__);
+            return NULL;
         }
     }
 
@@ -4170,6 +4173,10 @@ lyd_validate(struct lyd_node **node, int options, void *var_arg)
 
             /* move it to the beginning */
             for (; data_tree->prev->next; data_tree = data_tree->prev);
+        } else if (options & LYD_OPT_NOEXTDEPS) {
+            LOGERR(LY_EINVAL, "%s: invalid parameter (no variable arg const struct lyd_node *data_tree but LYD_OPT_NOEXTDEPS set).",
+                   __func__);
+            goto cleanup;
         }
     }