From a727cc7d76442fc0e2801a4c51f557ced2a0709f Mon Sep 17 00:00:00 2001 From: Christian Hopps Date: Tue, 7 May 2024 02:37:52 +0000 Subject: [PATCH] mgmtd: rpc and action handling both should use rpc map. The previous idea of using config xpath registrations for actions b/c the config is the subject of the action is sub-optimal. It splits handling of YANG "actions" (Action and RPCs) between 2 different registartion maps for the same category of functionality. Signed-off-by: Christian Hopps --- mgmtd/mgmt_fe_adapter.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/mgmtd/mgmt_fe_adapter.c b/mgmtd/mgmt_fe_adapter.c index b20e36ce0c..fc1bde0b38 100644 --- a/mgmtd/mgmt_fe_adapter.c +++ b/mgmtd/mgmt_fe_adapter.c @@ -1443,20 +1443,14 @@ static void fe_adapter_handle_rpc(struct mgmt_fe_session_ctx *session, return; } - if (snode->nodetype == LYS_RPC) - clients = - mgmt_be_interested_clients(xpath, - MGMT_BE_XPATH_SUBSCR_TYPE_RPC); - else if (snode->nodetype == LYS_ACTION) - clients = - mgmt_be_interested_clients(xpath, - MGMT_BE_XPATH_SUBSCR_TYPE_CFG); - else { + if (snode->nodetype != LYS_RPC && snode->nodetype != LYS_ACTION) { fe_adapter_send_error(session, req_id, false, -EINVAL, "Not an RPC or action path: %s", xpath); return; } + clients = mgmt_be_interested_clients(xpath, + MGMT_BE_XPATH_SUBSCR_TYPE_RPC); if (!clients) { __dbg("No backends implement xpath: %s for txn-id: %" PRIu64 " session-id: %" PRIu64, -- 2.39.5