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

xml2cvec: range error (eg 1000 for int8) is not treated as error, just log and skip.

Browse source
This commit is contained in:
Olof hagsand 2018-02-03 14:56:27 +07:00
parent 2bbf0b8a15
commit eea8cd7660
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -26,7 +26,8 @@
### Corrected Bugs ### Corrected Bugs
* Corrected "No yang spec" printed on tty on leafref CLI usage * Corrected "No yang spec" printed on tty on leafref CLI usage
* xml2cvec: range error (eg 1000 for int8) is not treated as error, just log and skip.
### Known issues ### Known issues
## 3.4.0 (1 January 2018) ## 3.4.0 (1 January 2018)

28
lib/src/clixon_xml_map.c
View file

@ -415,6 +415,8 @@ xml_yang_validate_all(cxobj *xt,
* @retval 0 Everything OK, cvv allocated and set * @retval 0 Everything OK, cvv allocated and set
* @retval -1 Something wrong, clicon_err() called to set error. No cvv returned * @retval -1 Something wrong, clicon_err() called to set error. No cvv returned
* 'Not recursive' means that only one level of XML bodies is translated to cvec:s. * 'Not recursive' means that only one level of XML bodies is translated to cvec:s.
* If range is wriong (eg 1000 for uint8) a warning is logged, the value is
* skipped, and continues.
* yang is needed to know which type an xml element has. * yang is needed to know which type an xml element has.
* Example: * Example:
<a> <a>
@ -457,28 +459,30 @@ xml2cvec(cxobj *xt,
clicon_debug(0, "%s: yang sanity problem: %s in xml but not present in yang under %s", clicon_debug(0, "%s: yang sanity problem: %s in xml but not present in yang under %s",
__FUNCTION__, name, yt->ys_argument); __FUNCTION__, name, yt->ys_argument);
if ((body = xml_body(xc)) != NULL){ if ((body = xml_body(xc)) != NULL){
if ((cv = cvec_add(cvv, CGV_STRING)) == NULL){ if ((cv = cv_new(CGV_STRING)) == NULL){
clicon_err(OE_PLUGIN, errno, "cvec_add"); clicon_err(OE_PLUGIN, errno, "cv_new");
goto err; goto err;
} }
cv_name_set(cv, name); cv_name_set(cv, name);
if ((ret = cv_parse1(body, cv, &reason)) < 0){ if ((ret = cv_parse1(body, cv, &reason)) < 0){
clicon_err(OE_PLUGIN, errno, "cv_parse"); clicon_err(OE_PLUGIN, errno, "cv_parse %s",name);
goto err; goto err;
} }
/* If value is out-of-range, log and skip value, and continue */
if (ret == 0){ if (ret == 0){
clicon_err(OE_PLUGIN, errno, "cv_parse: %s", reason); clicon_log(LOG_WARNING, "cv_parse %s: %s", name, reason);
if (reason) if (reason)
free(reason); free(reason);
goto err;
} }
else
cvec_append_var(cvv, cv); /* Add to variable vector */
cv_free(cv);
} }
} }
else if ((ycv = ys->ys_cv) != NULL){ else if ((ycv = ys->ys_cv) != NULL){
if ((body = xml_body(xc)) != NULL){ if ((body = xml_body(xc)) != NULL){
/* XXX: cvec_add uses realloc, can we avoid that? */ if ((cv = cv_new(CGV_STRING)) == NULL){
if ((cv = cvec_add(cvv, CGV_STRING)) == NULL){ clicon_err(OE_PLUGIN, errno, "cv_new");
clicon_err(OE_PLUGIN, errno, "cvec_add");
goto err; goto err;
} }
if (cv_cp(cv, ycv) < 0){ if (cv_cp(cv, ycv) < 0){
@ -486,15 +490,17 @@ xml2cvec(cxobj *xt,
goto err; goto err;
} }
if ((ret = cv_parse1(body, cv, &reason)) < 0){ if ((ret = cv_parse1(body, cv, &reason)) < 0){
clicon_err(OE_PLUGIN, errno, "cv_parse"); clicon_err(OE_PLUGIN, errno, "cv_parse: %s", name);
goto err; goto err;
} }
if (ret == 0){ if (ret == 0){
clicon_err(OE_PLUGIN, errno, "cv_parse: %s", reason); clicon_log(LOG_WARNING, "cv_parse %s: %s", name, reason);
if (reason) if (reason)
free(reason); free(reason);
goto err;
} }
else
cvec_append_var(cvv, cv); /* Add to variable vector */
cv_free(cv);
} }
} }
} }