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

Fixed: ["autocli:hide-show" extension cause bug in xmldb_put method #343](https://github.com/clicon/clixon/issues/343)

Browse source 
As a side-effect, added extra "autocliext" parameter to:
- clixon_xml2file()
- clixon_json2file()
- clixon_json2cbuf()
- clixon_txt2file()
This commit is contained in:
Olof hagsand 2022-07-22 15:56:06 +02:00
parent e724dd7f40
commit 4514f2a538
26 changed files with 213 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

19
CHANGELOG.md
View file

@ -96,18 +96,18 @@ Developers may need to change their code
* `clixon_cli2file()` - Print internal tree as CLI format to file * `clixon_cli2file()` - Print internal tree as CLI format to file
* `clixon_txt2file()` - Print internal tree as text format to file * `clixon_txt2file()` - Print internal tree as text format to file
* As developer, you need to replace the old functions to the new API as follows: * As developer, you need to replace the old functions to the new API as follows:
* `clicon_xml2file(f, x, l, p)` -> `clixon_xml2file(f, x, l, p, NULL, 0)` * `clicon_xml2file(f, x, l, p)` -> `clixon_xml2file(f, x, l, p, NULL, 0, 0)`
* `clicon_xml2file_cb(f, x, l, p, fn)` -> `clixon_xml2file(f, x, l, p, fn, 0)` * `clicon_xml2file_cb(f, x, l, p, fn)` -> `clixon_xml2file(f, x, l, p, fn, 0, 0)`
* `cli_xml2file(x, l, p, fn)` -> `clixon_xml2file(stdout, x, l, p, fn, 0)` * `cli_xml2file(x, l, p, fn)` -> `clixon_xml2file(stdout, x, l, p, fn, 0, 0)`
* `clicon_xml2cbuf(c, x, l, p, d)` -> `clixon_xml2cbuf(c, x, l, p, d, 0)` * `clicon_xml2cbuf(c, x, l, p, d)` -> `clixon_xml2cbuf(c, x, l, p, d, 0)`
* `clicon_xml2str(x)` -> Rewrite using cbufs and `clixon_xml2cbuf()` * `clicon_xml2str(x)` -> Rewrite using cbufs and `clixon_xml2cbuf()`
* `xml2json(f, x, p)` -> `clixon_json2file(f, x, p, NULL, 0)` * `xml2json(f, x, p)` -> `clixon_json2file(f, x, p, NULL, 0, 0)`
* `xml2json_cb(f, x, p, fn)` -> `clixon_json2file(f, x, p, fn, 0)` * `xml2json_cb(f, x, p, fn)` -> `clixon_json2file(f, x, p, fn, 0, 0)`
* `xml2json_cbuf(c, x, p)` -> `clixon_json2cbuf(c, x, p, 0)` * `xml2json_cbuf(c, x, p)` -> `clixon_json2cbuf(c, x, p, 0, 0)`
* `xml2cli(h, f, x, p, fn)` -> `clixon_cli2file(h, f, x, p, fn, 0)` * `xml2cli(h, f, x, p, fn)` -> `clixon_cli2file(h, f, x, p, fn, 0)`
* `cli_xml2txt(x, fn, l)` -> `clixon_txt2file(stdout, x, l, NULL, 0)` * `cli_xml2txt(x, fn, l)` -> `clixon_txt2file(stdout, x, l, NULL, 0, 0)`
* `xml2txt(f, x, l)` -> `clixon_txt2file(f, x, l, NULL, 0)` * `xml2txt(f, x, l)` -> `clixon_txt2file(f, x, l, NULL, 0, 0)`
* `xml2txt_cb(f, x, fn)` -> `clixon_txt2file(f, x, 0, NULL, 0)` * `xml2txt_cb(f, x, fn)` -> `clixon_txt2file(f, x, 0, NULL, 0, 0)`
### Minor features ### Minor features
@ -122,6 +122,7 @@ Developers may need to change their code
### Corrected Bugs ### Corrected Bugs
* Fixed: ["autocli:hide-show" extension cause bug in xmldb_put method #343](https://github.com/clicon/clixon/issues/343)
* Fixed: [Schema Ambiguity Error with openconfig-system re: NTP](https://github.com/clicon/clixon/issues/334) * Fixed: [Schema Ambiguity Error with openconfig-system re: NTP](https://github.com/clicon/clixon/issues/334)
* Fixed: [YANG mandatory statements within case nodes do not work](https://github.com/clicon/clixon/issues/344) * Fixed: [YANG mandatory statements within case nodes do not work](https://github.com/clicon/clixon/issues/344)
* Fixed: [Nested YANG choice does not work](https://github.com/clicon/clixon/issues/342) * Fixed: [Nested YANG choice does not work](https://github.com/clicon/clixon/issues/342)

8
apps/cli/cli_auto.c
View file

@ -452,17 +452,17 @@ cli_auto_show(clicon_handle h,
/* Print configuration according to format */ /* Print configuration according to format */
switch (format){ switch (format){
case FORMAT_XML: case FORMAT_XML:
if (clixon_xml2file(stdout, xp, 0, pretty, cligen_output, skiproot) < 0) if (clixon_xml2file(stdout, xp, 0, pretty, cligen_output, skiproot, 1) < 0)
goto done; goto done;
fprintf(stdout, "\n"); fprintf(stdout, "\n");
break; break;
case FORMAT_JSON: case FORMAT_JSON:
if (clixon_json2file(stdout, xp, pretty, cligen_output, skiproot) < 0) if (clixon_json2file(stdout, xp, pretty, cligen_output, skiproot, 1) < 0)
goto done; goto done;
fprintf(stdout, "\n"); fprintf(stdout, "\n");
break; break;
case FORMAT_TEXT: case FORMAT_TEXT:
if (clixon_txt2file(stdout, xp, 0, cligen_output, skiproot) < 0) if (clixon_txt2file(stdout, xp, 0, cligen_output, skiproot, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_CLI: case FORMAT_CLI:
@ -474,7 +474,7 @@ cli_auto_show(clicon_handle h,
NETCONF_BASE_NAMESPACE, NETCONF_MESSAGE_ID_ATTR); NETCONF_BASE_NAMESPACE, NETCONF_MESSAGE_ID_ATTR);
if (pretty) if (pretty)
fprintf(stdout, "\n"); fprintf(stdout, "\n");
if (clixon_xml2file(stdout, xp, 2, pretty, cligen_output, skiproot) < 0) if (clixon_xml2file(stdout, xp, 2, pretty, cligen_output, skiproot, 1) < 0)
goto done; goto done;
fprintf(stdout, "</config></edit-config></rpc>]]>]]>\n"); fprintf(stdout, "</config></edit-config></rpc>]]>]]>\n");
break; break;

22
apps/cli/cli_common.c
View file

@ -696,12 +696,12 @@ compare_xmls(cxobj *xc1,
goto done; goto done;
switch(format){ switch(format){
case FORMAT_TEXT: case FORMAT_TEXT:
if (clixon_txt2file(f, xc1, 0, cligen_output, 1) < 0) if (clixon_txt2file(f, xc1, 0, cligen_output, 1, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_XML: case FORMAT_XML:
default: default:
if (clixon_xml2file(f, xc1, 0, 1, cligen_output, 1) < 0) if (clixon_xml2file(f, xc1, 0, 1, cligen_output, 1, 1) < 0)
goto done; goto done;
break; break;
} }
@ -717,12 +717,12 @@ compare_xmls(cxobj *xc1,
switch(format){ switch(format){
case FORMAT_TEXT: case FORMAT_TEXT:
if (clixon_txt2file(f, xc2, 0, cligen_output, 1) < 0) if (clixon_txt2file(f, xc2, 0, cligen_output, 1, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_XML: case FORMAT_XML:
default: default:
if (clixon_xml2file(f, xc2, 0, 1, cligen_output, 1) < 0) if (clixon_xml2file(f, xc2, 0, 1, cligen_output, 1, 1) < 0)
goto done; goto done;
break; break;
} }
@ -1048,15 +1048,15 @@ save_config_file(clicon_handle h,
} }
switch (format){ switch (format){
case FORMAT_XML: case FORMAT_XML:
if (clixon_xml2file(f, xt, 0, pretty, fprintf, 0) < 0) if (clixon_xml2file(f, xt, 0, pretty, fprintf, 0, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_JSON: case FORMAT_JSON:
if (clixon_json2file(f, xt, pretty, fprintf, 0) < 0) if (clixon_json2file(f, xt, pretty, fprintf, 0, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_TEXT: case FORMAT_TEXT:
if (clixon_txt2file(f, xt, 0, fprintf, 0) < 0) if (clixon_txt2file(f, xt, 0, fprintf, 0, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_CLI: case FORMAT_CLI:
@ -1067,7 +1067,7 @@ save_config_file(clicon_handle h,
fprintf(f, "<rpc xmlns=\"%s\" %s><edit-config><target><candidate/></target>", fprintf(f, "<rpc xmlns=\"%s\" %s><edit-config><target><candidate/></target>",
NETCONF_BASE_NAMESPACE, NETCONF_MESSAGE_ID_ATTR); NETCONF_BASE_NAMESPACE, NETCONF_MESSAGE_ID_ATTR);
fprintf(f, "\n"); fprintf(f, "\n");
if (clixon_xml2file(f, xt, 0, pretty, fprintf, 0) < 0) if (clixon_xml2file(f, xt, 0, pretty, fprintf, 0, 1) < 0)
goto done; goto done;
fprintf(f, "</edit-config></rpc>]]>]]>\n"); fprintf(f, "</edit-config></rpc>]]>]]>\n");
break; break;
@ -1171,14 +1171,14 @@ cli_notification_cb(int s,
} }
switch (format){ switch (format){
case FORMAT_JSON: case FORMAT_JSON:
if (clixon_json2file(stdout, xt, 1, cligen_output, 1) < 0) if (clixon_json2file(stdout, xt, 1, cligen_output, 1, 1) < 0)
goto done; goto done;
case FORMAT_TEXT: case FORMAT_TEXT:
if (clixon_txt2file(stdout, xt, 0, cligen_output, 1) < 0) if (clixon_txt2file(stdout, xt, 0, cligen_output, 1, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_XML: case FORMAT_XML:
if (clixon_xml2file(stdout, xt, 0, 1, cligen_output, 1) < 0) if (clixon_xml2file(stdout, xt, 0, 1, cligen_output, 1, 1) < 0)
goto done; goto done;
break; break;
default: default:

24
apps/cli/cli_show.c
View file

@ -494,15 +494,15 @@ cli_show_config1(clicon_handle h,
/* Print configuration according to format */ /* Print configuration according to format */
switch (format){ switch (format){
case FORMAT_XML: case FORMAT_XML:
if (clixon_xml2file(stdout, xt, 0, 1, cligen_output, 1) < 0) if (clixon_xml2file(stdout, xt, 0, 1, cligen_output, 1, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_JSON: case FORMAT_JSON:
if (clixon_json2file(stdout, xt, 1, cligen_output, 0) < 0) if (clixon_json2file(stdout, xt, 1, cligen_output, 0, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_TEXT: case FORMAT_TEXT:
if (clixon_txt2file(stdout, xt, 0, cligen_output, 1) < 0) if (clixon_txt2file(stdout, xt, 0, cligen_output, 1, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_CLI: case FORMAT_CLI:
@ -512,7 +512,7 @@ cli_show_config1(clicon_handle h,
case FORMAT_NETCONF: case FORMAT_NETCONF:
cligen_output(stdout, "<rpc xmlns=\"%s\" %s><edit-config><target><candidate/></target><config>\n", cligen_output(stdout, "<rpc xmlns=\"%s\" %s><edit-config><target><candidate/></target><config>\n",
NETCONF_BASE_NAMESPACE, NETCONF_MESSAGE_ID_ATTR); NETCONF_BASE_NAMESPACE, NETCONF_MESSAGE_ID_ATTR);
if (clixon_xml2file(stdout, xt, 2, 1, cligen_output, 1) < 0) if (clixon_xml2file(stdout, xt, 2, 1, cligen_output, 1, 1) < 0)
goto done; goto done;
cligen_output(stdout, "</config></edit-config></rpc>]]>]]>\n"); cligen_output(stdout, "</config></edit-config></rpc>]]>]]>\n");
break; break;
@ -647,7 +647,7 @@ show_conf_xpath(clicon_handle h,
if (xpath_vec(xt, nsc, "%s", &xv, &xlen, xpath) < 0) if (xpath_vec(xt, nsc, "%s", &xv, &xlen, xpath) < 0)
goto done; goto done;
for (i=0; i<xlen; i++) for (i=0; i<xlen; i++)
if (clixon_xml2file(stdout, xv[i], 0, 1, fprintf, 0) < 0) if (clixon_xml2file(stdout, xv[i], 0, 1, fprintf, 0, 1) < 0)
goto done; goto done;
retval = 0; retval = 0;
@ -765,20 +765,20 @@ cli_show_auto1(clicon_handle h,
break; break;
case FORMAT_NETCONF: case FORMAT_NETCONF:
fprintf(stdout, "<rpc><edit-config><target><candidate/></target><config>\n"); fprintf(stdout, "<rpc><edit-config><target><candidate/></target><config>\n");
if (clixon_xml2file(stdout, xp, 2, 1, fprintf, 0) < 0) if (clixon_xml2file(stdout, xp, 2, 1, fprintf, 0, 1) < 0)
goto done; goto done;
fprintf(stdout, "</config></edit-config></rpc>]]>]]>\n"); fprintf(stdout, "</config></edit-config></rpc>]]>]]>\n");
break; break;
case FORMAT_JSON: case FORMAT_JSON:
if (clixon_json2file(stdout, xp, 1, cligen_output, 1) < 0) // XXX helper? if (clixon_json2file(stdout, xp, 1, cligen_output, 1, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_TEXT: case FORMAT_TEXT:
if (clixon_txt2file(stdout, xp, 0, cligen_output, 1) < 0) // XXX helper? if (clixon_txt2file(stdout, xp, 0, cligen_output, 1, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_XML: case FORMAT_XML:
if (clixon_xml2file(stdout, xp, 0, 1, fprintf, 0) < 0) // XXX helper? if (clixon_xml2file(stdout, xp, 0, 1, fprintf, 0, 1) < 0)
goto done; goto done;
break; break;
} }
@ -970,15 +970,15 @@ cli_pagination(clicon_handle h,
xc = xvec[j]; xc = xvec[j];
switch (format){ switch (format){
case FORMAT_XML: case FORMAT_XML:
if (clixon_xml2file(stdout, xc, 0, 1, cligen_output, 0) < 0) if (clixon_xml2file(stdout, xc, 0, 1, cligen_output, 0, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_JSON: case FORMAT_JSON:
if (clixon_json2file(stdout, xc, 1, cligen_output, 0) < 0) if (clixon_json2file(stdout, xc, 1, cligen_output, 0, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_TEXT: case FORMAT_TEXT:
if (clixon_txt2file(stdout, xc, 0, cligen_output, 0) < 0) if (clixon_txt2file(stdout, xc, 0, cligen_output, 0, 1) < 0)
goto done; goto done;
break; break;
case FORMAT_CLI: case FORMAT_CLI:

4
apps/restconf/restconf_err.c
View file

@ -295,14 +295,14 @@ api_return_err(clicon_handle h,
clicon_debug(1, "%s code:%d", __FUNCTION__, code); clicon_debug(1, "%s code:%d", __FUNCTION__, code);
if (pretty){ if (pretty){
cprintf(cb, "{\n\"ietf-restconf:errors\" : "); cprintf(cb, "{\n\"ietf-restconf:errors\" : ");
if (clixon_json2cbuf(cb, xerr, pretty, 0) < 0) if (clixon_json2cbuf(cb, xerr, pretty, 0, 0) < 0)
goto done; goto done;
cprintf(cb, "\n}\r\n"); cprintf(cb, "\n}\r\n");
} }
else{ else{
cprintf(cb, "{"); cprintf(cb, "{");
cprintf(cb, "\"ietf-restconf:errors\":"); cprintf(cb, "\"ietf-restconf:errors\":");
if (clixon_json2cbuf(cb, xerr, pretty, 0) < 0) if (clixon_json2cbuf(cb, xerr, pretty, 0, 0) < 0)
goto done; goto done;
cprintf(cb, "}\r\n"); cprintf(cb, "}\r\n");
} }

2
apps/restconf/restconf_methods_get.c
View file

@ -229,7 +229,7 @@ api_data_get2(clicon_handle h,
goto done; goto done;
break; break;
case YANG_DATA_JSON: case YANG_DATA_JSON:
if (clixon_json2cbuf(cbx, xret, pretty, 0) < 0) if (clixon_json2cbuf(cbx, xret, pretty, 0, 0) < 0)
goto done; goto done;
break; break;
default: default:

8
apps/restconf/restconf_methods_patch.c
View file

@ -119,7 +119,7 @@ yang_patch_xml2json_modified_cbuf(cxobj *x_simple_patch)
if (json_simple_patch == NULL) if (json_simple_patch == NULL)
return NULL; return NULL;
cb = cbuf_new(); cb = cbuf_new();
if (clixon_json2cbuf(cb, x_simple_patch, 0) < 0) if (clixon_json2cbuf(cb, x_simple_patch, 0, 0) < 0)
goto done; goto done;
// Insert a '[' after the first '{' to get the JSON to match what api_data_post/write() expect // Insert a '[' after the first '{' to get the JSON to match what api_data_post/write() expect
@ -267,7 +267,7 @@ yang_patch_do_replace(clicon_handle h,
} }
} }
// Convert the data to json // Convert the data to json
if (clixon_json2cbuf(json_simple_patch, x_simple_patch, 0) < 0) if (clixon_json2cbuf(json_simple_patch, x_simple_patch, 0, 0) < 0)
goto done; goto done;
// Send the POST request // Send the POST request
@ -329,7 +329,7 @@ yang_patch_do_create(clicon_handle h,
xml_addsub(x_simple_patch, value_vec_tmp); xml_addsub(x_simple_patch, value_vec_tmp);
} }
} }
if (clixon_json2cbuf(cb, x_simple_patch, 0) < 0) if (clixon_json2cbuf(cb, x_simple_patch, 0, 0) < 0)
goto done; goto done;
if (api_data_post(h, req, cbuf_get(simple_patch_request_uri), if (api_data_post(h, req, cbuf_get(simple_patch_request_uri),
pi, qvec, pi, qvec,
@ -479,7 +479,7 @@ yang_patch_do_merge(clicon_handle h,
xml_addsub(x_simple_patch, value_vec_tmp); xml_addsub(x_simple_patch, value_vec_tmp);
} }
cbuf_reset(cb); /* reuse cb */ cbuf_reset(cb); /* reuse cb */
if (clixon_json2cbuf(cb, x_simple_patch, 0) < 0) if (clixon_json2cbuf(cb, x_simple_patch, 0, 0) < 0)
goto done; goto done;
if ((json_simple_patch = yang_patch_xml2json_modified_cbuf(x_simple_patch)) == NULL) if ((json_simple_patch = yang_patch_xml2json_modified_cbuf(x_simple_patch)) == NULL)

2
apps/restconf/restconf_methods_post.c
View file

@ -879,7 +879,7 @@ api_operations_post(clicon_handle h,
/* xoutput should now look: <output xmlns="uri"><x>0</x></output> */ /* xoutput should now look: <output xmlns="uri"><x>0</x></output> */
break; break;
case YANG_DATA_JSON: case YANG_DATA_JSON:
if (clixon_json2cbuf(cbret, xoutput, pretty, 0) < 0) if (clixon_json2cbuf(cbret, xoutput, pretty, 0, 0) < 0)
goto done; goto done;
/* xoutput should now look: {"example:output": {"x":0,"y":42}} */ /* xoutput should now look: {"example:output": {"x":0,"y":42}} */
break; break;

4
apps/restconf/restconf_root.c
View file

@ -209,7 +209,7 @@ api_root_restconf_exact(clicon_handle h,
break; break;
case YANG_DATA_JSON: case YANG_DATA_JSON:
case YANG_PATCH_JSON: case YANG_PATCH_JSON:
if (clixon_json2cbuf(cb, xt, pretty, 0) < 0) if (clixon_json2cbuf(cb, xt, pretty, 0, 0) < 0)
goto done; goto done;
break; break;
default: default:
@ -293,7 +293,7 @@ api_yang_library_version(clicon_handle h,
break; break;
case YANG_DATA_JSON: case YANG_DATA_JSON:
case YANG_PATCH_JSON: case YANG_PATCH_JSON:
if (clixon_json2cbuf(cb, xt, pretty, 0) < 0) if (clixon_json2cbuf(cb, xt, pretty, 0, 0) < 0)
goto done; goto done;
break; break;
default: default:

4
example/main/example_cli.c
View file

@ -74,7 +74,7 @@ mycallback(clicon_handle h, cvec *cvv, cvec *argv)
nsc, nsc,
&xret) < 0) &xret) < 0)
goto done; goto done;
if (clixon_xml2file(stdout, xret, 0, 1, cligen_output, 0) < 0) if (clixon_xml2file(stdout, xret, 0, 1, cligen_output, 0, 1) < 0)
goto done; goto done;
retval = 0; retval = 0;
done: done:
@ -119,7 +119,7 @@ example_client_rpc(clicon_handle h,
goto done; goto done;
} }
/* Print result */ /* Print result */
if (clixon_xml2file(stdout, xml_child_i(xret, 0), 0, 0, cligen_output, 0) < 0) if (clixon_xml2file(stdout, xml_child_i(xret, 0), 0, 0, cligen_output, 0, 1) < 0)
goto done; goto done;
fprintf(stdout,"\n"); fprintf(stdout,"\n");

4
lib/clixon/clixon_json.h
View file

@ -44,9 +44,9 @@
* Prototypes * Prototypes
*/ */
int json2xml_decode(cxobj *x, cxobj **xerr); int json2xml_decode(cxobj *x, cxobj **xerr);
int clixon_json2cbuf(cbuf *cb, cxobj *x, int pretty, int skiptop); int clixon_json2cbuf(cbuf *cb, cxobj *x, int pretty, int skiptop, int autocliext);
int xml2json_cbuf_vec(cbuf *cb, cxobj **vec, size_t veclen, int pretty); int xml2json_cbuf_vec(cbuf *cb, cxobj **vec, size_t veclen, int pretty);
int clixon_json2file(FILE *f, cxobj *x, int pretty, clicon_output_cb *fn, int skiptop); int clixon_json2file(FILE *f, cxobj *x, int pretty, clicon_output_cb *fn, int skiptop, int autocliext);
int json_print(FILE *f, cxobj *x); int json_print(FILE *f, cxobj *x);
int xml2json_vec(FILE *f, cxobj **vec, size_t veclen, int pretty); int xml2json_vec(FILE *f, cxobj **vec, size_t veclen, int pretty);
int clixon_json_parse_string(char *str, int rfc7951, yang_bind yb, yang_stmt *yspec, cxobj **xt, cxobj **xret); int clixon_json_parse_string(char *str, int rfc7951, yang_bind yb, yang_stmt *yspec, cxobj **xt, cxobj **xret);

2
lib/clixon/clixon_text_syntax.h
View file

@ -39,7 +39,7 @@
/* /*
* Prototypes * Prototypes
*/ */
int clixon_txt2file(FILE *f, cxobj *xn, int level, clicon_output_cb *fn, int skiptop); int clixon_txt2file(FILE *f, cxobj *xn, int level, clicon_output_cb *fn, int skiptop, int autocliext);
int clixon_text_syntax_parse_string(char *str, yang_bind yb, yang_stmt *yspec, cxobj **xt, cxobj **xerr); int clixon_text_syntax_parse_string(char *str, yang_bind yb, yang_stmt *yspec, cxobj **xt, cxobj **xerr);
int clixon_text_syntax_parse_file(FILE *fp, yang_bind yb, yang_stmt *yspec, cxobj **xt, cxobj **xerr); int clixon_text_syntax_parse_file(FILE *fp, yang_bind yb, yang_stmt *yspec, cxobj **xt, cxobj **xerr);

2
lib/clixon/clixon_xml_io.h
View file

@ -43,7 +43,7 @@
/* /*
* Prototypes * Prototypes
*/ */
int clixon_xml2file(FILE *f, cxobj *xn, int level, int pretty, clicon_output_cb *fn, int skiptop); int clixon_xml2file(FILE *f, cxobj *xn, int level, int pretty, clicon_output_cb *fn, int skiptop, int autocliext);
int xml_print(FILE *f, cxobj *xn); int xml_print(FILE *f, cxobj *xn);
int xml_dump(FILE *f, cxobj *x); int xml_dump(FILE *f, cxobj *x);
int clixon_xml2cbuf(cbuf *cb, cxobj *x, int level, int prettyprint, int32_t depth, int skiptop); int clixon_xml2cbuf(cbuf *cb, cxobj *x, int level, int prettyprint, int32_t depth, int skiptop);

6
lib/src/clixon_datastore_read.c
View file

@ -745,7 +745,7 @@ xmldb_get_nocache(clicon_handle h,
clicon_log(LOG_NOTICE, "%s: sort verify failed #2", __FUNCTION__); clicon_log(LOG_NOTICE, "%s: sort verify failed #2", __FUNCTION__);
#endif #endif
if (clicon_debug_get()>1) if (clicon_debug_get()>1)
if (clixon_xml2file(stderr, xt, 0, 1, fprintf, 0) < 0) if (clixon_xml2file(stderr, xt, 0, 1, fprintf, 0, 0) < 0)
goto done; goto done;
*xtop = xt; *xtop = xt;
xt = NULL; xt = NULL;
@ -917,7 +917,7 @@ xmldb_get_cache(clicon_handle h,
* If cache was empty, also update to datastore cache * If cache was empty, also update to datastore cache
*/ */
if (clicon_debug_get()>1) if (clicon_debug_get()>1)
if (clixon_xml2file(stderr, x1t, 0, 1, fprintf, 0) < 0) if (clixon_xml2file(stderr, x1t, 0, 1, fprintf, 0, 0) < 0)
goto done; goto done;
*xtop = x1t; *xtop = x1t;
retval = 1; retval = 1;
@ -1019,7 +1019,7 @@ xmldb_get_zerocopy(clicon_handle h,
goto done; goto done;
} }
if (clicon_debug_get() > 1) if (clicon_debug_get() > 1)
if (clixon_xml2file(stderr, x0t, 0, 1, fprintf, 0) < 0) if (clixon_xml2file(stderr, x0t, 0, 1, fprintf, 0, 0) < 0)
goto done; goto done;
*xtop = x0t; *xtop = x0t;
retval = 1; retval = 1;

8
lib/src/clixon_datastore_write.c
View file

@ -1244,10 +1244,10 @@ xmldb_put(clicon_handle h,
} }
pretty = clicon_option_bool(h, "CLICON_XMLDB_PRETTY"); pretty = clicon_option_bool(h, "CLICON_XMLDB_PRETTY");
if (strcmp(format,"json")==0){ if (strcmp(format,"json")==0){
if (clixon_json2file(f, x0, pretty, fprintf, 0) < 0) if (clixon_json2file(f, x0, pretty, fprintf, 0, 0) < 0)
goto done; goto done;
} }
else if (clixon_xml2file(f, x0, 0, pretty, fprintf, 0) < 0) else if (clixon_xml2file(f, x0, 0, pretty, fprintf, 0, 0) < 0)
goto done; goto done;
/* Remove modules state after writing to file /* Remove modules state after writing to file
*/ */
@ -1302,10 +1302,10 @@ xmldb_dump(clicon_handle h,
} }
pretty = clicon_option_bool(h, "CLICON_XMLDB_PRETTY"); pretty = clicon_option_bool(h, "CLICON_XMLDB_PRETTY");
if (strcmp(format,"json")==0){ if (strcmp(format,"json")==0){
if (clixon_json2file(f, xt, pretty, fprintf, 0) < 0) if (clixon_json2file(f, xt, pretty, fprintf, 0, 0) < 0)
goto done; goto done;
} }
else if (clixon_xml2file(f, xt, 0, pretty, fprintf, 0) < 0) else if (clixon_xml2file(f, xt, 0, pretty, fprintf, 0, 0) < 0)
goto done; goto done;
retval = 0; retval = 0;
done: done:

33
lib/src/clixon_json.c
View file

@ -1043,6 +1043,7 @@ xml2json1_cbuf(cbuf *cb,
* @param[in,out] cb Cligen buffer to write to * @param[in,out] cb Cligen buffer to write to
* @param[in] x XML tree to translate from * @param[in] x XML tree to translate from
* @param[in] pretty Set if output is pretty-printed * @param[in] pretty Set if output is pretty-printed
* @param[in] autocliext How to handle autocli extensions: 0: ignore 1: follow
* @retval 0 OK * @retval 0 OK
* @retval -1 Error * @retval -1 Error
* *
@ -1052,18 +1053,27 @@ xml2json1_cbuf(cbuf *cb,
static int static int
xml2json_cbuf1(cbuf *cb, xml2json_cbuf1(cbuf *cb,
cxobj *x, cxobj *x,
int pretty) int pretty,
int autocliext)
{ {
int retval = 1; int retval = 1;
int level = 0; int level = 0;
yang_stmt *y; yang_stmt *y;
enum array_element_type arraytype = NO_ARRAY; enum array_element_type arraytype = NO_ARRAY;
int exist = 0;
y = xml_spec(x);
if (autocliext && y != NULL) {
if (yang_extension_value(y, "hide-show", CLIXON_AUTOCLI_NS, &exist, NULL) < 0)
goto done;
if (exist)
goto ok;
}
cprintf(cb, "%*s{%s", cprintf(cb, "%*s{%s",
pretty?level*JSON_INDENT:0,"", pretty?level*JSON_INDENT:0,"",
pretty?"\n":""); pretty?"\n":"");
if ((y = xml_spec(x)) != NULL){ if (y != NULL){
switch (yang_keyword_get(y)){ switch (yang_keyword_get(y)){
case Y_LEAF_LIST: case Y_LEAF_LIST:
case Y_LIST: case Y_LIST:
@ -1087,6 +1097,7 @@ xml2json_cbuf1(cbuf *cb,
pretty?"\n":"", pretty?"\n":"",
pretty?level*JSON_INDENT:0,"", pretty?level*JSON_INDENT:0,"",
pretty?"\n":""); pretty?"\n":"");
ok:
retval = 0; retval = 0;
done: done:
return retval; return retval;
@ -1101,6 +1112,7 @@ xml2json_cbuf1(cbuf *cb,
* @param[in] xt Top-level xml object * @param[in] xt Top-level xml object
* @param[in] pretty Set if output is pretty-printed * @param[in] pretty Set if output is pretty-printed
* @param[in] skiptop 0: Include top object 1: Skip top-object, only children, * @param[in] skiptop 0: Include top object 1: Skip top-object, only children,
* @param[in] autocliext How to handle autocli extensions: 0: ignore 1: follow
* @retval 0 OK * @retval 0 OK
* @retval -1 Error * @retval -1 Error
* @code * @code
@ -1115,7 +1127,8 @@ int
clixon_json2cbuf(cbuf *cb, clixon_json2cbuf(cbuf *cb,
cxobj *xt, cxobj *xt,
int pretty, int pretty,
int skiptop) int skiptop,
int autocliext)
{ {
int retval = -1; int retval = -1;
cxobj *xc; cxobj *xc;
@ -1123,11 +1136,11 @@ clixon_json2cbuf(cbuf *cb,
if (skiptop){ if (skiptop){
xc = NULL; xc = NULL;
while ((xc = xml_child_each(xt, xc, CX_ELMNT)) != NULL) while ((xc = xml_child_each(xt, xc, CX_ELMNT)) != NULL)
if (xml2json_cbuf1(cb, xc, pretty) < 0) if (xml2json_cbuf1(cb, xc, pretty, autocliext) < 0)
goto done; goto done;
} }
else { else {
if (xml2json_cbuf1(cb, xt, pretty) < 0) if (xml2json_cbuf1(cb, xt, pretty, autocliext) < 0)
goto done; goto done;
} }
retval = 0; retval = 0;
@ -1206,13 +1219,14 @@ xml2json_cbuf_vec(cbuf *cb,
* @param[in] pretty Set if output is pretty-printed * @param[in] pretty Set if output is pretty-printed
* @param[in] fn File print function (if NULL, use fprintf) * @param[in] fn File print function (if NULL, use fprintf)
* @param[in] skiptop 0: Include top object 1: Skip top-object, only children, * @param[in] skiptop 0: Include top object 1: Skip top-object, only children,
* @param[in] autocliext How to handle autocli extensions: 0: ignore 1: follow
* @retval 0 OK * @retval 0 OK
* @retval -1 Error * @retval -1 Error
* *
* @note yang is necessary to translate to one-member lists, * @note yang is necessary to translate to one-member lists,
* eg if a is a yang LIST <a>0</a> -> {"a":["0"]} and not {"a":"0"} * eg if a is a yang LIST <a>0</a> -> {"a":["0"]} and not {"a":"0"}
* @code * @code
* if (clixon_json2file(stderr, xn, 0, fprintf, 0) < 0) * if (clixon_json2file(stderr, xn, 0, fprintf, 0, 0) < 0)
* goto err; * goto err;
* @endcode * @endcode
*/ */
@ -1221,7 +1235,8 @@ clixon_json2file(FILE *f,
cxobj *xn, cxobj *xn,
int pretty, int pretty,
clicon_output_cb *fn, clicon_output_cb *fn,
int skiptop) int skiptop,
int autocliext)
{ {
int retval = 1; int retval = 1;
cbuf *cb = NULL; cbuf *cb = NULL;
@ -1232,7 +1247,7 @@ clixon_json2file(FILE *f,
clicon_err(OE_XML, errno, "cbuf_new"); clicon_err(OE_XML, errno, "cbuf_new");
goto done; goto done;
} }
if (clixon_json2cbuf(cb, xn, pretty, skiptop) < 0) if (clixon_json2cbuf(cb, xn, pretty, skiptop, autocliext) < 0)
goto done; goto done;
(*fn)(f, "%s", cbuf_get(cb)); (*fn)(f, "%s", cbuf_get(cb));
retval = 0; retval = 0;
@ -1251,7 +1266,7 @@ int
json_print(FILE *f, json_print(FILE *f,
cxobj *x) cxobj *x)
{ {
return clixon_json2file(f, x, 1, fprintf, 0); return clixon_json2file(f, x, 1, fprintf, 0, 0);
} }
/*! Translate a vector of xml objects to JSON File. /*! Translate a vector of xml objects to JSON File.

2
lib/src/clixon_netconf_lib.c
View file

@ -1998,7 +1998,7 @@ netconf_output(int s,
if (clicon_debug_get() > 1){ /* XXX: below only works to stderr, clicon_debug may log to syslog */ if (clicon_debug_get() > 1){ /* XXX: below only works to stderr, clicon_debug may log to syslog */
cxobj *xt = NULL; cxobj *xt = NULL;
if (clixon_xml_parse_string(buf, YB_NONE, NULL, &xt, NULL) == 0){ if (clixon_xml_parse_string(buf, YB_NONE, NULL, &xt, NULL) == 0){
if (clixon_xml2file(stderr, xml_child_i(xt, 0), 0, 0, fprintf, 0) < 0) if (clixon_xml2file(stderr, xml_child_i(xt, 0), 0, 0, fprintf, 0, 0) < 0)
goto done; goto done;
fprintf(stderr, "\n"); fprintf(stderr, "\n");
xml_free(xt); xml_free(xt);

23
lib/src/clixon_text_syntax.c
View file

@ -101,6 +101,7 @@ tleaf(cxobj *x)
* @param[in] fn Callback to make print function * @param[in] fn Callback to make print function
* @param[in] f File to print to * @param[in] f File to print to
* @param[in] level Print 4 spaces per level in front of each line * @param[in] level Print 4 spaces per level in front of each line
* @param[in] autocliext How to handle autocli extensions: 0: ignore 1: follow
* @param[in,out] leafl Leaflist state for keeping track of when [] ends * @param[in,out] leafl Leaflist state for keeping track of when [] ends
* @param[in,out] leaflname Leaflist state for [] * @param[in,out] leaflname Leaflist state for []
* leaflist state: * leaflist state:
@ -112,8 +113,10 @@ xml2txt1(cxobj *xn,
clicon_output_cb *fn, clicon_output_cb *fn,
FILE *f, FILE *f,
int level, int level,
int autocliext,
int *leafl, int *leafl,
char **leaflname) char **leaflname)
{ {
cxobj *xc = NULL; cxobj *xc = NULL;
int children=0; int children=0;
@ -134,10 +137,12 @@ xml2txt1(cxobj *xn,
goto done; goto done;
} }
if ((yn = xml_spec(xn)) != NULL){ if ((yn = xml_spec(xn)) != NULL){
if (yang_extension_value(yn, "hide-show", CLIXON_AUTOCLI_NS, &exist, NULL) < 0) if (autocliext){
goto done; if (yang_extension_value(yn, "hide-show", CLIXON_AUTOCLI_NS, &exist, NULL) < 0)
if (exist) goto done;
goto ok; if (exist)
goto ok;
}
/* Find out prefix if needed: topmost or new module a la API-PATH */ /* Find out prefix if needed: topmost or new module a la API-PATH */
if (ys_real_module(yn, &ymod) < 0) if (ys_real_module(yn, &ymod) < 0)
goto done; goto done;
@ -230,7 +235,7 @@ xml2txt1(cxobj *xn,
if (xml_type(xc) == CX_ELMNT || xml_type(xc) == CX_BODY){ if (xml_type(xc) == CX_ELMNT || xml_type(xc) == CX_BODY){
if (yn && yang_key_match(yn, xml_name(xc), NULL)) if (yn && yang_key_match(yn, xml_name(xc), NULL))
continue; /* Skip keys, already printed */ continue; /* Skip keys, already printed */
if (xml2txt1(xc, fn, f, level+1, leafl, leaflname) < 0) if (xml2txt1(xc, fn, f, level+1, autocliext, leafl, leaflname) < 0)
break; break;
} }
} }
@ -256,6 +261,7 @@ xml2txt1(cxobj *xn,
* @param[in] level Print 4 spaces per level in front of each line * @param[in] level Print 4 spaces per level in front of each line
* @param[in] fn File print function (if NULL, use fprintf) * @param[in] fn File print function (if NULL, use fprintf)
* @param[in] skiptop 0: Include top object 1: Skip top-object, only children, * @param[in] skiptop 0: Include top object 1: Skip top-object, only children,
* @param[in] autocliext How to handle autocli extensions: 0: ignore 1: follow
* @retval 0 OK * @retval 0 OK
* @retval -1 Error * @retval -1 Error
*/ */
@ -264,7 +270,8 @@ clixon_txt2file(FILE *f,
cxobj *xn, cxobj *xn,
int level, int level,
clicon_output_cb *fn, clicon_output_cb *fn,
int skiptop) int skiptop,
int autocliext)
{ {
int retval = 1; int retval = 1;
cxobj *xc; cxobj *xc;
@ -276,11 +283,11 @@ clixon_txt2file(FILE *f,
if (skiptop){ if (skiptop){
xc = NULL; xc = NULL;
while ((xc = xml_child_each(xn, xc, CX_ELMNT)) != NULL) while ((xc = xml_child_each(xn, xc, CX_ELMNT)) != NULL)
if (xml2txt1(xc, fn, f, level, &leafl, &leaflname) < 0) if (xml2txt1(xc, fn, f, level, autocliext, &leafl, &leaflname) < 0)
goto done; goto done;
} }
else { else {
if (xml2txt1(xn, fn, f, level, &leafl, &leaflname) < 0) if (xml2txt1(xn, fn, f, level, autocliext, &leafl, &leaflname) < 0)
goto done; goto done;
} }
retval = 0; retval = 0;

50
lib/src/clixon_xml_io.c
View file

@ -89,21 +89,26 @@
/*! Print an XML tree structure to an output stream and encode chars "<>&" /*! Print an XML tree structure to an output stream and encode chars "<>&"
* *
* @param[in] f UNIX output stream * @param[in] f UNIX output stream
* @param[in] xn Clicon xml tree * @param[in] xn Clicon xml tree
* @param[in] level How many spaces to insert before each line * @param[in] level How many spaces to insert before each line
* @param[in] pretty Insert \n and spaces to make the xml more readable. * @param[in] pretty Insert \n and spaces to make the xml more readable.
* @param[in] fn Callback to make print function * @param[in] fn Callback to make print function
* @param[in] autocliext How to handle autocli extensions: 0: ignore 1: follow
* @retval 0 OK
* @retval -1 Error
* @see clixon_xml2cbuf * @see clixon_xml2cbuf
* One can use clixon_xml2cbuf to get common code, but using fprintf is * One can use clixon_xml2cbuf to get common code, but using fprintf is
* much faster than using cbuf and then printing that,... * much faster than using cbuf and then printing that,...
*
*/ */
int static int
xml2file_recurse(FILE *f, xml2file_recurse(FILE *f,
cxobj *x, cxobj *x,
int level, int level,
int pretty, int pretty,
clicon_output_cb *fn) clicon_output_cb *fn,
int autocliext)
{ {
int retval = -1; int retval = -1;
char *name; char *name;
@ -114,13 +119,17 @@ xml2file_recurse(FILE *f,
char *val; char *val;
char *encstr = NULL; /* xml encoded string */ char *encstr = NULL; /* xml encoded string */
int exist = 0; int exist = 0;
yang_stmt *y;
if (x == NULL) if (x == NULL)
goto ok; goto ok;
if (yang_extension_value(xml_spec(x), "hide-show", CLIXON_AUTOCLI_NS, &exist, NULL) < 0) if (autocliext &&
goto done; (y = xml_spec(x)) != NULL){
if (exist) if (yang_extension_value(y, "hide-show", CLIXON_AUTOCLI_NS, &exist, NULL) < 0)
goto ok; goto done;
if (exist)
goto ok;
}
name = xml_name(x); name = xml_name(x);
namespace = xml_prefix(x); namespace = xml_prefix(x);
switch(xml_type(x)){ switch(xml_type(x)){
@ -149,7 +158,7 @@ xml2file_recurse(FILE *f,
while ((xc = xml_child_each(x, xc, -1)) != NULL) { while ((xc = xml_child_each(x, xc, -1)) != NULL) {
switch (xml_type(xc)){ switch (xml_type(xc)){
case CX_ATTR: case CX_ATTR:
if (xml2file_recurse(f, xc, level+1, pretty, fn) <0) if (xml2file_recurse(f, xc, level+1, pretty, fn, autocliext) <0)
goto done; goto done;
break; break;
case CX_BODY: case CX_BODY:
@ -174,7 +183,7 @@ xml2file_recurse(FILE *f,
xc = NULL; xc = NULL;
while ((xc = xml_child_each(x, xc, -1)) != NULL) { while ((xc = xml_child_each(x, xc, -1)) != NULL) {
if (xml_type(xc) != CX_ATTR) if (xml_type(xc) != CX_ATTR)
if (xml2file_recurse(f, xc, level+1, pretty, fn) <0) if (xml2file_recurse(f, xc, level+1, pretty, fn, autocliext) <0)
goto done; goto done;
} }
if (pretty && hasbody==0) if (pretty && hasbody==0)
@ -206,9 +215,12 @@ xml2file_recurse(FILE *f,
* @param[in] pretty Insert \n and spaces to make the xml more readable. * @param[in] pretty Insert \n and spaces to make the xml more readable.
* @param[in] fn File print function (if NULL, use fprintf) * @param[in] fn File print function (if NULL, use fprintf)
* @param[in] skiptop 0: Include top object 1: Skip top-object, only children, * @param[in] skiptop 0: Include top object 1: Skip top-object, only children,
* @param[in] autocliext How to handle autocli extensions: 0: ignore 1: follow
* @retval 0 OK * @retval 0 OK
* @retval -1 Error * @retval -1 Error
* @see clixon_xml2cbuf print to a cbuf string * @see clixon_xml2cbuf print to a cbuf string
* @note There is a slight "layer violation" with the autocli parameter: it should normally be set
* for CLI calls, but not for others.
*/ */
int int
clixon_xml2file(FILE *f, clixon_xml2file(FILE *f,
@ -216,7 +228,8 @@ clixon_xml2file(FILE *f,
int level, int level,
int pretty, int pretty,
clicon_output_cb *fn, clicon_output_cb *fn,
int skiptop) int skiptop,
int autocliext)
{ {
int retval = 1; int retval = 1;
cxobj *xc; cxobj *xc;
@ -226,11 +239,11 @@ clixon_xml2file(FILE *f,
if (skiptop){ if (skiptop){
xc = NULL; xc = NULL;
while ((xc = xml_child_each(xn, xc, CX_ELMNT)) != NULL) while ((xc = xml_child_each(xn, xc, CX_ELMNT)) != NULL)
if (xml2file_recurse(f, xc, level, pretty, fn) < 0) if (xml2file_recurse(f, xc, level, pretty, fn, autocliext) < 0)
goto done; goto done;
} }
else { else {
if (xml2file_recurse(f, xn, level, pretty, fn) < 0) if (xml2file_recurse(f, xn, level, pretty, fn, autocliext) < 0)
goto done; goto done;
} }
retval = 0; retval = 0;
@ -241,8 +254,7 @@ clixon_xml2file(FILE *f,
/*! Print an XML tree structure to an output stream /*! Print an XML tree structure to an output stream
* *
* Uses clixon_xml2file internally * Utility function eg in gdb. For code, use clixon_xml2file
*
* @param[in] f UNIX output stream * @param[in] f UNIX output stream
* @param[in] xn clicon xml tree * @param[in] xn clicon xml tree
* @see clixon_xml2cbuf * @see clixon_xml2cbuf
@ -252,7 +264,7 @@ int
xml_print(FILE *f, xml_print(FILE *f,
cxobj *x) cxobj *x)
{ {
return xml2file_recurse(f, x, 0, 1, fprintf); return xml2file_recurse(f, x, 0, 1, fprintf, 0);
} }
/*! Dump cxobj structure with pointers and flags for debugging, internal function /*! Dump cxobj structure with pointers and flags for debugging, internal function

2
lib/src/clixon_xml_vec.c
View file

@ -377,7 +377,7 @@ clixon_xvec_print(FILE *f,
int i; int i;
for (i=0; i<xv->xv_len; i++) for (i=0; i<xv->xv_len; i++)
if (clixon_xml2file(f, xv->xv_vec[i], 0, 1, fprintf, 0) < 0) if (clixon_xml2file(f, xv->xv_vec[i], 0, 1, fprintf, 0, 0) < 0)
return -1; return -1;
return 0; return 0;
} }

52
test/test_autocli_extension.sh
View file

@ -8,6 +8,8 @@ s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
APPNAME=example APPNAME=example
: ${clixon_util_datastore:=clixon_util_datastore}
fin=$dir/in fin=$dir/in
cfg=$dir/conf_yang.xml cfg=$dir/conf_yang.xml
fyang=$dir/example.yang fyang=$dir/example.yang
@ -113,20 +115,6 @@ module example-augment {
} }
EOF EOF
new "test params: -f $cfg"
if [ $BE -ne 0 ]; then
new "kill old backend"
sudo clixon_backend -z -f $cfg
if [ $? -ne 0 ]; then
err
fi
new "start backend -s init -f $cfg"
start_backend -s init -f $cfg
fi
new "wait backend"
wait_backend
function testparam() function testparam()
{ {
# Try hidden parameter list # Try hidden parameter list
@ -138,7 +126,16 @@ set table parameter x
show config xml show config xml
EOF EOF
new "set table parameter hidden" new "set table parameter hidden"
expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0 "set table parameter x" "<table xmlns=\"urn:example:clixon\"></table>" expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0 "set table parameter x" "<table xmlns=\"urn:example:clixon\"></table>"
XML="<table xmlns=\"urn:example:clixon\"><parameter><name>x</name></parameter></table>"
new "check datastore using netconf"
expecteof_netconf "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO" "<rpc $DEFAULTNS><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/ex:table/ex:parameter[ex:name='x']\" xmlns:ex=\"urn:example:clixon\" /></get-config></rpc>" "" "<rpc-reply $DEFAULTNS><data>$XML</data></rpc-reply>"
new "check datastore direct access"
expectpart "$($clixon_util_datastore -d candidate -b $dir -y $fyang -Y ${YANG_INSTALLDIR} -Y $dir get /)" 0 "$XML"
} }
function testvalue() function testvalue()
@ -157,8 +154,33 @@ show config xml
EOF EOF
new "set table parameter hidden leaf2" new "set table parameter hidden leaf2"
expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0 "<table xmlns=\"urn:example:clixon\"><parameter><name>x</name></parameter></table>" expectpart "$(cat $fin | $clixon_cli -f $cfg 2>&1)" 0 "<table xmlns=\"urn:example:clixon\"><parameter><name>x</name></parameter></table>"
XML="<table xmlns=\"urn:example:clixon\"><parameter><name>x</name><value>42</value></parameter></table>"
new "check datastore using netconf"
expecteof_netconf "$clixon_netconf -qf $cfg" 0 "$DEFAULTHELLO" "<rpc $DEFAULTNS><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/ex:table/ex:parameter[ex:name='x']\" xmlns:ex=\"urn:example:clixon\" /></get-config></rpc>" "" "<rpc-reply $DEFAULTNS><data>$XML</data></rpc-reply>"
new "check datastore direct access"
expectpart "$($clixon_util_datastore -d candidate -b $dir -y $fyang -Y ${YANG_INSTALLDIR} -Y $dir get /)" 0 "$XML"
} }
new "test params: -f $cfg"
if [ $BE -ne 0 ]; then
new "kill old backend"
sudo clixon_backend -z -f $cfg
if [ $? -ne 0 ]; then
err
fi
new "start backend -s init -f $cfg"
start_backend -s init -f $cfg
fi
new "wait backend"
wait_backend
sudo chmod a+r $dir/candidate_db
# INLINE MODE # INLINE MODE
new "Test hidden parameter in table/param inline" new "Test hidden parameter in table/param inline"

64
util/clixon_util_datastore.c
View file

@ -66,7 +66,7 @@
#include <clixon/clixon.h> #include <clixon/clixon.h>
/* Command line options to be passed to getopt(3) */ /* Command line options to be passed to getopt(3) */
#define DATASTORE_OPTS "hDd:b:f:x:y:" #define DATASTORE_OPTS "hDd:b:f:x:y:Y:"
/*! usage /*! usage
*/ */
@ -74,29 +74,30 @@ static void
usage(char *argv0) usage(char *argv0)
{ {
fprintf(stderr, "usage:%s <options>* [<command>]\n" fprintf(stderr, "usage:%s <options>* [<command>]\n"
"where options are\n" "where options are\n"
"\t-h\t\tHelp\n" "\t-h\t\tHelp\n"
"\t-D\t\tDebug\n" "\t-D\t\tDebug\n"
"\t-d <db>\t\tDatabase name. Default: running. Alt: candidate,startup\n" "\t-d <db>\t\tDatabase name. Default: running. Alt: candidate,startup\n"
"\t-b <dir>\tDatabase directory. Mandatory\n" "\t-b <dir>\tDatabase directory. Mandatory\n"
"\t-f <fmt>\tDatabase format: xml or json\n" "\t-f <fmt>\tDatabase format: xml or json\n"
"\t-x <xml>\tXML file. Alternative to put <xml> argument\n" "\t-x <xml>\tXML file. Alternative to put <xml> argument\n"
"\t-y <file>\tYang file. Mandatory\n" "\t-y <file>\tYang file. Mandatory\n"
"and command is either:\n" "\t-Y <dir> \tYang dirs (can be several)\n"
"\tget [<xpath>]\n" "and command is either:\n"
"\tmget <nr> [<xpath>]\n" "\tget [<xpath>]\n"
"\tput (merge|replace|create|delete|remove) [<xml>]\n" "\tmget <nr> [<xpath>]\n"
"\tcopy <todb>\n" "\tput (merge|replace|create|delete|remove) [<xml>]\n"
"\tlock <pid>\n" "\tcopy <todb>\n"
"\tunlock\n" "\tlock <pid>\n"
"\tunlock_all <pid>\n" "\tunlock\n"
"\tislocked\n" "\tunlock_all <pid>\n"
"\texists\n" "\tislocked\n"
"\tdelete\n" "\texists\n"
"\tinit\n" "\tdelete\n"
, "\tinit\n"
argv0 ,
); argv0
);
exit(0); exit(0);
} }
@ -122,6 +123,7 @@ main(int argc, char **argv)
cbuf *cbret = NULL; cbuf *cbret = NULL;
int dbg = 0; int dbg = 0;
cxobj *xerr = NULL; cxobj *xerr = NULL;
cxobj *xcfg = NULL;
/* In the startup, logs to stderr & debug flag set later */ /* In the startup, logs to stderr & debug flag set later */
clicon_log_init(__FILE__, LOG_INFO, CLICON_LOG_STDERR); clicon_log_init(__FILE__, LOG_INFO, CLICON_LOG_STDERR);
@ -130,6 +132,10 @@ main(int argc, char **argv)
/* Defaults */ /* Defaults */
if ((h = clicon_handle_init()) == NULL) if ((h = clicon_handle_init()) == NULL)
goto done; goto done;
if ((xcfg = xml_new("clixon-config", NULL, CX_ELMNT)) == NULL)
goto done;
if (clicon_conf_xml_set(h, xcfg) < 0)
goto done;
/* getopt in two steps, first find config-file before over-riding options. */ /* getopt in two steps, first find config-file before over-riding options. */
clicon_option_str_set(h, "CLICON_XMLDB_FORMAT", "xml"); /* default */ clicon_option_str_set(h, "CLICON_XMLDB_FORMAT", "xml"); /* default */
while ((c = getopt(argc, argv, DATASTORE_OPTS)) != -1) while ((c = getopt(argc, argv, DATASTORE_OPTS)) != -1)
@ -166,6 +172,10 @@ main(int argc, char **argv)
usage(argv0); usage(argv0);
yangfilename = optarg; yangfilename = optarg;
break; break;
case 'Y':
if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
goto done;
break;
} }
/* /*
* Logs, error and debug to stderr, set debug level * Logs, error and debug to stderr, set debug level
@ -206,7 +216,7 @@ main(int argc, char **argv)
xpath = "/"; xpath = "/";
if (xmldb_get(h, db, NULL, xpath, &xt) < 0) if (xmldb_get(h, db, NULL, xpath, &xt) < 0)
goto done; goto done;
if (clixon_xml2file(stdout, xt, 0, 0, fprintf, 0) < 0) if (clixon_xml2file(stdout, xt, 0, 0, fprintf, 0, 0) < 0)
goto done; goto done;
fprintf(stdout, "\n"); fprintf(stdout, "\n");
if (xt){ if (xt){
@ -230,7 +240,7 @@ main(int argc, char **argv)
clicon_err(OE_DB, 0, "xt is NULL"); clicon_err(OE_DB, 0, "xt is NULL");
goto done; goto done;
} }
if (clixon_xml2file(stdout, xt, 0, 0, fprintf, 0) < 0) if (clixon_xml2file(stdout, xt, 0, 0, fprintf, 0, 0) < 0)
goto done; goto done;
if (xt){ if (xt){
xml_free(xt); xml_free(xt);
@ -341,6 +351,8 @@ main(int argc, char **argv)
goto done; goto done;
retval = 0; retval = 0;
done: done:
if (xcfg)
xml_free(xcfg);
if (cbret) if (cbret)
cbuf_free(cbret); cbuf_free(cbret);
if (xt) if (xt)

2
util/clixon_util_json.c
View file

@ -144,7 +144,7 @@ main(int argc,
goto done; goto done;
} }
if (json){ if (json){
if (clixon_json2cbuf(cb, xt, pretty, 1) < 0) if (clixon_json2cbuf(cb, xt, pretty, 1, 0) < 0)
goto done; goto done;
} }
else if (clixon_xml2cbuf(cb, xt, 0, pretty, -1, 1) < 0) else if (clixon_xml2cbuf(cb, xt, 0, pretty, -1, 1) < 0)

2
util/clixon_util_path.c
View file

@ -281,7 +281,7 @@ main(int argc,
for (i = 0; i < xlen; i++){ for (i = 0; i < xlen; i++){
xc = xvec[i]; xc = xvec[i];
fprintf(stdout, "%d: ", i); fprintf(stdout, "%d: ", i);
clixon_xml2file(stdout, xc, 0, 0, fprintf, 0); clixon_xml2file(stdout, xc, 0, 0, fprintf, 0, 0);
fprintf(stdout, "\n"); fprintf(stdout, "\n");
fflush(stdout); fflush(stdout);
} }

4
util/clixon_util_xml.c
View file

@ -334,11 +334,11 @@ main(int argc,
/* 4. Output data (xml/json/text) */ /* 4. Output data (xml/json/text) */
if (output){ if (output){
if (textout){ if (textout){
if (clixon_txt2file(stdout, xt, 0, fprintf, 1) < 0) if (clixon_txt2file(stdout, xt, 0, fprintf, 1, 0) < 0)
goto done; goto done;
} }
else if (jsonout){ else if (jsonout){
if (clixon_json2cbuf(cb, xt, pretty, 1) < 0) if (clixon_json2cbuf(cb, xt, pretty, 1, 0) < 0)
goto done; goto done;
} }
else if (clixon_xml2cbuf(cb, xt, 0, pretty, -1, 1) < 0) else if (clixon_xml2cbuf(cb, xt, 0, pretty, -1, 1) < 0)

4
util/clixon_util_xml_mod.c
View file

@ -282,11 +282,11 @@ main(int argc, char **argv)
if (sort) if (sort)
xml_sort_recurse(xb); xml_sort_recurse(xb);
if (strcmp(xml_name(xb),"top")==0){ if (strcmp(xml_name(xb),"top")==0){
if (clixon_xml2file(stdout, xb, 0, 0, fprintf, 1) < 0) if (clixon_xml2file(stdout, xb, 0, 0, fprintf, 1, 0) < 0)
goto done; goto done;
} }
else{ else{
if (clixon_xml2file(stdout, xb, 0, 0, fprintf, 0) < 0) if (clixon_xml2file(stdout, xb, 0, 0, fprintf, 0, 0) < 0)
goto done; goto done;
} }
fprintf(stdout, "\n"); fprintf(stdout, "\n");