From 3cce1e642733e37d7053d0b2ad9ac40832bbed1b Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 29 Mar 2023 10:26:53 +0200 Subject: [PATCH] src/confd: drop shortname yang module aliases and load with version Drop the shortname yang aliases, installed they become copies of their versioned counterpart, which is not the intention, but also, no other yang consumer does this. We'd like to use ly_ctx_load_module() directly, or a slim sysrepo wrapper of the same, but no such API (load by yang module *name* with optional revision) exists currently. Signed-off-by: Joachim Wiberg --- src/confd/src/ietf-system.c | 4 ++-- src/confd/yang/iana-crypt-hash.yang | 1 - src/confd/yang/iana-if-type.yang | 1 - src/confd/yang/ietf-datastores.yang | 1 - src/confd/yang/ietf-inet-types.yang | 1 - src/confd/yang/ietf-interfaces.yang | 1 - src/confd/yang/ietf-ip.yang | 1 - src/confd/yang/ietf-netconf-acm.yang | 1 - src/confd/yang/ietf-system.yang | 1 - src/confd/yang/ietf-yang-types.yang | 1 - 10 files changed, 2 insertions(+), 11 deletions(-) delete mode 120000 src/confd/yang/iana-crypt-hash.yang delete mode 120000 src/confd/yang/iana-if-type.yang delete mode 120000 src/confd/yang/ietf-datastores.yang delete mode 120000 src/confd/yang/ietf-inet-types.yang delete mode 120000 src/confd/yang/ietf-interfaces.yang delete mode 120000 src/confd/yang/ietf-ip.yang delete mode 120000 src/confd/yang/ietf-netconf-acm.yang delete mode 120000 src/confd/yang/ietf-system.yang delete mode 120000 src/confd/yang/ietf-yang-types.yang diff --git a/src/confd/src/ietf-system.c b/src/confd/src/ietf-system.c index 471da7b2..5a4b743b 100644 --- a/src/confd/src/ietf-system.c +++ b/src/confd/src/ietf-system.c @@ -249,7 +249,7 @@ int sr_plugin_init_cb(sr_session_ctx_t *sess, void **priv) { sr_subscription_ctx_t *sub = NULL; sr_conn_ctx_t *conn; - char *features[] = { + const char *features[] = { "ntp", "ntp-udp-port", "timezone-name", @@ -259,7 +259,7 @@ int sr_plugin_init_cb(sr_session_ctx_t *sess, void **priv) openlog("sysrepo ietf-system plugin", LOG_USER, 0); conn = sr_session_get_connection(sess); - sr_install_module(conn, YANG_PATH_"ietf-system.yang", NULL, features); + sr_install_module(conn, YANG_PATH_"ietf-system@2014-08-06.yang", NULL, features); rc = sr_oper_get_subscribe(sess, "ietf-system", CLOCK_PATH_, clock_cb, NULL, SR_SUBSCR_DEFAULT, &sub); diff --git a/src/confd/yang/iana-crypt-hash.yang b/src/confd/yang/iana-crypt-hash.yang deleted file mode 120000 index 6c6431e3..00000000 --- a/src/confd/yang/iana-crypt-hash.yang +++ /dev/null @@ -1 +0,0 @@ -iana-crypt-hash@2014-08-06.yang \ No newline at end of file diff --git a/src/confd/yang/iana-if-type.yang b/src/confd/yang/iana-if-type.yang deleted file mode 120000 index e069e989..00000000 --- a/src/confd/yang/iana-if-type.yang +++ /dev/null @@ -1 +0,0 @@ -iana-if-type@2017-01-19.yang \ No newline at end of file diff --git a/src/confd/yang/ietf-datastores.yang b/src/confd/yang/ietf-datastores.yang deleted file mode 120000 index 31d0773b..00000000 --- a/src/confd/yang/ietf-datastores.yang +++ /dev/null @@ -1 +0,0 @@ -ietf-datastores@2018-02-14.yang \ No newline at end of file diff --git a/src/confd/yang/ietf-inet-types.yang b/src/confd/yang/ietf-inet-types.yang deleted file mode 120000 index f2c4cfee..00000000 --- a/src/confd/yang/ietf-inet-types.yang +++ /dev/null @@ -1 +0,0 @@ -ietf-inet-types@2013-07-15.yang \ No newline at end of file diff --git a/src/confd/yang/ietf-interfaces.yang b/src/confd/yang/ietf-interfaces.yang deleted file mode 120000 index 00c2e9ad..00000000 --- a/src/confd/yang/ietf-interfaces.yang +++ /dev/null @@ -1 +0,0 @@ -ietf-interfaces@2018-02-20.yang \ No newline at end of file diff --git a/src/confd/yang/ietf-ip.yang b/src/confd/yang/ietf-ip.yang deleted file mode 120000 index d16e72fc..00000000 --- a/src/confd/yang/ietf-ip.yang +++ /dev/null @@ -1 +0,0 @@ -ietf-ip@2018-02-22.yang \ No newline at end of file diff --git a/src/confd/yang/ietf-netconf-acm.yang b/src/confd/yang/ietf-netconf-acm.yang deleted file mode 120000 index 5c83622b..00000000 --- a/src/confd/yang/ietf-netconf-acm.yang +++ /dev/null @@ -1 +0,0 @@ -ietf-netconf-acm@2018-02-14.yang \ No newline at end of file diff --git a/src/confd/yang/ietf-system.yang b/src/confd/yang/ietf-system.yang deleted file mode 120000 index c3b6168c..00000000 --- a/src/confd/yang/ietf-system.yang +++ /dev/null @@ -1 +0,0 @@ -ietf-system@2014-08-06.yang \ No newline at end of file diff --git a/src/confd/yang/ietf-yang-types.yang b/src/confd/yang/ietf-yang-types.yang deleted file mode 120000 index a9d02a25..00000000 --- a/src/confd/yang/ietf-yang-types.yang +++ /dev/null @@ -1 +0,0 @@ -ietf-yang-types@2013-07-15.yang \ No newline at end of file