doc: additional merging

Manually merged:

6347ca161f94af4baa853bf09be7fff076e75491

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/doc/user/installation.rst b/doc/user/installation.rst
index 094b8b4ce4eb0c51fa2d08ae0762f64f8ebea60b..356d243e478567f236e1c8ad4bdec9118bfe5ecb 100644 (file)
--- a/doc/user/installation.rst
+++ b/doc/user/installation.rst
@@ -122,6 +122,12 @@ customize the build to include or exclude specific features and dependencies.
    Enable support for Equal Cost Multipath. `ARG` is the maximum number
    of ECMP paths to allow, set to 0 to allow unlimited number of paths.
 
+.. option:: --enable-realms
+
+   Enable the support of Linux Realms. Convert tag values from 1-255 into a
+   realm value when inserting into the Linux kernel. Then routing policy can be
+   assigned to the realm. See the tc man page.
+
 .. option:: --disable-rtadv
 
    Disable support IPV6 router advertisement in zebra.

diff --git a/doc/user/routemap.rst b/doc/user/routemap.rst
index 8422153f93a917cf9108f0b2875e09f5176c640c..735838b0e6585348583627cb7f9d917f81007b31 100644 (file)
--- a/doc/user/routemap.rst
+++ b/doc/user/routemap.rst
@@ -148,6 +148,12 @@ Route Map Match Command
 
    Matches the specified `metric`.
 
+.. index:: match tag TAG
+.. clicmd:: match tag TAG
+
+   Matches the specified tag value associated with the route. This tag value
+   can be in the range of (1-4294967295).
+
 .. index:: match local-preference METRIC
 .. clicmd:: match local-preference METRIC
 
@@ -182,6 +188,16 @@ Route Map Match Command
 Route Map Set Command
 =====================
 
+.. index:: set tag TAG
+.. clicmd:: set tag TAG
+
+.. program:: configure
+
+   Set a tag on the matched route. This tag value can be from (1-4294967295).
+   Additionally if you have compiled with the :option:`--enable-realms`
+   configure option. Tag values from (1-255) are sent to the Linux kernel as a
+   realm value. Then route policy can be applied. See the tc man page.
+
 .. index:: set ip next-hop IPV4_ADDRESS
 .. clicmd:: set ip next-hop IPV4_ADDRESS
 

diff --git a/doc/user/rpki.rst b/doc/user/rpki.rst
index 059b936491ddf5dcf927e6cec0bba0ebc7f788c5..f3e8a85bb709df4e0c94aa87e3e262a844cbf0f4 100644 (file)
--- a/doc/user/rpki.rst
+++ b/doc/user/rpki.rst
@@ -257,5 +257,5 @@ RPKI Configuration Example
    route-map rpki permit 40
    !
 
-.. [Securing-BGP] `Geoff Huston, Randy Bush: Securing BGP, In: The Internet Protocol Journal, Volume 14, No. 2, 2011. <http://www.cisco.com/web/about/ac123/ac147/archived_issues/ipj_14-2/142_bgp.html>`_
-.. [Resource-Certification] `Geoff Huston: Resource Certification, In: The Internet Protocol Journal, Volume 12, No.1, 2009. <http://www.cisco.com/web/about/ac123/ac147/archived_issues/ipj_12-1/121_resource.html>`_
+.. [Securing-BGP] Geoff Huston, Randy Bush: Securing BGP, In: The Internet Protocol Journal, Volume 14, No. 2, 2011. <http://www.cisco.com/web/about/ac123/ac147/archived_issues/ipj_14-2/142_bgp.html>
+.. [Resource-Certification] Geoff Huston: Resource Certification, In: The Internet Protocol Journal, Volume 12, No.1, 2009. <http://www.cisco.com/web/about/ac123/ac147/archived_issues/ipj_12-1/121_resource.html>

diff --git a/doc/user/vnc.rst b/doc/user/vnc.rst
index 7cd2153dc3e5eafbe0de2ee3902a9c42540d3e3f..bd2fdb34f16519c5810776e75b34aec1db68c8f3 100644 (file)
--- a/doc/user/vnc.rst
+++ b/doc/user/vnc.rst
@@ -4,15 +4,15 @@
 VNC and VNC-GW
 **************
 
-This chapter describes how to use Virtual Network Control (:abbr:`VNC`)
-services, including Network Virtualization Authority (:abbr:`NVA`) and VNC
-Gateway (:abbr:`VNC-GW`) functions. Background information on NVAs, Network
-Virtualization Edges (:abbr:`NVE`s), underlay networks (:abbr:`UN`s), and
-virtual networks (:abbr:`VN`s) is available from the
-`IETF Network Virtualization Overlays <https://datatracker.ietf.org/wg/nvo3>`_
-:abbr:`VNC-GW (VNC-Gateways)` support the import/export of routing information
-between VNC and customer edge routers (:abbr:`CE` s) operating within a VN.
-Both IP/Layer 3 (L3) VNs, and IP with Ethernet/Layer 2 (L2) VNs are supported.
+This chapter describes how to use :abbr:`VNC (Virtual Network Control)`
+services, including :abbr:`NVA (Network Virtualization Authority)` and
+:abbr:`VNC-GW (VNC Gateway)` functions. Background information on NVAs,
+:abbr:`NVE (Network Virtualization Edge)` s, :abbr:`UN (Underlay Network)` s,
+and :abbr:`VN (Virtual Network)` is available from the
+`IETF <https://datatracker.ietf.org/wg/nvo3>`_. :abbr:`VNC-GW (VNC Gateway)` s
+support the import/export of routing information between VNC and :abbr:`CE
+(customer edge)` routers operating within a VN.  Both IP/Layer 3 (L3) VNs, and
+IP with Ethernet/Layer 2 (L2) VNs are supported.
 
 BGP, with IP VPNs and Tunnel Encapsulation, is used to distribute VN
 information between NVAs. BGP based IP VPN support is defined in :rfc:`4364`,
@@ -902,7 +902,7 @@ Mesh NVA Configuration
 
 This example includes three NVAs, nine NVEs, and two NVE groups. Note that
 while not shown, a single physical device may support multiple logical NVEs.
-:figure:`fig-vnc-mesh` shows ``code NVA-1`` (192.168.1.100), ``NVA 2``
+:ref:`fig-vnc-mesh` shows ``code NVA-1`` (192.168.1.100), ``NVA 2``
 (192.168.1.101), and ``NVA 3`` (192.168.1.102), which are connected in a full
 mesh. Each is a member of the autonomous system 64512. Each NVA provides VNC
 services to three NVE clients in the 172.16.0.0/16 virtual-network address
@@ -919,7 +919,7 @@ Each NVA advertises NVE underlay-network IP addresses using the
 Tunnel Encapsulation Attribute.
 
 .. _vnc-fig-vnc-mesh:
-.. figure:: ../figure/fig-vnc-mesh.png
+.. figure:: ../figures/fig-vnc-mesh.png
    :align: center
    :alt: Three-way Mesh
 
@@ -1021,7 +1021,7 @@ and combine NVA and VNC-GW functions in a single FRR instance.
 
    Meshed NVEs and VNC-GWs
 
-As shown in :figure:`fig-vnc-gw`, NVAs and VNC-GWs are connected in a full iBGP
+As shown in :ref:`vnc-fig-vnc-gw`, NVAs and VNC-GWs are connected in a full iBGP
 mesh. The VNC-GWs each have two CEs configured as route-reflector clients.
 Each client provides BGP updates with unicast routes that the VNC-GW reflects
 to the other client. The VNC-GW also imports these unicast routes into VPN
@@ -1130,7 +1130,7 @@ VNC with FRR Route Reflector Configuration
 ------------------------------------------
 
 A route reflector eliminates the need for a fully meshed NVA network by acting
-as the hub between NVAs. :figure:`vnc-fig-vnc-frr-route-reflector` shows BGP
+as the hub between NVAs. :ref:`vnc-fig-vnc-frr-route-reflector` shows BGP
 route reflector ``BGP Route Reflector 1`` (192.168.1.100) as a route reflector
 for NVAs ``NVA 2``(192.168.1.101) and ``NVA 3`` (192.168.1.102).
 
@@ -1238,7 +1238,7 @@ This example is identical to :ref:`vnc-with-frr-route-reflector-configuration`
 with the exception that the route reflector is a commercial router. Only the
 VNC-relevant configuration is provided.
 
-.. figure:: ../figures/fig-vnc-commercial-route-reflector
+.. figure:: ../figures/fig-vnc-commercial-route-reflector.png
    :align: center
    :alt: Commercial Route Reflector
 
@@ -1349,7 +1349,7 @@ reflector configuration.  BGP route reflectors ``BGP Route Reflector 1`` and
 ``Commercial Router`` are the route reflectors for NVAs ``NVA 2`` and ``NVA
 3``.  The two NVAs have connections to both route reflectors.
 
-.. figure:: ../fig-vnc-redundant-route-reflectors.png
+.. figure:: ../figures/fig-vnc-redundant-route-reflectors.png
    :align: center
    :alt: Redundant Route Reflectors