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

Fixed: [Invalid api-path errors thrown when displayin qfx family device conf in CLI](https://github.com/clicon/clixon-controller/issues/126)

Browse source
This commit is contained in:
Olof hagsand 2024-06-19 14:49:22 +02:00
parent 0234ed94bc
commit 43325ca2f8
2 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -64,6 +64,7 @@ Developers may need to change their code
### Corrected Bugs ### Corrected Bugs
* Fixed: [Invalid api-path errors thrown when displayin qfx family device conf in CLI](https://github.com/clicon/clixon-controller/issues/126)
* Fixed: [Error message from CLI if terminal is modified](https://github.com/clicon/clixon-controller/issues/122) * Fixed: [Error message from CLI if terminal is modified](https://github.com/clicon/clixon-controller/issues/122)
* Fixed: backend exit when receiving invalid NETCONF get select XPath * Fixed: backend exit when receiving invalid NETCONF get select XPath
* Added XML encoding to XPaths in `select` attribute * Added XML encoding to XPaths in `select` attribute

46
lib/src/clixon_path.c
View file

@ -822,22 +822,13 @@ api_path2xpath_cvv(cvec *api_path,
goto done; goto done;
if (ret == 1){ if (ret == 1){
y1 = NULL; y1 = NULL;
if (nsc){
cvec_free(nsc);
nsc = NULL;
}
if (xml_nsctx_yangspec(yspec, &nsc) < 0) if (xml_nsctx_yangspec(yspec, &nsc) < 0)
goto done; goto done;
/* cf xml_bind_yang0_opt/xml_yang_mount_get */ /* cf xml_bind_yang0_opt/xml_yang_mount_get */
if (yang_mount_get(y, cbuf_get(xpath), &y1) < 0)
goto done;
if (y1 != NULL){
y = y1;
yspec = y1;
root = 1;
}
}
if ((ymtpoint = yang_schema_mount_point(y)) < 0)
goto done;
if (ymtpoint){
if (yang_mount_get_yspec_any(y, &yspec) < 0)
goto done;
} }
/* Get XML/xpath prefix given namespace. /* Get XML/xpath prefix given namespace.
* note different from api-path prefix * note different from api-path prefix
@ -857,6 +848,25 @@ api_path2xpath_cvv(cvec *api_path,
if (xprefix) if (xprefix)
cprintf(xpath, "%s:", xprefix); cprintf(xpath, "%s:", xprefix);
cprintf(xpath, "%s", name); cprintf(xpath, "%s", name);
if (ret == 1) {
if (yang_mount_get(y, cbuf_get(xpath), &y1) < 0)
goto done;
if (y1 != NULL){
y = y1;
yspec = y1;
root = 1;
}
}
/* y may have changed to new */
if ((ymtpoint = yang_schema_mount_point(y)) < 0)
goto done;
if (ymtpoint){
/* If we cant find a specific mountpoint, we just assign the first.
* XXX: note that maybe this may cause later errors?
*/
if (yang_mount_get_yspec_any(y, &yspec) < 0)
goto done;
}
/* Check if has value, means '=' */ /* Check if has value, means '=' */
if (cv_type_get(cv) == CGV_STRING){ if (cv_type_get(cv) == CGV_STRING){
/* val is uri percent encoded, eg x%2Cy,z */ /* val is uri percent encoded, eg x%2Cy,z */
@ -960,11 +970,11 @@ api_path2xpath_cvv(cvec *api_path,
* @see api_path2xml For api-path to xml translation (maybe could be combined?) * @see api_path2xml For api-path to xml translation (maybe could be combined?)
*/ */
int int
api_path2xpath(char *api_path, api_path2xpath(char *api_path,
yang_stmt *yspec, yang_stmt *yspec,
char **xpathp, char **xpathp,
cvec **nsc, cvec **nsc,
cxobj **xerr) cxobj **xerr)
{ {
int retval = -1; int retval = -1;
cvec *cvv = NULL; /* api-path vector */ cvec *cvv = NULL; /* api-path vector */