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

Fixed: [NACM paths don't work for mounted YANG models](https://github.com/clicon/clixon-controller/issues/62)

Browse source
This commit is contained in:
Olof hagsand 2023-11-15 16:47:33 +01:00
parent 2e6d9167f2
commit aaab8a4920
5 changed files with 331 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/src/clixon_path.c
View file

@ -667,6 +667,7 @@ api_path2xpath_cvv(cvec *api_path,
char *name = NULL;
cvec *cvk = NULL; /* vector of index keys */
yang_stmt *y = NULL;
yang_stmt *y1;
yang_stmt *ymod = NULL;
char *val;
cg_var *cvi;
@ -807,12 +808,11 @@ api_path2xpath_cvv(cvec *api_path,
cprintf(xpath, "%s:", xprefix);
cprintf(xpath, "%s", name);
}
/* If x/y is mountpoint, pass mount yspec to children */
if ((ret = yang_schema_mount_point(y)) < 0)
goto done;
if (ret == 1){
yang_stmt *y1 = NULL;
y1 = NULL;
if (xml_nsctx_yangspec(yspec, &nsc) < 0)
goto done;
/* cf xml_bind_yang0_opt/xml_yang_mount_get */
@ -976,6 +976,7 @@ api_path2xml_vec(char **vec,
int vi;
cxobj *x = NULL;
yang_stmt *y = NULL;
yang_stmt *y1;
yang_stmt *ymod;
yang_stmt *ykey;
char *namespace = NULL;
@ -1155,7 +1156,7 @@ api_path2xml_vec(char **vec,
if ((ret = yang_schema_mount_point(y)) < 0)
goto done;
if (ret == 1){
yang_stmt *y1 = NULL;
y1 = NULL;
if (xml_nsctx_yangspec(ys_spec(y), &nsc) < 0)
goto done;
if (xml2xpath(x, nsc, 0, 1, &xpath) < 0) // XXX should be canonical
@ -1472,6 +1473,7 @@ api_path_resolve(clixon_path *cplist,
/*! Resolve instance-id prefix:names to yang statements
*
* @param[in] cplist Lisp of clixon-path
* @param[in] path Instance-id path original
* @param[in] yt Yang statement of top symbol (can be yang-spec if top-level)
* @retval 1 OK
* @retval 0 Fail error in xerr
@ -1499,7 +1501,8 @@ instance_id_resolve(clixon_path *cplist,
cg_var *cva;
yang_stmt *yspec;
char *kname;
int ret;
yspec = ys_spec(yt);
if ((cp = cplist) != NULL){
do {
@ -1513,6 +1516,16 @@ instance_id_resolve(clixon_path *cplist,
goto fail;
}
}
if ((ret = yang_schema_mount_point(yt)) < 0)
goto done;
if (ret == 1){
if (yang_mount_get_yspec_any(yt, &yspec) == 1){
if ((yt = yang_find_module_by_prefix_yspec(yspec, cp->cp_prefix)) == NULL){
clicon_err(OE_YANG, ENOENT, "Prefix \"%s\" does not correspond to any existing module", cp->cp_prefix);
goto fail;
}
}
}
if ((yc = yang_find_datanode(yt, cp->cp_id)) == NULL){
clicon_err(OE_YANG, ENOENT, "Node %s used in path has no corresponding yang node",
cp->cp_id);

34
lib/src/clixon_yang_schema_mount.c
View file

@ -150,8 +150,8 @@ yang_mount_get(yang_stmt *y,
char *xpath,
yang_stmt **yspec)
{
cvec *cvv = NULL;
cg_var *cv;
cvec *cvv;
cg_var *cv;
clicon_debug(CLIXON_DBG_DEFAULT, "%s %s %p", __FUNCTION__, xpath, y);
/* Special value in yang unknown node for mount-points: mapping from xpath->mounted yspec */
@ -328,6 +328,34 @@ xml_yang_mount_set(clicon_handle h,
return retval;
}
/*! Get any yspec of a mount-point, special function
*
* Get (the first) mounted yspec.
* A more generic way would be to call plugin_mount to get the yanglib and from that get the
* yspec. But there is clixon code that cant call the plugin since h is not available
* @param[in] y Yang container/list containing unknown node
* @param[out] yspec YANG stmt spec
* @retval 1 yspec found and set
* @retval 0 Not found
*/
int
yang_mount_get_yspec_any(yang_stmt *y,
yang_stmt **yspec)
{
cvec *cvv;
cg_var *cv;
void *p;
/* Special value in yang unknown node for mount-points: mapping from xpath->mounted yspec */
if ((cvv = yang_cvec_get(y)) != NULL &&
(cv = cvec_i(cvv, 0)) != NULL &&
(p = cv_void_get(cv)) != NULL){
*yspec = p;
return 1;
}
return 0;
}
/*! Free all yspec yang-mounts
*
* @param[in] cvv Cligen-variable vector containing xpath -> yspec mapping
@ -663,7 +691,7 @@ yang_schema_yanglib_parse_mount(clicon_handle h,
goto done;
}
/*! Check if XML nod is mount-point and return matching YANG child
/*! Check if XML node is mount-point and return matching YANG child
*
* @param[in] h Clixon handle
* @param[in] x1 XML node