yanglint UPDATE data validation type now operational datastore

There is no use-case for fully validating state
data and generating errors.

Author: michalvasko

tests/yanglint/interactive/data_merge.test

@@ -11,10 +11,10 @@ test data_merge_basic {Data is merged and the node is added} {
 test data_merge_validation_failed {Data is merged but validation failed.} {
 -setup $ly_setup -cleanup $ly_cleanup -body {
     ly_cmd "load modmerge"
-    ly_cmd "data $ddir/modmerge.xml"
-    ly_cmd "data $ddir/modmerge2.xml"
-    ly_cmd "data -m $ddir/modmerge2.xml $ddir/modmerge.xml"
-    ly_cmd_err "data -m $ddir/modmerge.xml $ddir/modmerge2.xml" "Merged data are not valid"
+    ly_cmd "data -t config $ddir/modmerge.xml"
+    ly_cmd "data -t config $ddir/modmerge2.xml"
+    ly_cmd "data -m -t config $ddir/modmerge2.xml $ddir/modmerge.xml"
+    ly_cmd_err "data -m -t config $ddir/modmerge.xml $ddir/modmerge2.xml" "Merged data are not valid"
 }}
 
 test data_merge_dataconfig {The merge option has effect only for 'data' and 'config' TYPEs} {

tools/lint/cmd_data.c

@@ -49,7 +49,7 @@ cmd_data_help_type(void)
 {
     printf("  -t TYPE, --type=TYPE\n"
             "                Specify data tree type in the input data file(s):\n"
-            "        data          - Complete datastore with status data (default type).\n"
+            "        data          - Complete (operational) datastore with state data (default).\n"
             "        config        - Configuration datastore (without status data).\n"
             "        get           - Result of the NETCONF <get> operation.\n"
             "        getconfig     - Result of the NETCONF <get-config> operation.\n"
@@ -180,7 +180,7 @@ cmd_data_opt(struct yl_opt *yo, const char *cmdline, char ***posv, int *posc)
     uint8_t data_type_set = 0;
 
     yo->data_parse_options = YL_DEFAULT_DATA_PARSE_OPTIONS;
-    yo->data_validate_options = YL_DEFAULT_DATA_VALIDATE_OPTIONS;
+    yo->data_validate_options = YL_DEFAULT_DATA_VALIDATE_OPTIONS | LYD_VALIDATE_OPERATIONAL;
 
     if ((rc = parse_cmdline(cmdline, &argc, &yo->argv))) {
         return rc;
@@ -219,14 +219,14 @@ cmd_data_opt(struct yl_opt *yo, const char *cmdline, char ***posv, int *posc)
                 }
             }
             break;
-        case 'O':   /* --operational */
+        case 'O': /* --operational */
             if (yo->data_operational.path) {
                 YLMSG_E("The operational datastore (-O) cannot be set multiple times.");
                 return 1;
             }
             yo->data_operational.path = optarg;
             break;
-        case 'R':   /* --reply-rpc */
+        case 'R': /* --reply-rpc */
             if (yo->reply_rpc.path) {
                 YLMSG_E("The PRC of the reply (-R) cannot be set multiple times.");
                 return 1;

tools/lint/main_ni.c

@@ -136,8 +136,8 @@ help(int shortout)
 
     printf("  -t TYPE, --type=TYPE\n"
             "                Specify data tree type in the input data file(s):\n"
-            "        data          - Complete datastore with status data (default type).\n"
-            "        config        - Configuration datastore (without status data).\n"
+            "        data          - Complete (operational) datastore with state data (default).\n"
+            "        config        - Configuration datastore (without state data).\n"
             "        get           - Data returned by the NETCONF <get> operation.\n"
             "        getconfig     - Data returned by the NETCONF <get-config> operation.\n"
             "        edit          - Config content of the NETCONF <edit-config> operation.\n"

tools/lint/yl_opt.c

@@ -98,9 +98,7 @@ yl_opt_erase(struct yl_opt *yo)
 
     free_cmdline(yo->argv);
 
-    *yo = (const struct yl_opt) {
-        0
-    };
+    memset(yo, 0, sizeof *yo);
     yo->interactive = interactive;
 }
 
@@ -177,6 +175,10 @@ yl_opt_update_out_format(const char *arg, struct yl_opt *yo)
 int
 yl_opt_update_data_type(const char *arg, struct yl_opt *yo)
 {
+    /* reset to default */
+    yo->data_parse_options = YL_DEFAULT_DATA_PARSE_OPTIONS;
+    yo->data_validate_options = YL_DEFAULT_DATA_VALIDATE_OPTIONS;
+
     if (!strcasecmp(arg, "config")) {
         yo->data_parse_options |= LYD_PARSE_NO_STATE;
         yo->data_validate_options |= LYD_VALIDATE_NO_STATE;
@@ -197,7 +199,8 @@ yl_opt_update_data_type(const char *arg, struct yl_opt *yo)
     } else if (!strcasecmp(arg, "nc-notif")) {
         yo->data_type = LYD_TYPE_NOTIF_NETCONF;
     } else if (!strcasecmp(arg, "data")) {
-        /* default option */
+        /* default option but uses a specific validation flag */
+        yo->data_validate_options |= LYD_VALIDATE_OPERATIONAL;
     } else if (!strcasecmp(arg, "ext")) {
         yo->data_ext = 1;
     } else {