CLI - Hierarchy position does not change, when moving to BGP L2VPN EVPN

[jhiggins-NZ]

When entering the configuration mode for bgp l2vpn evpn, the prompt does not change to reflect the new mode.

Example:

(config-router)# address-family l2vpn evpn 
(config-router)# neighbor 2.2.2.2 activate       **<< Expected " (config-router-af)# " prompt**
(config-router)# exit

(config)# do sh run
Building configuration...

Current configuration:
!
no ipv6 forwarding
!
debug ospf6 lsa unknown
!
router bgp 100
 neighbor 2.2.2.2 remote-as external
 !
 address-family l2vpn evpn
  neighbor 2.2.2.2 activate            **<<< Writes to running config however**

Example

(config)# router bgp 100
(config-router)# address-family l2vpn evpn 
(config-router)#                                         **<<<  No hierarchy change**
  address-family     Enter Address Family command mode 
  aggregate-address  Configure BGP aggregate entries
  bgp                BGP specific commands
  coalesce-time      Subgroup coalesce timer
  distance           Define an administrative distance

[rwestphal]

I just checked here and the "address-family l2vpn evpn" command works when telneting directly to bgpd but not when using vtysh.

Looking at the code I found this:

bgpd's code:

DEFUN_NOSH (address_family_evpn,
       address_family_evpn_cmd,
       "address-family <l2vpn evpn>",
       "Enter Address Family command mode\n"
       "EVPN Address family\n"
       "Layer2 VPN Address family\n"
       "Ethernet Virtual Private Network Subsequent Address Family\n")
{
  vty->node = BGP_EVPN_NODE;
  return CMD_SUCCESS;
}

vtysh's code:

DEFUNSH (VTYSH_BGPD,
         address_family_evpn,
         address_family_evpn_cmd,
         "address-family <l2vpn evpn>",
         "Enter Address Family command mode\n"
         "EVPN Address family\n"
         "Layer2 VPN Address family\n"
         "Ethernet Virtual Private Network Subsequent Address Family\n")
{
#if defined(HAVE_EVPN)
  vty->node = BGP_EVPN_NODE;
#endif /* HAVE_EVPN */
  return CMD_SUCCESS;
}

@louberger could you take a look at this?

[louberger]

evpn really belongs to 6winds @vjardin6WIND @pguibert6WIND , can one of you take a look?

[pguibert6WIND]

Hello,
thanks @ jhiggins-NZ for pointing out the issue.
thanks @rwestphal for pointing out the root cause.
I made a fix into pull request

#363

I think it will be very helpful.
anyone can review it ?

[rwestphal]

Fixed by #379.