vtysh: [7.0] exit-vrf cli is broken

exit-vrf is not working any more, so anything configured after executing this command are still configured under that VRF context.
For example: Below configuration

vrf VRF_A
ip route 11.11.11.11/32 Null0
exit-vrf
ip route 21.21.21.21/32 Null0

results in ...

vrf VRF_A
 ip route 11.11.11.11/32 Null0
 ip route 21.21.21.21/32 Null0
 exit-vrf
!

It should have been

!
ip route 21.21.21.21/32 Null0
!
vrf VRF_A
 ip route 11.11.11.11/32 Null0
 exit-vrf
!

Porting https://github.com/FRRouting/frr/pull/4725 from FRR master.

Signed-off-by: Sri Mohana Singamsetty <msingamsetty@vmware.com>

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 440b6182316cbb54739afda3174a009018232f5f..178a806dab9905c5385a1d3cdd523846c6f743d6 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1892,7 +1892,7 @@ DEFUNSH(VTYSH_BGPD, rpki_quit, rpki_quit_cmd, "quit",
        return rpki_exit(self, vty, argc, argv);
 }
 
-DEFUNSH(VTYSH_PIMD|VTYSH_ZEBRA, exit_vrf_config, exit_vrf_config_cmd, "exit-vrf",
+DEFUNSH(VTYSH_VRF, exit_vrf_config, exit_vrf_config_cmd, "exit-vrf",
        "Exit from VRF configuration mode\n")
 {
        if (vty->node == VRF_NODE)