Merge pull request #10179 from patrasar/pimv6_northbound

1 files changed, 55 insertions, 55 deletions

diff --git a/pimd/pim_nb.c b/pimd/pim_nb.c
index 6fe078bd8e..3542d804a8 100644
--- a/pimd/pim_nb.c
+++ b/pimd/pim_nb.c
@@ -29,52 +29,59 @@ const struct frr_yang_module_info frr_pim_info = {
 	.name = "frr-pim",
 	.nodes = {
 		{
-			.xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-pim:pim/ecmp",
+			.xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-pim:pim/address-family",
 			.cbs = {
-				.modify = routing_control_plane_protocols_control_plane_protocol_pim_ecmp_modify,
+				.create = routing_control_plane_protocols_control_plane_protocol_pim_address_family_create,
+				.destroy = routing_control_plane_protocols_control_plane_protocol_pim_address_family_destroy,
 			}
 		},
 		{
-			.xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-pim:pim/ecmp-rebalance",
+			.xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-pim:pim/address-family/ecmp",
 			.cbs = {
-				.modify = routing_control_plane_protocols_control_plane_protocol_pim_ecmp_rebalance_modify,
+				.modify = routing_control_plane_protocols_control_plane_protocol_pim_address_family_ecmp_modify,
 			}
 		},
 		{
-			.xpath = "/frr-pim:pim/join-prune-interval",
+			.xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-pim:pim/address-family/ecmp-rebalance",
 			.cbs = {
-				.modify = pim_join_prune_interval_modify,
+				.modify = routing_control_plane_protocols_control_plane_protocol_pim_address_family_ecmp_rebalance_modify,
 			}
 		},
 		{
-			.xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-pim:pim/keep-alive-timer",
+			.xpath = "/frr-pim:pim/address-family/join-prune-interval",
 			.cbs = {
-				.modify = routing_control_plane_protocols_control_plane_protocol_pim_keep_alive_timer_modify,
+				.modify = pim_address_family_join_prune_interval_modify,
 			}
 		},
 		{
-			.xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-pim:pim/rp-keep-alive-timer",
+			.xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-pim:pim/address-family/keep-alive-timer",
 			.cbs = {
-				.modify = routing_control_plane_protocols_control_plane_protocol_pim_rp_keep_alive_timer_modify,
+				.modify = routing_control_plane_protocols_control_plane_protocol_pim_address_family_keep_alive_timer_modify,
 			}
 		},
 		{
-			.xpath = "/frr-pim:pim/packets",
+			.xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-pim:pim/address-family/rp-keep-alive-timer",
 			.cbs = {
-				.modify = pim_packets_modify,
+				.modify = routing_control_plane_protocols_control_plane_protocol_pim_address_family_rp_keep_alive_timer_modify,
 			}
 		},
 		{
-			.xpath = "/frr-pim:pim/register-suppress-time",
+			.xpath = "/frr-pim:pim/address-family",
 			.cbs = {
-				.modify = pim_register_suppress_time_modify,
+				.create = pim_address_family_create,
+				.destroy = pim_address_family_destroy,
 			}
 		},
 		{
-			.xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-pim:pim/address-family",
+			.xpath = "/frr-pim:pim/address-family/packets",
 			.cbs = {
-				.create = routing_control_plane_protocols_control_plane_protocol_pim_address_family_create,
-				.destroy = routing_control_plane_protocols_control_plane_protocol_pim_address_family_destroy,
+				.modify = pim_address_family_packets_modify,
+			}
+		},
+		{
+			.xpath = "/frr-pim:pim/address-family/register-suppress-time",
+			.cbs = {
+				.modify = pim_address_family_register_suppress_time_modify,
 			}
 		},
 		{
@@ -211,93 +218,86 @@ const struct frr_yang_module_info frr_pim_info = {
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim",
-			.cbs = {
-				.create = lib_interface_pim_create,
-				.destroy = lib_interface_pim_destroy,
-			}
-		},
-		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/pim-enable",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family",
 			.cbs = {
-				.modify = lib_interface_pim_pim_enable_modify,
+				.create = lib_interface_pim_address_family_create,
+				.destroy = lib_interface_pim_address_family_destroy,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/dr-priority",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/pim-enable",
 			.cbs = {
-				.modify = lib_interface_pim_dr_priority_modify,
+				.modify = lib_interface_pim_address_family_pim_enable_modify,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/hello-interval",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/dr-priority",
 			.cbs = {
-				.modify = lib_interface_pim_hello_interval_modify,
+				.modify = lib_interface_pim_address_family_dr_priority_modify,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/hello-holdtime",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/hello-interval",
 			.cbs = {
-				.modify = lib_interface_pim_hello_holdtime_modify,
-				.destroy = lib_interface_pim_hello_holdtime_destroy,
+				.modify = lib_interface_pim_address_family_hello_interval_modify,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/bfd",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/hello-holdtime",
 			.cbs = {
-				.create = lib_interface_pim_bfd_create,
-				.destroy = lib_interface_pim_bfd_destroy,
-				.apply_finish = lib_interface_pim_bfd_apply_finish,
+				.modify = lib_interface_pim_address_family_hello_holdtime_modify,
+				.destroy = lib_interface_pim_address_family_hello_holdtime_destroy,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/bfd/min-rx-interval",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/bfd",
 			.cbs = {
-				.modify = lib_interface_pim_bfd_min_rx_interval_modify,
+				.create = lib_interface_pim_address_family_bfd_create,
+				.destroy = lib_interface_pim_address_family_bfd_destroy,
+				.apply_finish = lib_interface_pim_address_family_bfd_apply_finish,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/bfd/min-tx-interval",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/bfd/min-rx-interval",
 			.cbs = {
-				.modify = lib_interface_pim_bfd_min_tx_interval_modify,
+				.modify = lib_interface_pim_address_family_bfd_min_rx_interval_modify,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/bfd/detect_mult",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/bfd/min-tx-interval",
 			.cbs = {
-				.modify = lib_interface_pim_bfd_detect_mult_modify,
+				.modify = lib_interface_pim_address_family_bfd_min_tx_interval_modify,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/bfd/profile",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/bfd/detect_mult",
 			.cbs = {
-				.modify = lib_interface_pim_bfd_profile_modify,
-				.destroy = lib_interface_pim_bfd_profile_destroy,
+				.modify = lib_interface_pim_address_family_bfd_detect_mult_modify,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/bsm",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/bfd/profile",
 			.cbs = {
-				.modify = lib_interface_pim_bsm_modify,
+				.modify = lib_interface_pim_address_family_bfd_profile_modify,
+				.destroy = lib_interface_pim_address_family_bfd_profile_destroy,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/unicast-bsm",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/bsm",
 			.cbs = {
-				.modify = lib_interface_pim_unicast_bsm_modify,
+				.modify = lib_interface_pim_address_family_bsm_modify,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/active-active",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/unicast-bsm",
 			.cbs = {
-				.modify = lib_interface_pim_active_active_modify,
+				.modify = lib_interface_pim_address_family_unicast_bsm_modify,
 			}
 		},
 		{
-			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family",
+			.xpath = "/frr-interface:lib/interface/frr-pim:pim/address-family/active-active",
 			.cbs = {
-				.create = lib_interface_pim_address_family_create,
-				.destroy = lib_interface_pim_address_family_destroy,
+				.modify = lib_interface_pim_address_family_active_active_modify,
 			}
 		},
 		{