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

* [Identityref inside augment statement](https://github.com/clicon/clixon/issues/77)

Browse source 
* Yang-stmt enhanced with "shortcut" to original module
This commit is contained in:
Olof hagsand 2019-03-05 22:41:41 +01:00
parent efe44d60e8
commit 01c8b0b836
7 changed files with 103 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/src/clixon_xml_map.c
View file

@ -316,6 +316,7 @@ validate_leafref(cxobj *xt,
* @retval 0 Validation failed
* @retval -1 Error
* @see ys_populate_identity where the derived types are set
* @see yang_augment_node
* @see RFC7950 Sec 9.10.2:
*/
static int

15
lib/src/clixon_yang.c
View file

@ -773,6 +773,7 @@ ys_module_by_xml(yang_spec *ysp,
* @param[in] ys Any yang statement in a yang tree
* @retval ymod The top module or sub-module
* @see ys_spec
* @note For an augmented node, the original module is returned
*/
yang_stmt *
ys_module(yang_stmt *ys)
@ -786,6 +787,10 @@ ys_module(yang_stmt *ys)
while (ys != NULL &&
ys->ys_keyword != Y_MODULE &&
ys->ys_keyword != Y_SUBMODULE){
if (ys->ys_module){ /* shortcut due to augment */
ys = ys->ys_module;
break;
}
yn = ys->ys_parent;
/* Some extra stuff to ensure ys is a stmt */
if (yn && yn->yn_keyword == Y_SPEC)
@ -800,6 +805,7 @@ ys_module(yang_stmt *ys)
* @param[in] ys Any yang statement in a yang tree
* @retval yspec The top yang specification
* @see ys_module
* @see ys_yang_augment_node where shortcut is set
*/
yang_spec *
ys_spec(yang_stmt *ys)
@ -1640,7 +1646,12 @@ yang_augment_node(yang_stmt *ys,
yang_stmt *ytarget = NULL;
yang_stmt *yc;
int i;
yang_stmt *ymod;
if ((ymod = ys_module(ys)) == NULL){
clicon_err(OE_YANG, 0, "My yang module not found");
goto done;
}
schema_nodeid = ys->ys_argument;
clicon_debug(2, "%s %s", __FUNCTION__, schema_nodeid);
/* Find the target */
@ -1654,7 +1665,7 @@ yang_augment_node(yang_stmt *ys,
for (i=0; i<ys->ys_len; i++){
if ((yc = ys_dup(ys->ys_stmt[i])) == NULL)
goto done;
/* XXX: use prefix of origin */
yc->ys_module = ymod;
if (yn_insert((yang_node*)ytarget, yc) < 0)
goto done;
}

2
lib/src/clixon_yang_type.c
View file

@ -772,7 +772,7 @@ ys_typedef_up(yang_stmt *ys)
identityref's base identity.
1. (base) identity must exist (be found). This is a sanity check
of the specification and also necessary for identity statements.
(This is what is dine here)
(This is what is done here)
2. Check if a given node has value derived from base identity. This is
a run-time check necessary when validating eg netconf.
(This is validation)