bgpd: move advertise-vni-all above vni config

Move config 'advertise-vni-all' above all evpn
configuration as vni specific confi commands
have check for advertise-vni-all enabled first.

Ticket: CM-29312
Reviewed By:
Testing Done:

router bgp 5650
...
advertise-all-vni
vni 1002
 route-target import 55500:10002
 route-target export 55500:10002
exit-vni
...

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

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 85604d856d865a9b43e91a0a3c434eb9d63d22d5..eac1af2ea952d94f9a192864893cb434e35c2ba8 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -5657,6 +5657,9 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
        char buf1[RD_ADDRSTRLEN];
        char buf2[INET6_ADDRSTRLEN];
 
+       if (bgp->advertise_all_vni)
+               vty_out(vty, "  advertise-all-vni\n");
+
        if (bgp->vnihash) {
                struct list *vnilist = hash_to_list(bgp->vnihash);
                struct listnode *ln;
@@ -5669,9 +5672,6 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
                list_delete(&vnilist);
        }
 
-       if (bgp->advertise_all_vni)
-               vty_out(vty, "  advertise-all-vni\n");
-
        if (bgp->advertise_autort_rfc8365)
                vty_out(vty, "  autort rfc8365-compatible\n");