System-only 7.2 adjustment mismatching yang revisions after branch merge
This commit is contained in:
Olof hagsand
parent
69b65ad13d
commit
7b01b029a4
6 changed files with 149 additions and 106 deletions
|
|
@ -24,6 +24,13 @@ Expected: January 2025
|
|||
* New `CLICON_XMLDB_SYSTEM_ONLY_CONFIG` configuration option
|
||||
* New `system-only-config` extension
|
||||
* New `ca_system_only` backend callback for reading system-only data
|
||||
* New `clixon-config@2024-08-01.yang` revision
|
||||
* Added: `CLICON_XMLDB_SYSTEM_ONLY_CONFIG`
|
||||
|
||||
### C/CLI-API changes on existing features
|
||||
|
||||
Developers may need to change their code
|
||||
|
||||
* Changed C-API: add `system-only` parameter with default value `0` last:
|
||||
* `clixon_json2file()` -> `clixon_json2file(,0)`
|
||||
* `clixon_json2cbuf()` -> `clixon_json2cbuf(,0)`
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@ DATASTORE_TOP="config"
|
|||
|
||||
# clixon yang revisions occuring in tests (see eg yang/clixon/Makefile.in)
|
||||
CLIXON_AUTOCLI_REV="2024-08-01"
|
||||
CLIXON_LIB_REV="2024-08-01"
|
||||
CLIXON_CONFIG_REV="2024-08-01"
|
||||
CLIXON_LIB_REV="2024-11-01"
|
||||
CLIXON_CONFIG_REV="2024-11-01"
|
||||
CLIXON_RESTCONF_REV="2022-08-01"
|
||||
CLIXON_EXAMPLE_REV="2022-11-01"
|
||||
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ datarootdir = @datarootdir@
|
|||
YANG_INSTALLDIR = @YANG_INSTALLDIR@
|
||||
|
||||
# Note: mirror these to test/config.sh.in
|
||||
YANGSPECS = clixon-config@2024-08-01.yang # 7.2
|
||||
YANGSPECS += clixon-lib@2024-08-01.yang # 7.2
|
||||
YANGSPECS = clixon-config@2024-11-01.yang # 7.3
|
||||
YANGSPECS += clixon-lib@2024-11-01.yang # 7.3
|
||||
YANGSPECS += clixon-rfc5277@2008-07-01.yang
|
||||
YANGSPECS += clixon-xml-changelog@2019-03-21.yang
|
||||
YANGSPECS += clixon-restconf@2022-08-01.yang # 5.9
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ module clixon-config {
|
|||
"Added options:
|
||||
CLICON_YANG_DOMAIN_DIR
|
||||
CLICON_YANG_USE_ORIGINAL
|
||||
CLICON_XMLDB_SYSTEM_ONLY_CONFIG (tentative)
|
||||
Released in Clixon 7.2";
|
||||
}
|
||||
revision 2024-04-01 {
|
||||
|
|
@ -1195,15 +1194,6 @@ module clixon-config {
|
|||
May not work together with CLICON_BACKEND_PRIVILEGES=drop and root, since
|
||||
new files need to be created in XMLDB_DIR";
|
||||
}
|
||||
leaf CLICON_XMLDB_SYSTEM_ONLY_CONFIG {
|
||||
type boolean;
|
||||
default true;
|
||||
description
|
||||
"If set, some fields in the configuration tree are not stored to datastore.
|
||||
Instead, the application must provide a mechanism to save the system-only-config
|
||||
in the system via commit/system-only-config callbacks.
|
||||
See also extension system-only-config in clixon-lib.yang";
|
||||
}
|
||||
leaf CLICON_XML_CHANGELOG {
|
||||
type boolean;
|
||||
default false;
|
||||
|
|
|
|||
|
|
@ -49,6 +49,20 @@ module clixon-config {
|
|||
|
||||
***** END LICENSE BLOCK *****";
|
||||
|
||||
revision 2024-11-01 {
|
||||
description
|
||||
"Added options:
|
||||
CLICON_XMLDB_SYSTEM_ONLY_CONFIG
|
||||
Released in Clixon 7.3";
|
||||
}
|
||||
revision 2024-08-01 {
|
||||
description
|
||||
"Added options:
|
||||
CLICON_YANG_DOMAIN_DIR
|
||||
CLICON_YANG_USE_ORIGINAL
|
||||
CLICON_XMLDB_SYSTEM_ONLY_CONFIG (tentative)
|
||||
Released in Clixon 7.2";
|
||||
}
|
||||
revision 2024-04-01 {
|
||||
description
|
||||
"Added options:
|
||||
|
|
@ -473,19 +487,6 @@ module clixon-config {
|
|||
*:<feature> means enable the specific feature in all modules";
|
||||
type string;
|
||||
}
|
||||
leaf-list CLICON_YANG_DIR {
|
||||
ordered-by user;
|
||||
type string;
|
||||
description
|
||||
"Yang directory path for finding module and submodule files.
|
||||
A list of these options should be in the configuration.
|
||||
When loading a Yang module, Clixon searches this list in the order
|
||||
they appear.
|
||||
Note since Clixon 5.4 such a directory is searched recursively, not just the
|
||||
directory itself.
|
||||
Ensure that YANG_INSTALLDIR (default
|
||||
/usr/local/share/clixon) is present in the path";
|
||||
}
|
||||
/* Configuration */
|
||||
leaf CLICON_CONFIGFILE{
|
||||
type string;
|
||||
|
|
@ -521,6 +522,19 @@ module clixon-config {
|
|||
";
|
||||
}
|
||||
/* YANG */
|
||||
leaf-list CLICON_YANG_DIR {
|
||||
ordered-by user;
|
||||
type string;
|
||||
description
|
||||
"Yang directory path for finding module and submodule files.
|
||||
A list of these options should be in the configuration.
|
||||
When loading a Yang module, Clixon searches this list in the order
|
||||
they appear.
|
||||
Note since Clixon 5.4 such a directory is searched recursively, not just the
|
||||
directory itself.
|
||||
Ensure that YANG_INSTALLDIR (default
|
||||
/usr/local/share/clixon) is present in the path";
|
||||
}
|
||||
leaf CLICON_YANG_MAIN_FILE {
|
||||
type string;
|
||||
description
|
||||
|
|
@ -534,6 +548,18 @@ module clixon-config {
|
|||
"If given, load all modules in this directory (all .yang files)
|
||||
See also CLICON_YANG_DIR which specifies a path of dirs";
|
||||
}
|
||||
leaf CLICON_YANG_DOMAIN_DIR {
|
||||
type string;
|
||||
description
|
||||
"Virtual domain directory for RFC 8528 mount-points.
|
||||
If set and domain is given, instead of loading from CLICON_YANG_MAIN_DIR,
|
||||
look for .yang files first in CLICON_YANG_DOMAIN_DIR/domain,
|
||||
where domain is given as yangmnt:mount-point <domain>;
|
||||
Useful in eg mountpoints where another YANG domain may be required,
|
||||
even isolated from the main YANG context, as well as from other moint-points.
|
||||
Note that CLICON_YANG_DIR that may be given as library YANGs are not isolated.
|
||||
If not set, use CLICON_YANG_MAIN_DIR as default.";
|
||||
}
|
||||
leaf CLICON_YANG_MODULE_MAIN {
|
||||
type string;
|
||||
description
|
||||
|
|
@ -623,6 +649,17 @@ module clixon-config {
|
|||
See also CLICON_XMLDB_MODSTATE where the module state info is used to tag datastores
|
||||
with module information.";
|
||||
}
|
||||
leaf CLICON_YANG_USE_ORIGINAL{
|
||||
type boolean;
|
||||
default false;
|
||||
description
|
||||
"YANG memory optimization.
|
||||
If set, for a selected set of YANG nodes, (see uses_orig_ptr()):
|
||||
For augmented and grouping/uses, use original YANG node instead of the derived node.
|
||||
This is safe if all content of derived node is not changed (eg read-only).
|
||||
It is not safe if the derived node is in some way different than the original node.
|
||||
";
|
||||
}
|
||||
/* Backend */
|
||||
leaf CLICON_BACKEND_DIR {
|
||||
type string;
|
||||
|
|
@ -1164,6 +1201,15 @@ module clixon-config {
|
|||
May not work together with CLICON_BACKEND_PRIVILEGES=drop and root, since
|
||||
new files need to be created in XMLDB_DIR";
|
||||
}
|
||||
leaf CLICON_XMLDB_SYSTEM_ONLY_CONFIG {
|
||||
type boolean;
|
||||
default true;
|
||||
description
|
||||
"If set, some fields in the configuration tree are not stored to datastore.
|
||||
Instead, the application must provide a mechanism to save the system-only-config
|
||||
in the system via commit/system-only-config callbacks.
|
||||
See also extension system-only-config in clixon-lib.yang";
|
||||
}
|
||||
leaf CLICON_XML_CHANGELOG {
|
||||
type boolean;
|
||||
default false;
|
||||
|
|
@ -69,10 +69,10 @@ module clixon-lib {
|
|||
- link # For split multiple XML files
|
||||
";
|
||||
|
||||
revision 2024-08-01 {
|
||||
revision 2024-11-01 {
|
||||
description
|
||||
"Added: system-only-config extension (tentative)
|
||||
Released in Clixon 7.2";
|
||||
"Added: system-only-config extension
|
||||
Released in Clixon 7.3";
|
||||
}
|
||||
revision 2024-04-01 {
|
||||
description
|
||||
Loading…
Add table
Add a link
Reference in a new issue