Break out init of orig-ptr to yang_start() to be made after options

This commit is contained in:
Olof hagsand 2024-09-28 18:04:04 +02:00
parent ba40f5a929
commit 43bfc82942
8 changed files with 24 additions and 3 deletions

View file

@ -829,6 +829,7 @@ main(int argc,
if (nacm_load_external(h) < 0)
goto done;
}
yang_start(h);
/* Create top-level data yangs */
if ((yspec = yspec_new(h, YANG_DATA_TOP)) == NULL)
goto done;

View file

@ -842,8 +842,10 @@ main(int argc,
/* In case ietf-yang-metadata is loaded by application, handle annotation extension */
if (yang_metadata_init(h) < 0)
goto done;
yang_start(h);
/* Set default namespace according to CLICON_NAMESPACE_NETCONF_DEFAULT */
xml_nsctx_namespace_netconf_default(h);
/* Create top-level and store as option */
if ((yspec = yspec_new(h, YANG_DATA_TOP)) == NULL)
goto done;

View file

@ -866,6 +866,7 @@ main(int argc,
/* Initialize plugin module by creating a handle holding plugin and callback lists */
if (clixon_plugin_module_init(h) < 0)
goto done;
yang_start(h);
/* In case ietf-yang-metadata is loaded by application, handle annotation extension */
if (yang_metadata_init(h) < 0)
goto done;

View file

@ -1353,6 +1353,7 @@ main(int argc,
/* Initialize plugin module by creating a handle holding plugin and callback lists */
if (clixon_plugin_module_init(h) < 0)
goto done;
yang_start(h);
/* Call start function in all plugins before we go interactive */
if (clixon_plugin_start_all(h) < 0)
goto done;

View file

@ -511,7 +511,7 @@ main(int argc,
/* Set default namespace according to CLICON_NAMESPACE_NETCONF_DEFAULT */
xml_nsctx_namespace_netconf_default(h);
yang_start(h);
/* Add (hardcoded) netconf features in case ietf-netconf loaded here
* Otherwise it is loaded in netconf_module_load below
*/