FRRouting · choppsv1 · Jun 20, 2023 · Jun 21, 2023 · Mar 15, 2025 · Jul 6, 2023
diff --git a/lib/vty.c b/lib/vty.c
@@ -138,6 +138,9 @@ char const *const mgmt_daemons[] = {
 #ifdef HAVE_STATICD
 	"staticd",
 #endif
+#ifdef HAVE_OSPFD
+	"ospfd",
+#endif
 };
 uint mgmt_daemons_count = array_size(mgmt_daemons);
 

diff --git a/mgmtd/mgmt_be_adapter.c b/mgmtd/mgmt_be_adapter.c
@@ -37,6 +37,9 @@
 const char *mgmt_be_client_names[MGMTD_BE_CLIENT_ID_MAX + 1] = {
 	[MGMTD_BE_CLIENT_ID_TESTC] = "mgmtd-testc", /* always first */
 	[MGMTD_BE_CLIENT_ID_ZEBRA] = "zebra",
+#ifdef HAVE_OSPFD
+	[MGMTD_BE_CLIENT_ID_OSPFD] = "ospfd",
+#endif
 #ifdef HAVE_RIPD
 	[MGMTD_BE_CLIENT_ID_RIPD] = "ripd",
 #endif
@@ -91,6 +94,14 @@ static const char *const mgmtd_testc_oper_xpaths[] = {
 };
 #endif
 
+#if HAVE_OSPFD
+static const char *const ospfd_oper_xpaths[] = {
+	"/frr-interface:lib/interface/state/frr-ospfd-lite:ospf/state/*",
+	"/frr-ospfd-lite:ospf/instance/state/*",
+	NULL,
+};
+#endif
+
 #ifdef HAVE_RIPD
 static const char *const ripd_config_xpaths[] = {
 	"/frr-filter:lib",
@@ -174,6 +185,9 @@ static const char *const *be_client_oper_xpaths[MGMTD_BE_CLIENT_ID_MAX] = {
 	[MGMTD_BE_CLIENT_ID_STATICD] = staticd_oper_xpaths,
 #endif
 	[MGMTD_BE_CLIENT_ID_ZEBRA] = zebra_oper_xpaths,
+#if HAVE_OSPFD
+	[MGMTD_BE_CLIENT_ID_OSPFD] = ospfd_oper_xpaths,
+#endif
 };
 
 static const char *const *be_client_notif_xpaths[MGMTD_BE_CLIENT_ID_MAX] = {

diff --git a/mgmtd/mgmt_be_adapter.h b/mgmtd/mgmt_be_adapter.h
@@ -29,6 +29,9 @@
 enum mgmt_be_client_id {
 	MGMTD_BE_CLIENT_ID_TESTC, /* always first */
 	MGMTD_BE_CLIENT_ID_ZEBRA,
+#ifdef HAVE_OSPFD
+	MGMTD_BE_CLIENT_ID_OSPFD,
+#endif
 #ifdef HAVE_RIPD
 	MGMTD_BE_CLIENT_ID_RIPD,
 #endif

diff --git a/mgmtd/mgmt_main.c b/mgmtd/mgmt_main.c
@@ -15,6 +15,7 @@
 #include "frr_pthread.h"
 #include "mgmtd/mgmt.h"
 #include "mgmtd/mgmt_ds.h"
+#include "ospfd/ospf_nb.h"
 #include "ripd/rip_nb.h"
 #include "ripngd/ripng_nb.h"
 #include "routing_nb.h"
@@ -175,6 +176,7 @@ const struct frr_yang_module_info zebra_route_map_info = {
  * List of YANG modules to be loaded in the process context of
  * MGMTd.
  */
+/* clang-format off */
 static const struct frr_yang_module_info *const mgmt_yang_modules[] = {
 	&frr_filter_cli_info,
 	&frr_interface_cli_info,
@@ -205,9 +207,11 @@ static const struct frr_yang_module_info *const mgmt_yang_modules[] = {
 #ifdef HAVE_STATICD
 	&frr_staticd_cli_info,
 #endif
+#ifdef HAVE_OSPFD
+	&frr_ospfd_lite_cli_info
+#endif
 };
 
-/* clang-format off */
 FRR_DAEMON_INFO(mgmtd, MGMTD,
 		.vty_port = MGMTD_VTY_PORT,
 		.proghelp = "FRR Management Daemon.",

diff --git a/mgmtd/subdir.am b/mgmtd/subdir.am
@@ -78,6 +78,15 @@ nodist_mgmtd_mgmtd_SOURCES += yang/frr-bfdd.yang.c
 endif
 endif
 
+if OSPFD
+nodist_mgmtd_mgmtd_SOURCES += \
+	yang/frr-ospfd-lite.yang.c \
+	# end
+mgmtd_libmgmt_be_nb_la_SOURCES += \
+	ospfd/ospf_cli.c \
+	# end
+endif
+
 if RIPD
 nodist_mgmtd_mgmtd_SOURCES += \
 	yang/frr-ripd.yang.c \

diff --git a/ospfd/ospf_cli.c b/ospfd/ospf_cli.c
@@ -0,0 +1,62 @@
+/*
+ * March 15 2025, Christian Hopps <chopps@labn.net>
+ *
+ * Copyright (c) 2025, LabN Consulting, L.L.C.
+ *
+ */
+#include <zebra.h>
+#include "ospf_nb.h"
+#include "ospfd/ospf_cli_clippy.c"
+
+/*
+ * XXX Add YANG based CLI config writing functions here.
+ */
+
+#if 0
+static void lib_interface_ospf_interface_cli_write(struct vty *vty, const struct lyd_node *dnode, bool show_defaults)
+{
+	/* TODO: this cli callback is optional; the cli output may not need to be done at each node. */
+}
+
+static void ospf_instance_cli_write(struct vty *vty, const struct lyd_node *dnode, bool show_defaults)
+{
+	/* TODO: this cli callback is optional; the cli output may not need to be done at each node. */
+}
+
+static void ospf_instance_areas_area_cli_write(struct vty *vty, const struct lyd_node *dnode, bool show_defaults)
+{
+	/* TODO: this cli callback is optional; the cli output may not need to be done at each node. */
+}
+#endif
+
+/* clang-format off */
+const struct frr_yang_module_info frr_ospfd_lite_cli_info = {
+        .name = "frr-ospfd-lite",
+	.ignore_cfg_cbs = true,
+        .nodes = {
+#if 0
+                {
+                        .xpath = "/frr-interface:lib/interface/frr-ospfd-lite:ospf-interface",
+                        .cbs = {
+                                .cli_show = lib_interface_ospf_interface_cli_write,
+                        }
+                },
+                {
+                        .xpath = "/frr-ospfd-lite:ospf/instance",
+                        .cbs = {
+                                .cli_show = ospf_instance_cli_write,
+                        }
+                },
+                {
+                        .xpath = "/frr-ospfd-lite:ospf/instance/areas/area",
+                        .cbs = {
+                                .cli_show = ospf_instance_areas_area_cli_write,
+                        }
+                },
+#endif
+                {
+                        .xpath = NULL,
+                },
+        }
+};
+/* clang-format on */
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
@@ -15,6 +15,7 @@
 #include "stream.h"
 #include "log.h"
 #include "sockopt.h"
+#include "mgmt_be_client.h"
 
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_interface.h"
@@ -2112,4 +2113,7 @@ void ospf_debug_init(void)
 	install_element(CONFIG_NODE, &no_debug_ospf_instance_event_cmd);
 	install_element(CONFIG_NODE, &no_debug_ospf_instance_nssa_cmd);
 	install_element(CONFIG_NODE, &no_debug_ospf_cmd);
+
+	/* Init mgmtd backend client debug commands. */
+	mgmt_be_client_lib_vty_init();
 }
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
@@ -29,6 +29,7 @@
 #include "routemap.h"
 #include "keychain.h"
 #include "libagentx.h"
+#include "mgmt_be_client.h"
 
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_interface.h"
@@ -46,6 +47,7 @@
 #include "ospfd/ospf_ldp_sync.h"
 #include "ospfd/ospf_routemap_nb.h"
 #include "ospfd/ospf_apiserver.h"
+#include "ospfd/ospf_nb.h"
 
 #define OSPFD_STATE_NAME	 "%s/ospfd.json", frr_libstatedir
 #define OSPFD_INST_STATE_NAME(i) "%s/ospfd-%d.json", frr_libstatedir, i
@@ -92,6 +94,8 @@ const struct option longopts[] = {
 /* Master of threads. */
 struct event_loop *master;
 
+struct mgmt_be_client *mgmt_be_client;
+
 /* SIGHUP handler. */
 static void sighup(void)
 {
@@ -103,6 +107,7 @@ static void sigint(void)
 {
 	zlog_notice("Terminating on signal");
 	bfd_protocol_integration_set_shutdown(true);
+	mgmt_be_client_destroy(mgmt_be_client);
 	ospf_terminate();
 
 	exit(0);
@@ -134,13 +139,10 @@ struct frr_signal_t ospf_signals[] = {
 };
 
 static const struct frr_yang_module_info *const ospfd_yang_modules[] = {
-	&frr_filter_info,
-	&frr_interface_info,
-	&frr_route_map_info,
-	&frr_vrf_info,
-	&frr_ospf_route_map_info,
-	&ietf_key_chain_info,
-	&ietf_key_chain_deviation_info,
+	&frr_filter_info,	  &frr_interface_info,
+	&frr_route_map_info,	  &frr_vrf_info,
+	&frr_ospf_route_map_info, &frr_ospfd_lite_info,
+	&ietf_key_chain_info,	  &ietf_key_chain_deviation_info,
 };
 
 /* actual paths filled in main() */
@@ -291,6 +293,8 @@ int main(int argc, char **argv)
 	ospf_vty_show_init();
 	ospf_vty_clear_init();
 
+	mgmt_be_client = mgmt_be_client_create("ospfd", NULL, 0, master);
+
 	/* OSPF BFD init */
 	ospf_bfd_init(master);