1 files changed, 50 insertions, 11 deletions

diff --git a/lib/routing_nb_config.c b/lib/routing_nb_config.c
index b789e8494e..17698d2b87 100644
--- a/lib/routing_nb_config.c
+++ b/lib/routing_nb_config.c
@@ -45,15 +45,21 @@ int routing_control_plane_protocols_control_plane_protocol_create(
 	case NB_EV_ABORT:
 		break;
 	case NB_EV_APPLY:
-		vrfname = yang_dnode_get_string(args->dnode, "./vrf");
-		vrf = vrf_lookup_by_name(vrfname);
-		vrf = vrf ? vrf : vrf_get(VRF_UNKNOWN, vrfname);
-		if (!vrf) {
-			flog_warn(EC_LIB_NB_CB_CONFIG_APPLY,
-				  "vrf creation %s failed", vrfname);
-			return NB_ERR;
+		/*
+		 * If the daemon relies on the VRF pointer stored in this
+		 * dnode, then it should register the dependency between this
+		 * module and the VRF module using
+		 * routing_control_plane_protocols_register_vrf_dependency.
+		 * If such dependency is not registered, then nothing is
+		 * stored in the dnode. If the dependency is registered,
+		 * find the vrf and store the pointer.
+		 */
+		if (nb_node_has_dependency(args->dnode->schema->priv)) {
+			vrfname = yang_dnode_get_string(args->dnode, "./vrf");
+			vrf = vrf_lookup_by_name(vrfname);
+			assert(vrf);
+			nb_running_set_entry(args->dnode, vrf);
 		}
-		nb_running_set_entry(args->dnode, vrf);
 		break;
 	};
 
@@ -63,12 +69,45 @@ int routing_control_plane_protocols_control_plane_protocol_create(
 int routing_control_plane_protocols_control_plane_protocol_destroy(
 	struct nb_cb_destroy_args *args)
 {
-	struct vrf *vrf __attribute__((unused));
-
 	if (args->event != NB_EV_APPLY)
 		return NB_OK;
 
-	vrf = nb_running_unset_entry(args->dnode);
+	/*
+	 * If dependency on VRF module is registered, then VRF
+	 * pointer was stored and must be cleared.
+	 */
+	if (nb_node_has_dependency(args->dnode->schema->priv))
+		nb_running_unset_entry(args->dnode);
 
 	return NB_OK;
 }
+
+static void vrf_to_control_plane_protocol(const struct lyd_node *dnode,
+					  char *xpath)
+{
+	const char *vrf;
+
+	vrf = yang_dnode_get_string(dnode, "./name");
+
+	snprintf(xpath, XPATH_MAXLEN, FRR_ROUTING_KEY_XPATH_VRF, vrf);
+}
+
+static void control_plane_protocol_to_vrf(const struct lyd_node *dnode,
+					  char *xpath)
+{
+	const char *vrf;
+
+	vrf = yang_dnode_get_string(dnode, "./vrf");
+
+	snprintf(xpath, XPATH_MAXLEN, FRR_VRF_KEY_XPATH, vrf);
+}
+
+void routing_control_plane_protocols_register_vrf_dependency(void)
+{
+	struct nb_dependency_callbacks cbs;
+
+	cbs.get_dependant_xpath = vrf_to_control_plane_protocol;
+	cbs.get_dependency_xpath = control_plane_protocol_to_vrf;
+
+	nb_node_set_dependency_cbs(FRR_VRF_XPATH, FRR_ROUTING_XPATH, &cbs);
+}