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

New clixon-config@2024-04-01.yang revision

Browse source 
Added options: `CLICON_NETCONF_DUPLICATE_ALLOW` - Disable duplicate check in NETCONF messages
New `clixon-lib@2024-04-01.yang` revision
This commit is contained in:
Olof hagsand 2024-04-03 17:39:50 +02:00
parent 9826ac16ff
commit bd3a841103
7 changed files with 1313 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -13,6 +13,11 @@
## 7.1.0
Expected: June 2024
### Features
* New `clixon-config@2024-04-01.yang` revision
* Added options: `CLICON_NETCONF_DUPLICATE_ALLOW` - Disable duplicate check in NETCONF messages
* New `clixon-lib@2024-04-01.yang` revision
## 7.0.1
3 April 2024

5
apps/backend/backend_client.c
View file

@ -557,7 +557,10 @@ from_client_edit_config(clixon_handle h,
*/
if ((ret = xml_yang_validate_minmax(xc, 1, &xret)) < 0)
goto done;
if (ret == 1 && (ret = xml_yang_validate_unique_recurse(xc, &xret)) < 0)
/* Disable duplicate check in NETCONF messages.*/
if (clicon_option_bool(h, "CLICON_NETCONF_DUPLICATE_ALLOW"))
;
else if (ret == 1 && (ret = xml_yang_validate_unique_recurse(xc, &xret)) < 0)
goto done;
/* xmldb_put (difflist handling) requires list keys */
if (ret == 1 && (ret = xml_yang_validate_list_key_only(xc, &xret)) < 0)

4
docker/test/start.sh
View file

@ -50,6 +50,8 @@ err(){
# Turn on debug in containers (restconf, backend)
DBG=${DBG:-0}
NAME=${NAME:-"clixon-test"}
# Expose other host port than port 80
PORT=${PORT:-8080}
@ -85,7 +87,7 @@ CONFIG=${CONFIG:-$CONFIG0}
# Create clixon-test container
>&2 echo -n "Starting Container..."
sudo docker run -p $PORT:80 -p $SPORT:443 --name clixon-test --rm -e DBG=$DBG -e CONFIG="$CONFIG" -e STORE="$STORE" -td clixon/clixon-test || err "Error starting clixon-test"
sudo docker run -p $PORT:80 -p $SPORT:443 --name ${NAME} --rm -e DBG=$DBG -e CONFIG="$CONFIG" -e STORE="$STORE" -td clixon/clixon-test || err "Error starting clixon-test"
# Wait for snmpd to start
sudo docker exec -t clixon-test bash -c 'while [ ! -S /var/run/snmp.sock ]; do sleep 1; done'

4
test/config.sh.in
View file

@ -76,8 +76,8 @@ DATASTORE_TOP="config"
# clixon yang revisions occuring in tests (see eg yang/clixon/Makefile.in)
CLIXON_AUTOCLI_REV="2023-09-01"
CLIXON_LIB_REV="2024-01-01"
CLIXON_CONFIG_REV="2024-01-01"
CLIXON_LIB_REV="2024-04-01"
CLIXON_CONFIG_REV="2024-04-01"
CLIXON_RESTCONF_REV="2022-08-01"
CLIXON_EXAMPLE_REV="2022-11-01"

5
yang/clixon/Makefile.in
View file

@ -42,9 +42,8 @@ datarootdir = @datarootdir@
YANG_INSTALLDIR = @YANG_INSTALLDIR@
# Note: mirror these to test/config.sh.in
YANGSPECS = clixon-config@2024-01-01.yang # 7.0
YANGSPECS += clixon-lib@2023-11-01.yang # 6.5
YANGSPECS += clixon-lib@2024-01-01.yang # 7.0
YANGSPECS = clixon-config@2024-04-01.yang # 7.1
YANGSPECS += clixon-lib@2024-04-01.yang # 7.1
YANGSPECS += clixon-rfc5277@2008-07-01.yang
YANGSPECS += clixon-xml-changelog@2019-03-21.yang
YANGSPECS += clixon-restconf@2022-08-01.yang # 5.9

1285
yang/clixon/clixon-config@2024-04-01.yang Normal file
View file

File diff suppressed because it is too large Load diff

29
yang/clixon/clixon-lib@2023-11-01.yang → yang/clixon/clixon-lib@2024-04-01.yang
View file

@ -68,6 +68,15 @@ module clixon-lib {
- objectexisted
";
revision 2024-04-01 {
description
"Released in Clixon 7.1";
}
revision 2024-01-01 {
description
"Removed container creators from 6.5
Released in 7.0";
}
revision 2023-11-01 {
description
"Added ignore-compare extension
@ -197,8 +206,9 @@ module clixon-lib {
extension ignore-compare {
description
"The object should be ignored when comparing device configs for equality.
One example is auto-created objects by the server, such as uid.
Another example is a plain-text password is changed to an encrypted by the server.";
The object should never be added, modified, or deleted on target.
Essentially a read-only object
One example is auto-created objects by the , such as uid.";
}
md:annotation creator {
type string;
@ -210,21 +220,6 @@ module clixon-lib {
Limitations: only objects that are actually added or deleted.
A sub-object will not be noted";
}
container creators{
config false;
description "Meta-data for creator attribute.";
list creator {
key name;
leaf name {
description "Name of creator / service (instance) name";
type string;
}
leaf-list path {
description "Path to object";
type string;
}
}
}
rpc debug {
description "Set debug level of backend.";
input {