lyd_validate_minmax(): always return a valid data path

The current code never returns a data path, only a schema path for
failures where the 'min' value is not reached.  Integrators may need
to obtain both a LIST key as well as the leaf name to present proper
error messages.

When we don't have a full valid data path, the code now will return
the parent's data path with the current schema node name appended.

This fix was inspired by porting of SONiC's sonic-mgmt-common which
is utilizing this feature which previously worked with libyang1.

Signed-off-by: Brad House <[email protected]>

Author: bradh352

src/validation.c

@@ -1142,11 +1142,15 @@ lyd_validate_minmax(const struct lyd_node *first, const struct lyd_node *parent,
 {
     uint32_t count = 0;
     struct lyd_node *iter;
+    struct lyd_node *any_valid = NULL;
+    char suffix_path[256] = "";
     const struct lysc_when *disabled;
+    LY_ERR rv = LY_SUCCESS;
 
     assert(min || max);
 
     LYD_LIST_FOR_INST(first, snode, iter) {
+        any_valid = iter;
         ++count;
 
         if (min && (count == min)) {
@@ -1182,32 +1186,28 @@ lyd_validate_minmax(const struct lyd_node *first, const struct lyd_node *parent,
         max = 0;
     }
 
-    if (min) {
-        if (val_opts & LYD_VALIDATE_OPERATIONAL) {
-            /* only a warning */
-            LOG_LOCSET(snode, NULL);
-            LOGWRN(snode->module->ctx, "Too few \"%s\" instances.", snode->name);
-            LOG_LOCBACK(1, 0);
+    if (min || max) {
+        snprintf(suffix_path, sizeof(suffix_path), "/%s", snode->name);
+        ly_log_location(NULL, any_valid?any_valid:parent, any_valid?NULL:suffix_path, NULL);
+        if (min) {
+            if (val_opts & LYD_VALIDATE_OPERATIONAL) {
+                LOGWRN(snode->module->ctx, "Too few \"%s\" instances.", snode->name);
+            } else {
+                LOGVAL_APPTAG(snode->module->ctx, "too-few-elements", LY_VCODE_NOMIN, snode->name);
+            }
         } else {
-            LOG_LOCSET(snode, NULL);
-            LOGVAL_APPTAG(snode->module->ctx, "too-few-elements", LY_VCODE_NOMIN, snode->name);
-            LOG_LOCBACK(1, 0);
-            return LY_EVALID;
+            if (val_opts & LYD_VALIDATE_OPERATIONAL) {
+                LOGWRN(snode->module->ctx, "Too many \"%s\" instances.", snode->name);
+            } else {
+                LOGVAL_APPTAG(snode->module->ctx, "too-many-elements", LY_VCODE_NOMAX, snode->name);
+            }
         }
-    } else if (max) {
-        if (val_opts & LYD_VALIDATE_OPERATIONAL) {
-            /* only a warning */
-            LOG_LOCSET(NULL, iter);
-            LOGWRN(snode->module->ctx, "Too many \"%s\" instances.", snode->name);
-            LOG_LOCBACK(0, 1);
-        } else {
-            LOG_LOCSET(NULL, iter);
-            LOGVAL_APPTAG(snode->module->ctx, "too-many-elements", LY_VCODE_NOMAX, snode->name);
-            LOG_LOCBACK(0, 1);
-            return LY_EVALID;
+        ly_log_location_revert(0, 1, any_valid?0:1, 0);
+        if (!(val_opts & LYD_VALIDATE_OPERATIONAL)) {
+            rv = LY_EVALID;
         }
     }
-    return LY_SUCCESS;
+    return rv;
 }
 
 /**