diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bgpd.texi | 15 | ||||
| -rw-r--r-- | doc/isisd.texi | 55 | ||||
| -rw-r--r-- | doc/ospfd.texi | 55 | ||||
| -rw-r--r-- | doc/vnc.texi | 43 |
4 files changed, 80 insertions, 88 deletions
diff --git a/doc/bgpd.texi b/doc/bgpd.texi index d62c3a7516..83483f5697 100644 --- a/doc/bgpd.texi +++ b/doc/bgpd.texi @@ -823,22 +823,15 @@ Network Layer protocols. BGP supports multiple Address Family Identifier (AFI), namely IPv4 and IPv6. Support is also provided for multiple sets of per-AFI information via Subsequent Address Family Identifiers (SAFI). In addition to unicast information, VPN information -@cite{RFC4364} and @cite{RFC4659}, and Encapsulation information +@cite{RFC4364} and @cite{RFC4659}, and Encapsulation attribute @cite{RFC5512} is supported. -@deffn {Command} {show ip bgp vpnv4 all} {} -@deffnx {Command} {show ipv6 bgp vpn all} {} +@deffn {Command} {show ip bgp ipv4 vpn} {} +@deffnx {Command} {show ipv6 bgp ipv6 vpn} {} Print active IPV4 or IPV6 routes advertised via the VPN SAFI. @end deffn -@deffn {Command} {show ip bgp encap all} {} -@deffnx {Command} {show ipv6 bgp encap all} {} -Print active IPV4 or IPV6 routes advertised via the Encapsulation SAFI. -@end deffn - -@deffn {Command} {show bgp ipv4 encap summary} {} -@deffnx {Command} {show bgp ipv4 vpn summary} {} -@deffnx {Command} {show bgp ipv6 encap summary} {} +@deffn {Command} {show bgp ipv4 vpn summary} {} @deffnx {Command} {show bgp ipv6 vpn summary} {} Print a summary of neighbor connections for the specified AFI/SAFI combination. @end deffn diff --git a/doc/isisd.texi b/doc/isisd.texi index bbc2896755..404698d805 100644 --- a/doc/isisd.texi +++ b/doc/isisd.texi @@ -373,36 +373,37 @@ log file /var/log/zebra.log ! interface eth0 ip address 10.2.2.2/24 - mpls-te on - mpls-te link metric 10 - mpls-te link max-bw 1.25e+06 - mpls-te link max-rsv-bw 1.25e+06 - mpls-te link unrsv-bw 0 1.25e+06 - mpls-te link unrsv-bw 1 1.25e+06 - mpls-te link unrsv-bw 2 1.25e+06 - mpls-te link unrsv-bw 3 1.25e+06 - mpls-te link unrsv-bw 4 1.25e+06 - mpls-te link unrsv-bw 5 1.25e+06 - mpls-te link unrsv-bw 6 1.25e+06 - mpls-te link unrsv-bw 7 1.25e+06 - mpls-te link rsc-clsclr 0xab + link-params + enable + metric 100 + max-bw 1.25e+07 + max-rsv-bw 1.25e+06 + unrsv-bw 0 1.25e+06 + unrsv-bw 1 1.25e+06 + unrsv-bw 2 1.25e+06 + unrsv-bw 3 1.25e+06 + unrsv-bw 4 1.25e+06 + unrsv-bw 5 1.25e+06 + unrsv-bw 6 1.25e+06 + unrsv-bw 7 1.25e+06 + admin-grp 0xab ! interface eth1 ip address 10.1.1.1/24 - mpls-te on - mpls-te link metric 10 - mpls-te link max-bw 1.25e+06 - mpls-te link max-rsv-bw 1.25e+06 - mpls-te link unrsv-bw 0 1.25e+06 - mpls-te link unrsv-bw 1 1.25e+06 - mpls-te link unrsv-bw 2 1.25e+06 - mpls-te link unrsv-bw 3 1.25e+06 - mpls-te link unrsv-bw 4 1.25e+06 - mpls-te link unrsv-bw 5 1.25e+06 - mpls-te link unrsv-bw 6 1.25e+06 - mpls-te link unrsv-bw 7 1.25e+06 - mpls-te link rsc-clsclr 0xab - mpls-te neighbor 10.1.1.2 as 65000 + link-params + enable + metric 100 + max-bw 1.25e+07 + max-rsv-bw 1.25e+06 + unrsv-bw 0 1.25e+06 + unrsv-bw 1 1.25e+06 + unrsv-bw 2 1.25e+06 + unrsv-bw 3 1.25e+06 + unrsv-bw 4 1.25e+06 + unrsv-bw 5 1.25e+06 + unrsv-bw 6 1.25e+06 + unrsv-bw 7 1.25e+06 + neighbor 10.1.1.2 as 65000 @end group @end example diff --git a/doc/ospfd.texi b/doc/ospfd.texi index 9feba08b21..33341d2be6 100644 --- a/doc/ospfd.texi +++ b/doc/ospfd.texi @@ -884,36 +884,37 @@ log file /var/log/zebra.log ! interface eth0 ip address 198.168.1.1/24 - mpls-te on - mpls-te link metric 10 - mpls-te link max-bw 1.25e+06 - mpls-te link max-rsv-bw 1.25e+06 - mpls-te link unrsv-bw 0 1.25e+06 - mpls-te link unrsv-bw 1 1.25e+06 - mpls-te link unrsv-bw 2 1.25e+06 - mpls-te link unrsv-bw 3 1.25e+06 - mpls-te link unrsv-bw 4 1.25e+06 - mpls-te link unrsv-bw 5 1.25e+06 - mpls-te link unrsv-bw 6 1.25e+06 - mpls-te link unrsv-bw 7 1.25e+06 - mpls-te link rsc-clsclr 0xab + link-params + enable + admin-grp 0xa1 + metric 100 + max-bw 1.25e+07 + max-rsv-bw 1.25e+06 + unrsv-bw 0 1.25e+06 + unrsv-bw 1 1.25e+06 + unrsv-bw 2 1.25e+06 + unrsv-bw 3 1.25e+06 + unrsv-bw 4 1.25e+06 + unrsv-bw 5 1.25e+06 + unrsv-bw 6 1.25e+06 + unrsv-bw 7 1.25e+06 ! interface eth1 ip address 192.168.2.1/24 - mpls-te on - mpls-te link metric 10 - mpls-te link max-bw 1.25e+06 - mpls-te link max-rsv-bw 1.25e+06 - mpls-te link unrsv-bw 0 1.25e+06 - mpls-te link unrsv-bw 1 1.25e+06 - mpls-te link unrsv-bw 2 1.25e+06 - mpls-te link unrsv-bw 3 1.25e+06 - mpls-te link unrsv-bw 4 1.25e+06 - mpls-te link unrsv-bw 5 1.25e+06 - mpls-te link unrsv-bw 6 1.25e+06 - mpls-te link unrsv-bw 7 1.25e+06 - mpls-te link rsc-clsclr 0xab - mpls-te neighbor 192.168.2.2 as 65000 + link-params + enable + metric 10 + max-bw 1.25e+07 + max-rsv-bw 1.25e+06 + unrsv-bw 0 1.25e+06 + unrsv-bw 1 1.25e+06 + unrsv-bw 2 1.25e+06 + unrsv-bw 3 1.25e+06 + unrsv-bw 4 1.25e+06 + unrsv-bw 5 1.25e+06 + unrsv-bw 6 1.25e+06 + unrsv-bw 7 1.25e+06 + neighbor 192.168.2.2 as 65000 @end group @end example diff --git a/doc/vnc.texi b/doc/vnc.texi index c44519a9f3..6193d3c906 100644 --- a/doc/vnc.texi +++ b/doc/vnc.texi @@ -22,8 +22,8 @@ BGP, with IP VPNs and Tunnel Encapsulation, is used to distribute VN information between NVAs. BGP based IP VPN support is defined in @cite{RFC4364, BGP/MPLS IP Virtual Private Networks (VPNs)}, and @cite{RFC4659, BGP-MPLS IP Virtual Private Network (VPN) Extension for -IPv6 VPN }. Both the Encapsulation Subsequent Address Family Identifier -(SAFI) and the Tunnel Encapsulation Attribute, @cite{RFC5512, The BGP +IPv6 VPN }. Encapsulation information is provided via +the Tunnel Encapsulation Attribute, @cite{RFC5512, The BGP Encapsulation Subsequent Address Family Identifier (SAFI) and the BGP Tunnel Encapsulation Attribute}, are supported. @@ -83,12 +83,10 @@ operating within a VN. @node General VNC Configuration @subsection General VNC Configuration -@deffn {VNC} {vnc advertise-un-method encap-safi|encap-attr} {} -Advertise NVE underlay-network IP addresses using the encapsulation SAFI -(@code{encap-safi}) or the UN address sub-TLV of the Tunnel Encapsulation attribute -(@code{encap-attr}). When @code{encap-safi} is used, neighbors under -@code{address-family encap} and/or @code{address-family encapv6} must be -configured. The default is @code{encap-attr}. +@deffn {VNC} {vnc advertise-un-method encap-attr} {} +Advertise NVE underlay-network IP addresses using +the UN address sub-TLV of the Tunnel Encapsulation attribute +(@code{encap-attr}). The default is @code{encap-attr}. @end deffn @node RFP Related Configuration @@ -356,8 +354,7 @@ by receiving NVAs. The second form, @code{rt import} specifies an @var{import rt-list}, which is a filter for incoming routes. In order to be made available to NVEs in the group, -incoming BGP VPN and @w{ENCAP} @w{SAFI} (when @code{vnc -advertise-un-method encap-safi} is set) routes must have +incoming BGP VPN @w{SAFI} routes must have RT lists that have at least one route target in common with the group's @var{import rt-list}. @@ -1010,7 +1007,7 @@ router bgp 64512 neighbor 192.168.1.101 remote-as 64512 neighbor 192.168.1.102 remote-as 64512 - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.101 activate neighbor 192.168.1.102 activate exit-address-family @@ -1043,7 +1040,7 @@ router bgp 64512 neighbor 192.168.1.100 remote-as 64512 neighbor 192.168.1.102 remote-as 64512 - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.100 activate neighbor 192.168.1.102 activate exit-address-family @@ -1066,7 +1063,7 @@ router bgp 64512 neighbor 192.168.1.101 remote-as 64512 neighbor 192.168.1.102 remote-as 64512 - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.100 activate neighbor 192.168.1.101 activate exit-address-family @@ -1131,7 +1128,7 @@ router bgp 64512 neighbor 172.16.2.2 route-reflector-client exit-address-family ! - address-family vpnv4 unicast + address-family ipv4 vpn neighbor 192.168.1.102 activate neighbor 192.168.1.103 activate neighbor 192.168.1.104 activate @@ -1161,7 +1158,7 @@ router bgp 64512 no neighbor 192.168.1.103 activate exit-address-family ! - address-family vpnv4 unicast + address-family ipv4 vpn neighbor 192.168.1.101 activate neighbor 192.168.1.102 activate neighbor 192.168.1.103 activate @@ -1250,7 +1247,7 @@ router bgp 64512 neighbor 192.168.1.102 route-reflector-client exit-address-family - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.101 activate neighbor 192.168.1.102 activate @@ -1269,7 +1266,7 @@ router bgp 64512 neighbor 192.168.1.100 remote-as 64512 - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.100 activate exit-address-family @@ -1290,7 +1287,7 @@ router bgp 64512 neighbor 192.168.1.100 remote-as 64512 - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.100 activate exit-address-family @@ -1381,7 +1378,7 @@ router bgp 64512 neighbor 192.168.1.100 remote-as 64512 - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.100 activate exit-address-family @@ -1402,7 +1399,7 @@ router bgp 64512 neighbor 192.168.1.100 remote-as 64512 - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.100 activate exit-address-family @@ -1450,7 +1447,7 @@ router bgp 64512 neighbor 192.168.1.102 description iBGP-client-192-168-1-102 neighbor 192.168.1.102 route-reflector-client - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.101 activate neighbor 192.168.1.102 activate neighbor 192.168.1.104 activate @@ -1470,7 +1467,7 @@ router bgp 64512 neighbor 192.168.1.100 remote-as 64512 neighbor 192.168.1.104 remote-as 64512 - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.100 activate neighbor 192.168.1.104 activate exit-address-family @@ -1493,7 +1490,7 @@ router bgp 64512 neighbor 192.168.1.100 remote-as 64512 neighbor 192.168.1.104 remote-as 64512 - address-family vpnv4 + address-family ipv4 vpn neighbor 192.168.1.100 activate neighbor 192.168.1.104 activate exit-address-family |