experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: [Issues with ietf-snmp modules](https://github.com/clicon/clixon/issues/353)

Browse source
This commit is contained in:
Olof hagsand 2022-08-18 18:07:29 +02:00
parent 74da966096
commit 9a5504eed0
5 changed files with 136 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/src/clixon_yang.c
View file

@ -2789,7 +2789,7 @@ ys_populate2(yang_stmt *ys,
* @retval -1 Error
* @retval 0 Feature not enabled: remove yt
* @retval 1 OK
* @note On return 1 the over-lying function need to remove yt from its parent
* @note On return 0 the over-lying function need to remove yt from its parent
* @note cannot use yang_apply here since child-list is modified (destructive)
* @note if-features is parsed in full context here, previous restricted pass in ys_parse_sub
*/
@ -2835,6 +2835,7 @@ yang_features(clicon_handle h,
ys->ys_keyword = Y_ANYDATA;
ys_freechildren(ys);
ys->ys_len = 0;
yang_flag_set(ys, YANG_FLAG_DISABLED);
break;
}
for (j=i+1; j<yt->ys_len; j++)

7
lib/src/clixon_yang_parse_lib.c
View file

@ -289,10 +289,13 @@ yang_augment_node(clicon_handle h,
if (childkey != Y_ACTION && childkey != Y_NOTIFICATION && childkey != Y_UNKNOWN &&
childkey != Y_CONTAINER && childkey != Y_LEAF && childkey != Y_LIST &&
childkey != Y_LEAF_LIST && childkey != Y_USES && childkey != Y_CHOICE){
clicon_log(LOG_WARNING, "Warning: Augment failed in module %s: node %s %d cannot be added to target node %s",
/* Special case if yc0 is disabled by if-feature=false, then it is transformed to ANYDATA
*/
if (yang_flag_get(yc0, YANG_FLAG_DISABLED) == 0)
clicon_log(LOG_WARNING, "Warning: Augment failed in module %s: node %s of type %s cannot be added to target node %s (see RFC 7950 Sec 17)",
yang_argument_get(ys_module(ys)),
yang_argument_get(yc0),
yang_key2str(childkey),
childkey,
schema_nodeid);
goto ok;
}