Revert "bgpd: rename router bgp callbacks"

This reverts commit feded4118b89eba5a1629f45cfe623277612e404.

diff --git a/bgpd/bgp_nb.c b/bgpd/bgp_nb.c
index 7b36130b74222183adc36a2e4d0d131fa39560db..004e74d7edbb012419def2eb72897a3e1b1f41a4 100644 (file)
--- a/bgpd/bgp_nb.c
+++ b/bgpd/bgp_nb.c
@@ -32,8 +32,8 @@ const struct frr_yang_module_info frr_bgp_info = {
                        .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp",
                        .cbs = {
                                .cli_show = cli_show_router_bgp,
-                               .create = bgp_router_create,
-                               .destroy = bgp_router_destroy,
+                               .create = bgp_create,
+                               .destroy = bgp_destroy,
                        }
                },
                {

diff --git a/bgpd/bgp_nb.h b/bgpd/bgp_nb.h
index b817275ae114b8bf7f39b30b011f531d0829ab11..530d5888112f5019981860d35d712da80407ab73 100644 (file)
--- a/bgpd/bgp_nb.h
+++ b/bgpd/bgp_nb.h
@@ -26,8 +26,8 @@
 extern const struct frr_yang_module_info frr_bgp_info;
 
 /* prototypes */
-int bgp_router_create(struct nb_cb_create_args *args);
-int bgp_router_destroy(struct nb_cb_destroy_args *args);
+int bgp_create(struct nb_cb_create_args *args);
+int bgp_destroy(struct nb_cb_destroy_args *args);
 int bgp_global_local_as_modify(struct nb_cb_modify_args *args);
 int bgp_global_router_id_modify(struct nb_cb_modify_args *args);
 int bgp_global_router_id_destroy(struct nb_cb_destroy_args *args);

diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c
index deecbfe8428906886af6335756350c2d86262805..c0339b34c0e53b80e3d226d7d4d75821d56ec756 100644 (file)
--- a/bgpd/bgp_nb_config.c
+++ b/bgpd/bgp_nb_config.c
@@ -66,7 +66,7 @@ int routing_control_plane_protocols_name_validate(
  * XPath:
  * /frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp
  */
-int bgp_router_create(struct nb_cb_create_args *args)
+int bgp_create(struct nb_cb_create_args *args)
 {
        const struct lyd_node *vrf_dnode;
        struct bgp *bgp;
@@ -136,7 +136,7 @@ int bgp_router_create(struct nb_cb_create_args *args)
        return NB_OK;
 }
 
-int bgp_router_destroy(struct nb_cb_destroy_args *args)
+int bgp_destroy(struct nb_cb_destroy_args *args)
 {
        struct bgp *bgp;