From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Tue, 30 Jan 2018 21:12:26 +0000 (-0500)
Subject: doc: manually merge isis.rst
X-Git-Tag: frr-5.0-dev~165^2~60
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cb39e63e59ab338eb1edb40df4af6e55a5ecd9a9;p=mirror%2Ffrr.git

doc: manually merge isis.rst

Manually merged:

ee65c55e2a923dd9499baa3207d629a09600ba64

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

diff --git a/doc/user/isisd.rst b/doc/user/isisd.rst
index 4b29c81639..1dffc2cf8f 100644
--- a/doc/user/isisd.rst
+++ b/doc/user/isisd.rst
@@ -574,36 +574,35 @@ First, the 'zebra.conf' part:::
    !
    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
+     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
 
 
 Then the 'isisd.conf' itself:::