From 794a2e0ba04a5eeb3078b5d71d5cc99528651939 Mon Sep 17 00:00:00 2001 From: Lou Berger Date: Tue, 17 Jan 2017 13:45:46 -0500 Subject: [PATCH] bgpd: use address-family in show running for vpn&encap (Issue #80) Signed-off-by: Lou Berger --- bgpd/bgpd.c | 8 ++++---- vtysh/extract.pl.in | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 5457822f3b..ec2223d3ed 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -7182,9 +7182,9 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi, else if (safi == SAFI_MULTICAST) vty_out (vty, "ipv4 multicast"); else if (safi == SAFI_MPLS_VPN) - vty_out (vty, "vpnv4"); + vty_out (vty, "ipv4 vpn"); else if (safi == SAFI_ENCAP) - vty_out (vty, "encap"); + vty_out (vty, "ipv4 encap"); } else if (afi == AFI_IP6) { @@ -7193,9 +7193,9 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi, else if (safi == SAFI_MULTICAST) vty_out (vty, "ipv6 multicast"); else if (safi == SAFI_MPLS_VPN) - vty_out (vty, "vpnv6"); + vty_out (vty, "ipv6 vpn"); else if (safi == SAFI_ENCAP) - vty_out (vty, "encapv6"); + vty_out (vty, "ipv6 encap"); } vty_out (vty, "%s", VTY_NEWLINE); diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in index a9ed3fc3d1..d38ea60a03 100755 --- a/vtysh/extract.pl.in +++ b/vtysh/extract.pl.in @@ -57,11 +57,15 @@ $ignore{'"address-family ipv4"'} = "ignore"; $ignore{'"address-family ipv4 "'} = "ignore"; $ignore{'"address-family ipv6"'} = "ignore"; $ignore{'"address-family ipv6 "'} = "ignore"; +$ignore{'"address-family ipv4 vpn"'} = "ignore"; $ignore{'"address-family vpnv4"'} = "ignore"; $ignore{'"address-family vpnv4 unicast"'} = "ignore"; $ignore{'"address-family ipv4 vrf NAME"'} = "ignore"; $ignore{'"address-family "'} = "ignore"; $ignore{'"address-family encapv6"'} = "ignore"; +$ignore{'"address-family ipv4 encap"'} = "ignore"; +$ignore{'"address-family ipv6 encap"'} = "ignore"; +$ignore{'"address-family ipv6 vpn"'} = "ignore"; $ignore{'"address-family vpnv6"'} = "ignore"; $ignore{'"address-family vpnv6 unicast"'} = "ignore"; $ignore{'"exit-address-family"'} = "ignore"; -- 2.39.5