zebra: stub changes to assimilate re into rib nb

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>

diff --git a/zebra/zebra_nb.c b/zebra/zebra_nb.c
index 33a3c8f6d966c46d447c39204c1452a48d251ca5..1c653ef8125073fd05295d338a8948e5414f9b34 100644 (file)
--- a/zebra/zebra_nb.c
+++ b/zebra/zebra_nb.c
@@ -410,195 +410,197 @@ const struct frr_yang_module_info frr_zebra_info = {
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/protocol",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_protocol_get_elem,
+                               .get_next = lib_vrf_ribs_rib_route_route_entry_get_next,
+                               .get_keys = lib_vrf_ribs_rib_route_route_entry_get_keys,
+                               .lookup_entry = lib_vrf_ribs_rib_route_route_entry_lookup_entry,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/protocol-v6",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/protocol",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_protocol_v6_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_protocol_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/vrf",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/instance",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_vrf_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_instance_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/distance",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/distance",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_distance_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_distance_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/metric",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/metric",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_metric_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_metric_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/tag",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/tag",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_tag_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_tag_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/selected",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/selected",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_selected_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_selected_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/installed",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/installed",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_installed_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_installed_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/failed",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/failed",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_failed_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_failed_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/queued",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/queued",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_queued_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_queued_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/internal-flags",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/internal-flags",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_internal_flags_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_internal_flags_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/internal-status",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/internal-status",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_internal_status_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_internal_status_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/uptime",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/uptime",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_uptime_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_uptime_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group",
                        .cbs = {
-                               .get_next = lib_vrf_ribs_rib_route_nexthop_group_get_next,
-                               .get_keys = lib_vrf_ribs_rib_route_nexthop_group_get_keys,
-                               .lookup_entry = lib_vrf_ribs_rib_route_nexthop_group_lookup_entry,
+                               .get_next = lib_vrf_ribs_rib_route_route_entry_nexthop_group_get_next,
+                               .get_keys = lib_vrf_ribs_rib_route_route_entry_nexthop_group_get_keys,
+                               .lookup_entry = lib_vrf_ribs_rib_route_route_entry_nexthop_group_lookup_entry,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/name",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/name",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_name_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_name_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop",
                        .cbs = {
-                               .get_next = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_get_next,
-                               .get_keys = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_get_keys,
-                               .lookup_entry = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_lookup_entry,
+                               .get_next = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_get_next,
+                               .get_keys = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_get_keys,
+                               .lookup_entry = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_lookup_entry,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/nh-type",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/nh-type",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_nh_type_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_nh_type_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/vrf",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/vrf",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_vrf_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_vrf_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/gateway",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/gateway",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_gateway_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_gateway_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/interface",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/interface",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_interface_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_interface_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/bh-type",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/bh-type",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_bh_type_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_bh_type_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/onlink",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/onlink",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_onlink_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_onlink_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry",
                        .cbs = {
-                               .get_next = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_next,
-                               .get_keys = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_keys,
-                               .lookup_entry = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_lookup_entry,
+                               .get_next = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_next,
+                               .get_keys = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_keys,
+                               .lookup_entry = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_lookup_entry,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/id",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/id",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_id_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_id_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/label",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/label",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_label_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_label_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/ttl",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/ttl",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_ttl_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_ttl_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/traffic-class",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/traffic-class",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_traffic_class_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_traffic_class_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/duplicate",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/duplicate",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_duplicate_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_duplicate_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/recursive",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/recursive",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_recursive_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_recursive_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/active",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/active",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_active_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_active_get_elem,
                        }
                },
                {
-                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/fib",
+                       .xpath = "/frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/fib",
                        .cbs = {
-                               .get_elem = lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_fib_get_elem,
+                               .get_elem = lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_fib_get_elem,
                        }
                },
                {

diff --git a/zebra/zebra_nb.h b/zebra/zebra_nb.h
index 8d0f6f44732a6dcef6e335ed6c690c96161385d8..c3ebbfd07809eaca72975e402d46d88ee0e8fd04 100644 (file)
--- a/zebra/zebra_nb.h
+++ b/zebra/zebra_nb.h
@@ -340,58 +340,132 @@ const void *lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_get_next(
        const void *parent_list_entry, const void *list_entry);
 int lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_get_keys(
        const void *list_entry, struct yang_list_keys *keys);
+int lib_vrf_ribs_rib_create(enum nb_event event, const struct lyd_node *dnode,
+                           union nb_resource *resource);
+int lib_vrf_ribs_rib_destroy(enum nb_event event, const struct lyd_node *dnode);
+const void *lib_vrf_ribs_rib_get_next(const void *parent_list_entry,
+                                     const void *list_entry);
+int lib_vrf_ribs_rib_get_keys(const void *list_entry,
+                             struct yang_list_keys *keys);
+const void *lib_vrf_ribs_rib_lookup_entry(const void *parent_list_entry,
+                                         const struct yang_list_keys *keys);
+const void *lib_vrf_ribs_rib_route_get_next(const void *parent_list_entry,
+                                           const void *list_entry);
+int lib_vrf_ribs_rib_route_get_keys(const void *list_entry,
+                                   struct yang_list_keys *keys);
+const void *
+lib_vrf_ribs_rib_route_lookup_entry(const void *parent_list_entry,
+                                   const struct yang_list_keys *keys);
+struct yang_data *
+lib_vrf_ribs_rib_route_prefix_get_elem(const char *xpath,
+                                      const void *list_entry);
+const void *
+lib_vrf_ribs_rib_route_route_entry_get_next(const void *parent_list_entry,
+                                           const void *list_entry);
+int lib_vrf_ribs_rib_route_route_entry_get_keys(const void *list_entry,
+                                               struct yang_list_keys *keys);
+const void *lib_vrf_ribs_rib_route_route_entry_lookup_entry(
+       const void *parent_list_entry, const struct yang_list_keys *keys);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_protocol_get_elem(const char *xpath,
+                                                    const void *list_entry);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_instance_get_elem(const char *xpath,
+                                                    const void *list_entry);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_distance_get_elem(const char *xpath,
+                                                    const void *list_entry);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_metric_get_elem(const char *xpath,
+                                                  const void *list_entry);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_tag_get_elem(const char *xpath,
+                                               const void *list_entry);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_selected_get_elem(const char *xpath,
+                                                    const void *list_entry);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_installed_get_elem(const char *xpath,
+                                                     const void *list_entry);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_failed_get_elem(const char *xpath,
+                                                  const void *list_entry);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_queued_get_elem(const char *xpath,
+                                                  const void *list_entry);
+struct yang_data *lib_vrf_ribs_rib_route_route_entry_internal_flags_get_elem(
+       const char *xpath, const void *list_entry);
+struct yang_data *lib_vrf_ribs_rib_route_route_entry_internal_status_get_elem(
+       const char *xpath, const void *list_entry);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_uptime_get_elem(const char *xpath,
+                                                  const void *list_entry);
+const void *lib_vrf_ribs_rib_route_route_entry_nexthop_group_get_next(
+       const void *parent_list_entry, const void *list_entry);
+int lib_vrf_ribs_rib_route_route_entry_nexthop_group_get_keys(
+       const void *list_entry, struct yang_list_keys *keys);
+const void *lib_vrf_ribs_rib_route_route_entry_nexthop_group_lookup_entry(
+       const void *parent_list_entry, const struct yang_list_keys *keys);
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_name_get_elem(
+       const char *xpath, const void *list_entry);
+const void *
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_get_next(
+       const void *parent_list_entry, const void *list_entry);
+int lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_get_keys(
+       const void *list_entry, struct yang_list_keys *keys);
 const void *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_lookup_entry(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_lookup_entry(
        const void *parent_list_entry, const struct yang_list_keys *keys);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_nh_type_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_nh_type_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_vrf_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_vrf_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_gateway_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_gateway_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_interface_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_interface_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_bh_type_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_bh_type_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_onlink_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_onlink_get_elem(
        const char *xpath, const void *list_entry);
 const void *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_next(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_next(
        const void *parent_list_entry, const void *list_entry);
-int lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_keys(
+int lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_keys(
        const void *list_entry, struct yang_list_keys *keys);
 const void *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_lookup_entry(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_lookup_entry(
        const void *parent_list_entry, const struct yang_list_keys *keys);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_id_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_id_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_label_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_label_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_ttl_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_ttl_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_traffic_class_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_traffic_class_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_duplicate_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_duplicate_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_recursive_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_recursive_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_active_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_active_get_elem(
        const char *xpath, const void *list_entry);
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_fib_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_fib_get_elem(
        const char *xpath, const void *list_entry);
 
 #endif

diff --git a/zebra/zebra_nb_state.c b/zebra/zebra_nb_state.c
index 0cc4c6c2b13467d93c68c794a1421e1beeaa5d3a..c9bb320692b383b21ab65f7f1d711c0ebcb43c6e 100644 (file)
--- a/zebra/zebra_nb_state.c
+++ b/zebra/zebra_nb_state.c
@@ -79,161 +79,178 @@ struct yang_data *lib_vrf_ribs_rib_route_prefix_get_elem(const char *xpath,
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/protocol
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry
  */
-struct yang_data *
-lib_vrf_ribs_rib_route_protocol_get_elem(const char *xpath,
-                                        const void *list_entry)
+const void *
+lib_vrf_ribs_rib_route_route_entry_get_next(const void *parent_list_entry,
+                                           const void *list_entry)
+{
+       /* TODO: implement me. */
+       return NULL;
+}
+
+int lib_vrf_ribs_rib_route_route_entry_get_keys(const void *list_entry,
+                                               struct yang_list_keys *keys)
+{
+       /* TODO: implement me. */
+       return NB_OK;
+}
+
+const void *lib_vrf_ribs_rib_route_route_entry_lookup_entry(
+       const void *parent_list_entry, const struct yang_list_keys *keys)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/protocol-v6
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/protocol
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_protocol_v6_get_elem(const char *xpath,
-                                           const void *list_entry)
+lib_vrf_ribs_rib_route_route_entry_protocol_get_elem(const char *xpath,
+                                                    const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/vrf
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/instance
  */
-struct yang_data *lib_vrf_ribs_rib_route_vrf_get_elem(const char *xpath,
-                                                     const void *list_entry)
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_instance_get_elem(const char *xpath,
+                                                    const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/distance
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/distance
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_distance_get_elem(const char *xpath,
-                                        const void *list_entry)
+lib_vrf_ribs_rib_route_route_entry_distance_get_elem(const char *xpath,
+                                                    const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/metric
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/metric
  */
-struct yang_data *lib_vrf_ribs_rib_route_metric_get_elem(const char *xpath,
-                                                        const void *list_entry)
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_metric_get_elem(const char *xpath,
+                                                  const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/tag
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/tag
  */
-struct yang_data *lib_vrf_ribs_rib_route_tag_get_elem(const char *xpath,
-                                                     const void *list_entry)
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_tag_get_elem(const char *xpath,
+                                               const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/selected
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/selected
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_selected_get_elem(const char *xpath,
-                                        const void *list_entry)
+lib_vrf_ribs_rib_route_route_entry_selected_get_elem(const char *xpath,
+                                                    const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/installed
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/installed
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_installed_get_elem(const char *xpath,
-                                         const void *list_entry)
+lib_vrf_ribs_rib_route_route_entry_installed_get_elem(const char *xpath,
+                                                     const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/failed
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/failed
  */
-struct yang_data *lib_vrf_ribs_rib_route_failed_get_elem(const char *xpath,
-                                                        const void *list_entry)
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_failed_get_elem(const char *xpath,
+                                                  const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/queued
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/queued
  */
-struct yang_data *lib_vrf_ribs_rib_route_queued_get_elem(const char *xpath,
-                                                        const void *list_entry)
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_queued_get_elem(const char *xpath,
+                                                  const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/internal-flags
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/internal-flags
  */
-struct yang_data *
-lib_vrf_ribs_rib_route_internal_flags_get_elem(const char *xpath,
-                                              const void *list_entry)
+struct yang_data *lib_vrf_ribs_rib_route_route_entry_internal_flags_get_elem(
+       const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/internal-status
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/internal-status
  */
-struct yang_data *
-lib_vrf_ribs_rib_route_internal_status_get_elem(const char *xpath,
-                                               const void *list_entry)
+struct yang_data *lib_vrf_ribs_rib_route_route_entry_internal_status_get_elem(
+       const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/uptime
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/uptime
  */
-struct yang_data *lib_vrf_ribs_rib_route_uptime_get_elem(const char *xpath,
-                                                        const void *list_entry)
+struct yang_data *
+lib_vrf_ribs_rib_route_route_entry_uptime_get_elem(const char *xpath,
+                                                  const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group
+ * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group
  */
-const void *
-lib_vrf_ribs_rib_route_nexthop_group_get_next(const void *parent_list_entry,
-                                             const void *list_entry)
+const void *lib_vrf_ribs_rib_route_route_entry_nexthop_group_get_next(
+       const void *parent_list_entry, const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
-int lib_vrf_ribs_rib_route_nexthop_group_get_keys(const void *list_entry,
-                                                 struct yang_list_keys *keys)
+int lib_vrf_ribs_rib_route_route_entry_nexthop_group_get_keys(
+       const void *list_entry, struct yang_list_keys *keys)
 {
        /* TODO: implement me. */
        return NB_OK;
 }
 
-const void *lib_vrf_ribs_rib_route_nexthop_group_lookup_entry(
+const void *lib_vrf_ribs_rib_route_route_entry_nexthop_group_lookup_entry(
        const void *parent_list_entry, const struct yang_list_keys *keys)
 {
        /* TODO: implement me. */
@@ -241,11 +258,12 @@ const void *lib_vrf_ribs_rib_route_nexthop_group_lookup_entry(
 }
 
 /*
- * XPath: /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/name
+ * XPath:
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/name
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_name_get_elem(const char *xpath,
-                                                  const void *list_entry)
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_name_get_elem(
+       const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
@@ -253,16 +271,17 @@ lib_vrf_ribs_rib_route_nexthop_group_name_get_elem(const char *xpath,
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop
  */
-const void *lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_get_next(
+const void *
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_get_next(
        const void *parent_list_entry, const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
-int lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_get_keys(
+int lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_get_keys(
        const void *list_entry, struct yang_list_keys *keys)
 {
        /* TODO: implement me. */
@@ -270,7 +289,7 @@ int lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_get_keys(
 }
 
 const void *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_lookup_entry(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_lookup_entry(
        const void *parent_list_entry, const struct yang_list_keys *keys)
 {
        /* TODO: implement me. */
@@ -279,10 +298,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_lookup_entry(
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/nh-type
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/nh-type
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_nh_type_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_nh_type_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -291,10 +310,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_nh_type_get_elem(
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/vrf
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/vrf
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_vrf_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_vrf_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -303,10 +322,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_vrf_get_elem(
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/gateway
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/gateway
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_gateway_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_gateway_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -315,10 +334,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_gateway_get_elem(
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/interface
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/interface
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_interface_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_interface_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -327,10 +346,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_interface_get_elem(
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/bh-type
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/bh-type
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_bh_type_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_bh_type_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -339,10 +358,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_bh_type_get_elem(
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/onlink
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/onlink
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_onlink_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_onlink_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -351,17 +370,17 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_onlink_get_elem(
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry
  */
 const void *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_next(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_next(
        const void *parent_list_entry, const void *list_entry)
 {
        /* TODO: implement me. */
        return NULL;
 }
 
-int lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_keys(
+int lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_get_keys(
        const void *list_entry, struct yang_list_keys *keys)
 {
        /* TODO: implement me. */
@@ -369,7 +388,7 @@ int lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_e
 }
 
 const void *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_lookup_entry(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_lookup_entry(
        const void *parent_list_entry, const struct yang_list_keys *keys)
 {
        /* TODO: implement me. */
@@ -378,10 +397,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/id
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/id
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_id_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_id_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -390,10 +409,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/label
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/label
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_label_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_label_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -402,10 +421,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/ttl
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/ttl
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_ttl_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_ttl_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -414,10 +433,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/traffic-class
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/mpls-label-stack/entry/traffic-class
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_traffic_class_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry_traffic_class_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -426,10 +445,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_mpls_label_stack_entry
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/duplicate
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/duplicate
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_duplicate_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_duplicate_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -438,10 +457,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_duplicate_get_elem(
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/recursive
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/recursive
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_recursive_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_recursive_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -450,10 +469,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_recursive_get_elem(
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/active
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/active
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_active_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_active_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */
@@ -462,10 +481,10 @@ lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_active_get_elem(
 
 /*
  * XPath:
- * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/nexthop-group/frr-nexthops/nexthop/fib
+ * /frr-vrf:lib/vrf/frr-zebra:ribs/rib/route/route-entry/nexthop-group/frr-nexthops/nexthop/fib
  */
 struct yang_data *
-lib_vrf_ribs_rib_route_nexthop_group_frr_nexthops_nexthop_fib_get_elem(
+lib_vrf_ribs_rib_route_route_entry_nexthop_group_frr_nexthops_nexthop_fib_get_elem(
        const char *xpath, const void *list_entry)
 {
        /* TODO: implement me. */