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

Added new DOMAIN level in YANG spec structure

Browse source
This commit is contained in:
Olof hagsand 2024-10-06 09:18:24 +02:00
parent 0c8aef0291
commit f0bd103e79
17 changed files with 201 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

25
apps/backend/backend_client.c
View file

@ -1419,20 +1419,22 @@ from_client_stats(clixon_handle h,
{ {
int retval = -1; int retval = -1;
uint64_t nr; uint64_t nr;
yang_stmt *ym;
char *str; char *str;
int modules = 0; int modules = 0;
yang_stmt *yspec; yang_stmt *yspec0;
yang_stmt *ymounts; yang_stmt *ymounts;
yang_stmt *ydomain; yang_stmt *ydomain;
yang_stmt *yspec;
yang_stmt *ymodule;
cxobj *xt = NULL; cxobj *xt = NULL;
char *name; char *domain;
int inext; int inext;
int inext2; int inext2;
int inext3;
if ((str = xml_find_body(xe, "modules")) != NULL) if ((str = xml_find_body(xe, "modules")) != NULL)
modules = strcmp(str, "true") == 0; modules = strcmp(str, "true") == 0;
yspec = clicon_dbspec_yang(h); yspec0 = clicon_dbspec_yang(h);
cprintf(cbret, "<rpc-reply xmlns=\"%s\">", NETCONF_BASE_NAMESPACE); cprintf(cbret, "<rpc-reply xmlns=\"%s\">", NETCONF_BASE_NAMESPACE);
cprintf(cbret, "<global xmlns=\"%s\">", CLIXON_LIB_NS); cprintf(cbret, "<global xmlns=\"%s\">", CLIXON_LIB_NS);
nr=0; nr=0;
@ -1447,7 +1449,7 @@ from_client_stats(clixon_handle h,
goto done; goto done;
if (clixon_stats_datastore_get(h, "candidate", cbret) < 0) if (clixon_stats_datastore_get(h, "candidate", cbret) < 0)
goto done; goto done;
if (if_feature(yspec, "ietf-netconf", "startup")) if (if_feature(yspec0, "ietf-netconf", "startup"))
if (clixon_stats_datastore_get(h, "startup", cbret) < 0) if (clixon_stats_datastore_get(h, "startup", cbret) < 0)
goto done; goto done;
cprintf(cbret, "</datastores>"); cprintf(cbret, "</datastores>");
@ -1458,21 +1460,24 @@ from_client_stats(clixon_handle h,
cprintf(cbret, "<module-sets xmlns=\"%s\">", CLIXON_LIB_NS); cprintf(cbret, "<module-sets xmlns=\"%s\">", CLIXON_LIB_NS);
inext = 0; inext = 0;
while ((ydomain = yn_iter(ymounts, &inext)) != NULL) { while ((ydomain = yn_iter(ymounts, &inext)) != NULL) {
name = yang_argument_get(ydomain); domain = yang_argument_get(ydomain);
/* per module-set, first configuration, then main dbspec, then mountpoints */ /* per module-set, first configuration, then main dbspec, then mountpoints */
cprintf(cbret, "<module-set>"); cprintf(cbret, "<module-set>");
cprintf(cbret, "<name>%s</name>", name); cprintf(cbret, "<name>%s</name>", domain);
if (clixon_stats_module_get(h, ydomain, cbret) < 0) if (clixon_stats_module_get(h, ydomain, cbret) < 0)
goto done; goto done;
if (modules){ if (modules){
inext2 = 0; inext2 = 0;
while ((ym = yn_iter(ydomain, &inext2)) != NULL) { while ((yspec = yn_iter(ydomain, &inext2)) != NULL) {
cprintf(cbret, "<module><name>%s</name>", yang_argument_get(ym)); inext3 = 0;
if (clixon_stats_module_get(h, ym, cbret) < 0) while ((ymodule = yn_iter(yspec, &inext3)) != NULL) {
cprintf(cbret, "<module><name>%s</name>", yang_argument_get(ymodule));
if (clixon_stats_module_get(h, ymodule, cbret) < 0)
goto done; goto done;
cprintf(cbret, "</module>"); cprintf(cbret, "</module>");
} }
} }
}
cprintf(cbret, "</module-set>"); cprintf(cbret, "</module-set>");
} }
cprintf(cbret, "</module-sets>"); cprintf(cbret, "</module-sets>");

4
apps/backend/backend_main.c
View file

@ -221,7 +221,7 @@ nacm_load_external(clixon_handle h)
clixon_err(OE_UNIX, errno, "configure file: %s", filename); clixon_err(OE_UNIX, errno, "configure file: %s", filename);
return -1; return -1;
} }
if ((yspec = yspec_new(h, YANG_NACM_TOP)) == NULL) if ((yspec = yspec_new1(h, YANG_DOMAIN_TOP, YANG_NACM_TOP)) == NULL)
goto done; goto done;
if (yang_spec_parse_module(h, "ietf-netconf-acm", NULL, yspec) < 0) if (yang_spec_parse_module(h, "ietf-netconf-acm", NULL, yspec) < 0)
goto done; goto done;
@ -831,7 +831,7 @@ main(int argc,
} }
yang_start(h); yang_start(h);
/* Create top-level data yangs */ /* Create top-level data yangs */
if ((yspec = yspec_new(h, YANG_DATA_TOP)) == NULL) if ((yspec = yspec_new1(h, YANG_DOMAIN_TOP, YANG_DATA_TOP)) == NULL)
goto done; goto done;
/* Load backend plugins before yangs are loaded (eg extension callbacks) */ /* Load backend plugins before yangs are loaded (eg extension callbacks) */

33
apps/cli/cli_generate.c
View file

@ -270,7 +270,8 @@ yang2cli_print_alias(cbuf *cb,
* @param[out] cb CLIgen buf * @param[out] cb CLIgen buf
* @param[in] delim Delimiter string that may not occur in any of the elements (except the last) * @param[in] delim Delimiter string that may not occur in any of the elements (except the last)
* @param[in] tag Context-specific tag, eg "grouping" * @param[in] tag Context-specific tag, eg "grouping"
* @param[in] domain Domain name (= yspec name) * @param[in] domain Domain name
* @param[in] spec yspec name
* @param[in] module Name of module (in domain context) * @param[in] module Name of module (in domain context)
* @param[in] id Top-level nodeid (schema-id) * @param[in] id Top-level nodeid (schema-id)
* @retval 0 Ok * @retval 0 Ok
@ -281,15 +282,17 @@ yang2cli_cmd_encode(cbuf *cb,
const char *delim, const char *delim,
char *tag, char *tag,
char *domain, char *domain,
char *spec,
char *module, char *module,
char *id) char *id)
{ {
if (tag == NULL || domain == NULL || module == NULL || id == NULL){ if (tag == NULL || domain == NULL || spec == NULL || module == NULL || id == NULL){
clixon_err(OE_YANG, EINVAL, "tag, domain, module or id is NULL"); clixon_err(OE_YANG, EINVAL, "tag, domain, module or id is NULL");
return -1; return -1;
} }
cprintf(cb, "%s", tag); cprintf(cb, "%s", tag);
cprintf(cb, "%s%s", delim, domain); cprintf(cb, "%s%s", delim, domain);
cprintf(cb, "%s%s", delim, spec);
cprintf(cb, "%s%s", delim, module); cprintf(cb, "%s%s", delim, module);
cprintf(cb, "%s%s", delim, id); cprintf(cb, "%s%s", delim, id);
return 0; return 0;
@ -300,7 +303,8 @@ yang2cli_cmd_encode(cbuf *cb,
* @param[in] cmd CLIgen cmd string * @param[in] cmd CLIgen cmd string
* @param[in] delim Delimiter string that may not occur in any of the elements (except the last) * @param[in] delim Delimiter string that may not occur in any of the elements (except the last)
* @param[out] tag Context-specific tag, eg "grouping" * @param[out] tag Context-specific tag, eg "grouping"
* @param[out] domain Domain name (= yspec name) * @param[out] domain Domain name
* @param[out] spec Yspec name
* @param[out] module Name of module (in domain context) * @param[out] module Name of module (in domain context)
* @param[out] id Top-level nodeid (schema-id) * @param[out] id Top-level nodeid (schema-id)
* @retval 0 Ok * @retval 0 Ok
@ -311,6 +315,7 @@ yang2cli_cmd_decode(char *cmd,
const char *delim, const char *delim,
char **tag, char **tag,
char **domain, char **domain,
char **spec,
char **modname, char **modname,
char **id) char **id)
{ {
@ -339,6 +344,13 @@ yang2cli_cmd_decode(char *cmd,
goto ok; goto ok;
*s2 = '\0'; *s2 = '\0';
s2 += strlen(delim); s2 += strlen(delim);
if (spec)
*spec = s2;
s1 = s2;
if ((s2 = strstr(s1, delim)) == NULL)
goto ok;
*s2 = '\0';
s2 += strlen(delim);
if (modname) if (modname)
*modname = s2; *modname = s2;
s1 = s2; s1 = s2;
@ -1307,6 +1319,7 @@ yang2cli_uses(clixon_handle h,
if ((ns = yang_find_mynamespace(ygrouping)) == NULL) if ((ns = yang_find_mynamespace(ygrouping)) == NULL)
goto done; goto done;
if (yang2cli_cmd_encode(cbtree, AUTOCLI_CMD_DELIM, "grouping", if (yang2cli_cmd_encode(cbtree, AUTOCLI_CMD_DELIM, "grouping",
yang_argument_get(ys_domain(ygrouping)),
yang_argument_get(ys_spec(ygrouping)), yang_argument_get(ys_spec(ygrouping)),
yang_argument_get(ys_module(ygrouping)), yang_argument_get(ys_module(ygrouping)),
id) < 0) id) < 0)
@ -1897,11 +1910,13 @@ yang2cli_grouping_wrap(cligen_handle ch,
int retval = -1; int retval = -1;
clixon_handle h; clixon_handle h;
yang_stmt *ymnt; yang_stmt *ymnt;
yang_stmt *ydomain;
yang_stmt *yspec; yang_stmt *yspec;
yang_stmt *ymod; yang_stmt *ymod;
yang_stmt *ygrouping; yang_stmt *ygrouping;
char *tag = NULL; char *tag = NULL;
char *domain = NULL; char *domain = NULL;
char *spec = NULL;
char *modname = NULL; char *modname = NULL;
char *grouping = NULL; char *grouping = NULL;
int ret; int ret;
@ -1912,7 +1927,7 @@ yang2cli_grouping_wrap(cligen_handle ch,
} }
h = cligen_userhandle(ch); h = cligen_userhandle(ch);
yspec = clicon_dbspec_yang(h); yspec = clicon_dbspec_yang(h);
if (yang2cli_cmd_decode(name, AUTOCLI_CMD_DELIM, &tag, &domain, &modname, &grouping) < 0) if (yang2cli_cmd_decode(name, AUTOCLI_CMD_DELIM, &tag, &domain, &spec, &modname, &grouping) < 0)
goto done; goto done;
if (tag == NULL || strcmp(tag, "grouping") != 0) if (tag == NULL || strcmp(tag, "grouping") != 0)
goto ok; goto ok;
@ -1920,13 +1935,17 @@ yang2cli_grouping_wrap(cligen_handle ch,
*namep = strdup(name); *namep = strdup(name);
goto ok; goto ok;
} }
if (domain == NULL || modname == NULL || grouping == NULL){ if (domain == NULL || spec == NULL || modname == NULL || grouping == NULL){
clixon_err(OE_YANG, 0, "yang2cli cmd label invalid format"); clixon_err(OE_YANG, 0, "yang2cli cmd label invalid format");
goto done; goto done;
} }
ymnt = clixon_yang_mounts_get(h); ymnt = clixon_yang_mounts_get(h);
if ((yspec = yang_find(ymnt, Y_SPEC, domain)) == NULL){ if ((ydomain = yang_find(ymnt, Y_DOMAIN, domain)) == NULL){
clixon_err(OE_YANG, 0, "yang2cli cmd label no yspec %s", domain); clixon_err(OE_YANG, 0, "yang2cli cmd label no ydomain %s", domain);
goto done;
}
if ((yspec = yang_find(ydomain, Y_SPEC, spec)) == NULL){
clixon_err(OE_YANG, 0, "yang2cli cmd label no yspec %s", spec);
goto done; goto done;
} }
if ((ymod = yang_find(yspec, 0, modname)) == NULL){ if ((ymod = yang_find(yspec, 0, modname)) == NULL){

4
apps/cli/cli_generate.h
View file

@ -63,8 +63,8 @@
/* /*
* Prototypes * Prototypes
*/ */
int yang2cli_cmd_encode(cbuf *cb, const char *delim, char *tag, char *domain, char *modname, char *id); int yang2cli_cmd_encode(cbuf *cb, const char *delim, char *tag, char *domain, char *spec, char *modname, char *id);
int yang2cli_cmd_decode(char *cmd, const char *delim, char **tag, char **domain, char **modname, char **id); int yang2cli_cmd_decode(char *cmd, const char *delim, char **tag, char **domain, char **spec, char **modname, char **id);
int yang2cli_grouping(clixon_handle h, yang_stmt *ys, char *treename); int yang2cli_grouping(clixon_handle h, yang_stmt *ys, char *treename);
int yang2cli_yspec(clixon_handle h, yang_stmt *yspec, char *treename); int yang2cli_yspec(clixon_handle h, yang_stmt *yspec, char *treename);
int yang2cli_grouping_wrap(cligen_handle ch, char *name, cvec *cvt, void *arg, char **namep); int yang2cli_grouping_wrap(cligen_handle ch, char *name, cvec *cvt, void *arg, char **namep);

2
apps/cli/cli_main.c
View file

@ -847,7 +847,7 @@ main(int argc,
xml_nsctx_namespace_netconf_default(h); xml_nsctx_namespace_netconf_default(h);
/* Create top-level and store as option */ /* Create top-level and store as option */
if ((yspec = yspec_new(h, YANG_DATA_TOP)) == NULL) if ((yspec = yspec_new1(h, YANG_DOMAIN_TOP, YANG_DATA_TOP)) == NULL)
goto done; goto done;
/* Load Yang modules /* Load Yang modules

2
apps/netconf/netconf_main.c
View file

@ -871,7 +871,7 @@ main(int argc,
if (yang_metadata_init(h) < 0) if (yang_metadata_init(h) < 0)
goto done; goto done;
/* Create top-level yang spec and store as option */ /* Create top-level yang spec and store as option */
if ((yspec = yspec_new(h, YANG_DATA_TOP)) == NULL) if ((yspec = yspec_new1(h, YANG_DOMAIN_TOP, YANG_DATA_TOP)) == NULL)
goto done; goto done;
/* Load netconf plugins before yangs are loaded (eg extension callbacks) */ /* Load netconf plugins before yangs are loaded (eg extension callbacks) */

2
apps/restconf/restconf_main_fcgi.c
View file

@ -498,7 +498,7 @@ main(int argc,
goto done; goto done;
/* Create top-level yang spec and store as option */ /* Create top-level yang spec and store as option */
if ((yspec = yspec_new(h, YANG_DATA_TOP)) == NULL) if ((yspec = yspec_new1(h, YANG_DOMAIN_TOP, YANG_DATA_TOP)) == NULL)
goto done; goto done;
/* Initialize plugin module by creating a handle holding plugin and callback lists */ /* Initialize plugin module by creating a handle holding plugin and callback lists */

2
apps/restconf/restconf_main_native.c
View file

@ -967,7 +967,7 @@ restconf_clixon_init(clixon_handle h,
if (yang_metadata_init(h) < 0) if (yang_metadata_init(h) < 0)
goto done; goto done;
/* Create top-level yang spec and store as option */ /* Create top-level yang spec and store as option */
if ((yspec = yspec_new(h, YANG_DATA_TOP)) == NULL) if ((yspec = yspec_new1(h, YANG_DOMAIN_TOP, YANG_DATA_TOP)) == NULL)
goto done; goto done;
/* Load restconf plugins before yangs are loaded (eg extension callbacks) */ /* Load restconf plugins before yangs are loaded (eg extension callbacks) */

2
apps/snmp/snmp_main.c
View file

@ -519,7 +519,7 @@ main(int argc,
goto done; goto done;
/* Create top-level yang spec and store as option */ /* Create top-level yang spec and store as option */
if ((yspec = yspec_new(h, YANG_DATA_TOP)) == NULL) if ((yspec = yspec_new1(h, YANG_DOMAIN_TOP, YANG_DATA_TOP)) == NULL)
goto done; goto done;
/* Load Yang modules /* Load Yang modules

9
lib/clixon/clixon_yang.h
View file

@ -102,6 +102,7 @@
*/ */
/*! Names of top-level data YANGs /*! Names of top-level data YANGs
*/ */
#define YANG_DOMAIN_TOP "top"
#define YANG_DATA_TOP "data" /* "dbspec" */ #define YANG_DATA_TOP "data" /* "dbspec" */
#define YANG_CONFIG_TOP "config" #define YANG_CONFIG_TOP "config"
#define YANG_NACM_TOP "nacm_ext_yang" #define YANG_NACM_TOP "nacm_ext_yang"
@ -190,8 +191,9 @@ enum rfc_6020{
Y_YANG_VERSION, Y_YANG_VERSION,
Y_YIN_ELEMENT, Y_YIN_ELEMENT,
/* Note, from here not actual yang statement from the RFC */ /* Note, from here not actual yang statement from the RFC */
Y_MOUNTS, /* Top-level all mounts */ Y_MOUNTS, /* Top-level root single object, see clixon_yang_mounts_get() */
Y_SPEC /* Specifications on top, config or mount-points */ Y_DOMAIN, /* YANG domain: many module revisions allowed but name+revision unique */
Y_SPEC /* Module set for single data, config and mount-point: unique module name */
}; };
/* Type used to group yang nodes used in some functions /* Type used to group yang nodes used in some functions
@ -286,7 +288,9 @@ int yang_stats(yang_stmt *y, enum rfc_6020 keyw, uint64_t *nrp, size_t *s
/* Other functions */ /* Other functions */
yang_stmt *yspec_new(clixon_handle h, char *name); yang_stmt *yspec_new(clixon_handle h, char *name);
yang_stmt *yspec_new1(clixon_handle h, char *domain, char *name);
yang_stmt *yspec_new_shared(clixon_handle h, char *name, char *domain, yang_stmt *yspec0); yang_stmt *yspec_new_shared(clixon_handle h, char *name, char *domain, yang_stmt *yspec0);
yang_stmt *ydomain_new(clixon_handle h, char *domain);
yang_stmt *ys_new(enum rfc_6020 keyw); yang_stmt *ys_new(enum rfc_6020 keyw);
yang_stmt *ys_prune(yang_stmt *yp, int i); yang_stmt *ys_prune(yang_stmt *yp, int i);
int ys_prune_self(yang_stmt *ys); int ys_prune_self(yang_stmt *ys);
@ -304,6 +308,7 @@ int ys_module_by_xml(yang_stmt *ysp, struct xml *xt, yang_stmt **ymodp);
yang_stmt *ys_module(yang_stmt *ys); yang_stmt *ys_module(yang_stmt *ys);
int ys_real_module(yang_stmt *ys, yang_stmt **ymod); int ys_real_module(yang_stmt *ys, yang_stmt **ymod);
yang_stmt *ys_spec(yang_stmt *ys); yang_stmt *ys_spec(yang_stmt *ys);
yang_stmt *ys_domain(yang_stmt *ys);
yang_stmt *ys_mounts(yang_stmt *ys); yang_stmt *ys_mounts(yang_stmt *ys);
yang_stmt *yang_find(yang_stmt *yn, int keyword, const char *argument); yang_stmt *yang_find(yang_stmt *yn, int keyword, const char *argument);
yang_stmt *yang_find_datanode(yang_stmt *yn, char *argument); yang_stmt *yang_find_datanode(yang_stmt *yn, char *argument);

24
lib/src/clixon_data.c
View file

@ -354,11 +354,13 @@ clixon_yang_mounts_set(clixon_handle h,
yang_stmt * yang_stmt *
clicon_dbspec_yang(clixon_handle h) clicon_dbspec_yang(clixon_handle h)
{ {
yang_stmt *ymounts;
yang_stmt *ydomain;
yang_stmt *ys = NULL; yang_stmt *ys = NULL;
yang_stmt *ymounts = NULL;
if ((ymounts = clixon_yang_mounts_get(h)) != NULL) if ((ymounts = clixon_yang_mounts_get(h)) != NULL &&
ys = yang_find(ymounts, Y_SPEC, YANG_DATA_TOP); (ydomain = yang_find(ymounts, Y_DOMAIN, YANG_DOMAIN_TOP)) != NULL)
ys = yang_find(ydomain, Y_SPEC, YANG_DATA_TOP);
return ys; return ys;
} }
@ -371,11 +373,13 @@ clicon_dbspec_yang(clixon_handle h)
yang_stmt * yang_stmt *
clicon_config_yang(clixon_handle h) clicon_config_yang(clixon_handle h)
{ {
yang_stmt *ymounts = NULL; yang_stmt *ymounts;
yang_stmt *ydomain;
yang_stmt *ys = NULL; yang_stmt *ys = NULL;
if ((ymounts = clixon_yang_mounts_get(h)) != NULL) if ((ymounts = clixon_yang_mounts_get(h)) != NULL &&
ys = yang_find(ymounts, Y_SPEC, YANG_CONFIG_TOP); (ydomain = yang_find(ymounts, Y_DOMAIN, YANG_DOMAIN_TOP)) != NULL)
ys = yang_find(ydomain, Y_SPEC, YANG_CONFIG_TOP);
return ys; return ys;
} }
@ -388,11 +392,13 @@ clicon_config_yang(clixon_handle h)
yang_stmt * yang_stmt *
clicon_nacm_ext_yang(clixon_handle h) clicon_nacm_ext_yang(clixon_handle h)
{ {
yang_stmt *ymounts = NULL; yang_stmt *ymounts;
yang_stmt *ydomain;
yang_stmt *ys = NULL; yang_stmt *ys = NULL;
if ((ymounts = clixon_yang_mounts_get(h)) != NULL) if ((ymounts = clixon_yang_mounts_get(h)) != NULL &&
ys = yang_find(ymounts, Y_SPEC, YANG_NACM_TOP); (ydomain = yang_find(ymounts, Y_DOMAIN, YANG_DOMAIN_TOP)) != NULL)
ys = yang_find(ydomain, Y_SPEC, YANG_NACM_TOP);
return ys; return ys;
} }

2
lib/src/clixon_datastore_read.c
View file

@ -708,7 +708,7 @@ xmldb_readfile(clixon_handle h,
* Same ymodules are inserted into yspec1, ie pointers only * Same ymodules are inserted into yspec1, ie pointers only
*/ */
if (needclone && xmodfile){ if (needclone && xmodfile){
if ((yspec1 = yspec_new(h, "tmp")) == NULL) if ((yspec1 = yspec_new1(h, YANG_DOMAIN_TOP, "tmp")) == NULL)
goto done; goto done;
xmsd = NULL; xmsd = NULL;
while ((xmsd = xml_child_each(xmodfile, xmsd, CX_ELMNT)) != NULL) { while ((xmsd = xml_child_each(xmodfile, xmsd, CX_ELMNT)) != NULL) {

2
lib/src/clixon_options.c
View file

@ -639,7 +639,7 @@ clicon_options_main(clixon_handle h)
char *yangspec = "clixon-config"; char *yangspec = "clixon-config";
/* Create configure yang-spec */ /* Create configure yang-spec */
if ((yspec = yspec_new(h, YANG_CONFIG_TOP)) == NULL) if ((yspec = yspec_new1(h, YANG_DOMAIN_TOP, YANG_CONFIG_TOP)) == NULL)
goto done; goto done;
/* /*
* Set configure file if not set by command-line above * Set configure file if not set by command-line above

103
lib/src/clixon_yang.c
View file

@ -260,6 +260,8 @@ yang_argument_set(yang_stmt *ys,
* *
* @param[in] ys Yang statement node * @param[in] ys Yang statement node
* @param[in] arg Argument, is copied * @param[in] arg Argument, is copied
* @retval 0 Ok
* @retval -1 Error
*/ */
int int
yang_argument_dup(yang_stmt *ys, yang_argument_dup(yang_stmt *ys,
@ -829,27 +831,53 @@ yang_stats(yang_stmt *yt,
/* stats end */ /* stats end */
/*! Create new yang specification, addd as child to top-level yang_mounts /*! Create new yang specification for top domain, add as child to top-level yang_mounts
* *
* @retval yspec Free with ys_free() * @param[in] h Clixon handle
* @param[in] domain Yang domain
* @param[in] name Yang spec name
* @retval yspec Yang spec, free with ys_free
* @retval NULL Error * @retval NULL Error
* XXX Backward-compatible 7.1
*/ */
yang_stmt * yang_stmt *
yspec_new(clixon_handle h, yspec_new(clixon_handle h,
char *name) char *name)
{
return yspec_new1(h, YANG_DOMAIN_TOP, name);
}
/*! Create new yang specification, addd as child to top-level yang_mounts
*
* @param[in] h Clixon handle
* @param[in] domain Yang domain
* @param[in] name Yang spec name
* @retval yspec Yang spec, free with ys_free
* @retval NULL Error
* @see yspec_new Hardcoded to top-domain
*/
yang_stmt *
yspec_new1(clixon_handle h,
char *domain,
char *name)
{ {
yang_stmt *ymounts; yang_stmt *ymounts;
yang_stmt *ydomain;
yang_stmt *yspec; yang_stmt *yspec;
if ((ymounts = clixon_yang_mounts_get(h)) == NULL){ if ((ymounts = clixon_yang_mounts_get(h)) == NULL){
clixon_err(OE_YANG, 0, "Yang-mounts not created"); clixon_err(OE_YANG, 0, "Yang-mounts not created");
goto done; goto done;
} }
if ((ydomain = yang_find(ymounts, Y_DOMAIN, domain)) == NULL){
clixon_err(OE_YANG, 0, "Yang domain %s not found", domain);
goto done;
}
if ((yspec = ys_new(Y_SPEC)) == NULL) if ((yspec = ys_new(Y_SPEC)) == NULL)
goto done; goto done;
if (yang_argument_dup(yspec, name) < 0) if (name != NULL && yang_argument_dup(yspec, name) < 0)
goto done; goto done;
if (yn_insert(ymounts, yspec) < 0) if (yn_insert(ydomain, yspec) < 0)
goto done; goto done;
return yspec; return yspec;
done: done:
@ -876,7 +904,8 @@ yspec_new_shared(clixon_handle h,
yspec1 = yspec0; yspec1 = yspec0;
} }
else { else {
if ((yspec1 = yspec_new(h, domain)) == NULL) // XXX domain used as name
if ((yspec1 = yspec_new1(h, domain, domain)) == NULL)
goto done; goto done;
yang_flag_set(yspec1, YANG_FLAG_SPEC_MOUNT); yang_flag_set(yspec1, YANG_FLAG_SPEC_MOUNT);
clixon_debug(CLIXON_DBG_YANG, "new yang-spec: %p", yspec1); clixon_debug(CLIXON_DBG_YANG, "new yang-spec: %p", yspec1);
@ -889,6 +918,39 @@ yspec_new_shared(clixon_handle h,
return yspec1; return yspec1;
} }
/*! Create new yang domain
*
* @param[in] h Clixon handle
* @param[in] domain Yang domain name
* @retval ydomain Yang spec, free with ys_free
* @retval NULL Error
*/
yang_stmt *
ydomain_new(clixon_handle h,
char *domain)
{
yang_stmt *ymounts;
yang_stmt *ydomain;
if (domain == NULL){
clixon_err(OE_YANG, EINVAL, "domain is NULL");
goto done;
}
if ((ymounts = clixon_yang_mounts_get(h)) == NULL){
clixon_err(OE_YANG, 0, "Yang-mounts not created");
goto done;
}
if ((ydomain = ys_new(Y_DOMAIN)) == NULL)
goto done;
if (yang_argument_dup(ydomain, domain) < 0)
goto done;
if (yn_insert(ymounts, ydomain) < 0)
goto done;
return ydomain;
done:
return NULL;
}
/*! Create new yang node/statement given size /*! Create new yang node/statement given size
* *
* Size parameter for variable size, eg extended YANG struct * Size parameter for variable size, eg extended YANG struct
@ -2156,10 +2218,10 @@ ys_real_module(yang_stmt *ys,
return retval; return retval;
} }
/*! Find top of tree, the yang specification from within the tree /*! Find spec tree, the yang specification from within the tree
* *
* @param[in] ys Any yang statement in a yang tree * @param[in] ys Any yang statement in a yang tree
* @retval yspec The top yang specification * @retval yspec The yang specification
* @see ys_module * @see ys_module
* @see yang_augment_node where shortcut is set for augment * @see yang_augment_node where shortcut is set for augment
* @see yang_myroot for first node under (sub)module * @see yang_myroot for first node under (sub)module
@ -2177,6 +2239,21 @@ ys_spec(yang_stmt *ys)
return ys; return ys;
} }
/*! Find domain tree,
*
* @param[in] ys Any yang statement in a yang tree
* @retval ydomain The yang domain specification
*/
yang_stmt *
ys_domain(yang_stmt *ys)
{
yang_stmt *yn;
if ((yn = ys_spec(ys)) != NULL)
return yn->ys_parent;
return NULL;
}
/*! Find top of tree, the yang specification from within the tree /*! Find top of tree, the yang specification from within the tree
* *
* @param[in] ys Any yang statement in a yang tree * @param[in] ys Any yang statement in a yang tree
@ -2296,8 +2373,10 @@ int
yang_mounts_print(FILE *f, yang_mounts_print(FILE *f,
yang_stmt *ymounts) yang_stmt *ymounts)
{ {
yang_stmt *ydomain;
yang_stmt *yspec; yang_stmt *yspec;
int inext; int inext;
int inext2;
cg_var *cv; cg_var *cv;
cvec *cvv; cvec *cvv;
@ -2306,8 +2385,11 @@ yang_mounts_print(FILE *f,
return -1; return -1;
} }
inext = 0; inext = 0;
while ((yspec = yn_iter(ymounts, &inext)) != NULL) { while ((ydomain = yn_iter(ymounts, &inext)) != NULL) {
fprintf(f, " %s\n", yang_argument_get(yspec)); fprintf(f, "domain:%s\n", yang_argument_get(ydomain));
inext2 = 0;
while ((yspec = yn_iter(ydomain, &inext2)) != NULL) {
fprintf(f, " spec:%s\n", yang_argument_get(yspec));
if ((cv = yang_cv_get(yspec)) != NULL){ if ((cv = yang_cv_get(yspec)) != NULL){
cv_print(f, yang_cv_get(yspec)); cv_print(f, yang_cv_get(yspec));
fprintf(f, "\n"); fprintf(f, "\n");
@ -2317,6 +2399,7 @@ yang_mounts_print(FILE *f,
fprintf(f, "\n"); fprintf(f, "\n");
} }
} }
}
return 0; return 0;
} }
@ -4486,6 +4569,8 @@ yang_init(clixon_handle h)
goto done; goto done;
if (clixon_yang_mounts_set(h, ymounts) < 0) if (clixon_yang_mounts_set(h, ymounts) < 0)
goto done; goto done;
if (ydomain_new(h, YANG_DOMAIN_TOP) == NULL)
goto done;
retval = 0; retval = 0;
done: done:
return retval; return retval;

17
lib/src/clixon_yang_schema_mount.c
View file

@ -197,15 +197,20 @@ yang_mount_get(yang_stmt *ys,
{ {
int retval = 1; int retval = 1;
yang_stmt *ymounts; yang_stmt *ymounts;
yang_stmt *ydomain;
yang_stmt *yspec = NULL; yang_stmt *yspec = NULL;
int inext; int inext;
int inext2;
if ((ymounts = ys_mounts(ys)) == NULL){ if ((ymounts = ys_mounts(ys)) == NULL){
clixon_err(OE_YANG, ENOENT, "Top-level yang mounts not found"); clixon_err(OE_YANG, ENOENT, "Top-level yang mounts not found");
goto done; goto done;
} }
inext = 0; inext = 0;
while ((yspec = yn_iter(ymounts, &inext)) != NULL) { ydomain = NULL;
while ((ydomain = yn_iter(ymounts, &inext)) != NULL) {
inext2 = 0;
while ((yspec = yn_iter(ydomain, &inext2)) != NULL) {
if (yang_keyword_get(yspec) != Y_SPEC || if (yang_keyword_get(yspec) != Y_SPEC ||
yang_cvec_get(yspec) == NULL || yang_cvec_get(yspec) == NULL ||
yang_flag_get(yspec, YANG_FLAG_SPEC_MOUNT) == 0) yang_flag_get(yspec, YANG_FLAG_SPEC_MOUNT) == 0)
@ -213,6 +218,9 @@ yang_mount_get(yang_stmt *ys,
if (xpath == NULL || cvec_find(yang_cvec_get(yspec), xpath) != NULL) if (xpath == NULL || cvec_find(yang_cvec_get(yspec), xpath) != NULL)
break; break;
} }
if (yspec != NULL)
break;
}
*yspecp = yspec; *yspecp = yspec;
retval = 0; retval = 0;
done: done:
@ -712,6 +720,7 @@ yang_schema_yanglib_parse_mount(clixon_handle h,
cxobj *xyanglib = NULL; cxobj *xyanglib = NULL;
cxobj *xb; cxobj *xb;
yang_stmt *ymounts; yang_stmt *ymounts;
yang_stmt *ydomain;
yang_stmt *yspec0 = NULL; yang_stmt *yspec0 = NULL;
yang_stmt *yspec1 = NULL; yang_stmt *yspec1 = NULL;
char *xpath = NULL; char *xpath = NULL;
@ -742,7 +751,11 @@ yang_schema_yanglib_parse_mount(clixon_handle h,
clixon_err(OE_YANG, ENOENT, "Top-level yang mounts not found"); clixon_err(OE_YANG, ENOENT, "Top-level yang mounts not found");
goto done; goto done;
} }
yspec0 = yang_find(ymounts, Y_SPEC, domain); if ((ydomain = yang_find(ymounts, Y_DOMAIN, domain)) == NULL){
if ((ydomain = ydomain_new(h, domain)) == NULL)
goto done;
}
yspec0 = yang_find(ydomain, Y_SPEC, domain); // XXX name?
if ((yspec1 = yspec_new_shared(h, xpath, domain, yspec0)) < 0) if ((yspec1 = yspec_new_shared(h, xpath, domain, yspec0)) < 0)
goto done; goto done;
/* Either yspec0 = NULL and yspec1 is new, or yspec0 == yspec1 != NULL (shared) */ /* Either yspec0 = NULL and yspec1 is new, or yspec0 == yspec1 != NULL (shared) */

4
test/test_autocli_grouping.sh
View file

@ -209,10 +209,10 @@ EOF
# The testcase assumes enabled # The testcase assumes enabled
if ${grouping_treeref}; then if ${grouping_treeref}; then
new "verify grouping is enabled" new "verify grouping is enabled"
expectpart "$($clixon_cli -f $cfg -G -1 2>&1)" 0 "@grouping--data--example--pg1" "@grouping--data--example-external--pg2" # "@grouping--data--example-external--pg3" expectpart "$($clixon_cli -f $cfg -G -1 2>&1)" 0 "@grouping--top--data--example--pg1" "@grouping--top--data--example-external--pg2" # "@grouping--top--data--example-external--pg3"
else else
new "verify grouping is disabled" new "verify grouping is disabled"
expectpart "$($clixon_cli -f $cfg -G -1 2>&1)" 0 --not-- "@grouping--data--example--pg1" "@grouping--data--example-external--pg2" "@grouping--data-example-external-pg3" expectpart "$($clixon_cli -f $cfg -G -1 2>&1)" 0 --not-- "@grouping--top--data--example--pg1" "@grouping--top--data--example-external--pg2" "@grouping--top--data-example-external-pg3"
fi fi
new "set top-level grouping" new "set top-level grouping"

2
test/test_nacm_mount.sh
View file

@ -189,7 +189,7 @@ RULES=$(cat <<EOF
</nacm> </nacm>
EOF EOF
) )
// /ex:top/ex:mylist/ex:mnt/m0:mymount0/m0:mylist0 # /ex:top/ex:mylist/ex:mnt/m0:mymount0/m0:mylist0
new "test params: -f $cfg" new "test params: -f $cfg"