Revert "bgpd: fix import vrf creates multiple bgp instances"

This reverts commit 8c187fb4f838d8d8a21f8608c3a510136764b122.

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 9dc85e745e309be3bfb81764088868fdbad8ef32..9eabfb6da00adb8decd648e5df5d36873e6a2925 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -10440,7 +10440,7 @@ DEFPY(bgp_imexport_vrf, bgp_imexport_vrf_cmd,
                }
        }
 
-       vrf_bgp = bgp_lookup_by_name_filter(import_name, false);
+       vrf_bgp = bgp_lookup_by_name(import_name);
        if (!vrf_bgp) {
                if (strcmp(import_name, VRF_DEFAULT_NAME) == 0) {
                        vrf_bgp = bgp_default;

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 7c1be226b1c79cf7786bda3f750e1d792be45d62..34c0eab089c8d79a64d76624687c04626f8f01e8 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3623,7 +3623,7 @@ struct bgp *bgp_lookup(as_t as, const char *name)
 }
 
 /* Lookup BGP structure by view name. */
-struct bgp *bgp_lookup_by_name_filter(const char *name, bool filter_auto)
+static struct bgp *bgp_lookup_by_name_filter(const char *name, bool filter_auto)
 {
        struct bgp *bgp;
        struct listnode *node, *nnode;

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index a565a323b54c9273884f74fd109e9f26a2dac3aa..8500f5537118cfd5fa149aa67c2e2e8c1c7a4677 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -2225,7 +2225,6 @@ extern void bgp_zclient_reset(void);
 extern struct bgp *bgp_get_default(void);
 extern struct bgp *bgp_lookup(as_t, const char *);
 extern struct bgp *bgp_lookup_by_name(const char *);
-extern struct bgp *bgp_lookup_by_name_filter(const char *name, bool filter_auto);
 extern struct bgp *bgp_lookup_by_vrf_id(vrf_id_t);
 extern struct bgp *bgp_get_evpn(void);
 extern void bgp_set_evpn(struct bgp *bgp);