yanglint UPDATE ni schema-comparison support

michalvasko · michalvasko · commit c05a66f0f33f · 2025-09-19T15:20:08.000+02:00
diff --git a/modules/ietf-schema-comparison@2025-09-19.yang b/modules/ietf-schema-comparison@2025-09-19.yang
@@ -10,7 +10,7 @@ module ietf-schema-comparison {
     prefix yanglib;
   }
 
-  revision 2025-09-03 {
+  revision 2025-09-19 {
     description
       "Initial revision.";
   }
@@ -590,6 +590,11 @@ module ietf-schema-comparison {
       description
         "Compared module revision.";
     }
+    leaf-list enabled-feature {
+      type yang:yang-identifier;
+      description
+        "All the enabled features of the module.";
+    }
   }
 
   container schema-comparison {
diff --git a/src/plugins_exts/schema_comparison.c b/src/plugins_exts/schema_comparison.c
@@ -52,7 +52,7 @@ bc_parse(struct lysp_ctx *pctx, struct lysp_ext_instance *ext)
 const struct lyplg_ext_record plugins_schema_cmp[] = {
     {
         .module = "ietf-schema-comparison",
-        .revision = "2025-09-03",
+        .revision = "2025-09-19",
         .name = "backwards-compatible",
 
         .plugin.id = "ly2 schema-comparison",
diff --git a/src/schema_diff_tree.c b/src/schema_diff_tree.c
@@ -1207,6 +1207,29 @@ schema_diff_ext_inst(const struct lysc_ext_instance *ext, struct lyd_node *chang
     return rc;
 }
 
+/**
+ * @brief Create leaf-list of enabled features as part of cmp YANG data.
+ *
+ * @param[in] mod Module to use.
+ * @param[in,out] parent Node to append to.
+ * @return LY_ERR value.
+ */
+static LY_ERR
+schema_diff_enabled_features(const struct lys_module *mod, struct lyd_node *parent)
+{
+    LY_ARRAY_COUNT_TYPE u;
+
+    if (!mod->implemented) {
+        return LY_SUCCESS;
+    }
+
+    LY_ARRAY_FOR(mod->compiled->features, u) {
+        LY_CHECK_RET(lyd_new_term(parent, NULL, "enabled-feature", mod->compiled->features[u], 0, NULL));
+    }
+
+    return LY_SUCCESS;
+}
+
 /**
  * @brief Create cmp YANG data from module imports.
  *
@@ -1222,6 +1245,7 @@ schema_diff_imports(const struct lys_module *mod, const struct lysc_node *schema
     LY_ARRAY_COUNT_TYPE u;
     char *keys = NULL;
     const struct lys_module *imp;
+    struct lyd_node *mod_list;
 
     LY_ARRAY_FOR(mod->parsed->imports, u) {
         imp = mod->parsed->imports[u].module;
@@ -1238,7 +1262,8 @@ schema_diff_imports(const struct lys_module *mod, const struct lysc_node *schema
         }
 
         /* add the imports, recursively */
-        LY_CHECK_GOTO(rc = lyd_new_list(diff_list, NULL, schema->name, 0, NULL, imp->name, imp->revision), cleanup);
+        LY_CHECK_GOTO(rc = lyd_new_list(diff_list, NULL, schema->name, 0, &mod_list, imp->name, imp->revision), cleanup);
+        LY_CHECK_GOTO(rc = schema_diff_enabled_features(imp, mod_list), cleanup);
         LY_CHECK_GOTO(rc = schema_diff_imports(imp, schema, diff_list), cleanup);
     }
 
@@ -2023,6 +2048,7 @@ lysc_diff_tree(const struct lys_module *mod1, const struct lys_module *mod2, con
     LY_CHECK_GOTO(rc = lyd_new_inner(diff_list, NULL, "source", 0, &mod_cont), cleanup);
     LY_CHECK_GOTO(rc = lyd_new_term(mod_cont, NULL, "module", mod1->name, 0, NULL), cleanup);
     LY_CHECK_GOTO(rc = lyd_new_term(mod_cont, NULL, "revision", mod1->revision, 0, NULL), cleanup);
+    LY_CHECK_GOTO(rc = schema_diff_enabled_features(mod1, mod_cont), cleanup);
 
     imp_schema = lys_find_path(NULL, diff_list->schema, "source-import", 0);
     LY_CHECK_GOTO(rc = schema_diff_imports(mod1, imp_schema, diff_list), cleanup);
@@ -2031,6 +2057,7 @@ lysc_diff_tree(const struct lys_module *mod1, const struct lys_module *mod2, con
     LY_CHECK_GOTO(rc = lyd_new_inner(diff_list, NULL, "target", 0, &mod_cont), cleanup);
     LY_CHECK_GOTO(rc = lyd_new_term(mod_cont, NULL, "module", mod2->name, 0, NULL), cleanup);
     LY_CHECK_GOTO(rc = lyd_new_term(mod_cont, NULL, "revision", mod2->revision, 0, NULL), cleanup);
+    LY_CHECK_GOTO(rc = schema_diff_enabled_features(mod2, mod_cont), cleanup);
 
     imp_schema = lys_find_path(NULL, diff_list->schema, "target-import", 0);
     LY_CHECK_GOTO(rc = schema_diff_imports(mod2, imp_schema, diff_list), cleanup);
diff --git a/src/tree_schema.c b/src/tree_schema.c
@@ -1228,8 +1228,8 @@ lysc_compare(const struct ly_ctx *ctx, const struct lys_module *src_mod, const s
         LOGERR(ctx, LY_ENOTFOUND, "Module \"ietf-schema-comparison\" not found.");
         rc = LY_ENOTFOUND;
         goto cleanup;
-    } else if (!cmp_mod->revision || strcmp(cmp_mod->revision, "2025-09-03")) {
-        LOGERR(ctx, LY_ENOTFOUND, "Module \"ietf-schema-comparison\" not in the expected revision \"2025-09-03\".");
+    } else if (!cmp_mod->revision || strcmp(cmp_mod->revision, "2025-09-19")) {
+        LOGERR(ctx, LY_ENOTFOUND, "Module \"ietf-schema-comparison\" not in the expected revision \"2025-09-19\".");
         rc = LY_ENOTFOUND;
         goto cleanup;
     }
diff --git a/tests/utests/schema_comparison/bc/12 description/description_cmp.json b/tests/utests/schema_comparison/bc/12 description/description_cmp.json
@@ -13,7 +13,7 @@
         "target-import": [
           {
             "module": "ietf-schema-comparison",
-            "revision": "2025-09-03"
+            "revision": "2025-09-19"
           },
           {
             "module": "ietf-yang-types",
diff --git a/tests/utests/schema_comparison/bc/3 pattern/pattern_cmp.json b/tests/utests/schema_comparison/bc/3 pattern/pattern_cmp.json
@@ -13,7 +13,7 @@
         "target-import": [
           {
             "module": "ietf-schema-comparison",
-            "revision": "2025-09-03"
+            "revision": "2025-09-19"
           },
           {
             "module": "ietf-yang-types",
diff --git a/tests/utests/schema_comparison/bc/7 must/must_cmp.json b/tests/utests/schema_comparison/bc/7 must/must_cmp.json
@@ -13,7 +13,7 @@
         "target-import": [
           {
             "module": "ietf-schema-comparison",
-            "revision": "2025-09-03"
+            "revision": "2025-09-19"
           },
           {
             "module": "ietf-yang-types",
diff --git a/tests/utests/schema_comparison/bc/8 when/when_cmp.json b/tests/utests/schema_comparison/bc/8 when/when_cmp.json
@@ -13,7 +13,7 @@
         "target-import": [
           {
             "module": "ietf-schema-comparison",
-            "revision": "2025-09-03"
+            "revision": "2025-09-19"
           },
           {
             "module": "ietf-yang-types",
diff --git a/tests/utests/schema_comparison/test_schema_comparison.c b/tests/utests/schema_comparison/test_schema_comparison.c
@@ -58,10 +58,10 @@ setup(void **state)
     }
 
     /* load ietf-schema-comparison into both contexts, the module is imported */
-    if (lys_parse_path(st->ctx1, TESTS_SRC "/../modules/ietf-schema-comparison@2025-09-03.yang", LYS_IN_YANG, NULL)) {
+    if (lys_parse_path(st->ctx1, TESTS_SRC "/../modules/ietf-schema-comparison@2025-09-19.yang", LYS_IN_YANG, NULL)) {
         return 1;
     }
-    if (lys_parse_path(st->ctx2, TESTS_SRC "/../modules/ietf-schema-comparison@2025-09-03.yang", LYS_IN_YANG, NULL)) {
+    if (lys_parse_path(st->ctx2, TESTS_SRC "/../modules/ietf-schema-comparison@2025-09-19.yang", LYS_IN_YANG, NULL)) {
         return 1;
     }
 
diff --git a/tools/lint/CMakeLists.txt b/tools/lint/CMakeLists.txt
@@ -14,6 +14,7 @@ set(lintsrc
     cmd_help.c
     cmd_verb.c
     cmd_debug.c
+    cmd_cmp.c
     yl_opt.c
     yl_schema_features.c
     common.c
diff --git a/tools/lint/cmd.h b/tools/lint/cmd.h
@@ -400,4 +400,8 @@ int parse_ext_string(const char *extension_id, struct yl_opt *yo);
 int cmd_debug_setlog(struct ly_ctx *ctx, struct yl_opt *yo);
 void cmd_debug_help(void);
 
+/* cmd_cmp.c */
+
+int cmd_cmp_exec(struct ly_ctx **ctx, struct yl_opt *yo);
+
 #endif /* COMMANDS_H_ */
diff --git a/tools/lint/cmd_add.c b/tools/lint/cmd_add.c
@@ -125,26 +125,11 @@ cmd_add_dep(struct yl_opt *yo, int posc)
     return 0;
 }
 
-static int
-store_parsed_module(const char *filepath, struct lys_module *mod, struct yl_opt *yo)
-{
-    assert(!yo->interactive);
-
-    if (yo->schema_out_format || yo->feature_param_format) {
-        if (ly_set_add(&yo->schema_modules, (void *)mod, 1, NULL)) {
-            YLMSG_E("Storing parsed schema module (%s) for print failed.", filepath);
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
 int
 cmd_add_exec(struct ly_ctx **ctx, struct yl_opt *yo, const char *posv)
 {
     const char *all_features[] = {"*", NULL};
-    LY_ERR ret;
+    LY_ERR ret = 0;
     uint8_t path_unset = 1; /* flag to unset the path from the searchpaths list (if not already present) */
     char *dir, *modname = NULL;
     const char **features = NULL;
@@ -164,7 +149,7 @@ cmd_add_exec(struct ly_ctx **ctx, struct yl_opt *yo, const char *posv)
     if (!yo->interactive) {
         /* The module should already be parsed if yang_lib_file was set. */
         if (yo->yang_lib_file && (mod = ly_ctx_get_module_implemented(*ctx, modname))) {
-            ret = store_parsed_module(posv, mod, yo);
+            ly_set_add(&yo->schema_modules, (void *)mod, 1, NULL);
             goto cleanup;
         }
         /* parse module */
@@ -197,9 +182,7 @@ cmd_add_exec(struct ly_ctx **ctx, struct yl_opt *yo, const char *posv)
     }
 
     if (!yo->interactive) {
-        if ((ret = store_parsed_module(posv, mod, yo))) {
-            goto cleanup;
-        }
+        ly_set_add(&yo->schema_modules, (void *)mod, 1, NULL);
     }
 
 cleanup:
diff --git a/tools/lint/cmd_cmp.c b/tools/lint/cmd_cmp.c
@@ -0,0 +1,105 @@
+/**
+ * @file cmd_cmp.c
+ * @author Michal Vasko <mvasko@cesnet.cz>
+ * @brief schema comparison of the libyang's yanglint tool.
+ *
+ * Copyright (c) 2025 CESNET, z.s.p.o.
+ *
+ * This source code is licensed under BSD 3-Clause License (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://opensource.org/licenses/BSD-3-Clause
+ */
+
+#define _GNU_SOURCE
+
+#include "cmd.h"
+
+#include <errno.h>
+#include <getopt.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+
+#include "libyang.h"
+
+#include "common.h"
+#include "yl_opt.h"
+
+/* only the non-interactive variant implemented */
+
+static int
+cmp_ctx_dup(const struct ly_ctx *ctx, struct yl_opt *yo, struct ly_ctx **dup)
+{
+    uint32_t idx;
+    const struct lys_module *mod;
+
+    /* create a new context */
+    if (ly_ctx_new(yo->searchpaths, yo->ctx_options, dup)) {
+        YLMSG_E("Unable to create libyang context.");
+        return -1;
+    }
+
+    /* add all the implemented modules */
+    idx = ly_ctx_internal_modules_count(ctx);
+    while ((mod = ly_ctx_get_module_iter(ctx, &idx))) {
+        if (!mod->implemented) {
+            continue;
+        }
+
+        if (cmd_add_exec(dup, yo, mod->filepath)) {
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+int
+cmd_cmp_exec(struct ly_ctx **ctx, struct yl_opt *yo)
+{
+    int rc = 0;
+    struct ly_ctx *ctx2 = NULL;
+    const struct lys_module *mod1, *mod2;
+    struct lyd_node *data = NULL;
+
+    /* create the second context */
+    if ((rc = cmp_ctx_dup(*ctx, yo, &ctx2))) {
+        goto cleanup;
+    }
+
+    /* add the compared modules to their contexts */
+    if (cmd_add_exec(ctx, yo, yo->cmp_mod_path1)) {
+        rc = -1;
+        goto cleanup;
+    }
+    if (cmd_add_exec(&ctx2, yo, yo->cmp_mod_path2)) {
+        rc = -1;
+        goto cleanup;
+    }
+
+    /* get the 2 modules */
+    mod1 = yo->schema_modules.objs[yo->schema_modules.count - 2];
+    mod2 = yo->schema_modules.objs[yo->schema_modules.count - 1];
+
+    /* generate comparison data */
+    if (lysc_compare(*ctx, mod1, mod2, &data)) {
+        rc = -1;
+        goto cleanup;
+    }
+
+    if (yo->data_out_format) {
+        /* print them */
+        if (lyd_print_all(yo->out, data, yo->data_out_format, yo->data_print_options)) {
+            rc = -1;
+            goto cleanup;
+        }
+    }
+
+cleanup:
+    lyd_free_siblings(data);
+    ly_ctx_destroy(ctx2);
+    return rc;
+}
diff --git a/tools/lint/main_ni.c b/tools/lint/main_ni.c
diff --git a/tools/lint/yl_opt.c b/tools/lint/yl_opt.c
diff --git a/tools/lint/yl_opt.h b/tools/lint/yl_opt.h

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ module ietf-schema-comparison {`
`10`	`10`	`prefix yanglib;`
`11`	`11`	`}`
`12`	`12`
`13`		`- revision 2025-09-03 {`
	`13`	`+ revision 2025-09-19 {`
`14`	`14`	`description`
`15`	`15`	`"Initial revision.";`
`16`	`16`	`}`
`@@ -590,6 +590,11 @@ module ietf-schema-comparison {`
`590`	`590`	`description`
`591`	`591`	`"Compared module revision.";`
`592`	`592`	`}`
	`593`	`+ leaf-list enabled-feature {`
	`594`	`+ type yang:yang-identifier;`
	`595`	`+ description`
	`596`	`+ "All the enabled features of the module.";`
	`597`	`+ }`
`593`	`598`	`}`
`594`	`599`
`595`	`600`	`container schema-comparison {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ bc_parse(struct lysp_ctx pctx, struct lysp_ext_instance ext)`
`52`	`52`	`const struct lyplg_ext_record plugins_schema_cmp[] = {`
`53`	`53`	`{`
`54`	`54`	`.module = "ietf-schema-comparison",`
`55`		`- .revision = "2025-09-03",`
	`55`	`+ .revision = "2025-09-19",`
`56`	`56`	`.name = "backwards-compatible",`
`57`	`57`
`58`	`58`	`.plugin.id = "ly2 schema-comparison",`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`"target-import": [`
`14`	`14`	`{`
`15`	`15`	`"module": "ietf-schema-comparison",`
`16`		`- "revision": "2025-09-03"`
	`16`	`+ "revision": "2025-09-19"`
`17`	`17`	`},`
`18`	`18`	`{`
`19`	`19`	`"module": "ietf-yang-types",`
Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,10 @@ setup(void **state)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/* load ietf-schema-comparison into both contexts, the module is imported */`
`61`		`- if (lys_parse_path(st->ctx1, TESTS_SRC "/../modules/ietf-schema-comparison@2025-09-03.yang", LYS_IN_YANG, NULL)) {`
	`61`	`+ if (lys_parse_path(st->ctx1, TESTS_SRC "/../modules/ietf-schema-comparison@2025-09-19.yang", LYS_IN_YANG, NULL)) {`
`62`	`62`	`return 1;`
`63`	`63`	`}`
`64`		`- if (lys_parse_path(st->ctx2, TESTS_SRC "/../modules/ietf-schema-comparison@2025-09-03.yang", LYS_IN_YANG, NULL)) {`
	`64`	`+ if (lys_parse_path(st->ctx2, TESTS_SRC "/../modules/ietf-schema-comparison@2025-09-19.yang", LYS_IN_YANG, NULL)) {`
`65`	`65`	`return 1;`
`66`	`66`	`}`
`67`	`67`