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

* New YANG generated auto-cli feature with syntax modes

Browse source 
* The existing autocli does not support modes, complete paths must be given, eg: `set a b c d 42`.
  * In the new auto-cli, automatic modes are present at each YANG syntax node level, eg the above can be given as: `edit a b c; set d 4; top`
  * The existing CLI API remains, the new API is as follows: `cli_auto_edit()`, `cli_auto_up()`, `cli_auto_top()`, `cli_auto_show()`, `cli_auto_set()`, `cli_auto_merge()`, `cli_auto_create()`, `cli_auto_del()`.
  * See `test/test_cli_auto.sh` for an example of the new API, and `apps/cli/cli_auto.c` for the source code of the new callback API.
  * Documentation will be appear and full integration with the main example.
* Added inline state field to clixon-example.yang
* Added new clicon_data_cvec_*() API for generic cvec structs
This commit is contained in:
Olof hagsand 2020-10-14 10:54:10 +02:00
parent 8d901e1fde
commit 2d56c9674a
11 changed files with 972 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
apps/cli/cli_plugin.c
View file

@ -120,8 +120,16 @@ static int
gen_parse_tree(clicon_handle h,
cli_syntaxmode_t *m)
{
cligen_tree_add(cli_cligen(h), m->csm_name, m->csm_pt);
return 0;
int retval = -1;
pt_head *ph;
if ((ph = cligen_ph_add(cli_cligen(h), m->csm_name)) == NULL)
goto done;
if (cligen_ph_parsetree_set(ph, m->csm_pt) < 0)
goto done;
retval = 0;
done:
return retval;
}
/*! Append syntax
@ -568,13 +576,13 @@ clicon_parse(clicon_handle h,
}
if (smode){
modename0 = NULL;
if ((pt = cligen_tree_active_get(cli_cligen(h))) != NULL)
if ((pt = cligen_ph_active_get(cli_cligen(h))) != NULL)
modename0 = pt_name_get(pt);
if (cligen_tree_active_set(cli_cligen(h), modename) < 0){
if (cligen_ph_active_set(cli_cligen(h), modename) < 0){
fprintf(stderr, "No such parse-tree registered: %s\n", modename);
goto done;
}
if ((pt = cligen_tree_active_get(cli_cligen(h))) == NULL){
if ((pt = cligen_ph_active_get(cli_cligen(h))) == NULL){
fprintf(stderr, "No such parse-tree registered: %s\n", modename);
goto done;
}
@ -589,7 +597,7 @@ clicon_parse(clicon_handle h,
if (*result != CG_MATCH)
pt_expand_cleanup(pt); /* XXX change to pt_expand_treeref_cleanup */
if (modename0){
cligen_tree_active_set(cli_cligen(h), modename0);
cligen_ph_active_set(cli_cligen(h), modename0);
modename0 = NULL;
}
switch (*result) {
@ -607,7 +615,8 @@ clicon_parse(clicon_handle h,
}
if ((r = clicon_eval(h, cmd, match_obj, cvv)) < 0)
cli_handler_err(stdout);
pt_expand_cleanup(pt); /* XXX change to pt_expand_treeref_cleanup */
pt_expand_cleanup(pt);
pt_expand_treeref_cleanup(pt);
if (evalres)
*evalres = r;
break;
@ -656,7 +665,7 @@ clicon_cliread(clicon_handle h,
cli_prompt_set(h, "");
else
cli_prompt_set(h, cli_prompt(h, pfmt ? pfmt : mode->csm_prompt));
cligen_tree_active_set(cli_cligen(h), mode->csm_name);
cligen_ph_active_set(cli_cligen(h), mode->csm_name);
if (cliread(cli_cligen(h), stringp) < 0){
clicon_err(OE_FATAL, errno, "CLIgen");