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

Added new clixon-lib yang module for internal netconf protocol. Currently only extends the standard with a debug RPC.

Browse source
This commit is contained in:
Olof hagsand 2019-01-02 22:50:03 +01:00
parent 11479f7ec3
commit 7a8f242a09
14 changed files with 362 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/backend/backend_main.c
View file

@ -805,6 +805,9 @@ main(int argc,
if ((str = clicon_yang_main_dir(h)) != NULL)
if (yang_spec_load_dir(h, str, yspec) < 0)
goto done;
/* Load clixon lib yang module */
if (yang_spec_parse_module(h, "clixon-lib", NULL, yspec) < 0)
goto done;
/* Load yang module library, RFC7895 */
if (yang_modules_init(h) < 0)
goto done;

3
apps/cli/cli_main.c
View file

@ -446,6 +446,9 @@ main(int argc, char **argv)
if (yang_spec_load_dir(h, str, yspec) < 0)
goto done;
}
/* Load clixon lib yang module */
if (yang_spec_parse_module(h, "clixon-lib", NULL, yspec) < 0)
goto done;
/* Load yang module library, RFC7895 */
if (yang_modules_init(h) < 0)

4
apps/netconf/netconf_main.c
View file

@ -468,7 +468,9 @@ main(int argc,
if (yang_spec_load_dir(h, str, yspec) < 0)
goto done;
}
/* Load clixon lib yang module */
if (yang_spec_parse_module(h, "clixon-lib", NULL, yspec) < 0)
goto done;
/* Load yang module library, RFC7895 */
if (yang_modules_init(h) < 0)
goto done;

4
apps/restconf/restconf_main.c
View file

@ -645,7 +645,9 @@ main(int argc,
if (yang_spec_load_dir(h, str, yspec) < 0)
goto done;
}
/* Load clixon lib yang module */
if (yang_spec_parse_module(h, "clixon-lib", NULL, yspec) < 0)
goto done;
/* Load yang module library, RFC7895 */
if (yang_modules_init(h) < 0)
goto done;

12
apps/restconf/restconf_methods.c
View file

@ -1132,27 +1132,23 @@ api_operations_get(clicon_handle h,
if (use_xml)
cprintf(cbx, "<operations>");
else
cprintf(cbx, "{\"operations\": ");
cprintf(cbx, "{\"operations\": {");
ymod = NULL;
i = 0;
while ((ymod = yn_each((yang_node*)yspec, ymod)) != NULL) {
namespace = yang_find_mynamespace(ymod);
yc = NULL; i=0;
yc = NULL;
while ((yc = yn_each((yang_node*)ymod, yc)) != NULL) {
if (yc->ys_keyword != Y_RPC)
continue;
if (use_xml)
cprintf(cbx, "<%s xmlns=\"%s\"/>", yc->ys_argument, namespace);
else{
if (i==0)
cprintf(cbx, "{");
if (i)
if (i++)
cprintf(cbx, ",");
cprintf(cbx, "\"%s:%s\": null", ymod->ys_argument, yc->ys_argument);
}
i++;
}
if (!use_xml && i)
cprintf(cbx, "}");
}
if (use_xml)
cprintf(cbx, "</operations>");