From 44727b9a47c6f552aa4e9f5eeea55f90c52d5499 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 18 Oct 2024 08:52:58 +0200 Subject: [PATCH 1/2] confd: mark entire meta container obsolete Mark meta data as obsolete to hide from CLI and other frontends. Signed-off-by: Joachim Wiberg --- src/confd/yang/confd.inc | 2 +- src/confd/yang/infix-meta.yang | 7 +++++++ ...fix-meta@2024-06-19.yang => infix-meta@2024-10-18.yang} | 0 3 files changed, 8 insertions(+), 1 deletion(-) rename src/confd/yang/{infix-meta@2024-06-19.yang => infix-meta@2024-10-18.yang} (100%) diff --git a/src/confd/yang/confd.inc b/src/confd/yang/confd.inc index ae7cec4a..aa2de0f2 100644 --- a/src/confd/yang/confd.inc +++ b/src/confd/yang/confd.inc @@ -31,7 +31,7 @@ MODULES=( "ieee802-dot1ab-lldp@2022-03-15.yang" "infix-lldp@2023-08-23.yang" "infix-dhcp-client@2024-09-20.yang" - "infix-meta@2024-06-19.yang" + "infix-meta@2024-10-18.yang" "infix-system@2024-09-13.yang" "infix-services@2024-05-30.yang" "ieee802-ethernet-interface@2019-06-21.yang" diff --git a/src/confd/yang/infix-meta.yang b/src/confd/yang/infix-meta.yang index e7c2fc12..e111deed 100644 --- a/src/confd/yang/infix-meta.yang +++ b/src/confd/yang/infix-meta.yang @@ -7,12 +7,19 @@ module infix-meta { contact "kernelkit@googlegroups.com"; description "Infix metadata."; + revision 2024-10-18 { + description "Mark entire meta container obsolete."; + reference "internal"; + } revision 2024-06-19 { description "Initial revision."; reference "internal"; } container meta { + description "Meta data"; + status obsolete; + leaf version { status obsolete; // Ensure frontends don't show this, used for migration. description "Configuration file format version, automatically generated."; diff --git a/src/confd/yang/infix-meta@2024-06-19.yang b/src/confd/yang/infix-meta@2024-10-18.yang similarity index 100% rename from src/confd/yang/infix-meta@2024-06-19.yang rename to src/confd/yang/infix-meta@2024-10-18.yang From 903960f6a02f915e21cf4dced48e45284b8a825b Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 18 Oct 2024 08:55:44 +0200 Subject: [PATCH 2/2] package/klish-plugin-sysrepo: add units to help text, hide obsolete Fixes the following CLI issues: - kernelkit/klish-plugin-sysrepo#5 : hide obsolete nodes, e.g., meta/version - kernelkit/klish-plugin-sysrepo#6 : add units to online help text Signed-off-by: Joachim Wiberg --- package/klish-plugin-sysrepo/klish-plugin-sysrepo.hash | 2 +- package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/klish-plugin-sysrepo/klish-plugin-sysrepo.hash b/package/klish-plugin-sysrepo/klish-plugin-sysrepo.hash index 4696068d..736db0db 100644 --- a/package/klish-plugin-sysrepo/klish-plugin-sysrepo.hash +++ b/package/klish-plugin-sysrepo/klish-plugin-sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 9d9d33b873917ca5d0bdcc47a36d2fd385971ab0c045d1472fcadf95ee5bcf5b LICENCE -sha256 7c8c1cc2234331bb8123893356562cce6731448dbaf5b80db72e34490da55b48 klish-plugin-sysrepo-261c615b903233f63c695f91c1dbe58ac063ba13-br1.tar.gz +sha256 58b6b271912f9331ea78a815a8cec073924b423403868dd9fcc48de0942f49f8 klish-plugin-sysrepo-213cd51aa8863e7ef66944137db3dffc88d58cc1-br1.tar.gz diff --git a/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk b/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk index 04b80124..8a9fef3d 100644 --- a/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk +++ b/package/klish-plugin-sysrepo/klish-plugin-sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KLISH_PLUGIN_SYSREPO_VERSION = 261c615b903233f63c695f91c1dbe58ac063ba13 +KLISH_PLUGIN_SYSREPO_VERSION = 213cd51aa8863e7ef66944137db3dffc88d58cc1 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