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

Library functions in clixon_cli_api.h (e.g cli_commit) is rewritten in new

Browse source 
for (eg cli_commitv). See clixon_cli_api.h for new names.
Use restconf format for internal xmldb keys. Eg /a/b=3,4
Changed example to use multiple cli callbacks
This commit is contained in:
Olof hagsand 2017-01-31 22:36:14 +01:00
parent c9f1ece53e
commit 7f0b9909b3
30 changed files with 1444 additions and 1054 deletions
Download patch file Download diff file Expand all files Collapse all files

64
lib/src/clixon_yang.c
View file

@ -419,10 +419,8 @@ yang_find(yang_node *yn,
* the following keyword: container, leaf, list, leaf-list
* That is, basic syntax nodes.
* @note check if argument==NULL really required?
* Is this yang-stmt a container, list, leaf or leaf-list?
*/
/*! Is this yang-stmt a container, list, leaf or leaf-list? */
yang_stmt *
yang_find_syntax(yang_node *yn,
char *argument)
@ -1638,66 +1636,6 @@ yang_apply(yang_node *yn,
return retval;
}
static yang_stmt *
yang_dbkey_vec(yang_node *yn,
char **vec,
int nvec)
{
char *key;
yang_stmt *ys;
int64_t i;
int ret;
if (nvec <= 0)
return NULL;
key = vec[0];
if (yn->yn_keyword == Y_LIST){
ret = parse_int64(key, &i, NULL);
if (ret != 1){
clicon_err(OE_YANG, errno, "strtol");
goto done;
}
if (nvec == 1)
return (yang_stmt*)yn;
vec++;
nvec--;
key = vec[0];
}
if ((ys = yang_find_syntax(yn, key)) == NULL)
goto done;
if (nvec == 1)
return ys;
return yang_dbkey_vec((yang_node*)ys, vec+1, nvec-1);
done:
return NULL;
}
/*! Given a dbkey (eg a.b.0) recursively find matching yang specification
*
* e.g. a.0 matches the db_spec corresponding to a[].
* Input args:
* @param[in] yn top-of yang tree where to start finding
* @param[in] dbkey database key to match in yang spec tree
* @see yang_dbkey_get
*/
yang_stmt *
dbkey2yang(yang_node *yn,
char *dbkey)
{
char **vec;
int nvec;
yang_stmt *ys;
/* Split key into parts, eg "a.0.b" -> "a" "0" "b" */
if ((vec = clicon_strsplit(dbkey, ".", &nvec, __FUNCTION__)) == NULL){
clicon_err(OE_YANG, errno, "%s: strsplit", __FUNCTION__);
return NULL;
}
ys = yang_dbkey_vec(yn, vec, nvec);
unchunk_group(__FUNCTION__);
return ys;
}
/*! All the work for yang_xpath.
Ignore prefixes, see _abs */
static yang_node *