qos was rewritten and renamed from "traffic-policy" node to "qos policy"

1 files changed, 35 insertions, 36 deletions

diff --git a/docs/configexamples/qos.rst b/docs/configexamples/qos.rst
index c73158bd..842719c5 100644
--- a/docs/configexamples/qos.rst
+++ b/docs/configexamples/qos.rst
@@ -10,9 +10,8 @@ Configuration 'dcsp' and shaper using QoS
 =========================================
 
 In this case, we'll try to make a simple lab using QoS and the general ability of the VyOS system.
-Before we recommend you noticed the main article about QoS
+We recommend you to go through the main article about `QoS <https://docs.vyos.io/en/latest/configuration/trafficpolicy/index.html>`_ first.
 
-| :ref:configuration/trafficpolicy/index:qos
 
 Using the general schema for example:
 
@@ -44,19 +43,19 @@ On the VyOS3 router, we need to change the 'dscp' labels for the VPCs. To do thi
 .. code-block:: none
 
 	set interfaces ethernet eth0 address '10.1.1.100/24'
-	set interfaces ethernet eth0 traffic-policy out 'vyos3'
 	set interfaces ethernet eth1 address '172.17.1.1/24'
 	set protocols static route 0.0.0.0/0 next-hop 10.1.1.1
-	set traffic-policy shaper vyos3 class 10 match ADDRESS10 ip source address '172.17.1.2/32'
-	set traffic-policy shaper vyos3 class 10 set-dscp 'CS4'
-	set traffic-policy shaper vyos3 class 20 match ADDRESS20 ip source address '172.17.1.3/32'
-	set traffic-policy shaper vyos3 class 20 set-dscp 'CS5'
-	set traffic-policy shaper vyos3 class 30 match ADDRESS20 ip source address '172.17.1.4/32'
-	set traffic-policy shaper vyos3 class 30 set-dscp 'CS6'
-	set traffic-policy shaper vyos3 default bandwidth '10%'
-	set traffic-policy shaper vyos3 default ceiling '100%'
-	set traffic-policy shaper vyos3 default priority '7'
-	set traffic-policy shaper vyos3 default queue-type 'fair-queue'
+	set qos policy shaper vyos3 class 10 match ADDRESS10 ip source address '172.17.1.2/32'
+	set qos policy shaper vyos3 class 10 set-dscp 'CS4'
+	set qos policy shaper vyos3 class 20 match ADDRESS20 ip source address '172.17.1.3/32'
+	set qos policy shaper vyos3 class 20 set-dscp 'CS5'
+	set qos policy shaper vyos3 class 30 match ADDRESS20 ip source address '172.17.1.4/32'
+	set qos policy shaper vyos3 class 30 set-dscp 'CS6'
+	set qos policy shaper vyos3 default bandwidth '10%'
+	set qos policy shaper vyos3 default ceiling '100%'
+	set qos policy shaper vyos3 default priority '7'
+	set qos policy shaper vyos3 default queue-type 'fair-queue'
+        set qos interface eth0 egress 'vyos3'
 
 Main rules:
 
@@ -91,18 +90,18 @@ On the router, VyOS4 set all traffic as CS4. We have to configure the default cl
 .. code-block:: none
 
 	set interfaces ethernet eth0 address '10.2.1.100/24'
-	set interfaces ethernet eth0 traffic-policy out 'vyos4'
 	set protocols static route 0.0.0.0/0 next-hop 10.2.1.1
-	set traffic-policy shaper vyos4 class 10 bandwidth '100%'
-	set traffic-policy shaper vyos4 class 10 burst '15k'
-	set traffic-policy shaper vyos4 class 10 match ALL ether protocol 'all'
-	set traffic-policy shaper vyos4 class 10 queue-type 'fair-queue'
-	set traffic-policy shaper vyos4 class 10 set-dscp 'CS4'
-	set traffic-policy shaper vyos4 default bandwidth '10%'
-	set traffic-policy shaper vyos4 default burst '15k'
-	set traffic-policy shaper vyos4 default ceiling '100%'
-	set traffic-policy shaper vyos4 default priority '7'
-	set traffic-policy shaper vyos4 default queue-type 'fair-queue'
+	set qos policy shaper vyos4 class 10 bandwidth '100%'
+	set qos policy shaper vyos4 class 10 burst '15k'
+	set qos policy shaper vyos4 class 10 match ALL ether protocol 'all'
+	set qos policy shaper vyos4 class 10 queue-type 'fair-queue'
+	set qos policy shaper vyos4 class 10 set-dscp 'CS4'
+	set qos policy shaper vyos4 default bandwidth '10%'
+	set qos policy shaper vyos4 default burst '15k'
+	set qos policy shaper vyos4 default ceiling '100%'
+	set qos policy shaper vyos4 default priority '7'
+	set qos policy shaper vyos4 default queue-type 'fair-queue'
+        set qos interface eth0 egress 'vyos4'
 
 Next on the router VyOS2 we will change labels on all incoming traffic only from CS4-> CS6
 
@@ -116,18 +115,18 @@ Next on the router VyOS2 we will change labels on all incoming traffic only from
 	set interfaces ethernet eth0 address '10.1.1.1/24'
 	set interfaces ethernet eth1 address '10.2.1.1/24'
 	set interfaces ethernet eth2 address '10.9.9.1/24'
-	set interfaces ethernet eth2 traffic-policy out 'vyos2'
 	set protocols static route 172.17.1.0/24 next-hop 10.1.1.100
-	set traffic-policy shaper vyos2 class 10 bandwidth '100%'
-	set traffic-policy shaper vyos2 class 10 burst '15k'
-	set traffic-policy shaper vyos2 class 10 match VYOS2 ip dscp 'CS4'
-	set traffic-policy shaper vyos2 class 10 queue-type 'fair-queue'
-	set traffic-policy shaper vyos2 class 10 set-dscp 'CS5'
-	set traffic-policy shaper vyos2 default bandwidth '100%'
-	set traffic-policy shaper vyos2 default burst '15k'
-	set traffic-policy shaper vyos2 default ceiling '100%'
-	set traffic-policy shaper vyos2 default priority '7'
-	set traffic-policy shaper vyos2 default queue-type 'fair-queue'
+	set qos policy shaper vyos2 class 10 bandwidth '100%'
+	set qos policy shaper vyos2 class 10 burst '15k'
+	set qos policy shaper vyos2 class 10 match VYOS2 ip dscp 'CS4'
+	set qos policy shaper vyos2 class 10 queue-type 'fair-queue'
+	set qos policy shaper vyos2 class 10 set-dscp 'CS5'
+	set qos policy shaper vyos2 default bandwidth '100%'
+	set qos policy shaper vyos2 default burst '15k'
+	set qos policy shaper vyos2 default ceiling '100%'
+	set qos policy shaper vyos2 default priority '7'
+	set qos policy shaper vyos2 default queue-type 'fair-queue'
+        set qos interface eth2 egress 'vyos2'
 
 .. image:: /_static/images/qos6.png
    :width: 80%
@@ -162,7 +161,7 @@ Set up bandwidth limits on the eth2 interface of the router “VyOS2”.
 .. code-block:: none
 
 
-	vyos@vyos2# show traffic-policy shaper vyos2 class 20
+	vyos@vyos2# show qos policy shaper vyos2 class 20
 	bandwidth 5mbit
 	description "for VyOS3 eth0"
 	match VyOS3 {