bfdd: implement Xpath callbacks for SBFD

Signed-off-by: wumu.zsl <wumu.zsl@alibaba-inc.com>

diff --git a/bfdd/bfdd_nb.c b/bfdd/bfdd_nb.c
index 114fbc2bdd8759161d561ac5e02e770c7b37f975..f60d8397bb66e9ab52b9c3422852c0041aa28688 100644 (file)
--- a/bfdd/bfdd_nb.c
+++ b/bfdd/bfdd_nb.c
@@ -483,6 +483,459 @@ const struct frr_yang_module_info frr_bfdd_info = {
                                .get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_output_count_get_elem,
                        }
                },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo",
+                       .cbs = {
+                               .create = bfdd_bfd_sessions_sbfd_echo_create,
+                               .destroy = bfdd_bfd_sessions_sbfd_echo_destroy,
+                               .get_next = bfdd_bfd_sessions_sbfd_echo_get_next,
+                               .get_keys = bfdd_bfd_sessions_sbfd_echo_get_keys,
+                               .lookup_entry = bfdd_bfd_sessions_sbfd_echo_lookup_entry,
+                               .cli_show = bfd_cli_show_sbfd_echo_peer, /* TODO */
+                               .cli_show_end = bfd_cli_show_peer_end, /* TODO */
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/dest-addr",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_sbfd_echo_dest_addr_modify,
+                               .destroy = bfdd_bfd_sessions_sbfd_echo_dest_addr_destroy,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/srv6-source-ipv6",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_sbfd_srv6_source_ipv6_modify,
+                               .destroy = bfdd_bfd_sessions_sbfd_srv6_source_ipv6_destroy,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/profile",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_profile_modify,
+                               .destroy = bfdd_bfd_sessions_single_hop_profile_destroy,
+                               .cli_show = bfd_cli_peer_profile_show,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/detection-multiplier",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_detection_multiplier_modify,
+                               .cli_show = bfd_cli_show_mult,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/desired-transmission-interval",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_desired_transmission_interval_modify,
+                               .cli_show = bfd_cli_show_tx,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/required-receive-interval",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_required_receive_interval_modify,
+                               .cli_show = bfd_cli_show_rx,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/echo-mode",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_sbfd_echo_mode_modify,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/desired-echo-transmission-interval",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_desired_echo_transmission_interval_modify,
+                               .cli_show = bfd_cli_show_desired_echo_transmission_interval,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/required-echo-receive-interval",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_required_echo_receive_interval_modify,
+                               .cli_show = bfd_cli_show_required_echo_receive_interval,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/administrative-down",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_administrative_down_modify,
+                               .cli_show = bfd_cli_show_shutdown,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/passive-mode",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_passive_mode_modify,
+                               .cli_show = bfd_cli_show_passive,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/bfd-mode",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_bfd_mode_modify,
+                               .destroy = bfdd_bfd_sessions_bfd_mode_destroy,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/srv6-encap-data",
+                       .cbs = {
+                               .create = bfdd_bfd_sessions_segment_list_create,
+                               .destroy = bfdd_bfd_sessions_segment_list_destroy,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/minimum-ttl",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_multi_hop_minimum_ttl_modify,
+                               .cli_show = bfd_cli_show_minimum_ttl,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/multi-hop",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_sbfd_multi_hop_modify,
+                               .destroy = bfdd_bfd_sessions_sbfd_multi_hop_destroy,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/local-discriminator",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_local_discriminator_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/local-state",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_local_state_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/local-diagnostic",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_local_diagnostic_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/local-multiplier",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_local_multiplier_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/remote-discriminator",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_discriminator_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/remote-state",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_state_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/remote-diagnostic",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_diagnostic_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/remote-multiplier",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_multiplier_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/negotiated-transmission-interval",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_transmission_interval_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/negotiated-receive-interval",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_receive_interval_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/detection-mode",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_detection_mode_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/last-down-time",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_last_down_time_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/last-up-time",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_last_up_time_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/session-down-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_session_down_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/session-up-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_session_up_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/control-packet-input-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_input_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/control-packet-output-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_output_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/negotiated-echo-transmission-interval",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_echo_transmission_interval_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/echo-packet-input-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_input_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/stats/echo-packet-output-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_output_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init",
+                       .cbs = {
+                               .create = bfdd_bfd_sessions_sbfd_init_create,
+                               .destroy = bfdd_bfd_sessions_sbfd_init_destroy,
+                               .get_next = bfdd_bfd_sessions_sbfd_init_get_next,
+                               .get_keys = bfdd_bfd_sessions_sbfd_init_get_keys,
+                               .lookup_entry = bfdd_bfd_sessions_sbfd_init_lookup_entry,
+                               .cli_show = bfd_cli_show_sbfd_init_peer, /* TODO */
+                               .cli_show_end = bfd_cli_show_peer_end, /* TODO */
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/srv6-source-ipv6",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_sbfd_srv6_source_ipv6_modify,
+                               .destroy = bfdd_bfd_sessions_sbfd_srv6_source_ipv6_destroy,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/remote-discr",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_sbfd_init_remote_discr_modify,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/profile",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_profile_modify,
+                               .destroy = bfdd_bfd_sessions_single_hop_profile_destroy,
+                               .cli_show = bfd_cli_peer_profile_show,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/detection-multiplier",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_detection_multiplier_modify,
+                               .cli_show = bfd_cli_show_mult,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/desired-transmission-interval",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_desired_transmission_interval_modify,
+                               .cli_show = bfd_cli_show_tx,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/required-receive-interval",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_required_receive_interval_modify,
+                               .cli_show = bfd_cli_show_rx,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/administrative-down",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_administrative_down_modify,
+                               .cli_show = bfd_cli_show_shutdown,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/passive-mode",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_single_hop_passive_mode_modify,
+                               .cli_show = bfd_cli_show_passive,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/bfd-mode",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_bfd_mode_modify,
+                               .destroy = bfdd_bfd_sessions_bfd_mode_destroy,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/srv6-encap-data",
+                       .cbs = {
+                               .create = bfdd_bfd_sessions_segment_list_create,
+                               .destroy = bfdd_bfd_sessions_segment_list_destroy,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/minimum-ttl",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_multi_hop_minimum_ttl_modify,
+                               .cli_show = bfd_cli_show_minimum_ttl,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/multi-hop",
+                       .cbs = {
+                               .modify = bfdd_bfd_sessions_sbfd_multi_hop_modify,
+                               .destroy = bfdd_bfd_sessions_sbfd_multi_hop_destroy,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/local-discriminator",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_local_discriminator_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/local-state",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_local_state_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/local-diagnostic",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_local_diagnostic_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/local-multiplier",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_local_multiplier_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/remote-discriminator",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_discriminator_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/remote-state",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_state_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/remote-diagnostic",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_diagnostic_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/remote-multiplier",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_multiplier_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/negotiated-transmission-interval",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_transmission_interval_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/negotiated-receive-interval",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_receive_interval_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/detection-mode",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_detection_mode_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/last-down-time",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_last_down_time_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/last-up-time",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_last_up_time_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/session-down-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_session_down_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/session-up-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_session_up_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/control-packet-input-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_input_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/control-packet-output-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_output_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/negotiated-echo-transmission-interval",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_echo_transmission_interval_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/echo-packet-input-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_input_count_get_elem,
+                       }
+               },
+               {
+                       .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/stats/echo-packet-output-count",
+                       .cbs = {
+                               .get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_output_count_get_elem,
+                       }
+               },
                {
                        .xpath = NULL,
                },

diff --git a/bfdd/bfdd_nb.h b/bfdd/bfdd_nb.h
index b5b00b57e4b04127e58bea8c3a328e64ab433a48..6621973ae36531c6a44c374367443e060103ef77 100644 (file)
--- a/bfdd/bfdd_nb.h
+++ b/bfdd/bfdd_nb.h
@@ -112,6 +112,26 @@ bfdd_bfd_sessions_single_hop_stats_echo_packet_output_count_get_elem(
        struct nb_cb_get_elem_args *args);
 int bfdd_bfd_sessions_multi_hop_create(struct nb_cb_create_args *args);
 int bfdd_bfd_sessions_multi_hop_destroy(struct nb_cb_destroy_args *args);
+int bfdd_bfd_sessions_sbfd_echo_create(struct nb_cb_create_args *args);
+int bfdd_bfd_sessions_sbfd_echo_destroy(struct nb_cb_destroy_args *args);
+int bfdd_bfd_sessions_sbfd_echo_dest_addr_modify(struct nb_cb_modify_args *args);
+int bfdd_bfd_sessions_sbfd_echo_mode_modify(struct nb_cb_modify_args *args);
+int bfdd_bfd_sessions_sbfd_echo_dest_addr_destroy(struct nb_cb_destroy_args *args);
+int bfdd_bfd_sessions_sbfd_srv6_source_ipv6_modify(struct nb_cb_modify_args *args);
+int bfdd_bfd_sessions_sbfd_srv6_source_ipv6_destroy(struct nb_cb_destroy_args *args);
+int bfdd_bfd_sessions_sbfd_init_remote_discr_modify(struct nb_cb_modify_args *args);
+int bfdd_bfd_sessions_sbfd_multi_hop_modify(struct nb_cb_modify_args *args);
+int bfdd_bfd_sessions_sbfd_multi_hop_destroy(struct nb_cb_destroy_args *args);
+
+int bfdd_bfd_sessions_sbfd_init_create(struct nb_cb_create_args *args);
+int bfdd_bfd_sessions_sbfd_init_destroy(struct nb_cb_destroy_args *args);
+const void *bfdd_bfd_sessions_sbfd_echo_get_next(struct nb_cb_get_next_args *args);
+int bfdd_bfd_sessions_sbfd_echo_get_keys(struct nb_cb_get_keys_args *args);
+const void *bfdd_bfd_sessions_sbfd_echo_lookup_entry(struct nb_cb_lookup_entry_args *args);
+const void *bfdd_bfd_sessions_sbfd_init_get_next(struct nb_cb_get_next_args *args);
+int bfdd_bfd_sessions_sbfd_init_get_keys(struct nb_cb_get_keys_args *args);
+const void *bfdd_bfd_sessions_sbfd_init_lookup_entry(struct nb_cb_lookup_entry_args *args);
+
 const void *
 bfdd_bfd_sessions_multi_hop_get_next(struct nb_cb_get_next_args *args);
 int bfdd_bfd_sessions_multi_hop_get_keys(struct nb_cb_get_keys_args *args);
@@ -185,6 +205,8 @@ void bfd_cli_show_single_hop_peer(struct vty *vty, const struct lyd_node *dnode,
                                  bool show_defaults);
 void bfd_cli_show_multi_hop_peer(struct vty *vty, const struct lyd_node *dnode,
                                 bool show_defaults);
+void bfd_cli_show_sbfd_echo_peer(struct vty *vty, const struct lyd_node *dnode, bool show_defaults);
+void bfd_cli_show_sbfd_init_peer(struct vty *vty, const struct lyd_node *dnode, bool show_defaults);
 void bfd_cli_show_peer_end(struct vty *vty, const struct lyd_node *dnode);
 void bfd_cli_show_mult(struct vty *vty, const struct lyd_node *dnode,
                       bool show_defaults);
@@ -210,4 +232,10 @@ void bfd_cli_show_passive(struct vty *vty, const struct lyd_node *dnode,
 void bfd_cli_show_minimum_ttl(struct vty *vty, const struct lyd_node *dnode,
                              bool show_defaults);
 
+int bfdd_bfd_sessions_bfd_mode_modify(struct nb_cb_modify_args *args);
+int bfdd_bfd_sessions_bfd_mode_destroy(struct nb_cb_destroy_args *args);
+
+int bfdd_bfd_sessions_segment_list_create(struct nb_cb_create_args *args);
+int bfdd_bfd_sessions_segment_list_destroy(struct nb_cb_destroy_args *args);
+
 #endif /* _FRR_BFDD_NB_H_ */

diff --git a/bfdd/bfdd_nb_config.c b/bfdd/bfdd_nb_config.c
index 91084ba02ea495eed56d2753c4271bc2a5db9020..15da1e2440d54e14886c65905fe24bdef5cdeed7 100644 (file)
--- a/bfdd/bfdd_nb_config.c
+++ b/bfdd/bfdd_nb_config.c
@@ -903,6 +903,45 @@ int bfdd_bfd_sessions_single_hop_passive_mode_modify(
        return NB_OK;
 }
 
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-init/bfd-mode
+ *        /frr-bfdd:bfdd/bfd/sessions/sbfd-echo/bfd-mode
+ */
+int bfdd_bfd_sessions_bfd_mode_modify(struct nb_cb_modify_args *args)
+{
+       uint32_t bfd_mode = yang_dnode_get_uint32(args->dnode, NULL);
+       struct bfd_session *bs;
+
+       switch (args->event) {
+       case NB_EV_VALIDATE:
+               if ((bfd_mode != BFD_MODE_TYPE_BFD) && (bfd_mode != BFD_MODE_TYPE_SBFD_ECHO) &&
+                   (bfd_mode != BFD_MODE_TYPE_SBFD_INIT)) {
+                       snprintf(args->errmsg, args->errmsg_len, "bfd mode is invalid.");
+                       return NB_ERR_VALIDATION;
+               }
+               return NB_OK;
+       case NB_EV_PREPARE:
+               return NB_OK;
+
+       case NB_EV_APPLY:
+               break;
+
+       case NB_EV_ABORT:
+               return NB_OK;
+       }
+
+       bs = nb_running_get_entry(args->dnode, NULL, true);
+       bs->bfd_mode = bfd_mode;
+       bfd_session_apply(bs);
+
+       return NB_OK;
+}
+
+int bfdd_bfd_sessions_bfd_mode_destroy(struct nb_cb_destroy_args *args)
+{
+       return NB_OK;
+}
+
 /*
  * XPath: /frr-bfdd:bfdd/bfd/sessions/single-hop/echo-mode
  */
@@ -1034,3 +1073,106 @@ int bfdd_bfd_sessions_multi_hop_minimum_ttl_modify(
 
        return NB_OK;
 }
+
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-echo
+ */
+int bfdd_bfd_sessions_sbfd_echo_create(struct nb_cb_create_args *args)
+{
+       return bfd_session_create(args, yang_dnode_exists(args->dnode, "multi-hop"),
+                                 BFD_MODE_TYPE_SBFD_ECHO);
+}
+
+int bfdd_bfd_sessions_sbfd_echo_destroy(struct nb_cb_destroy_args *args)
+{
+       return bfd_session_destroy(args->event, args->dnode,
+                                  yang_dnode_exists(args->dnode, "multi-hop"),
+                                  BFD_MODE_TYPE_SBFD_ECHO);
+}
+
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-echo/srv6-encap-data
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-init/srv6-encap-data
+ */
+int bfdd_bfd_sessions_segment_list_create(struct nb_cb_create_args *args)
+{
+       return NB_OK;
+}
+
+int bfdd_bfd_sessions_segment_list_destroy(struct nb_cb_destroy_args *args)
+{
+       return NB_OK;
+}
+
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-echo/dest-addr
+ */
+int bfdd_bfd_sessions_sbfd_echo_dest_addr_modify(struct nb_cb_modify_args *args)
+{
+       return NB_OK;
+}
+
+int bfdd_bfd_sessions_sbfd_echo_dest_addr_destroy(struct nb_cb_destroy_args *args)
+{
+       return NB_OK;
+}
+
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-echo/echo-mode
+ */
+int bfdd_bfd_sessions_sbfd_echo_mode_modify(struct nb_cb_modify_args *args)
+{
+       return NB_OK;
+}
+
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-echo/srv6-source-ipv6
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-init/srv6-source-ipv6
+ */
+int bfdd_bfd_sessions_sbfd_srv6_source_ipv6_modify(struct nb_cb_modify_args *args)
+{
+       return NB_OK;
+}
+
+int bfdd_bfd_sessions_sbfd_srv6_source_ipv6_destroy(struct nb_cb_destroy_args *args)
+{
+       return NB_OK;
+}
+
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-init
+ */
+int bfdd_bfd_sessions_sbfd_init_create(struct nb_cb_create_args *args)
+{
+       return bfd_session_create(args, yang_dnode_exists(args->dnode, "multi-hop"),
+                                 BFD_MODE_TYPE_SBFD_INIT);
+}
+
+int bfdd_bfd_sessions_sbfd_init_destroy(struct nb_cb_destroy_args *args)
+{
+       return bfd_session_destroy(args->event, args->dnode,
+                                  yang_dnode_exists(args->dnode, "multi-hop"),
+                                  BFD_MODE_TYPE_SBFD_INIT);
+}
+
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-init/remote-discr
+ */
+int bfdd_bfd_sessions_sbfd_init_remote_discr_modify(struct nb_cb_modify_args *args)
+{
+       return NB_OK;
+}
+
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-echo/multi-hop
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-init/multi-hop
+ */
+int bfdd_bfd_sessions_sbfd_multi_hop_modify(struct nb_cb_modify_args *args)
+{
+       return NB_OK;
+}
+
+int bfdd_bfd_sessions_sbfd_multi_hop_destroy(struct nb_cb_destroy_args *args)
+{
+       return NB_OK;
+}

diff --git a/bfdd/bfdd_nb_state.c b/bfdd/bfdd_nb_state.c
index 1fc5b9588752f03d21f7a2e8d6d9bd803c9c672a..c52847823148af2c273750cced92ad99a7af4297 100644 (file)
--- a/bfdd/bfdd_nb_state.c
+++ b/bfdd/bfdd_nb_state.c
@@ -358,3 +358,83 @@ bfdd_bfd_sessions_multi_hop_lookup_entry(struct nb_cb_lookup_entry_args *args)
 
        return bfd_key_lookup(bk);
 }
+
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-echo
+ */
+const void *bfdd_bfd_sessions_sbfd_echo_get_next(struct nb_cb_get_next_args *args)
+{
+       return bfd_session_next(args->list_entry, true, BFD_MODE_TYPE_SBFD_ECHO);
+}
+
+int bfdd_bfd_sessions_sbfd_echo_get_keys(struct nb_cb_get_keys_args *args)
+{
+       const struct bfd_session *bs = args->list_entry;
+       char srcbuf[INET6_ADDRSTRLEN];
+
+       inet_ntop(bs->key.family, &bs->key.local, srcbuf, sizeof(srcbuf));
+
+       args->keys->num = 3;
+       strlcpy(args->keys->key[0], srcbuf, sizeof(args->keys->key[0]));
+       strlcpy(args->keys->key[1], bs->key.bfdname, sizeof(args->keys->key[1]));
+       strlcpy(args->keys->key[2], bs->key.vrfname, sizeof(args->keys->key[2]));
+
+       return NB_OK;
+}
+
+const void *bfdd_bfd_sessions_sbfd_echo_lookup_entry(struct nb_cb_lookup_entry_args *args)
+{
+       const char *source_addr = args->keys->key[0];
+       const char *bfdname = args->keys->key[1];
+       const char *vrf = args->keys->key[2];
+       struct sockaddr_any psa, lsa;
+       struct bfd_key bk;
+
+       strtosa(source_addr, &lsa);
+       memset(&psa, 0, sizeof(psa));
+       gen_bfd_key(&bk, &psa, &lsa, true, NULL, vrf, bfdname);
+
+       return bfd_key_lookup(bk);
+}
+
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-init
+ */
+const void *bfdd_bfd_sessions_sbfd_init_get_next(struct nb_cb_get_next_args *args)
+{
+       return bfd_session_next(args->list_entry, true, BFD_MODE_TYPE_SBFD_INIT);
+}
+
+int bfdd_bfd_sessions_sbfd_init_get_keys(struct nb_cb_get_keys_args *args)
+{
+       const struct bfd_session *bs = args->list_entry;
+       char srcbuf[INET6_ADDRSTRLEN];
+       char dstbuf[INET6_ADDRSTRLEN];
+
+       inet_ntop(bs->key.family, &bs->key.local, srcbuf, sizeof(srcbuf));
+       inet_ntop(bs->key.family, &bs->key.peer, dstbuf, sizeof(dstbuf));
+
+       args->keys->num = 4;
+       strlcpy(args->keys->key[0], srcbuf, sizeof(args->keys->key[0]));
+       strlcpy(args->keys->key[1], dstbuf, sizeof(args->keys->key[1]));
+       strlcpy(args->keys->key[2], bs->key.bfdname, sizeof(args->keys->key[2]));
+       strlcpy(args->keys->key[3], bs->key.vrfname, sizeof(args->keys->key[3]));
+
+       return NB_OK;
+}
+
+const void *bfdd_bfd_sessions_sbfd_init_lookup_entry(struct nb_cb_lookup_entry_args *args)
+{
+       const char *source_addr = args->keys->key[0];
+       const char *dest_addr = args->keys->key[1];
+       const char *bfdname = args->keys->key[2];
+       const char *vrf = args->keys->key[3];
+       struct sockaddr_any psa, lsa;
+       struct bfd_key bk;
+
+       strtosa(source_addr, &lsa);
+       strtosa(dest_addr, &psa);
+       gen_bfd_key(&bk, &psa, &lsa, true, NULL, vrf, bfdname);
+
+       return bfd_key_lookup(bk);
+}