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

Re-added shared yang mounts

Browse source 
YANG: de-dperecated CLICON_YANG_SCHEMA_MOUNT_SHARE
This commit is contained in:
Olof hagsand 2024-10-06 11:39:32 +02:00
parent f0bd103e79
commit 5ebc5a2219
5 changed files with 101 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -19,7 +19,6 @@ Expected: October 2024
* Added yang domains for mount-point isolation
* This replaces the computation of shared yang-specs
* New option: `CLICON_YANG_DOMAIN_DIR`
* Deprecated: `CLICON_YANG_SCHEMA_MOUNT_SHARE`
* Restconf: Support for list of media in Accept header
* Refactoring of schema mount-points
* Add new top-level `Y_MOUNTS` and add top-level yangs and mountpoints in yspecs
@ -39,7 +38,6 @@ Expected: October 2024
* New `clixon-config@2024-08-01.yang` revision
* Added: `CLICON_YANG_DOMAIN_DIR`
* Added: `CLICON_YANG_USE_ORIGINAL`
* Deprecated: `CLICON_YANG_SCHEMA_MOUNT_SHARE`
* New `clixon-lib@2024-08-01.yang` revision
- Added: list-pagination-partial-state extension

37
apps/cli/cli_show.c
View file

@ -1889,19 +1889,21 @@ cli_show_statistics(clixon_handle h,
size_t tsz;
yang_stmt *ymounts;
yang_stmt *ydomain;
yang_stmt *yspec;
cg_var *cv;
cxobj *xp;
char *domain;
char *name;
cxobj *x;
uint64_t u64;
char *unit;
int inext;
int inext2;
if (argv == NULL || (cvec_len(argv) < 1 || cvec_len(argv) > 2)){
clixon_err(OE_PLUGIN, EINVAL, "Expected arguments: [(cli|backend|all) [detail]]");
goto done;
}
ydomain = clicon_dbspec_yang(h);
cv = cvec_i(argv, 0);
what = cv_string_get(cv);
if (strcmp(what, "cli") == 0)
@ -1939,19 +1941,25 @@ cli_show_statistics(clixon_handle h,
}
inext = 0;
while ((ydomain = yn_iter(ymounts, &inext)) != NULL) {
name = yang_argument_get(ydomain);
nr = 0; sz = 0;
if (yang_stats(ydomain, 0, &nr, &sz) < 0)
goto done;
tnr = nr;
tsz = sz;
if (detail) {
cligen_output(stdout, "YANG-%s-size: %" PRIu64 "\n", name, sz);
cligen_output(stdout, "YANG-%s-nr: %" PRIu64 "\n", name, nr);
}
else{
translatenumber(sz, &u64, &unit);
cligen_output(stdout, "%-25s %" PRIu64 "%-10s\n", yang_argument_get(ydomain), u64, unit);
domain = yang_argument_get(ydomain);
inext2 = 0;
while ((yspec = yn_iter(ydomain, &inext2)) != NULL) {
name = yang_argument_get(yspec);
nr = 0; sz = 0;
if (yang_stats(ydomain, 0, &nr, &sz) < 0)
goto done;
tnr = nr;
tsz = sz;
if (detail) {
cligen_output(stdout, "YANG-%s-%s-size: %" PRIu64 "\n", domain, name, sz);
cligen_output(stdout, "YANG-%s-%s-nr: %" PRIu64 "\n", domain, name, nr);
}
else{
translatenumber(sz, &u64, &unit);
cprintf(cb, "%s/%s", domain, name);
cligen_output(stdout, "%-25s %" PRIu64 "%-10s\n", cbuf_get(cb), u64, unit);
cbuf_reset(cb);
}
}
}
if (detail){
@ -1994,7 +2002,6 @@ cli_show_statistics(clixon_handle h,
translatenumber(tsz0+tsz, &u64, &unit);
cligen_output(stdout, "%-25s %" PRIu64 "%-10s\n", "Mem Total", u64, unit);
}
}
if (backend) {
cprintf(cb, "<rpc xmlns=\"%s\"", NETCONF_BASE_NAMESPACE);

19
lib/src/clixon_yang.c
View file

@ -887,10 +887,11 @@ yspec_new1(clixon_handle h,
/*! Create or add a shared yspec
*
* @param[in] h Clixon handle
* @param[in] tag Typically an xpath
* @param[in] tag Typically an xpath, saved in cvec
* @param[in] yspec0 Input NULL if no previous shared exist, otherwise a shared yspec but new name
* @retval yspec1 New or (previously shared)
* @retval NULL Error
* @note yspec name used by concatenating domain and a unique number.
*/
yang_stmt *
yspec_new_shared(clixon_handle h,
@ -899,13 +900,19 @@ yspec_new_shared(clixon_handle h,
yang_stmt *yspec0)
{
yang_stmt *yspec1 = NULL;
cbuf *cb = NULL;
static int nr = 0;
if (yspec0 != NULL){ /* shared */
yspec1 = yspec0;
}
else {
// XXX domain used as name
if ((yspec1 = yspec_new1(h, domain, domain)) == NULL)
if ((cb = cbuf_new()) == NULL){
clixon_err(OE_YANG, errno, "cbuf_new");
goto done;
}
cprintf(cb, "%s%d", domain, nr++);
if ((yspec1 = yspec_new1(h, domain, cbuf_get(cb))) == NULL)
goto done;
yang_flag_set(yspec1, YANG_FLAG_SPEC_MOUNT);
clixon_debug(CLIXON_DBG_YANG, "new yang-spec: %p", yspec1);
@ -915,6 +922,8 @@ yspec_new_shared(clixon_handle h,
goto done;
}
done:
if (cb)
cbuf_free(cb);
return yspec1;
}
@ -2313,10 +2322,10 @@ yang_print_cb(FILE *f,
if (yang_print_cbuf(cb, yn, 0, 1) < 0)
goto done;
(*fn)(f, "%s", cbuf_get(cb));
if (cb)
cbuf_free(cb);
retval = 0;
done:
if (cb)
cbuf_free(cb);
return retval;
}

65
lib/src/clixon_yang_schema_mount.c
View file

@ -703,6 +703,65 @@ yang_schema_mount_statedata(clixon_handle h,
goto done;
}
/*! Given xml mount-point and yanglib, find existing yspec
*
* Get and loop through all XML from xt mount-points.
* Get xyanglib and if equal to xt, find and return yspec
* @param[in] h Clixon handle
* @param[in] xt XML tree node
* @param[in] xyanglib yanglib in XML
* @param[out] yspecp Yang spec
* @retval 0 OK
* @retval -1 Error
*/
static int
yang_schema_find_share(clixon_handle h,
cxobj *xt,
cxobj *xyanglib,
yang_stmt **yspecp)
{
int retval = -1;
cvec *cvv = NULL;
cg_var *cv;
cxobj *xroot;
cxobj *xmnt;
cxobj *xylib;
int config = 1;
int ret;
xroot = xml_root(xt);
/* Get all XML mtpoints */
if (yang_mount_xtop2xmnt(xroot, &cvv) < 0)
goto done;
/* Loop through XML mount-points */
cv = NULL;
while ((cv = cvec_each(cvv, cv)) != NULL) {
xmnt = cv_void_get(cv);
if (xmnt == xt)
continue;
xylib = NULL;
/* Get xyanglib */
if (clixon_plugin_yang_mount_all(h, xmnt, &config, NULL, &xylib) < 0)
goto done;
if (xylib == NULL)
continue;
/* Check if equal */
if (xml_tree_equal(xyanglib, xylib) == 1)
continue;
/* Find and return yspec */
*yspecp = NULL;
if ((ret = xml_yang_mount_get(h, xmnt, NULL, NULL, yspecp)) < 0)
goto done;
if (ret == 1 && *yspecp != NULL)
break;
}
retval = 0;
done:
if (cvv)
cvec_free(cvv);
return retval;
}
/*! Get yanglib from user plugin callback, parse it and mount it
*
* Optionally check for shared yspec
@ -755,7 +814,11 @@ yang_schema_yanglib_parse_mount(clixon_handle h,
if ((ydomain = ydomain_new(h, domain)) == NULL)
goto done;
}
yspec0 = yang_find(ydomain, Y_SPEC, domain); // XXX name?
/* Optimization: find equal yspec from other mount-point */
if (clicon_option_bool(h, "CLICON_YANG_SCHEMA_MOUNT_SHARE")) {
if (yang_schema_find_share(h, xt, xyanglib, &yspec0) < 0)
goto done;
}
if ((yspec1 = yspec_new_shared(h, xpath, domain, yspec0)) < 0)
goto done;
/* Either yspec0 = NULL and yspec1 is new, or yspec0 == yspec1 != NULL (shared) */

6
yang/clixon/clixon-config@2024-08-01.yang
View file

@ -54,8 +54,6 @@ module clixon-config {
"Added options:
CLICON_YANG_DOMAIN_DIR
CLICON_YANG_USE_ORIGINAL
Deprecated:
CLICON_YANG_SCHEMA_MOUNT_SHARE
Released in Clixon 7.2";
}
revision 2024-04-01 {
@ -612,9 +610,7 @@ module clixon-config {
(yangmnt:mount-point is on same node).
A comparison is made between yang modules and revision and must match exactly.
If so, a new yang-spec is not created, instead the other is used.
Only if CLICON_YANG_SCHEMA_MOUNT is enabled
Deprecated, replaced by yang domain";
status deprecated;
Only if CLICON_YANG_SCHEMA_MOUNT is enabled";
default false;
}
leaf CLICON_YANG_AUGMENT_ACCEPT_BROKEN {