Revert "bgpd: fix bgp vrf instance creation from implicit"

This reverts commit 2ff08af78e315c69795417d150cd23649f68c655.

The fix is obviously wrong.

Link: 2ff08af78e315c69795417d150cd23649f68c655
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
(cherry picked from commit 339206341fa08c57316559eb3733d216236dfe9d)
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index edda82b63c87f8247599a751332fa67645923609..8a3ae538dcd30ac70501d47d04645331b34f45cc 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3410,6 +3410,17 @@ static struct bgp *bgp_create(as_t *as, const char *name,
        }
 
        bgp = XCALLOC(MTYPE_BGP, sizeof(struct bgp));
+       bgp->as = *as;
+       if (as_pretty)
+               bgp->as_pretty = XSTRDUP(MTYPE_BGP_NAME, as_pretty);
+       else
+               bgp->as_pretty = XSTRDUP(MTYPE_BGP_NAME, asn_asn2asplain(*as));
+
+       if (asnotation != ASNOTATION_UNDEFINED) {
+               bgp->asnotation = asnotation;
+               SET_FLAG(bgp->config, BGP_CONFIG_ASNOTATION);
+       } else
+               asn_str2asn_notation(bgp->as_pretty, NULL, &bgp->asnotation);
 
        if (BGP_DEBUG(zebra, ZEBRA)) {
                if (inst_type == BGP_INSTANCE_TYPE_DEFAULT)
@@ -3453,18 +3464,6 @@ static struct bgp *bgp_create(as_t *as, const char *name,
        bgp->peer = list_new();
 
 peer_init:
-       bgp->as = *as;
-       if (as_pretty)
-               bgp->as_pretty = XSTRDUP(MTYPE_BGP_NAME, as_pretty);
-       else
-               bgp->as_pretty = XSTRDUP(MTYPE_BGP_NAME, asn_asn2asplain(*as));
-
-       if (asnotation != ASNOTATION_UNDEFINED) {
-               bgp->asnotation = asnotation;
-               SET_FLAG(bgp->config, BGP_CONFIG_ASNOTATION);
-       } else
-               asn_str2asn_notation(bgp->as_pretty, NULL, &bgp->asnotation);
-
        bgp->peer->cmp = (int (*)(void *, void *))peer_cmp;
        bgp->peerhash = hash_create(peer_hash_key_make, peer_hash_same,
                                    "BGP Peer Hash");