Move yang models to confd

package/confd/confd.mk

@@ -35,13 +35,30 @@ define CONFD_INSTALL_EXTRA
 	cp $(CONFD_PKGDIR)/avahi.service $(TARGET_DIR)/etc/avahi/services/netconf.service
 endef
 
+NETOPEER2_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/netopeer2/
+SYSREPO_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/sysrepo/
+LIBNETCONF2_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/libnetconf2/
+CONFD_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/confd/
+TEST_MODE_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/test-mode/
+ROUSETTE_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/rousette/
 COMMON_SYSREPO_ENV = \
 	SYSREPO_SHM_PREFIX=$(CONFD_SYSREPO_SHM_PREFIX) \
 	SYSREPOCTL_EXECUTABLE="$(HOST_DIR)/bin/sysrepoctl" \
 	SYSREPOCFG_EXECUTABLE="$(HOST_DIR)/bin/sysrepocfg" \
-	SEARCH_PATH="$(TARGET_DIR)/usr/share/yang/modules/confd/"
+	SEARCH_PATH="$(NETOPEER2_SEARCHPATH) $(SYSREPO_SEARCHPATH) $(LIBNETCONF2_SEARCHPATH) $(TEST_MODE_SEARCHPATH) $(CONFD_SEARCHPATH) $(ROUSETTE_SEARCHPATH)"
+
 
 define CONFD_INSTALL_YANG_MODULES
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/sysrepo.inc
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/libnetconf2.inc
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/netopeer2.inc
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/rousette.inc
+	$(COMMON_SYSREPO_ENV) \
+	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/test-mode.inc
 	$(COMMON_SYSREPO_ENV) \
 	$(BR2_EXTERNAL_INFIX_PATH)/utils/srload $(@D)/yang/confd.inc
 endef
@@ -57,11 +74,13 @@ define CONFD_PERMISSIONS
 	/etc/sysrepo/data/ r 660 root wheel - - - - -
 	/etc/sysrepo/data  d 770 root wheel - - - - -
 endef
-
+define CONFD_EMPTY_SYSREPO
+	rm -rf $(TARGET_DIR)/etc/sysrepo/data/
+endef
 define CONFD_CLEANUP
 	rm -f /dev/shm/$(CONFD_SYSREPO_SHM_PREFIX)*
 endef
-
+CONFD_PRE_INSTALL_TARGET_HOOKS += CONFD_EMPTY_SYSREPO
 CONFD_PRE_INSTALL_TARGET_HOOKS += CONFD_CLEANUP
 CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA
 CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES

src/confd/configure.ac

@@ -19,8 +19,11 @@ AC_CONFIG_FILES([
 	share/migrate/1.3/Makefile
 	share/migrate/1.4/Makefile
 	share/migrate/1.5/Makefile
-	src/Makefile
 	yang/Makefile
+	yang/confd/Makefile
+	yang/test-mode/Makefile
+	yang/rousette/Makefile
+	src/Makefile
 ])
 
 AC_PROG_CC
@@ -83,7 +86,7 @@ DATAROOTDIR=`eval echo $datarootdir`
 DATAROOTDIR=`eval echo $DATAROOTDIR`
 AC_SUBST(DATAROOTDIR)
 
-YANGDIR=`eval echo $datarootdir/yang/modules/confd`
+YANGDIR=`eval echo $datarootdir/yang/modules`
 AC_SUBST(YANGDIR)
 
 LIBDIR=`eval echo $libdir`

src/confd/yang/Makefile.am

@@ -1,2 +1 @@
-yangdir   = $(YANGDIR)
-yang_DATA = $(wildcard *@*.yang) ieee802-types.yang ieee802-dot1ab-types.yang
+SUBDIRS             = confd test-mode rousette

src/confd/yang/confd.inc

@@ -1,25 +1,20 @@
 # -*- sh -*-
 # REMEMBER TO UPDATE infix-interfaces ALSO IN containers.inc
-#FORCE_UPDATE="infix-interfaces"
+
 MODULES=(
 	"ietf-system@2014-08-06.yang -e authentication -e local-users -e ntp -e ntp-udp-port -e timezone-name"
 	"iana-timezones@2013-11-19.yang"
-	"notifications@2008-07-14.yang"
-	"ietf-tcp-common@2023-12-28.yang -e keepalives-supported"
 	"ietf-interfaces@2018-02-20.yang -e if-mib"
 	"ietf-ip@2018-02-22.yang -e ipv6-privacy-autoconf"
 	"ietf-network-instance@2019-01-21.yang"
 	"ietf-netconf-monitoring@2010-10-04.yang"
-	"ietf-netconf-nmda@2019-01-07.yang -e origin -e with-defaults"
-	"ietf-subscribed-notifications@2019-09-09.yang -e encode-xml -e replay -e subtree -e xpath"
-	"ietf-yang-push@2019-09-09.yang -e on-change"
 	"ietf-routing@2018-03-13.yang"
 	"ietf-ipv6-unicast-routing@2018-03-13.yang"
 	"ietf-ipv4-unicast-routing@2018-03-13.yang"
 	"ietf-ospf@2022-10-19.yang -e bfd -e explicit-router-id"
 	"iana-if-type@2023-01-26.yang"
-	# NOTE: ietf-tls-client must be version matched with ietf-tls-server, used by netopeer2!
-	"ietf-tls-client@2023-12-28.yang" # used by ietf-syslog (remote)
+        # NOTE: ietf-tls-client must be version matched with ietf-tls-server, used by netopeer2!
+	"ietf-tls-client@2023-12-28.yang"
 	"ietf-syslog@2024-03-21.yang -e file-action -e file-limit-size -e remote-action"
 	"infix-syslog@2024-07-19.yang"
 	"iana-hardware@2018-03-13.yang"
@@ -43,22 +38,4 @@ MODULES=(
 	"infix-interfaces@2025-01-09.yang -e vlan-filtering"
 	"infix-crypto-types@2025-02-04.yang"
 	"infix-keystore@2025-02-04.yang"
-
-	# from rousette
-	"ietf-restconf@2017-01-26.yang"
-	"ietf-yang-patch@2017-02-22.yang"
-	"ietf-restconf-monitoring@2017-01-26.yang"
-
-	# from sysrepo
-	"sysrepo-plugind@2022-08-26.yang"
-	# from netopeer
-	"nc-notifications@2008-07-14.yang"
-	"ietf-crypto-types@2023-12-28.yang -e encrypted-private-keys"
-	"ietf-netconf-server@2023-12-28.yang -e ssh-listen -e tls-listen -e ssh-call-home -e tls-call-home"
-	"ietf-netconf-acm@2018-02-14.yang"
-	"ietf-netconf@2013-09-29.yang -e writable-running -e candidate -e rollback-on-error -e validate -e startup -e url -e xpath -e confirmed-commit"
-	"ietf-truststore@2023-12-28.yang -e central-truststore-supported -e certificates"
-	"ietf-keystore@2023-12-28.yang -e central-keystore-supported -e asymmetric-keys -e symmetric-keys"
-	"ietf-tls-server@2023-12-28.yang -e server-ident-raw-public-key -e server-ident-x509-cert"
-
 )

src/confd/yang/confd/Makefile.am

@@ -0,0 +1,2 @@
+yangdir   = $(YANGDIR)/confd
+yang_DATA = $(wildcard *@*.yang) ieee802-types.yang ieee802-dot1ab-types.yang