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

Fixed: [leafref in new type no work in union type](https://github.com/clicon/clixon/issues/388)

Browse source
This commit is contained in:
Olof hagsand 2022-12-27 11:29:22 +01:00
parent fb45085491
commit ca23b63a4e
3 changed files with 39 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -82,7 +82,8 @@ Developers may need to change their code
### Corrected Bugs
* [must statement check int value failed](https://github.com/clicon/clixon/issues/386)
* Fixed: [leafref in new type no work in union type](https://github.com/clicon/clixon/issues/388)
* Fixed: [must statement check int value failed](https://github.com/clicon/clixon/issues/386)
* Fixed: [Defaults in choice does not work properly](https://github.com/clicon/clixon/issues/390)
* Fixed: [Netconf monitoring](https://github.com/clicon/clixon/issues/370)
- Announce module capability

28
lib/src/clixon_validate.c
View file

@ -1109,24 +1109,32 @@ xml_yang_validate_leaf_union(clicon_handle h,
{
int retval = -1;
int ret;
yang_stmt *yc = NULL;
yang_stmt *ytsub = NULL;
cxobj *xret1 = NULL;
yang_stmt *ytype; /* resolved type */
char *restype;
/* Enough that one is valid, eg returns 1,otherwise fail */
while ((yc = yn_each(yrestype, yc)) != NULL){
if (yang_keyword_get(yc) != Y_TYPE)
while ((ytsub = yn_each(yrestype, ytsub)) != NULL){
if (yang_keyword_get(ytsub) != Y_TYPE)
continue;
/* Resolve the sub-union type to a resolved type */
if (yang_type_resolve(yt, yt, ytsub, /* in */
&ytype, NULL, /* resolved type */
NULL, NULL, NULL, NULL) < 0)
goto done;
restype = ytype?yang_argument_get(ytype):NULL;
ret = 1; /* If not leafref/identityref it is valid on this level */
if (strcmp(yang_argument_get(yc), "leafref") == 0){
if ((ret = validate_leafref(xt, yt, yc, &xret1)) < 0)
if (strcmp(restype, "leafref") == 0){
if ((ret = validate_leafref(xt, yt, ytype, &xret1)) < 0) // XXX
goto done;
}
else if (strcmp(yang_argument_get(yc), "identityref") == 0){
if ((ret = validate_identityref(xt, yt, yc, &xret1)) < 0)
else if (strcmp(restype, "identityref") == 0){
if ((ret = validate_identityref(xt, yt, ytype, &xret1)) < 0)
goto done;
}
else if (strcmp("union", yang_argument_get(yc)) == 0){
if ((ret = xml_yang_validate_leaf_union(h, xt, yt, yc, &xret1)) < 0)
else if (strcmp("union", yang_argument_get(ytsub)) == 0){
if ((ret = xml_yang_validate_leaf_union(h, xt, yt, ytype, &xret1)) < 0)
goto done;
}
if (ret == 1)
@ -1141,7 +1149,7 @@ xml_yang_validate_leaf_union(clicon_handle h,
xret1 = NULL;
}
}
if (yc == NULL)
if (ytsub == NULL)
goto fail;
retval = 1;
done:

19
test/test_leafref_union.sh
View file

@ -50,6 +50,18 @@ module example{
identity saab {
base "airplane";
}
typedef ref1 {
type leafref {
path "../x";
require-instance true;
}
}
typedef ref2 {
type leafref {
path "../y";
require-instance true;
}
}
container c {
leaf x {
type string;
@ -70,6 +82,13 @@ module example{
}
}
}
leaf zdecl {
description "leafref union using declared types";
type union {
type ref1;
type ref2;
}
}
leaf w {
description "idref union";
type union {