ospf: keep RFC 9129 protocol parents in NB candidate

The converted ietf-ospf config leaves live below the ietf-routing control-plane-protocol list. The legacy router ospf and router ospf6 commands still create daemon instances directly, so they also need to seed and destroy the corresponding RFC 9129 parent list entry in the northbound candidate. Without that parent entry, child writes can apply in the daemon while the candidate tree is missing the list entry that owns them.

Register create and destroy callbacks for the OSPFv2 and OSPFv3 control-plane-protocol entries, route the CLI router/no-router lifecycle through those callbacks, and clear pending NB changes after direct daemon teardown. Keep OSPFv3 config-file batching enabled immediately before ospf6_init(), where the converted config wrappers are registered.

Share the RFC 9129 control-plane-protocol XPath helpers between module info, backend registration, and CLI wrappers, and use the daemon's existing instance-name helpers instead of repeating default-instance literals.

Signed-off-by: Eric Parsonage <eric@eparsonage.com>

Author: lamestllama

ospf6d/ospf6_area.c

@@ -27,6 +27,7 @@
 #include "ospf6_area.h"
 #include "ospf6_message.h"
 #include "ospf6_neighbor.h"
+#include "ospf6_nb.h"
 #include "ospf6_interface.h"
 #include "ospf6_intra.h"
 #include "ospf6_abr.h"
@@ -1296,8 +1297,9 @@ static int ospf6_area_xpath(char *xpath, size_t size, const struct ospf6 *o, uin
 
 	inet_ntop(AF_INET, &addr, area_id_str, sizeof(area_id_str));
 	ret = snprintf(xpath, size,
-		       "/ietf-routing:routing/control-plane-protocols/control-plane-protocol[type='ietf-ospf:ospfv3'][name='%s']/ietf-ospf:ospf/areas/area[area-id='%s']%s",
-		       o->name ? o->name : "default", area_id_str, leaf ? leaf : "");
+		       OSPF6D_IETF_ROUTING_PROTOCOL_XPATH
+		       "/ietf-ospf:ospf/areas/area[area-id='%s']%s",
+		       o->name ? o->name : VRF_DEFAULT_NAME, area_id_str, leaf ? leaf : "");
 	if (ret < 0 || (size_t)ret >= size)
 		return -1;
 

ospf6d/ospf6_interface.c

@@ -30,6 +30,7 @@
 #include "ospf6_abr.h"
 #include "ospf6_interface.h"
 #include "ospf6_neighbor.h"
+#include "ospf6_nb.h"
 #include "ospf6_intra.h"
 #include "ospf6_spf.h"
 #include "ospf6d.h"
@@ -2065,8 +2066,9 @@ static int ospf6_per_iface_xpath(char *xpath, size_t size, const struct interfac
 	addr.s_addr = oi->area->area_id;
 	inet_ntop(AF_INET, &addr, area_id_str, sizeof(area_id_str));
 	ret = snprintf(xpath, size,
-		       "/ietf-routing:routing/control-plane-protocols/control-plane-protocol[type='ietf-ospf:ospfv3'][name='%s']/ietf-ospf:ospf/areas/area[area-id='%s']/interfaces/interface[name='%s']%s",
-		       ospf6->name ? ospf6->name : "default", area_id_str, ifp->name,
+		       OSPF6D_IETF_ROUTING_PROTOCOL_XPATH
+		       "/ietf-ospf:ospf/areas/area[area-id='%s']/interfaces/interface[name='%s']%s",
+		       ospf6->name ? ospf6->name : VRF_DEFAULT_NAME, area_id_str, ifp->name,
 		       leaf ? leaf : "");
 	if (ret < 0 || (size_t)ret >= size)
 		return -1;

ospf6d/ospf6_main.c

@@ -188,11 +188,11 @@ static const struct frr_yang_module_info *const ospf6d_yang_modules[] = {
  * in mgmtd/mgmt_be_adapter.c::mgmt_be_xpath_prefix().
  */
 static const char *const ospf6d_oper_xpaths[] = {
-	"/ietf-routing:routing/control-plane-protocols/control-plane-protocol[type='ietf-ospf:ospfv3']",
+	OSPF6D_IETF_ROUTING_PROTOCOL_TYPE_XPATH,
 };
 
 static const char *const ospf6d_config_xpaths[] = {
-	"/ietf-routing:routing/control-plane-protocols/control-plane-protocol[type='ietf-ospf:ospfv3']",
+	OSPF6D_IETF_ROUTING_PROTOCOL_TYPE_XPATH,
 };
 
 struct mgmt_be_client_cbs ospf6d_be_client_data = {
@@ -288,7 +288,6 @@ int main(int argc, char *argv[], char *envp[])
 
 	/* OSPF6 master init. */
 	ospf6_master_init(frr_init());
-	cmd_config_file_batching_set(true);
 
 	/* thread master */
 	master = om6->master;
@@ -300,6 +299,7 @@ int main(int argc, char *argv[], char *envp[])
 	prefix_list_init();
 
 	/* initialize ospf6 */
+	cmd_config_file_batching_set(true);
 	ospf6_init(master);
 
 	/* Configuration processing callback initialization. */

ospf6d/ospf6_nb.c

@@ -7,12 +7,6 @@
 
 #include "ospf6_nb.h"
 
-#define OSPF6D_IETF_ROUTING_CP_XPATH                                          \
-	"/ietf-routing:routing/control-plane-protocols/"                      \
-	"control-plane-protocol"
-#define OSPF6D_IETF_OSPF_XPATH                                                \
-	OSPF6D_IETF_ROUTING_CP_XPATH "/ietf-ospf:ospf"
-
 /* clang-format off */
 const struct frr_yang_module_info ospf6d_ietf_routing_info = {
 	.name = "ietf-routing",
@@ -21,11 +15,14 @@ const struct frr_yang_module_info ospf6d_ietf_routing_info = {
 		{
 			.xpath = OSPF6D_IETF_ROUTING_CP_XPATH,
 			.cbs = {
+				.create = ospf6d_ietf_routing_control_plane_protocol_create,
+				.destroy = ospf6d_ietf_routing_control_plane_protocol_destroy,
 				.get_next = ospf6d_ietf_routing_control_plane_protocol_get_next,
 				.get_keys = ospf6d_ietf_routing_control_plane_protocol_get_keys,
 				.lookup_entry =
 					ospf6d_ietf_routing_control_plane_protocol_lookup_entry,
 			},
+			.cfg_opt_in = true,
 		},
 		{
 			.xpath = NULL,

ospf6d/ospf6_nb.h

@@ -10,13 +10,25 @@
 
 struct ospf6;
 
+#define OSPF6D_IETF_ROUTING_CP_XPATH                                          \
+	"/ietf-routing:routing/control-plane-protocols/"                      \
+	"control-plane-protocol"
+#define OSPF6D_IETF_ROUTING_PROTOCOL_TYPE_XPATH                               \
+	OSPF6D_IETF_ROUTING_CP_XPATH "[type='ietf-ospf:ospfv3']"
+#define OSPF6D_IETF_ROUTING_PROTOCOL_XPATH                                    \
+	OSPF6D_IETF_ROUTING_PROTOCOL_TYPE_XPATH "[name='%s']"
+#define OSPF6D_IETF_OSPF_XPATH                                                \
+	OSPF6D_IETF_ROUTING_CP_XPATH "/ietf-ospf:ospf"
+
 extern const struct frr_yang_module_info ospf6d_ietf_routing_info;
 extern const struct frr_yang_module_info ospf6d_ietf_routing_ospf_deviation_info;
 extern const struct frr_yang_module_info ospf6d_ietf_ospf_info;
 
 /* Shared lookup: find an OSPFv3 instance by the ietf-routing instance name. */
 struct ospf6 *ospf6d_ietf_ospf_lookup_instance(const char *name);
 
+int ospf6d_ietf_routing_control_plane_protocol_create(struct nb_cb_create_args *args);
+int ospf6d_ietf_routing_control_plane_protocol_destroy(struct nb_cb_destroy_args *args);
 const void *ospf6d_ietf_routing_control_plane_protocol_get_next(struct nb_cb_get_next_args *args);
 int ospf6d_ietf_routing_control_plane_protocol_get_keys(struct nb_cb_get_keys_args *args);
 const void *

ospf6d/ospf6_nb_config.c

@@ -20,6 +20,8 @@
 #include "ospf6_message.h"
 #include "ospf6_neighbor.h"
 #include "ospf6_route.h"
+#include "ospf6_tlv.h"
+#include "ospf6_gr.h"
 #include "ospf6_nb.h"
 #include "ospf6_nssa.h"
 
@@ -42,6 +44,70 @@ static bool ospf6_area_type_is(const char *val, const char *name)
 	return false;
 }
 
+static bool ospf6d_ietf_ospf_type_is(const char *val)
+{
+	return val && (!strcmp(val, "ospfv3") ||
+		       !strcmp(val, "ietf-ospf:ospfv3"));
+}
+
+/*
+ * XPath: /ietf-routing:routing/control-plane-protocols/control-plane-protocol
+ *
+ * Keep the IETF routing protocol list present in the local candidate whenever
+ * the legacy `router ospf6` CLI creates the daemon instance directly. Child
+ * commands converted to RFC 9129 leaves, such as explicit-router-id, then have
+ * a real parent list entry to modify during the pending NB commit.
+ */
+int ospf6d_ietf_routing_control_plane_protocol_create(struct nb_cb_create_args *args)
+{
+	const char *type;
+	const char *name;
+
+	if (args->event != NB_EV_APPLY)
+		return NB_OK;
+
+	type = yang_dnode_get_string(args->dnode, "type");
+	if (!ospf6d_ietf_ospf_type_is(type))
+		return NB_OK;
+
+	name = yang_dnode_get_string(args->dnode, "name");
+	if (!name)
+		name = VRF_DEFAULT_NAME;
+
+	if (!ospf6d_ietf_ospf_lookup_instance(name))
+		ospf6_instance_create(name);
+
+	return NB_OK;
+}
+
+int ospf6d_ietf_routing_control_plane_protocol_destroy(struct nb_cb_destroy_args *args)
+{
+	const char *type;
+	const char *name;
+	struct ospf6 *ospf6;
+
+	if (args->event != NB_EV_APPLY)
+		return NB_OK;
+
+	type = yang_dnode_get_string(args->dnode, "type");
+	if (!ospf6d_ietf_ospf_type_is(type))
+		return NB_OK;
+
+	name = yang_dnode_get_string(args->dnode, "name");
+	if (!name)
+		name = VRF_DEFAULT_NAME;
+
+	ospf6 = ospf6d_ietf_ospf_lookup_instance(name);
+	if (!ospf6)
+		return NB_OK;
+
+	if (ospf6->gr_info.restart_support)
+		ospf6_gr_nvm_delete(ospf6);
+	ospf6_delete(&ospf6);
+
+	return NB_OK;
+}
+
 /*
  * Look up the OSPFv3 instance corresponding to an ietf-ospf config dnode.
  * Walks up to the parent control-plane-protocol list entry to read the

ospf6d/ospf6_nb_state.c

@@ -65,7 +65,7 @@ static void *ospf6d_ietf_list_next_data(struct list *list, const void *entry)
 
 static const char *ospf6d_ietf_instance_name(const struct ospf6 *ospf6)
 {
-	return ospf6->name ? ospf6->name : "default";
+	return ospf6->name ? ospf6->name : VRF_DEFAULT_NAME;
 }
 
 struct ospf6 *ospf6d_ietf_ospf_lookup_instance(const char *name)

ospf6d/ospf6_top.c

@@ -30,6 +30,7 @@
 #include "ospf6_area.h"
 #include "ospf6_interface.h"
 #include "ospf6_neighbor.h"
+#include "ospf6_nb.h"
 #include "ospf6_network.h"
 
 #include "ospf6_flood.h"
@@ -676,13 +677,21 @@ bool ospf6_router_id_update(struct ospf6 *ospf6, bool init)
 	return true;
 }
 
+static int ospf6_ietf_routing_protocol_xpath(char *xpath, size_t size, const struct ospf6 *ospf6)
+{
+	return snprintf(xpath, size, OSPF6D_IETF_ROUTING_PROTOCOL_XPATH,
+			ospf6->name ? ospf6->name : VRF_DEFAULT_NAME);
+}
+
 /* start ospf6 */
 DEFUN_NOSH(router_ospf6, router_ospf6_cmd, "router ospf6 [vrf NAME]",
 	   ROUTER_STR OSPF6_STR VRF_CMD_HELP_STR)
 {
 	struct ospf6 *ospf6;
 	const char *vrf_name = VRF_DEFAULT_NAME;
+	char xpath[XPATH_MAXLEN];
 	int idx_vrf = 0;
+	int ret;
 
 	if (argv_find(argv, argc, "vrf", &idx_vrf)) {
 		vrf_name = argv[idx_vrf + 1]->arg;
@@ -692,6 +701,12 @@ DEFUN_NOSH(router_ospf6, router_ospf6_cmd, "router ospf6 [vrf NAME]",
 	if (ospf6 == NULL)
 		ospf6 = ospf6_instance_create(vrf_name);
 
+	ospf6_ietf_routing_protocol_xpath(xpath, sizeof(xpath), ospf6);
+	nb_cli_enqueue_change(vty, xpath, NB_OP_CREATE, NULL);
+	ret = nb_cli_apply_changes(vty, NULL);
+	if (ret != CMD_SUCCESS)
+		return ret;
+
 	/* set current ospf point. */
 	VTY_PUSH_CONTEXT(OSPF6_NODE, ospf6);
 
@@ -704,7 +719,9 @@ DEFUN(no_router_ospf6, no_router_ospf6_cmd, "no router ospf6 [vrf NAME]",
 {
 	struct ospf6 *ospf6;
 	const char *vrf_name = VRF_DEFAULT_NAME;
+	char xpath[XPATH_MAXLEN];
 	int idx_vrf = 0;
+	int ret = CMD_SUCCESS;
 
 	if (argv_find(argv, argc, "vrf", &idx_vrf)) {
 		vrf_name = argv[idx_vrf + 1]->arg;
@@ -714,16 +731,19 @@ DEFUN(no_router_ospf6, no_router_ospf6_cmd, "no router ospf6 [vrf NAME]",
 	if (ospf6 == NULL)
 		vty_out(vty, "OSPFv3 is not configured\n");
 	else {
+		ospf6_ietf_routing_protocol_xpath(xpath, sizeof(xpath), ospf6);
 		if (ospf6->gr_info.restart_support)
 			ospf6_gr_nvm_delete(ospf6);
 
 		ospf6_delete(&ospf6);
+		nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
+		ret = nb_cli_apply_changes_clear_pending(vty, "%s", xpath);
 	}
 
 	/* return to config node . */
 	VTY_PUSH_CONTEXT_NULL(CONFIG_NODE);
 
-	return CMD_SUCCESS;
+	return ret;
 }
 
 static void ospf6_db_clear(struct ospf6 *ospf6)
@@ -810,8 +830,8 @@ DEFPY (clear_router_ospf6,
 static int ospf6_router_id_xpath(char *xpath, size_t size, const struct ospf6 *o)
 {
 	return snprintf(xpath, size,
-			"/ietf-routing:routing/control-plane-protocols/control-plane-protocol[type='ietf-ospf:ospfv3'][name='%s']/ietf-ospf:ospf/explicit-router-id",
-			o->name ? o->name : "default");
+			OSPF6D_IETF_ROUTING_PROTOCOL_XPATH "/ietf-ospf:ospf/explicit-router-id",
+			o->name ? o->name : VRF_DEFAULT_NAME);
 }
 
 /*

ospfd/ospf_main.c

@@ -153,15 +153,27 @@ static const struct frr_yang_module_info *const ospfd_yang_modules[] = {
 /*
  * ospfd and ospf6d both register the RFC 9129 ietf-ospf control-plane-protocol
  * subtree. Filter on the `type` list-key so mgmtd dispatches each change to
- * the daemon that owns that protocol family. See the predicate-aware matching
- * in mgmtd/mgmt_be_adapter.c::mgmt_be_xpath_prefix().
+ * the daemon that owns that protocol family. In ospfd daemon-instance mode,
+ * each process narrows this further to its own `name` key so `ospfd-1` and
+ * `ospfd-2` do not both receive the same YANG edit.
+ *
+ * See the predicate-aware matching in
+ * mgmtd/mgmt_be_adapter.c::mgmt_be_xpath_prefix().
  */
 static const char *const ospfd_oper_xpaths[] = {
-	"/ietf-routing:routing/control-plane-protocols/control-plane-protocol[type='ietf-ospf:ospfv2']",
+	OSPFD_IETF_ROUTING_PROTOCOL_TYPE_XPATH,
 };
 
 static const char *const ospfd_config_xpaths[] = {
-	"/ietf-routing:routing/control-plane-protocols/control-plane-protocol[type='ietf-ospf:ospfv2']",
+	OSPFD_IETF_ROUTING_PROTOCOL_TYPE_XPATH,
+};
+
+static char ospfd_instance_xpath[XPATH_MAXLEN];
+static const char *const ospfd_instance_oper_xpaths[] = {
+	ospfd_instance_xpath,
+};
+static const char *const ospfd_instance_config_xpaths[] = {
+	ospfd_instance_xpath,
 };
 
 struct mgmt_be_client_cbs ospfd_be_client_data = {
@@ -171,6 +183,20 @@ struct mgmt_be_client_cbs ospfd_be_client_data = {
 	.noper_xpaths = array_size(ospfd_oper_xpaths),
 };
 
+static void ospfd_mgmt_be_init(void)
+{
+	if (!ospf_instance)
+		return;
+
+	ospfd_ietf_routing_protocol_instance_xpath(
+		ospfd_instance_xpath, sizeof(ospfd_instance_xpath),
+		ospf_instance, VRF_DEFAULT_NAME);
+	ospfd_be_client_data.config_xpaths = ospfd_instance_config_xpaths;
+	ospfd_be_client_data.nconfig_xpaths = array_size(ospfd_instance_config_xpaths);
+	ospfd_be_client_data.oper_xpaths = ospfd_instance_oper_xpaths;
+	ospfd_be_client_data.noper_xpaths = array_size(ospfd_instance_oper_xpaths);
+}
+
 /* actual paths filled in main() */
 static char state_path[512];
 static char state_compat1_path[512];
@@ -332,6 +358,7 @@ int main(int argc, char **argv)
 	/* OSPF errors init */
 	ospf_error_init();
 
+	ospfd_mgmt_be_init();
 	mgmt_be_client = mgmt_be_client_create("ospfd", &ospfd_be_client_data, 0, master);
 
 	frr_config_fork();