From 3ed41c5a0402b2ac8ea9bb24df3700b3fdfddba7 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Thu, 5 Aug 2021 12:07:07 +0200 Subject: [PATCH] cli exclude clixon-restconf, extra cv check in default1 --- lib/src/clixon_xml_map.c | 8 +++++++- yang/clixon/clixon-config@2021-07-11.yang | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c index e288e129..0422e650 100644 --- a/lib/src/clixon_xml_map.c +++ b/lib/src/clixon_xml_map.c @@ -1144,6 +1144,7 @@ xml_default1(yang_stmt *yt, char *xpath; int nr = 0; int hit = 0; + cg_var *cv; if (xt == NULL){ /* No xml */ clicon_err(OE_XML, EINVAL, "No XML argument"); @@ -1163,7 +1164,12 @@ xml_default1(yang_stmt *yt, continue; switch (yang_keyword_get(yc)){ case Y_LEAF: - if (!cv_flag(yang_cv_get(yc), V_UNSET)){ /* Default value exists */ + if ((cv = yang_cv_get(yc)) == NULL){ + clicon_err(OE_YANG,0, "Internal error: yang leaf %s not populated with cv as it should", + yang_argument_get(yc)); + goto done; + } + if (!cv_flag(cv, V_UNSET)){ /* Default value exists */ /* Check when condition */ if (yang_check_when_xpath(NULL, xt, yc, &hit, &nr, &xpath) < 0) goto done; diff --git a/yang/clixon/clixon-config@2021-07-11.yang b/yang/clixon/clixon-config@2021-07-11.yang index f4d065c8..c4dea419 100644 --- a/yang/clixon/clixon-config@2021-07-11.yang +++ b/yang/clixon/clixon-config@2021-07-11.yang @@ -654,6 +654,7 @@ module clixon-config { clixon-restconf means generate autocli for all models except clixon-restconf.yang The value can be a list of space separated module names"; + default "clixon-restconf"; } leaf CLICON_CLI_VARONLY { type int32;