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

renamed xml_spec_populate*() to xml_bind_yang*()

Browse source
This commit is contained in:
Olof hagsand 2020-03-17 15:55:47 +01:00
parent c5e2039cac
commit b726c5008e
17 changed files with 191 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/backend/backend_client.c
View file

@ -670,7 +670,7 @@ from_client_edit_config(clicon_handle h,
xml_spec_set(xc, NULL);
/* Populate XML with Yang spec (why not do this in parser?)
*/
if (xml_spec_populate(xc, yspec, NULL) < 0)
if (xml_bind_yang(xc, yspec, NULL) < 0)
goto done;
/* Maybe validate xml here as in text_modify_top? */
if (xml_apply(xc, CX_ELMNT, xml_non_config_data, &non_config) < 0)
@ -1593,7 +1593,7 @@ from_client_msg(clicon_handle h,
* should really have been dealt with by decode above
* but it still is needed - test_cli debug test fails
*/
if (xml_spec_populate_rpc(x, yspec, NULL) < 0)
if (xml_bind_yang_rpc(x, yspec, NULL) < 0)
goto done;
if ((ret = xml_yang_validate_rpc(h, x, &xret)) < 0)
goto done;

2
apps/backend/backend_commit.c
View file

@ -214,7 +214,7 @@ startup_common(clicon_handle h,
goto done;
}
/* After upgrading, XML tree needs to be sorted and yang spec populated */
if (xml_spec_populate(xt, yspec, NULL) < 0)
if (xml_bind_yang(xt, yspec, NULL) < 0)
goto done;
if (xml_apply0(xt, CX_ELMNT, xml_sort, h) < 0)
goto done;

2
apps/backend/backend_plugin.c
View file

@ -128,7 +128,7 @@ clixon_plugin_statedata(clicon_handle h,
if (debug)
clicon_log_xml(LOG_DEBUG, x, "%s STATE:", __FUNCTION__);
#endif
if (xml_spec_populate(x, yspec, NULL) < 0)
if (xml_bind_yang(x, yspec, NULL) < 0)
goto done;
if ((ret = netconf_trymerge(x, yspec, xret)) < 0)
goto done;