bgpd: use address-family <afi> <safi> in show running for vpn&encap (Issue #80)

Signed-off-by: Lou Berger <lberger@labn.net>

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 5457822f3be672e61dd2b14b30913fc6869a8acb..ec2223d3eda3b7c15bd546d8d8b0dc799a4cf56d 100644 (file)
--- 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 a9ed3fc3d11b2a0c0446ecea808908c5ed990b0b..d38ea60a0368dc036241af1e95f0bc3a80317218 100755 (executable)
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -57,11 +57,15 @@ $ignore{'"address-family ipv4"'} = "ignore";
 $ignore{'"address-family ipv4 <unicast|multicast>"'} = "ignore";
 $ignore{'"address-family ipv6"'} = "ignore";
 $ignore{'"address-family ipv6 <unicast|multicast>"'} = "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 <encap|encapv4>"'} = "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";