Fix inconsistent naming in infix-routing model

in container: default-route-advertise
Obsolete leaf: enable
Add new leaf: enabled

enable is preferred if exist, else it use enabled.

Also update klish-plugin-sysrepo to not show the obsoleted node
in autocompletion.

This fixes #331
This commit is contained in:
Mattias Walström
2024-03-06 18:39:27 +01:00
committed by Joachim Wiberg
parent e8ff54cb67
commit 28846dd332
5 changed files with 11 additions and 4 deletions
+2 -1
View File
@@ -19,7 +19,8 @@ All notable changes to the project are documented in this file.
- Reduced syslog errors for accesses no non-existing xpaths
- Fix bogus warning about not properly updating `/etc/motd` in new
`motd-banner` setting, introduced in v24.02.0
- infix-routing model: For OSPF, the configuration setting in `default-route-advertise`, `enable`
has been obsoleted and replaced by `enabled`
[v24.02.0][] - 2024-03-01
-------------------------
@@ -1,3 +1,3 @@
# Locally calculated
sha256 9d9d33b873917ca5d0bdcc47a36d2fd385971ab0c045d1472fcadf95ee5bcf5b LICENCE
sha256 c06a369147ae1071c0c309c0bd9d49d8ae0ff5dd1e804e2009b1a18f7fc12b5c klish-plugin-sysrepo-909cbfb1253a3c3c3abfdc72de9db7aaf3a08de2-br1.tar.gz
sha256 e18a45b35ade84201d9d59918e0743c0d9b5451cfe89ec1f7f0f6de2dc343a42 klish-plugin-sysrepo-364f7c7b9c61f2cfd51dfd8d94a8c67449ee439f-br1.tar.gz
@@ -4,7 +4,7 @@
#
################################################################################
KLISH_PLUGIN_SYSREPO_VERSION = 909cbfb1253a3c3c3abfdc72de9db7aaf3a08de2
KLISH_PLUGIN_SYSREPO_VERSION = 364f7c7b9c61f2cfd51dfd8d94a8c67449ee439f
KLISH_PLUGIN_SYSREPO_SITE = https://github.com/kernelkit/klish-plugin-sysrepo.git
#KLISH_PLUGIN_SYSREPO_VERSION = cdd3eb51a7f7ee0ed5bd925fa636061d3b1b85fb
#KLISH_PLUGIN_SYSREPO_SITE = https://src.libcode.org/pkun/klish-plugin-sysrepo.git
+2 -1
View File
@@ -127,7 +127,8 @@ int parse_ospf(sr_session_ctx_t *session, struct lyd_node *ospf)
parse_ospf_redistribute(session, lydx_get_child(ospf, "redistribute"), fp);
default_route = lydx_get_child(ospf, "default-route-advertise");
if (default_route) {
if (lydx_get_bool(default_route, "enable")) {
/* enable is obsolete in favor for enabled. */
if ((lydx_get_child(default_route, "enable") && lydx_get_bool(default_route, "enable")) || lydx_get_bool(default_route, "enabled")) {
fputs(" default-information originate", fp);
if (lydx_get_bool(default_route, "always"))
fputs(" always", fp);
@@ -185,6 +185,11 @@ module infix-routing {
container default-route-advertise {
description "Distribute default route to network";
leaf enable {
status obsolete;
description "Legacy, replaced by 'enabled'.";
type boolean;
}
leaf enabled {
description "Distribute default route";
type boolean;
}