diff --git a/isisd/isis_cli.c b/isisd/isis_cli.c index c86d929903..46611a75ec 100644 --- a/isisd/isis_cli.c +++ b/isisd/isis_cli.c @@ -2157,7 +2157,7 @@ DEFPY_YANG_NOSH (isis_srv6_node_msd, /* * XPath: /frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-segs-left */ -DEFPY (isis_srv6_node_msd_max_segs_left, +DEFPY_YANG (isis_srv6_node_msd_max_segs_left, isis_srv6_node_msd_max_segs_left_cmd, "[no] max-segs-left (0-255)$max_segs_left", NO_STR @@ -2177,7 +2177,7 @@ DEFPY (isis_srv6_node_msd_max_segs_left, /* * XPath: /frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-end-pop */ -DEFPY (isis_srv6_node_msd_max_end_pop, +DEFPY_YANG (isis_srv6_node_msd_max_end_pop, isis_srv6_node_msd_max_end_pop_cmd, "[no] max-end-pop (0-255)$max_end_pop", NO_STR @@ -2196,7 +2196,7 @@ DEFPY (isis_srv6_node_msd_max_end_pop, /* * XPath: /frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-h-encaps */ -DEFPY (isis_srv6_node_msd_max_h_encaps, +DEFPY_YANG (isis_srv6_node_msd_max_h_encaps, isis_srv6_node_msd_max_h_encaps_cmd, "[no] max-h-encaps (0-255)$max_h_encaps", NO_STR @@ -2216,7 +2216,7 @@ DEFPY (isis_srv6_node_msd_max_h_encaps, /* * XPath: /frr-isisd:isis/instance/segment-routing-srv6/msd/node-msd/max-end-d */ -DEFPY (isis_srv6_node_msd_max_end_d, +DEFPY_YANG (isis_srv6_node_msd_max_end_d, isis_srv6_node_msd_max_end_d_cmd, "[no] max-end-d (0-255)$max_end_d", NO_STR @@ -2262,7 +2262,7 @@ void cli_show_isis_srv6_node_msd_end(struct vty *vty, const struct lyd_node *dno /* * XPath: /frr-isisd:isis/instance/segment-routing-srv6/interface */ -DEFPY (isis_srv6_interface, +DEFPY_YANG (isis_srv6_interface, isis_srv6_interface_cmd, "[no] interface WORD$interface", NO_STR @@ -3268,7 +3268,7 @@ void cli_show_ip_isis_frr(struct vty *vty, const struct lyd_node *dnode, /* * XPath: /frr-interface:lib/interface/frr-isisd:isis/fast-reroute/level-{1,2}/lfa/enable */ -DEFPY(isis_lfa, isis_lfa_cmd, +DEFPY_YANG(isis_lfa, isis_lfa_cmd, "[no] isis fast-reroute lfa [level-1|level-2]$level", NO_STR "IS-IS routing protocol\n" @@ -3311,7 +3311,7 @@ DEFPY(isis_lfa, isis_lfa_cmd, * XPath: * /frr-interface:lib/interface/frr-isisd:isis/fast-reroute/level-{1,2}/lfa/exclude-interface */ -DEFPY(isis_lfa_exclude_interface, isis_lfa_exclude_interface_cmd, +DEFPY_YANG(isis_lfa_exclude_interface, isis_lfa_exclude_interface_cmd, "[no] isis fast-reroute lfa [level-1|level-2]$level exclude interface IFNAME$ifname", NO_STR "IS-IS routing protocol\n" @@ -3362,7 +3362,7 @@ void cli_show_frr_lfa_exclude_interface(struct vty *vty, * XPath: * /frr-interface:lib/interface/frr-isisd:isis/fast-reroute/level-{1,2}/remote-lfa/enable */ -DEFPY(isis_remote_lfa, isis_remote_lfa_cmd, +DEFPY_YANG(isis_remote_lfa, isis_remote_lfa_cmd, "[no] isis fast-reroute remote-lfa tunnel mpls-ldp [level-1|level-2]$level", NO_STR "IS-IS routing protocol\n" @@ -3407,7 +3407,7 @@ DEFPY(isis_remote_lfa, isis_remote_lfa_cmd, * XPath: * /frr-interface:lib/interface/frr-isisd:isis/fast-reroute/level-{1,2}/remote-lfa/maximum-metric */ -DEFPY(isis_remote_lfa_max_metric, isis_remote_lfa_max_metric_cmd, +DEFPY_YANG(isis_remote_lfa_max_metric, isis_remote_lfa_max_metric_cmd, "[no] isis fast-reroute remote-lfa maximum-metric (1-16777215)$metric [level-1|level-2]$level", NO_STR "IS-IS routing protocol\n" @@ -3460,7 +3460,7 @@ void cli_show_frr_remote_lfa_max_metric(struct vty *vty, /* * XPath: /frr-interface:lib/interface/frr-isisd:isis/fast-reroute/level-{1,2}/ti-lfa/enable */ -DEFPY(isis_ti_lfa, isis_ti_lfa_cmd, +DEFPY_YANG(isis_ti_lfa, isis_ti_lfa_cmd, "[no] isis fast-reroute ti-lfa [level-1|level-2]$level [node-protection$node_protection [link-fallback$link_fallback]]", NO_STR "IS-IS routing protocol\n" @@ -3578,7 +3578,7 @@ void cli_show_isis_log_pdu_drops(struct vty *vty, const struct lyd_node *dnode, /* * XPath: /frr-isisd:isis/instance/mpls/ldp-sync */ -DEFPY(isis_mpls_ldp_sync, isis_mpls_ldp_sync_cmd, "mpls ldp-sync", +DEFPY_YANG(isis_mpls_ldp_sync, isis_mpls_ldp_sync_cmd, "mpls ldp-sync", MPLS_STR MPLS_LDP_SYNC_STR) { nb_cli_enqueue_change(vty, "./mpls/ldp-sync", NB_OP_CREATE, NULL); @@ -3586,7 +3586,7 @@ DEFPY(isis_mpls_ldp_sync, isis_mpls_ldp_sync_cmd, "mpls ldp-sync", return nb_cli_apply_changes(vty, NULL); } -DEFPY(no_isis_mpls_ldp_sync, no_isis_mpls_ldp_sync_cmd, "no mpls ldp-sync", +DEFPY_YANG(no_isis_mpls_ldp_sync, no_isis_mpls_ldp_sync_cmd, "no mpls ldp-sync", NO_STR MPLS_STR NO_MPLS_LDP_SYNC_STR) { nb_cli_enqueue_change(vty, "./mpls/ldp-sync", NB_OP_DESTROY, NULL); @@ -3600,7 +3600,7 @@ void cli_show_isis_mpls_ldp_sync(struct vty *vty, const struct lyd_node *dnode, vty_out(vty, " mpls ldp-sync\n"); } -DEFPY(isis_mpls_ldp_sync_holddown, isis_mpls_ldp_sync_holddown_cmd, +DEFPY_YANG(isis_mpls_ldp_sync_holddown, isis_mpls_ldp_sync_holddown_cmd, "mpls ldp-sync holddown (0-10000)", MPLS_STR MPLS_LDP_SYNC_STR "Time to wait for LDP-SYNC to occur before restoring interface metric\n" @@ -3612,7 +3612,7 @@ DEFPY(isis_mpls_ldp_sync_holddown, isis_mpls_ldp_sync_holddown_cmd, return nb_cli_apply_changes(vty, NULL); } -DEFPY(no_isis_mpls_ldp_sync_holddown, no_isis_mpls_ldp_sync_holddown_cmd, +DEFPY_YANG(no_isis_mpls_ldp_sync_holddown, no_isis_mpls_ldp_sync_holddown_cmd, "no mpls ldp-sync holddown [<(1-10000)>]", NO_STR MPLS_STR MPLS_LDP_SYNC_STR NO_MPLS_LDP_SYNC_HOLDDOWN_STR "Time in seconds\n") { @@ -3633,7 +3633,7 @@ void cli_show_isis_mpls_ldp_sync_holddown(struct vty *vty, /* * XPath: /frr-interface:lib/interface/frr-isisd:isis/mpls/ldp-sync */ -DEFPY(isis_mpls_if_ldp_sync, isis_mpls_if_ldp_sync_cmd, +DEFPY_YANG(isis_mpls_if_ldp_sync, isis_mpls_if_ldp_sync_cmd, "[no] isis mpls ldp-sync", NO_STR "IS-IS routing protocol\n" MPLS_STR MPLS_LDP_SYNC_STR) { @@ -3663,7 +3663,7 @@ void cli_show_isis_mpls_if_ldp_sync(struct vty *vty, vty_out(vty, " isis mpls ldp-sync\n"); } -DEFPY(isis_mpls_if_ldp_sync_holddown, isis_mpls_if_ldp_sync_holddown_cmd, +DEFPY_YANG(isis_mpls_if_ldp_sync_holddown, isis_mpls_if_ldp_sync_holddown_cmd, "isis mpls ldp-sync holddown (0-10000)", "IS-IS routing protocol\n" MPLS_STR MPLS_LDP_SYNC_STR "Time to wait for LDP-SYNC to occur before restoring interface metric\n" @@ -3684,7 +3684,7 @@ DEFPY(isis_mpls_if_ldp_sync_holddown, isis_mpls_if_ldp_sync_holddown_cmd, return nb_cli_apply_changes(vty, NULL); } -DEFPY(no_isis_mpls_if_ldp_sync_holddown, no_isis_mpls_if_ldp_sync_holddown_cmd, +DEFPY_YANG(no_isis_mpls_if_ldp_sync_holddown, no_isis_mpls_if_ldp_sync_holddown_cmd, "no isis mpls ldp-sync holddown [<(1-10000)>]", NO_STR "IS-IS routing protocol\n" MPLS_STR NO_MPLS_LDP_SYNC_STR NO_MPLS_LDP_SYNC_HOLDDOWN_STR "Time in seconds\n") diff --git a/pathd/path_cli.c b/pathd/path_cli.c index bf8a9ea028..27236667b1 100644 --- a/pathd/path_cli.c +++ b/pathd/path_cli.c @@ -234,7 +234,7 @@ DEFPY_NOSH( /* * XPath: /frr-pathd:pathd/srte/segment-list */ -DEFPY_NOSH( +DEFPY_YANG_NOSH( srte_segment_list, srte_segment_list_cmd, "segment-list WORD$name", @@ -267,7 +267,7 @@ DEFPY_NOSH( return ret; } -DEFPY(srte_no_segment_list, +DEFPY_YANG(srte_no_segment_list, srte_no_segment_list_cmd, "no segment-list WORD$name", NO_STR @@ -463,7 +463,7 @@ int segment_list_has_prefix( * XPath: /frr-pathd:pathd/srte/segment-list/segment */ /* clang-format off */ -DEFPY(srte_segment_list_segment, srte_segment_list_segment_cmd, +DEFPY_YANG(srte_segment_list_segment, srte_segment_list_segment_cmd, "index (0-4294967295)$index <[mpls$has_mpls_label label (16-1048575)$label] " "|" "[nai$has_nai <" @@ -527,7 +527,7 @@ DEFPY(srte_segment_list_segment, srte_segment_list_segment_cmd, return nb_cli_apply_changes(vty, NULL); } -DEFPY(srte_segment_list_no_segment, +DEFPY_YANG(srte_segment_list_no_segment, srte_segment_list_no_segment_cmd, "no index (0-4294967295)$index", NO_STR @@ -607,7 +607,7 @@ void cli_show_srte_segment_list_segment(struct vty *vty, /* * XPath: /frr-pathd:pathd/policy */ -DEFPY_NOSH( +DEFPY_YANG_NOSH( srte_policy, srte_policy_cmd, "policy color (0-4294967295)$num endpoint $endpoint", @@ -633,7 +633,7 @@ DEFPY_NOSH( return ret; } -DEFPY(srte_no_policy, +DEFPY_YANG(srte_no_policy, srte_no_policy_cmd, "no policy color (0-4294967295)$num endpoint $endpoint", NO_STR @@ -670,7 +670,7 @@ void cli_show_srte_policy_end(struct vty *vty, const struct lyd_node *dnode) /* * XPath: /frr-pathd:pathd/srte/policy/name */ -DEFPY(srte_policy_name, +DEFPY_YANG(srte_policy_name, srte_policy_name_cmd, "name WORD$name", "Segment Routing Policy name\n" @@ -681,7 +681,7 @@ DEFPY(srte_policy_name, return nb_cli_apply_changes(vty, NULL); } -DEFPY(srte_policy_no_name, +DEFPY_YANG(srte_policy_no_name, srte_policy_no_name_cmd, "no name [WORD]", NO_STR @@ -703,7 +703,7 @@ void cli_show_srte_policy_name(struct vty *vty, const struct lyd_node *dnode, /* * XPath: /frr-pathd:pathd/srte/policy/binding-sid */ -DEFPY(srte_policy_binding_sid, +DEFPY_YANG(srte_policy_binding_sid, srte_policy_binding_sid_cmd, "binding-sid (16-1048575)$label", "Segment Routing Policy Binding-SID\n" @@ -714,7 +714,7 @@ DEFPY(srte_policy_binding_sid, return nb_cli_apply_changes(vty, NULL); } -DEFPY(srte_policy_no_binding_sid, +DEFPY_YANG(srte_policy_no_binding_sid, srte_policy_no_binding_sid_cmd, "no binding-sid [(16-1048575)]", NO_STR @@ -736,7 +736,7 @@ void cli_show_srte_policy_binding_sid(struct vty *vty, /* * XPath: /frr-pathd:pathd/srte/policy/candidate-path */ -DEFPY(srte_policy_candidate_exp, +DEFPY_YANG(srte_policy_candidate_exp, srte_policy_candidate_exp_cmd, "candidate-path preference (0-4294967295)$preference name WORD$name \ explicit segment-list WORD$list_name", @@ -760,7 +760,7 @@ DEFPY(srte_policy_candidate_exp, preference_str); } -DEFPY_NOSH( +DEFPY_YANG_NOSH( srte_policy_candidate_dyn, srte_policy_candidate_dyn_cmd, "candidate-path preference (0-4294967295)$preference name WORD$name dynamic", @@ -791,7 +791,7 @@ DEFPY_NOSH( return ret; } -DEFPY(srte_candidate_bandwidth, +DEFPY_YANG(srte_candidate_bandwidth, srte_candidate_bandwidth_cmd, "bandwidth BANDWIDTH$value [required$required]", "Define a bandwidth constraint\n" @@ -805,7 +805,7 @@ DEFPY(srte_candidate_bandwidth, return nb_cli_apply_changes(vty, NULL); } -DEFPY(srte_candidate_no_bandwidth, +DEFPY_YANG(srte_candidate_no_bandwidth, srte_candidate_no_bandwidth_cmd, "no bandwidth [BANDWIDTH$value] [required$required]", NO_STR @@ -818,7 +818,7 @@ DEFPY(srte_candidate_no_bandwidth, return nb_cli_apply_changes(vty, NULL); } -DEFPY(srte_candidate_affinity_filter, srte_candidate_affinity_filter_cmd, +DEFPY_YANG(srte_candidate_affinity_filter, srte_candidate_affinity_filter_cmd, "affinity $type BITPATTERN$value", "Affinity constraint\n" "Exclude any matching link\n" @@ -842,7 +842,7 @@ DEFPY(srte_candidate_affinity_filter, srte_candidate_affinity_filter_cmd, return nb_cli_apply_changes(vty, NULL); } -DEFPY(srte_candidate_no_affinity_filter, srte_candidate_no_affinity_filter_cmd, +DEFPY_YANG(srte_candidate_no_affinity_filter, srte_candidate_no_affinity_filter_cmd, "no affinity $type [BITPATTERN$value]", NO_STR "Affinity constraint\n" @@ -858,7 +858,7 @@ DEFPY(srte_candidate_no_affinity_filter, srte_candidate_no_affinity_filter_cmd, return nb_cli_apply_changes(vty, NULL); } -DEFPY(srte_candidate_metric, +DEFPY_YANG(srte_candidate_metric, srte_candidate_metric_cmd, "metric [bound$bound] $type METRIC$value [required$required] [computed$computed]", "Define a metric constraint\n" @@ -907,7 +907,7 @@ DEFPY(srte_candidate_metric, return nb_cli_apply_changes(vty, NULL); } -DEFPY(srte_candidate_no_metric, +DEFPY_YANG(srte_candidate_no_metric, srte_candidate_no_metric_cmd, "no metric [bound] $type [METRIC$value] [required$required] [computed$computed]", NO_STR @@ -945,7 +945,7 @@ DEFPY(srte_candidate_no_metric, return nb_cli_apply_changes(vty, NULL); } -DEFPY(srte_policy_no_candidate, +DEFPY_YANG(srte_policy_no_candidate, srte_policy_no_candidate_cmd, "no candidate-path\ preference (0-4294967295)$preference\ @@ -971,7 +971,7 @@ DEFPY(srte_policy_no_candidate, preference_str); } -DEFPY(srte_candidate_objfun, +DEFPY_YANG(srte_candidate_objfun, srte_candidate_objfun_cmd, "objective-function $type [required$required]", "Define an objective function constraint\n" @@ -1006,7 +1006,7 @@ DEFPY(srte_candidate_objfun, return nb_cli_apply_changes(vty, NULL); } -DEFPY(srte_candidate_no_objfun, +DEFPY_YANG(srte_candidate_no_objfun, srte_candidate_no_objfun_cmd, "no objective-function [] [required$required]", NO_STR diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index f838c401e3..2dcea57051 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -3181,7 +3181,7 @@ DEFPY (clear_ip_mroute_count, return clear_ip_mroute_count_command(vty, name); } -DEFPY(clear_ip_msdp_peer, clear_ip_msdp_peer_cmd, +DEFPY_YANG(clear_ip_msdp_peer, clear_ip_msdp_peer_cmd, "clear ip msdp peer A.B.C.D$peer [vrf WORD$vrfname]", CLEAR_STR IP_STR @@ -3399,7 +3399,7 @@ DEFPY_NOSH (router_pim, return CMD_SUCCESS; } -DEFPY (no_router_pim, +DEFPY_YANG (no_router_pim, no_router_pim_cmd, "no router pim [vrf NAME]", NO_STR @@ -3424,7 +3424,7 @@ DEFPY (no_router_pim, } -DEFPY (pim_spt_switchover_infinity, +DEFPY_YANG (pim_spt_switchover_infinity, pim_spt_switchover_infinity_cmd, "spt-switchover infinity-and-beyond", "SPT-Switchover\n" @@ -3632,7 +3632,7 @@ DEFPY_ATTR(no_ip_pim_spt_switchover_infinity_plist, return ret; } -DEFPY (pim_register_accept_list, +DEFPY_YANG (pim_register_accept_list, pim_register_accept_list_cmd, "[no] register-accept-list PREFIXLIST4_NAME$word", NO_STR @@ -4237,7 +4237,7 @@ DEFPY (no_ip_igmp_group_watermark, return CMD_SUCCESS; } -DEFPY (pim_v6_secondary, +DEFPY_YANG (pim_v6_secondary, pim_v6_secondary_cmd, "send-v6-secondary", "Send v6 secondary addresses\n") @@ -4297,7 +4297,7 @@ DEFPY_ATTR(ip_pim_v6_secondary, return ret; } -DEFPY (no_pim_v6_secondary, +DEFPY_YANG (no_pim_v6_secondary, no_pim_v6_secondary_cmd, "no send-v6-secondary", NO_STR @@ -4716,7 +4716,7 @@ DEFPY (pim_bsr_candidate_rp_group, return pim_process_bsr_crp_grp_cmd(vty, group_str, no); } -DEFPY (pim_ssm_prefix_list, +DEFPY_YANG (pim_ssm_prefix_list, pim_ssm_prefix_list_cmd, "ssm prefix-list PREFIXLIST4_NAME$plist", "Source Specific Multicast\n" @@ -4776,7 +4776,7 @@ DEFPY_ATTR(ip_pim_ssm_prefix_list, return ret; } -DEFPY (no_pim_ssm_prefix_list, +DEFPY_YANG (no_pim_ssm_prefix_list, no_pim_ssm_prefix_list_cmd, "no ssm prefix-list", NO_STR @@ -4836,7 +4836,7 @@ DEFPY_ATTR(no_ip_pim_ssm_prefix_list, return ret; } -DEFPY (no_pim_ssm_prefix_list_name, +DEFPY_YANG (no_pim_ssm_prefix_list_name, no_pim_ssm_prefix_list_name_cmd, "no ssm prefix-list PREFIXLIST4_NAME$plist", NO_STR @@ -5128,7 +5128,7 @@ DEFPY_ATTR(no_ip_pim_ssmpingd, return ret; } -DEFPY (pim_ecmp, +DEFPY_YANG (pim_ecmp, pim_ecmp_cmd, "ecmp", "Enable PIM ECMP \n") @@ -5183,7 +5183,7 @@ DEFPY_ATTR(ip_pim_ecmp, return ret; } -DEFPY (no_pim_ecmp, +DEFPY_YANG (no_pim_ecmp, no_pim_ecmp_cmd, "no ecmp", NO_STR @@ -5240,7 +5240,7 @@ DEFPY_ATTR(no_ip_pim_ecmp, return ret; } -DEFPY (pim_ecmp_rebalance, +DEFPY_YANG (pim_ecmp_rebalance, pim_ecmp_rebalance_cmd, "ecmp rebalance", "Enable PIM ECMP \n" @@ -5306,7 +5306,7 @@ DEFPY_ATTR(ip_pim_ecmp_rebalance, return ret; } -DEFPY (no_pim_ecmp_rebalance, +DEFPY_YANG (no_pim_ecmp_rebalance, no_pim_ecmp_rebalance_cmd, "no ecmp rebalance", NO_STR @@ -5368,7 +5368,7 @@ DEFPY_ATTR(no_ip_pim_ecmp_rebalance, return ret; } -DEFUN (interface_ip_igmp, +DEFUN_YANG (interface_ip_igmp, interface_ip_igmp_cmd, "ip igmp", IP_STR @@ -5380,7 +5380,7 @@ DEFUN (interface_ip_igmp, "frr-routing:ipv4"); } -DEFUN (interface_no_ip_igmp, +DEFUN_YANG (interface_no_ip_igmp, interface_no_ip_igmp_cmd, "no ip igmp", NO_STR @@ -5464,7 +5464,7 @@ DEFPY_YANG (interface_ip_igmp_static_group, (src_str ? src_str : "0.0.0.0")); } -DEFUN (interface_ip_igmp_query_interval, +DEFUN_YANG (interface_ip_igmp_query_interval, interface_ip_igmp_query_interval_cmd, "ip igmp query-interval (1-65535)", IP_STR @@ -5494,7 +5494,7 @@ DEFUN (interface_ip_igmp_query_interval, "frr-routing:ipv4"); } -DEFUN (interface_no_ip_igmp_query_interval, +DEFUN_YANG (interface_no_ip_igmp_query_interval, interface_no_ip_igmp_query_interval_cmd, "no ip igmp query-interval [(1-65535)]", NO_STR @@ -5509,7 +5509,7 @@ DEFUN (interface_no_ip_igmp_query_interval, "frr-routing:ipv4"); } -DEFUN (interface_ip_igmp_version, +DEFUN_YANG (interface_ip_igmp_version, interface_ip_igmp_version_cmd, "ip igmp version (2-3)", IP_STR @@ -5526,7 +5526,7 @@ DEFUN (interface_ip_igmp_version, "frr-routing:ipv4"); } -DEFUN (interface_no_ip_igmp_version, +DEFUN_YANG (interface_no_ip_igmp_version, interface_no_ip_igmp_version_cmd, "no ip igmp version (2-3)", NO_STR @@ -5541,7 +5541,7 @@ DEFUN (interface_no_ip_igmp_version, "frr-routing:ipv4"); } -DEFPY (interface_ip_igmp_query_max_response_time, +DEFPY_YANG (interface_ip_igmp_query_max_response_time, interface_ip_igmp_query_max_response_time_cmd, "ip igmp query-max-response-time (1-65535)$qmrt", IP_STR @@ -5552,7 +5552,7 @@ DEFPY (interface_ip_igmp_query_max_response_time, return gm_process_query_max_response_time_cmd(vty, qmrt_str); } -DEFUN (interface_no_ip_igmp_query_max_response_time, +DEFUN_YANG (interface_no_ip_igmp_query_max_response_time, interface_no_ip_igmp_query_max_response_time_cmd, "no ip igmp query-max-response-time [(1-65535)]", NO_STR @@ -5564,7 +5564,7 @@ DEFUN (interface_no_ip_igmp_query_max_response_time, return gm_process_no_query_max_response_time_cmd(vty); } -DEFUN_HIDDEN (interface_ip_igmp_query_max_response_time_dsec, +DEFUN_YANG_HIDDEN (interface_ip_igmp_query_max_response_time_dsec, interface_ip_igmp_query_max_response_time_dsec_cmd, "ip igmp query-max-response-time-dsec (1-65535)", IP_STR @@ -5594,7 +5594,7 @@ DEFUN_HIDDEN (interface_ip_igmp_query_max_response_time_dsec, "frr-routing:ipv4"); } -DEFUN_HIDDEN (interface_no_ip_igmp_query_max_response_time_dsec, +DEFUN_YANG_HIDDEN (interface_no_ip_igmp_query_max_response_time_dsec, interface_no_ip_igmp_query_max_response_time_dsec_cmd, "no ip igmp query-max-response-time-dsec [(1-65535)]", NO_STR @@ -5904,7 +5904,7 @@ DEFPY (interface_no_ip_pim, } /* boundaries */ -DEFUN(interface_ip_pim_boundary_oil, +DEFUN_YANG(interface_ip_pim_boundary_oil, interface_ip_pim_boundary_oil_cmd, "ip multicast boundary oil WORD", IP_STR @@ -5916,7 +5916,7 @@ DEFUN(interface_ip_pim_boundary_oil, return pim_process_ip_pim_boundary_oil_cmd(vty, argv[4]->arg); } -DEFUN(interface_no_ip_pim_boundary_oil, +DEFUN_YANG(interface_no_ip_pim_boundary_oil, interface_no_ip_pim_boundary_oil_cmd, "no ip multicast boundary oil [WORD]", NO_STR @@ -6653,7 +6653,7 @@ DEFUN_NOSH (show_debugging_pim, return CMD_SUCCESS; } -DEFUN (interface_pim_use_source, +DEFUN_YANG (interface_pim_use_source, interface_pim_use_source_cmd, "ip pim use-source A.B.C.D", IP_STR @@ -6668,7 +6668,7 @@ DEFUN (interface_pim_use_source, "frr-routing:ipv4"); } -DEFUN (interface_no_pim_use_source, +DEFUN_YANG (interface_no_pim_use_source, interface_no_pim_use_source_cmd, "no ip pim use-source [A.B.C.D]", NO_STR @@ -6684,7 +6684,7 @@ DEFUN (interface_no_pim_use_source, "frr-routing:ipv4"); } -DEFPY (ip_pim_bfd, +DEFPY_YANG (ip_pim_bfd, ip_pim_bfd_cmd, "ip pim bfd [profile BFDPROF$prof]", IP_STR @@ -6717,7 +6717,7 @@ DEFPY (ip_pim_bfd, "frr-routing:ipv4"); } -DEFPY(no_ip_pim_bfd_profile, no_ip_pim_bfd_profile_cmd, +DEFPY_YANG(no_ip_pim_bfd_profile, no_ip_pim_bfd_profile_cmd, "no ip pim bfd profile [BFDPROF]", NO_STR IP_STR @@ -6733,7 +6733,7 @@ DEFPY(no_ip_pim_bfd_profile, no_ip_pim_bfd_profile_cmd, "frr-routing:ipv4"); } -DEFUN (no_ip_pim_bfd, +DEFUN_YANG (no_ip_pim_bfd, no_ip_pim_bfd_cmd, "no ip pim bfd", NO_STR @@ -6748,7 +6748,7 @@ DEFUN (no_ip_pim_bfd, "frr-routing:ipv4"); } -DEFUN (ip_pim_bsm, +DEFUN_YANG (ip_pim_bsm, ip_pim_bsm_cmd, "ip pim bsm", IP_STR @@ -6757,7 +6757,7 @@ DEFUN (ip_pim_bsm, { return pim_process_bsm_cmd(vty); } -DEFUN (no_ip_pim_bsm, +DEFUN_YANG (no_ip_pim_bsm, no_ip_pim_bsm_cmd, "no ip pim bsm", NO_STR @@ -6768,7 +6768,7 @@ DEFUN (no_ip_pim_bsm, return pim_process_no_bsm_cmd(vty); } -DEFUN (ip_pim_ucast_bsm, +DEFUN_YANG (ip_pim_ucast_bsm, ip_pim_ucast_bsm_cmd, "ip pim unicast-bsm", IP_STR @@ -6778,7 +6778,7 @@ DEFUN (ip_pim_ucast_bsm, return pim_process_unicast_bsm_cmd(vty); } -DEFUN (no_ip_pim_ucast_bsm, +DEFUN_YANG (no_ip_pim_ucast_bsm, no_ip_pim_ucast_bsm_cmd, "no ip pim unicast-bsm", NO_STR @@ -6790,7 +6790,7 @@ DEFUN (no_ip_pim_ucast_bsm, } #if HAVE_BFDD > 0 -DEFUN_HIDDEN ( +DEFUN_YANG_HIDDEN ( ip_pim_bfd_param, ip_pim_bfd_param_cmd, "ip pim bfd (2-255) (1-65535) (1-65535)", @@ -6801,7 +6801,7 @@ DEFUN_HIDDEN ( "Required min receive interval\n" "Desired min transmit interval\n") #else - DEFUN( + DEFUN_YANG( ip_pim_bfd_param, ip_pim_bfd_param_cmd, "ip pim bfd (2-255) (1-65535) (1-65535)", @@ -6855,7 +6855,7 @@ ALIAS(no_ip_pim_bfd, no_ip_pim_bfd_param_cmd, "Desired min transmit interval\n") #endif /* !HAVE_BFDD */ -DEFPY(pim_msdp_peer, pim_msdp_peer_cmd, +DEFPY_YANG(pim_msdp_peer, pim_msdp_peer_cmd, "msdp peer A.B.C.D$peer source A.B.C.D$source", CFG_MSDP_STR "Configure MSDP peer\n" @@ -6920,7 +6920,7 @@ DEFPY_ATTR(ip_pim_msdp_peer, return ret; } -DEFPY(msdp_peer_md5, msdp_peer_md5_cmd, +DEFPY_YANG(msdp_peer_md5, msdp_peer_md5_cmd, "msdp peer A.B.C.D$peer password WORD$psk", CFG_MSDP_STR "Configure MSDP peer\n" @@ -6945,7 +6945,7 @@ DEFPY(msdp_peer_md5, msdp_peer_md5_cmd, return nb_cli_apply_changes(vty, "%s", xpath); } -DEFPY(no_msdp_peer_md5, no_msdp_peer_md5_cmd, +DEFPY_YANG(no_msdp_peer_md5, no_msdp_peer_md5_cmd, "no msdp peer A.B.C.D$peer password [WORD]", NO_STR CFG_MSDP_STR @@ -6971,7 +6971,7 @@ DEFPY(no_msdp_peer_md5, no_msdp_peer_md5_cmd, return nb_cli_apply_changes(vty, "%s", xpath); } -DEFPY(pim_msdp_timers, pim_msdp_timers_cmd, +DEFPY_YANG(pim_msdp_timers, pim_msdp_timers_cmd, "msdp timers (1-65535)$keepalive (1-65535)$holdtime [(1-65535)$connretry]", CFG_MSDP_STR "MSDP timers configuration\n" @@ -7046,7 +7046,7 @@ DEFPY_ATTR(ip_pim_msdp_timers, return ret; } -DEFPY(no_pim_msdp_timers, no_pim_msdp_timers_cmd, +DEFPY_YANG(no_pim_msdp_timers, no_pim_msdp_timers_cmd, "no msdp timers [(1-65535) (1-65535) [(1-65535)]]", NO_STR CFG_MSDP_STR @@ -7110,7 +7110,7 @@ DEFPY_ATTR(no_ip_pim_msdp_timers, return ret; } -DEFPY (no_pim_msdp_peer, +DEFPY_YANG (no_pim_msdp_peer, no_pim_msdp_peer_cmd, "no msdp peer A.B.C.D", NO_STR @@ -7172,7 +7172,7 @@ DEFPY_ATTR(no_ip_pim_msdp_peer, return ret; } -DEFPY(msdp_peer_sa_filter, msdp_peer_sa_filter_cmd, +DEFPY_YANG(msdp_peer_sa_filter, msdp_peer_sa_filter_cmd, "msdp peer A.B.C.D$peer sa-filter ACL_NAME$acl_name $dir", CFG_MSDP_STR "Configure MSDP peer\n" @@ -7203,7 +7203,7 @@ DEFPY(msdp_peer_sa_filter, msdp_peer_sa_filter_cmd, return nb_cli_apply_changes(vty, "%s", xpath); } -DEFPY(no_msdp_peer_sa_filter, no_ip_msdp_peer_sa_filter_cmd, +DEFPY_YANG(no_msdp_peer_sa_filter, no_ip_msdp_peer_sa_filter_cmd, "no msdp peer A.B.C.D$peer sa-filter ACL_NAME $dir", NO_STR CFG_MSDP_STR @@ -7235,7 +7235,7 @@ DEFPY(no_msdp_peer_sa_filter, no_ip_msdp_peer_sa_filter_cmd, return nb_cli_apply_changes(vty, "%s", xpath); } -DEFPY(pim_msdp_mesh_group_member, +DEFPY_YANG(pim_msdp_mesh_group_member, pim_msdp_mesh_group_member_cmd, "msdp mesh-group WORD$gname member A.B.C.D$maddr", CFG_MSDP_STR @@ -7313,7 +7313,7 @@ DEFPY_ATTR(ip_pim_msdp_mesh_group_member, return ret; } -DEFPY(no_pim_msdp_mesh_group_member, +DEFPY_YANG(no_pim_msdp_mesh_group_member, no_pim_msdp_mesh_group_member_cmd, "no msdp mesh-group WORD$gname member A.B.C.D$maddr", NO_STR @@ -7432,7 +7432,7 @@ DEFPY_ATTR(no_ip_pim_msdp_mesh_group_member, return ret; } -DEFPY(pim_msdp_mesh_group_source, +DEFPY_YANG(pim_msdp_mesh_group_source, pim_msdp_mesh_group_source_cmd, "msdp mesh-group WORD$gname source A.B.C.D$saddr", CFG_MSDP_STR @@ -7505,7 +7505,7 @@ DEFPY_ATTR(ip_pim_msdp_mesh_group_source, return ret; } -DEFPY(no_pim_msdp_mesh_group_source, +DEFPY_YANG(no_pim_msdp_mesh_group_source, no_pim_msdp_mesh_group_source_cmd, "no msdp mesh-group WORD$gname source [A.B.C.D]", NO_STR @@ -7593,7 +7593,7 @@ DEFPY_ATTR(no_ip_pim_msdp_mesh_group_source, return ret; } -DEFPY(no_pim_msdp_mesh_group, +DEFPY_YANG(no_pim_msdp_mesh_group, no_pim_msdp_mesh_group_cmd, "no msdp mesh-group WORD$gname", NO_STR @@ -7661,7 +7661,7 @@ DEFPY_ATTR(no_ip_pim_msdp_mesh_group, return ret; } -DEFPY(msdp_shutdown, +DEFPY_YANG(msdp_shutdown, msdp_shutdown_cmd, "[no] msdp shutdown", NO_STR @@ -7679,7 +7679,7 @@ DEFPY(msdp_shutdown, return nb_cli_apply_changes(vty, NULL); } -DEFPY(msdp_peer_sa_limit, msdp_peer_sa_limit_cmd, +DEFPY_YANG(msdp_peer_sa_limit, msdp_peer_sa_limit_cmd, "[no] msdp peer A.B.C.D$peer sa-limit ![(1-4294967294)$sa_limit]", NO_STR CFG_MSDP_STR @@ -7702,7 +7702,7 @@ DEFPY(msdp_peer_sa_limit, msdp_peer_sa_limit_cmd, return nb_cli_apply_changes(vty, "%s", xpath); } -DEFPY(msdp_originator_id, msdp_originator_id_cmd, +DEFPY_YANG(msdp_originator_id, msdp_originator_id_cmd, "[no] msdp originator-id ![A.B.C.D$originator_id]", NO_STR CFG_MSDP_STR @@ -8448,7 +8448,7 @@ DEFUN (show_ip_msdp_sa_sg_vrf_all, return CMD_SUCCESS; } -DEFPY(msdp_log_neighbor_changes, msdp_log_neighbor_changes_cmd, +DEFPY_YANG(msdp_log_neighbor_changes, msdp_log_neighbor_changes_cmd, "[no] msdp log neighbor-events", NO_STR MSDP_STR @@ -8463,7 +8463,7 @@ DEFPY(msdp_log_neighbor_changes, msdp_log_neighbor_changes_cmd, return nb_cli_apply_changes(vty, NULL); } -DEFPY(msdp_log_sa_changes, msdp_log_sa_changes_cmd, +DEFPY_YANG(msdp_log_sa_changes, msdp_log_sa_changes_cmd, "[no] msdp log sa-events", NO_STR MSDP_STR @@ -8751,7 +8751,7 @@ DEFUN_HIDDEN (show_ip_pim_vxlan_sg_work, return CMD_SUCCESS; } -DEFPY_HIDDEN (no_pim_mlag, +DEFPY_YANG_HIDDEN (no_pim_mlag, no_pim_mlag_cmd, "no mlag", NO_STR @@ -8808,7 +8808,7 @@ DEFPY_ATTR(no_ip_pim_mlag, return ret; } -DEFPY_HIDDEN (pim_mlag, +DEFPY_YANG_HIDDEN (pim_mlag, pim_mlag_cmd, "mlag INTERFACE$iface role [primary|secondary]$role state [up|down]$state addr A.B.C.D$addr", "MLAG\n"