diff options
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 261 |
1 files changed, 170 insertions, 91 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 5cfe171b70..7b41c58f51 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -3815,7 +3815,7 @@ static void pim_cli_legacy_mesh_group_behavior(struct vty *vty, /* Get mesh group base XPath. */ snprintf(xpath_value, sizeof(xpath_value), - FRR_PIM_AF_XPATH "/msdp-mesh-groups[name='%s']", + FRR_PIM_VRF_XPATH "/msdp-mesh-groups[name='%s']", "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4", gname); /* Group must exists, otherwise just quit. */ if (!yang_dnode_exists(vty->candidate_config->dnode, xpath_value)) @@ -6792,13 +6792,13 @@ DEFUN (ip_pim_spt_switchover_infinity, return CMD_WARNING_CONFIG_FAILED; snprintf(spt_plist_xpath, sizeof(spt_plist_xpath), - FRR_PIM_AF_XPATH, "frr-pim:pimd", "pim", vrfname, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(spt_plist_xpath, "/spt-switchover/spt-infinity-prefix-list", sizeof(spt_plist_xpath)); snprintf(spt_action_xpath, sizeof(spt_action_xpath), - FRR_PIM_AF_XPATH, "frr-pim:pimd", "pim", vrfname, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(spt_action_xpath, "/spt-switchover/spt-action", sizeof(spt_action_xpath)); @@ -6831,13 +6831,13 @@ DEFUN (ip_pim_spt_switchover_infinity_plist, return CMD_WARNING_CONFIG_FAILED; snprintf(spt_plist_xpath, sizeof(spt_plist_xpath), - FRR_PIM_AF_XPATH, "frr-pim:pimd", "pim", vrfname, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(spt_plist_xpath, "/spt-switchover/spt-infinity-prefix-list", sizeof(spt_plist_xpath)); snprintf(spt_action_xpath, sizeof(spt_action_xpath), - FRR_PIM_AF_XPATH, "frr-pim:pimd", "pim", vrfname, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(spt_action_xpath, "/spt-switchover/spt-action", sizeof(spt_action_xpath)); @@ -6868,13 +6868,13 @@ DEFUN (no_ip_pim_spt_switchover_infinity, return CMD_WARNING_CONFIG_FAILED; snprintf(spt_plist_xpath, sizeof(spt_plist_xpath), - FRR_PIM_AF_XPATH, "frr-pim:pimd", "pim", vrfname, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(spt_plist_xpath, "/spt-switchover/spt-infinity-prefix-list", sizeof(spt_plist_xpath)); snprintf(spt_action_xpath, sizeof(spt_action_xpath), - FRR_PIM_AF_XPATH, "frr-pim:pimd", "pim", vrfname, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(spt_action_xpath, "/spt-switchover/spt-action", sizeof(spt_action_xpath)); @@ -6906,13 +6906,13 @@ DEFUN (no_ip_pim_spt_switchover_infinity_plist, return CMD_WARNING_CONFIG_FAILED; snprintf(spt_plist_xpath, sizeof(spt_plist_xpath), - FRR_PIM_AF_XPATH, "frr-pim:pimd", "pim", vrfname, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(spt_plist_xpath, "/spt-switchover/spt-infinity-prefix-list", sizeof(spt_plist_xpath)); snprintf(spt_action_xpath, sizeof(spt_action_xpath), - FRR_PIM_AF_XPATH, "frr-pim:pimd", "pim", vrfname, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(spt_action_xpath, "/spt-switchover/spt-action", sizeof(spt_action_xpath)); @@ -6941,7 +6941,7 @@ DEFPY (pim_register_accept_list, return CMD_WARNING_CONFIG_FAILED; snprintf(reg_alist_xpath, sizeof(reg_alist_xpath), - FRR_PIM_AF_XPATH, "frr-pim:pimd", "pim", vrfname, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(reg_alist_xpath, "/register-accept-list", sizeof(reg_alist_xpath)); @@ -6964,8 +6964,13 @@ DEFUN (ip_pim_joinprune_time, "Join Prune Send Interval\n" "Seconds\n") { - nb_cli_enqueue_change(vty, "/frr-pim:pim/join-prune-interval", - NB_OP_MODIFY, argv[3]->arg); + char xpath[XPATH_MAXLEN]; + + snprintf(xpath, sizeof(xpath), FRR_PIM_ROUTER_XPATH, + "frr-routing:ipv4"); + strlcat(xpath, "/join-prune-interval", sizeof(xpath)); + + nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, argv[3]->arg); return nb_cli_apply_changes(vty, NULL); } @@ -6979,8 +6984,13 @@ DEFUN (no_ip_pim_joinprune_time, "Join Prune Send Interval\n" IGNORED_IN_NO_STR) { - nb_cli_enqueue_change(vty, "/frr-pim:pim/join-prune-interval", - NB_OP_DESTROY, NULL); + char xpath[XPATH_MAXLEN]; + + snprintf(xpath, sizeof(xpath), FRR_PIM_ROUTER_XPATH, + "frr-routing:ipv4"); + strlcat(xpath, "/join-prune-interval", sizeof(xpath)); + + nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL); return nb_cli_apply_changes(vty, NULL); } @@ -6993,8 +7003,13 @@ DEFUN (ip_pim_register_suppress, "Register Suppress Timer\n" "Seconds\n") { - nb_cli_enqueue_change(vty, "/frr-pim:pim/register-suppress-time", - NB_OP_MODIFY, argv[3]->arg); + char xpath[XPATH_MAXLEN]; + + snprintf(xpath, sizeof(xpath), FRR_PIM_ROUTER_XPATH, + "frr-routing:ipv4"); + strlcat(xpath, "/register-suppress-time", sizeof(xpath)); + + nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, argv[3]->arg); return nb_cli_apply_changes(vty, NULL); } @@ -7008,8 +7023,13 @@ DEFUN (no_ip_pim_register_suppress, "Register Suppress Timer\n" IGNORED_IN_NO_STR) { - nb_cli_enqueue_change(vty, "/frr-pim:pim/register-suppress-time", - NB_OP_DESTROY, NULL); + char xpath[XPATH_MAXLEN]; + + snprintf(xpath, sizeof(xpath), FRR_PIM_ROUTER_XPATH, + "frr-routing:ipv4"); + strlcat(xpath, "/register-suppress-time", sizeof(xpath)); + + nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL); return nb_cli_apply_changes(vty, NULL); } @@ -7031,7 +7051,8 @@ DEFUN (ip_pim_rp_keep_alive, return CMD_WARNING_CONFIG_FAILED; snprintf(rp_ka_timer_xpath, sizeof(rp_ka_timer_xpath), - FRR_PIM_XPATH, "frr-pim:pimd", "pim", vrfname); + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, + "frr-routing:ipv4"); strlcat(rp_ka_timer_xpath, "/rp-keep-alive-timer", sizeof(rp_ka_timer_xpath)); @@ -7055,10 +7076,16 @@ DEFUN (no_ip_pim_rp_keep_alive, char rp_ka_timer[6]; char rp_ka_timer_xpath[XPATH_MAXLEN]; uint v; + char rs_timer_xpath[XPATH_MAXLEN]; + + snprintf(rs_timer_xpath, sizeof(rs_timer_xpath), + FRR_PIM_ROUTER_XPATH, "frr-routing:ipv4"); + strlcat(rs_timer_xpath, "/register-suppress-time", + sizeof(rs_timer_xpath)); /* RFC4601 */ v = yang_dnode_get_uint16(vty->candidate_config->dnode, - "/frr-pim:pim/register-suppress-time"); + rs_timer_xpath); v = 3 * v + PIM_REGISTER_PROBE_TIME_DEFAULT; if (v > UINT16_MAX) v = UINT16_MAX; @@ -7069,7 +7096,8 @@ DEFUN (no_ip_pim_rp_keep_alive, return CMD_WARNING_CONFIG_FAILED; snprintf(rp_ka_timer_xpath, sizeof(rp_ka_timer_xpath), - FRR_PIM_XPATH, "frr-pim:pimd", "pim", vrfname); + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, + "frr-routing:ipv4"); strlcat(rp_ka_timer_xpath, "/rp-keep-alive-timer", sizeof(rp_ka_timer_xpath)); @@ -7094,8 +7122,8 @@ DEFUN (ip_pim_keep_alive, if (vrfname == NULL) return CMD_WARNING_CONFIG_FAILED; - snprintf(ka_timer_xpath, sizeof(ka_timer_xpath), FRR_PIM_XPATH, - "frr-pim:pimd", "pim", vrfname); + snprintf(ka_timer_xpath, sizeof(ka_timer_xpath), FRR_PIM_VRF_XPATH, + "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ka_timer_xpath, "/keep-alive-timer", sizeof(ka_timer_xpath)); nb_cli_enqueue_change(vty, ka_timer_xpath, NB_OP_MODIFY, @@ -7120,8 +7148,8 @@ DEFUN (no_ip_pim_keep_alive, if (vrfname == NULL) return CMD_WARNING_CONFIG_FAILED; - snprintf(ka_timer_xpath, sizeof(ka_timer_xpath), FRR_PIM_XPATH, - "frr-pim:pimd", "pim", vrfname); + snprintf(ka_timer_xpath, sizeof(ka_timer_xpath), FRR_PIM_VRF_XPATH, + "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ka_timer_xpath, "/keep-alive-timer", sizeof(ka_timer_xpath)); nb_cli_enqueue_change(vty, ka_timer_xpath, NB_OP_DESTROY, NULL); @@ -7137,8 +7165,13 @@ DEFUN (ip_pim_packets, "packets to process at one time per fd\n" "Number of packets\n") { - nb_cli_enqueue_change(vty, "/frr-pim:pim/packets", NB_OP_MODIFY, - argv[3]->arg); + char xpath[XPATH_MAXLEN]; + + snprintf(xpath, sizeof(xpath), FRR_PIM_ROUTER_XPATH, + "frr-routing:ipv4"); + strlcat(xpath, "/packets", sizeof(xpath)); + + nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, argv[3]->arg); return nb_cli_apply_changes(vty, NULL); } @@ -7152,7 +7185,13 @@ DEFUN (no_ip_pim_packets, "packets to process at one time per fd\n" IGNORED_IN_NO_STR) { - nb_cli_enqueue_change(vty, "/frr-pim:pim/packets", NB_OP_DESTROY, NULL); + char xpath[XPATH_MAXLEN]; + + snprintf(xpath, sizeof(xpath), FRR_PIM_ROUTER_XPATH, + "frr-routing:ipv4"); + strlcat(xpath, "/packets", sizeof(xpath)); + + nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL); return nb_cli_apply_changes(vty, NULL); } @@ -7201,7 +7240,7 @@ DEFUN (ip_pim_v6_secondary, return CMD_WARNING_CONFIG_FAILED; snprintf(send_v6_secondary_xpath, sizeof(send_v6_secondary_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(send_v6_secondary_xpath, "/send-v6-secondary", sizeof(send_v6_secondary_xpath)); @@ -7228,7 +7267,7 @@ DEFUN (no_ip_pim_v6_secondary, return CMD_WARNING_CONFIG_FAILED; snprintf(send_v6_secondary_xpath, sizeof(send_v6_secondary_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(send_v6_secondary_xpath, "/send-v6-secondary", sizeof(send_v6_secondary_xpath)); @@ -7442,7 +7481,7 @@ DEFUN (ip_pim_ssm_prefix_list, if (vrfname == NULL) return CMD_WARNING_CONFIG_FAILED; - snprintf(ssm_plist_xpath, sizeof(ssm_plist_xpath), FRR_PIM_AF_XPATH, + snprintf(ssm_plist_xpath, sizeof(ssm_plist_xpath), FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ssm_plist_xpath, "/ssm-prefix-list", sizeof(ssm_plist_xpath)); @@ -7468,7 +7507,7 @@ DEFUN (no_ip_pim_ssm_prefix_list, return CMD_WARNING_CONFIG_FAILED; snprintf(ssm_plist_xpath, sizeof(ssm_plist_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ssm_plist_xpath, "/ssm-prefix-list", sizeof(ssm_plist_xpath)); @@ -7497,7 +7536,7 @@ DEFUN (no_ip_pim_ssm_prefix_list_name, return CMD_WARNING_CONFIG_FAILED; snprintf(ssm_plist_xpath, sizeof(ssm_plist_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ssm_plist_xpath, "/ssm-prefix-list", sizeof(ssm_plist_xpath)); ssm_plist_dnode = yang_dnode_get(vty->candidate_config->dnode, @@ -7656,7 +7695,7 @@ DEFUN (ip_ssmpingd, return CMD_WARNING_CONFIG_FAILED; snprintf(ssmpingd_ip_xpath, sizeof(ssmpingd_ip_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ssmpingd_ip_xpath, "/ssm-pingd-source-ip", sizeof(ssmpingd_ip_xpath)); @@ -7685,7 +7724,7 @@ DEFUN (no_ip_ssmpingd, return CMD_WARNING_CONFIG_FAILED; snprintf(ssmpingd_ip_xpath, sizeof(ssmpingd_ip_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ssmpingd_ip_xpath, "/ssm-pingd-source-ip", sizeof(ssmpingd_ip_xpath)); @@ -7710,8 +7749,8 @@ DEFUN (ip_pim_ecmp, if (vrfname == NULL) return CMD_WARNING_CONFIG_FAILED; - snprintf(ecmp_xpath, sizeof(ecmp_xpath), FRR_PIM_XPATH, - "frr-pim:pimd", "pim", vrfname); + snprintf(ecmp_xpath, sizeof(ecmp_xpath), FRR_PIM_VRF_XPATH, + "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ecmp_xpath, "/ecmp", sizeof(ecmp_xpath)); nb_cli_enqueue_change(vty, ecmp_xpath, NB_OP_MODIFY, "true"); @@ -7733,8 +7772,8 @@ DEFUN (no_ip_pim_ecmp, if (vrfname == NULL) return CMD_WARNING_CONFIG_FAILED; - snprintf(ecmp_xpath, sizeof(ecmp_xpath), FRR_PIM_XPATH, - "frr-pim:pimd", "pim", vrfname); + snprintf(ecmp_xpath, sizeof(ecmp_xpath), FRR_PIM_VRF_XPATH, + "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ecmp_xpath, "/ecmp", sizeof(ecmp_xpath)); nb_cli_enqueue_change(vty, ecmp_xpath, NB_OP_MODIFY, "false"); @@ -7758,12 +7797,12 @@ DEFUN (ip_pim_ecmp_rebalance, if (vrfname == NULL) return CMD_WARNING_CONFIG_FAILED; - snprintf(ecmp_xpath, sizeof(ecmp_xpath), FRR_PIM_XPATH, - "frr-pim:pimd", "pim", vrfname); + snprintf(ecmp_xpath, sizeof(ecmp_xpath), FRR_PIM_VRF_XPATH, + "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ecmp_xpath, "/ecmp", sizeof(ecmp_xpath)); snprintf(ecmp_rebalance_xpath, sizeof(ecmp_rebalance_xpath), - FRR_PIM_XPATH, - "frr-pim:pimd", "pim", vrfname); + FRR_PIM_VRF_XPATH, + "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ecmp_rebalance_xpath, "/ecmp-rebalance", sizeof(ecmp_rebalance_xpath)); @@ -7790,8 +7829,8 @@ DEFUN (no_ip_pim_ecmp_rebalance, return CMD_WARNING_CONFIG_FAILED; snprintf(ecmp_rebalance_xpath, sizeof(ecmp_rebalance_xpath), - FRR_PIM_XPATH, - "frr-pim:pimd", "pim", vrfname); + FRR_PIM_VRF_XPATH, + "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); strlcat(ecmp_rebalance_xpath, "/ecmp-rebalance", sizeof(ecmp_rebalance_xpath)); @@ -7822,10 +7861,12 @@ DEFUN (interface_no_ip_igmp, char pim_if_xpath[XPATH_MAXLEN + 20]; snprintf(pim_if_xpath, sizeof(pim_if_xpath), - "%s/frr-pim:pim", VTY_CURR_XPATH); + "%s/frr-pim:pim/address-family[address-family='%s']", + VTY_CURR_XPATH, "frr-routing:ipv4"); pim_enable_dnode = yang_dnode_getf(vty->candidate_config->dnode, - "%s/pim-enable", pim_if_xpath); + FRR_PIM_ENABLE_XPATH, VTY_CURR_XPATH, + "frr-routing:ipv4"); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, pim_if_xpath, NB_OP_DESTROY, NULL); nb_cli_enqueue_change(vty, ".", NB_OP_DESTROY, NULL); @@ -7921,9 +7962,10 @@ DEFUN (interface_ip_igmp_query_interval, pim_enable_dnode = yang_dnode_getf(vty->candidate_config->dnode, - "%s/frr-pim:pim/pim-enable", VTY_CURR_XPATH); + FRR_PIM_ENABLE_XPATH, VTY_CURR_XPATH, + "frr-routing:ipv4"); if (!pim_enable_dnode) { - nb_cli_enqueue_change(vty, "./igmp-enable", NB_OP_MODIFY, + nb_cli_enqueue_change(vty, "./enable", NB_OP_MODIFY, "true"); } else { if (!yang_dnode_get_bool(pim_enable_dnode, ".")) @@ -7992,7 +8034,8 @@ DEFUN (interface_ip_igmp_query_max_response_time, pim_enable_dnode = yang_dnode_getf(vty->candidate_config->dnode, - "%s/frr-pim:pim/pim-enable", VTY_CURR_XPATH); + FRR_PIM_ENABLE_XPATH, VTY_CURR_XPATH, + "frr-routing:ipv4"); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, "./igmp-enable", NB_OP_MODIFY, @@ -8035,7 +8078,8 @@ DEFUN_HIDDEN (interface_ip_igmp_query_max_response_time_dsec, pim_enable_dnode = yang_dnode_getf(vty->candidate_config->dnode, - "%s/frr-pim:pim/pim-enable", VTY_CURR_XPATH); + FRR_PIM_ENABLE_XPATH, VTY_CURR_XPATH, + "frr-routing:ipv4"); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, "./igmp-enable", NB_OP_MODIFY, "true"); @@ -8078,7 +8122,8 @@ DEFUN (interface_ip_igmp_last_member_query_count, pim_enable_dnode = yang_dnode_getf(vty->candidate_config->dnode, - "%s/frr-pim:pim/pim-enable", VTY_CURR_XPATH); + FRR_PIM_ENABLE_XPATH, VTY_CURR_XPATH, + "frr-routing:ipv4"); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, "./igmp-enable", NB_OP_MODIFY, "true"); @@ -8121,7 +8166,8 @@ DEFUN (interface_ip_igmp_last_member_query_interval, pim_enable_dnode = yang_dnode_getf(vty->candidate_config->dnode, - "%s/frr-pim:pim/pim-enable", VTY_CURR_XPATH); + FRR_PIM_ENABLE_XPATH, VTY_CURR_XPATH, + "frr-routing:ipv4"); if (!pim_enable_dnode) { nb_cli_enqueue_change(vty, "./igmp-enable", NB_OP_MODIFY, "true"); @@ -8165,7 +8211,8 @@ DEFUN (interface_ip_pim_drprio, nb_cli_enqueue_change(vty, "./dr-priority", NB_OP_MODIFY, argv[idx_number]->arg); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFUN (interface_no_ip_pim_drprio, @@ -8179,7 +8226,8 @@ DEFUN (interface_no_ip_pim_drprio, { nb_cli_enqueue_change(vty, "./dr-priority", NB_OP_DESTROY, NULL); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFPY_HIDDEN (interface_ip_igmp_query_generate, @@ -8277,7 +8325,9 @@ DEFPY (interface_ip_pim_activeactive, "true"); } - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFUN_HIDDEN (interface_ip_pim_ssm, @@ -8291,7 +8341,9 @@ DEFUN_HIDDEN (interface_ip_pim_ssm, nb_cli_enqueue_change(vty, "./pim-enable", NB_OP_MODIFY, "true"); - ret = nb_cli_apply_changes(vty, "./frr-pim:pim"); + ret = nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); if (ret != NB_OK) return ret; @@ -8311,7 +8363,9 @@ DEFUN_HIDDEN (interface_ip_pim_sm, { nb_cli_enqueue_change(vty, "./pim-enable", NB_OP_MODIFY, "true"); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFUN (interface_ip_pim, @@ -8322,7 +8376,10 @@ DEFUN (interface_ip_pim, { nb_cli_enqueue_change(vty, "./pim-enable", NB_OP_MODIFY, "true"); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); + } DEFUN_HIDDEN (interface_no_ip_pim_ssm, @@ -8354,7 +8411,8 @@ DEFUN_HIDDEN (interface_no_ip_pim_ssm, "false"); } - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFUN_HIDDEN (interface_no_ip_pim_sm, @@ -8386,7 +8444,9 @@ DEFUN_HIDDEN (interface_no_ip_pim_sm, "false"); } - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFUN (interface_no_ip_pim, @@ -8417,7 +8477,9 @@ DEFUN (interface_no_ip_pim, "false"); } - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } /* boundaries */ @@ -8434,7 +8496,7 @@ DEFUN(interface_ip_pim_boundary_oil, argv[4]->arg); return nb_cli_apply_changes(vty, - "./frr-pim:pim/address-family[address-family='%s']", + FRR_PIM_INTERFACE_XPATH, "frr-routing:ipv4"); } @@ -8453,7 +8515,7 @@ DEFUN(interface_no_ip_pim_boundary_oil, NULL); return nb_cli_apply_changes(vty, - "./frr-pim:pim/address-family[address-family='%s']", + FRR_PIM_INTERFACE_XPATH, "frr-routing:ipv4"); } @@ -8479,7 +8541,7 @@ DEFUN (interface_ip_mroute, argv[idx_interface]->arg); return nb_cli_apply_changes(vty, - "./frr-pim:pim/address-family[address-family='%s']/mroute[source-addr='%s'][group-addr='%s']", + FRR_PIM_MROUTE_XPATH, "frr-routing:ipv4", source_str, argv[idx_ipv4]->arg); } @@ -8505,7 +8567,7 @@ DEFUN (interface_no_ip_mroute, nb_cli_enqueue_change(vty, ".", NB_OP_DESTROY, NULL); return nb_cli_apply_changes(vty, - "./frr-pim:pim/address-family[address-family='%s']/mroute[source-addr='%s'][group-addr='%s']", + FRR_PIM_MROUTE_XPATH, "frr-routing:ipv4", source_str, argv[idx_ipv4]->arg); } @@ -8542,7 +8604,9 @@ DEFUN (interface_ip_pim_hello, nb_cli_enqueue_change(vty, "./hello-holdtime", NB_OP_MODIFY, argv[idx_hold]->arg); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFUN (interface_no_ip_pim_hello, @@ -8558,7 +8622,9 @@ DEFUN (interface_no_ip_pim_hello, nb_cli_enqueue_change(vty, "./hello-interval", NB_OP_DESTROY, NULL); nb_cli_enqueue_change(vty, "./hello-holdtime", NB_OP_DESTROY, NULL); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFUN (debug_igmp, @@ -9206,7 +9272,7 @@ DEFUN (interface_pim_use_source, nb_cli_enqueue_change(vty, "./use-source", NB_OP_MODIFY, argv[3]->arg); return nb_cli_apply_changes(vty, - "./frr-pim:pim/address-family[address-family='%s']", + FRR_PIM_INTERFACE_XPATH, "frr-routing:ipv4"); } @@ -9222,7 +9288,7 @@ DEFUN (interface_no_pim_use_source, nb_cli_enqueue_change(vty, "./use-source", NB_OP_MODIFY, "0.0.0.0"); return nb_cli_apply_changes(vty, - "./frr-pim:pim/address-family[address-family='%s']", + FRR_PIM_INTERFACE_XPATH, "frr-routing:ipv4"); } @@ -9253,7 +9319,9 @@ DEFPY (ip_pim_bfd, if (prof) nb_cli_enqueue_change(vty, "./bfd/profile", NB_OP_MODIFY, prof); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFPY(no_ip_pim_bfd_profile, no_ip_pim_bfd_profile_cmd, @@ -9267,7 +9335,9 @@ DEFPY(no_ip_pim_bfd_profile, no_ip_pim_bfd_profile_cmd, { nb_cli_enqueue_change(vty, "./bfd/profile", NB_OP_DESTROY, NULL); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFUN (no_ip_pim_bfd, @@ -9280,7 +9350,9 @@ DEFUN (no_ip_pim_bfd, { nb_cli_enqueue_change(vty, "./bfd", NB_OP_DESTROY, NULL); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, + "frr-routing:ipv4"); } DEFUN (ip_pim_bsm, @@ -9306,7 +9378,8 @@ DEFUN (ip_pim_bsm, nb_cli_enqueue_change(vty, "./bsm", NB_OP_MODIFY, "true"); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, "frr-routing:ipv4"); } DEFUN (no_ip_pim_bsm, @@ -9319,7 +9392,8 @@ DEFUN (no_ip_pim_bsm, { nb_cli_enqueue_change(vty, "./bsm", NB_OP_MODIFY, "false"); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, "frr-routing:ipv4"); } DEFUN (ip_pim_ucast_bsm, @@ -9345,7 +9419,9 @@ DEFUN (ip_pim_ucast_bsm, nb_cli_enqueue_change(vty, "./unicast-bsm", NB_OP_MODIFY, "true"); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, "frr-routing:ipv4"); + } DEFUN (no_ip_pim_ucast_bsm, @@ -9358,7 +9434,8 @@ DEFUN (no_ip_pim_ucast_bsm, { nb_cli_enqueue_change(vty, "./unicast-bsm", NB_OP_MODIFY, "false"); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, "frr-routing:ipv4"); } #if HAVE_BFDD > 0 @@ -9410,7 +9487,8 @@ DEFUN_HIDDEN ( nb_cli_enqueue_change(vty, "./bfd/detect_mult", NB_OP_MODIFY, argv[idx_number]->arg); - return nb_cli_apply_changes(vty, "./frr-pim:pim"); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, "frr-routing:ipv4"); } #if HAVE_BFDD == 0 @@ -9444,7 +9522,7 @@ DEFPY(ip_msdp_peer, ip_msdp_peer_cmd, return CMD_WARNING_CONFIG_FAILED; snprintf(msdp_peer_source_xpath, sizeof(msdp_peer_source_xpath), - FRR_PIM_AF_XPATH, "frr-pim:pimd", "pim", vrfname, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); snprintf(temp_xpath, sizeof(temp_xpath), "/msdp-peer[peer-ip='%s']/source-ip", peer_str); @@ -9454,7 +9532,8 @@ DEFPY(ip_msdp_peer, ip_msdp_peer_cmd, nb_cli_enqueue_change(vty, msdp_peer_source_xpath, NB_OP_MODIFY, source_str); - return nb_cli_apply_changes(vty, NULL); + return nb_cli_apply_changes(vty, + FRR_PIM_INTERFACE_XPATH, "frr-routing:ipv4"); } DEFPY(ip_msdp_timers, ip_msdp_timers_cmd, @@ -9536,7 +9615,7 @@ DEFUN (no_ip_msdp_peer, return CMD_WARNING_CONFIG_FAILED; snprintf(msdp_peer_xpath, sizeof(msdp_peer_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4"); snprintf(temp_xpath, sizeof(temp_xpath), "/msdp-peer[peer-ip='%s']", @@ -9568,7 +9647,7 @@ DEFPY(ip_msdp_mesh_group_member, /* Create mesh group. */ snprintf(xpath_value, sizeof(xpath_value), - FRR_PIM_AF_XPATH "/msdp-mesh-groups[name='%s']", + FRR_PIM_VRF_XPATH "/msdp-mesh-groups[name='%s']", "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4", gname); nb_cli_enqueue_change(vty, xpath_value, NB_OP_CREATE, NULL); @@ -9602,7 +9681,7 @@ DEFPY(no_ip_msdp_mesh_group_member, /* Get mesh group base XPath. */ snprintf(xpath_value, sizeof(xpath_value), - FRR_PIM_AF_XPATH "/msdp-mesh-groups[name='%s']", + FRR_PIM_VRF_XPATH "/msdp-mesh-groups[name='%s']", "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4", gname); if (!yang_dnode_exists(vty->candidate_config->dnode, xpath_value)) { @@ -9652,7 +9731,7 @@ DEFPY(ip_msdp_mesh_group_source, /* Create mesh group. */ snprintf(xpath_value, sizeof(xpath_value), - FRR_PIM_AF_XPATH "/msdp-mesh-groups[name='%s']", + FRR_PIM_VRF_XPATH "/msdp-mesh-groups[name='%s']", "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4", gname); nb_cli_enqueue_change(vty, xpath_value, NB_OP_CREATE, NULL); @@ -9683,7 +9762,7 @@ DEFPY(no_ip_msdp_mesh_group_source, /* Get mesh group base XPath. */ snprintf(xpath_value, sizeof(xpath_value), - FRR_PIM_AF_XPATH "/msdp-mesh-groups[name='%s']", + FRR_PIM_VRF_XPATH "/msdp-mesh-groups[name='%s']", "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4", gname); nb_cli_enqueue_change(vty, xpath_value, NB_OP_CREATE, NULL); @@ -9718,7 +9797,7 @@ DEFPY(no_ip_msdp_mesh_group, /* Get mesh group base XPath. */ snprintf(xpath_value, sizeof(xpath_value), - FRR_PIM_AF_XPATH "/msdp-mesh-groups[name='%s']", + FRR_PIM_VRF_XPATH "/msdp-mesh-groups[name='%s']", "frr-pim:pimd", "pim", vrfname, "frr-routing:ipv4", gname); if (!yang_dnode_exists(vty->candidate_config->dnode, xpath_value)) return CMD_SUCCESS; @@ -10759,7 +10838,7 @@ DEFUN_HIDDEN (no_ip_pim_mlag, { char mlag_xpath[XPATH_MAXLEN]; - snprintf(mlag_xpath, sizeof(mlag_xpath), FRR_PIM_AF_XPATH, + snprintf(mlag_xpath, sizeof(mlag_xpath), FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", "default", "frr-routing:ipv4"); strlcat(mlag_xpath, "/mlag", sizeof(mlag_xpath)); @@ -10792,7 +10871,7 @@ DEFUN_HIDDEN (ip_pim_mlag, char mlag_reg_address_xpath[XPATH_MAXLEN]; snprintf(mlag_peerlink_rif_xpath, sizeof(mlag_peerlink_rif_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", "default", "frr-routing:ipv4"); strlcat(mlag_peerlink_rif_xpath, "/mlag/peerlink-rif", sizeof(mlag_peerlink_rif_xpath)); @@ -10802,7 +10881,7 @@ DEFUN_HIDDEN (ip_pim_mlag, argv[idx]->arg); snprintf(mlag_my_role_xpath, sizeof(mlag_my_role_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", "default", "frr-routing:ipv4"); strlcat(mlag_my_role_xpath, "/mlag/my-role", sizeof(mlag_my_role_xpath)); @@ -10822,7 +10901,7 @@ DEFUN_HIDDEN (ip_pim_mlag, } snprintf(mlag_peer_state_xpath, sizeof(mlag_peer_state_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", "default", "frr-routing:ipv4"); strlcat(mlag_peer_state_xpath, "/mlag/peer-state", sizeof(mlag_peer_state_xpath)); @@ -10842,7 +10921,7 @@ DEFUN_HIDDEN (ip_pim_mlag, } snprintf(mlag_reg_address_xpath, sizeof(mlag_reg_address_xpath), - FRR_PIM_AF_XPATH, + FRR_PIM_VRF_XPATH, "frr-pim:pimd", "pim", "default", "frr-routing:ipv4"); strlcat(mlag_reg_address_xpath, "/mlag/reg-address", sizeof(mlag_reg_address_xpath)); |