From 3584691b35f35e40a1bfc22c34da031141fd0dfa Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 21 Mar 2022 21:41:41 +0100
Subject: qos: T4284: initial XML interface definitions for rewrite

---
 .../include/interface/redirect.xml.i               |  17 +
 .../include/interface/traffic-policy.xml.i         |  43 ++
 .../include/interface/vif-s.xml.i                  |   4 +
 interface-definitions/include/interface/vif.xml.i  |   4 +-
 interface-definitions/include/qos/bandwidth.xml.i  |  15 +
 interface-definitions/include/qos/burst.xml.i      |  16 +
 .../include/qos/codel-quantum.xml.i                |  16 +
 interface-definitions/include/qos/dscp.xml.i       | 143 ++++
 interface-definitions/include/qos/flows.xml.i      |  16 +
 interface-definitions/include/qos/hfsc-d.xml.i     |  15 +
 interface-definitions/include/qos/hfsc-m1.xml.i    |  32 +
 interface-definitions/include/qos/hfsc-m2.xml.i    |  32 +
 interface-definitions/include/qos/interval.xml.i   |  16 +
 interface-definitions/include/qos/match.xml.i      | 221 +++++++
 interface-definitions/include/qos/max-length.xml.i |  15 +
 .../include/qos/queue-limit-1-4294967295.xml.i     |  15 +
 .../include/qos/queue-limit-2-10999.xml.i          |  16 +
 interface-definitions/include/qos/queue-type.xml.i |  30 +
 interface-definitions/include/qos/set-dscp.xml.i   |  63 ++
 interface-definitions/include/qos/target.xml.i     |  16 +
 interface-definitions/include/qos/tcp-flags.xml.i  |  21 +
 interface-definitions/interfaces-bonding.xml.in    |   2 +
 interface-definitions/interfaces-bridge.xml.in     |   2 +
 interface-definitions/interfaces-dummy.xml.in      |   2 +
 interface-definitions/interfaces-ethernet.xml.in   |   2 +
 interface-definitions/interfaces-geneve.xml.in     |   2 +
 interface-definitions/interfaces-input.xml.in      |  30 +
 interface-definitions/interfaces-l2tpv3.xml.in     |   1 +
 interface-definitions/interfaces-loopback.xml.in   |   2 +
 interface-definitions/interfaces-macsec.xml.in     |   2 +
 interface-definitions/interfaces-openvpn.xml.in    |   2 +
 interface-definitions/interfaces-pppoe.xml.in      |   4 +-
 .../interfaces-pseudo-ethernet.xml.in              |   2 +
 interface-definitions/interfaces-tunnel.xml.in     |   4 +-
 interface-definitions/interfaces-vti.xml.in        |   2 +
 interface-definitions/interfaces-vxlan.xml.in      |   2 +
 interface-definitions/interfaces-wireguard.xml.in  |   4 +-
 interface-definitions/interfaces-wireless.xml.in   |   2 +
 interface-definitions/interfaces-wwan.xml.in       |   4 +-
 interface-definitions/qos.xml.in                   | 721 +++++++++++++++++++++
 40 files changed, 1553 insertions(+), 5 deletions(-)
 create mode 100644 interface-definitions/include/interface/redirect.xml.i
 create mode 100644 interface-definitions/include/interface/traffic-policy.xml.i
 create mode 100644 interface-definitions/include/qos/bandwidth.xml.i
 create mode 100644 interface-definitions/include/qos/burst.xml.i
 create mode 100644 interface-definitions/include/qos/codel-quantum.xml.i
 create mode 100644 interface-definitions/include/qos/dscp.xml.i
 create mode 100644 interface-definitions/include/qos/flows.xml.i
 create mode 100644 interface-definitions/include/qos/hfsc-d.xml.i
 create mode 100644 interface-definitions/include/qos/hfsc-m1.xml.i
 create mode 100644 interface-definitions/include/qos/hfsc-m2.xml.i
 create mode 100644 interface-definitions/include/qos/interval.xml.i
 create mode 100644 interface-definitions/include/qos/match.xml.i
 create mode 100644 interface-definitions/include/qos/max-length.xml.i
 create mode 100644 interface-definitions/include/qos/queue-limit-1-4294967295.xml.i
 create mode 100644 interface-definitions/include/qos/queue-limit-2-10999.xml.i
 create mode 100644 interface-definitions/include/qos/queue-type.xml.i
 create mode 100644 interface-definitions/include/qos/set-dscp.xml.i
 create mode 100644 interface-definitions/include/qos/target.xml.i
 create mode 100644 interface-definitions/include/qos/tcp-flags.xml.i
 create mode 100644 interface-definitions/interfaces-input.xml.in
 create mode 100644 interface-definitions/qos.xml.in

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/interface/redirect.xml.i b/interface-definitions/include/interface/redirect.xml.i
new file mode 100644
index 000000000..3be9ee16b
--- /dev/null
+++ b/interface-definitions/include/interface/redirect.xml.i
@@ -0,0 +1,17 @@
+<!-- include start from interface/redirect.xml.i -->
+<leafNode name="redirect">
+  <properties>
+    <help>Incoming packet redirection destination</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Interface name</description>
+    </valueHelp>
+    <constraint>
+      <validator name="interface-name"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/traffic-policy.xml.i b/interface-definitions/include/interface/traffic-policy.xml.i
new file mode 100644
index 000000000..cd60b62a5
--- /dev/null
+++ b/interface-definitions/include/interface/traffic-policy.xml.i
@@ -0,0 +1,43 @@
+<!-- include start from interface/traffic-policy.xml.i -->
+<node name="traffic-policy">
+  <properties>
+    <help>Traffic-policy for interface</help>
+  </properties>
+  <children>
+    <leafNode name="in">
+      <properties>
+        <help>Ingress traffic policy for interface</help>
+        <completionHelp>
+          <path>traffic-policy drop-tail</path>
+          <path>traffic-policy fair-queue</path>
+          <path>traffic-policy fq-codel</path>
+          <path>traffic-policy limiter</path>
+          <path>traffic-policy network-emulator</path>
+          <path>traffic-policy priority-queue</path>
+          <path>traffic-policy random-detect</path>
+          <path>traffic-policy rate-control</path>
+          <path>traffic-policy round-robin</path>
+          <path>traffic-policy shaper</path>
+          <path>traffic-policy shaper-hfsc</path>
+        </completionHelp>
+        <valueHelp>
+          <format>txt</format>
+          <description>Policy name</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="out">
+      <properties>
+        <help>Egress traffic policy for interface</help>
+        <completionHelp>
+          <path>traffic-policy</path>
+        </completionHelp>
+        <valueHelp>
+          <format>txt</format>
+          <description>Policy name</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index f1a61ff64..59a47b5ff 100644
--- a/interface-definitions/include/interface/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -64,11 +64,15 @@
         #include <include/interface/ipv6-options.xml.i>
         #include <include/interface/mac.xml.i>
         #include <include/interface/mtu-68-16000.xml.i>
+        #include <include/interface/redirect.xml.i>
+        #include <include/interface/traffic-policy.xml.i>
         #include <include/interface/vrf.xml.i>
         #include <include/interface/interface-firewall-vif-c.xml.i>
         #include <include/interface/interface-policy-vif-c.xml.i>
       </children>
     </tagNode>
+    #include <include/interface/redirect.xml.i>
+    #include <include/interface/traffic-policy.xml.i>
     #include <include/interface/vrf.xml.i>
   </children>
 </tagNode>
diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i
index 11ba7e2f8..8a1475711 100644
--- a/interface-definitions/include/interface/vif.xml.i
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -18,7 +18,6 @@
     #include <include/interface/dhcpv6-options.xml.i>
     #include <include/interface/disable-link-detect.xml.i>
     #include <include/interface/disable.xml.i>
-    #include <include/interface/vrf.xml.i>
     #include <include/interface/interface-firewall-vif.xml.i>
     #include <include/interface/interface-policy-vif.xml.i>
     <leafNode name="egress-qos">
@@ -51,6 +50,9 @@
     #include <include/interface/ipv6-options.xml.i>
     #include <include/interface/mac.xml.i>
     #include <include/interface/mtu-68-16000.xml.i>
+    #include <include/interface/redirect.xml.i>
+    #include <include/interface/traffic-policy.xml.i>
+    #include <include/interface/vrf.xml.i>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/qos/bandwidth.xml.i b/interface-definitions/include/qos/bandwidth.xml.i
new file mode 100644
index 000000000..82af22f42
--- /dev/null
+++ b/interface-definitions/include/qos/bandwidth.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from qos/bandwidth.xml.i -->
+<leafNode name="bandwidth">
+  <properties>
+    <help>Traffic-limit used for this class</help>
+    <valueHelp>
+      <format>&lt;number&gt;</format>
+      <description>Rate in kbit (kilobit per second)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;&lt;suffix&gt;</format>
+      <description>Rate with scaling suffix (mbit, mbps, ...)</description>
+    </valueHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/burst.xml.i b/interface-definitions/include/qos/burst.xml.i
new file mode 100644
index 000000000..761618027
--- /dev/null
+++ b/interface-definitions/include/qos/burst.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from qos/burst.xml.i -->
+<leafNode name="burst">
+  <properties>
+    <help>Burst size for this class</help>
+    <valueHelp>
+      <format>&lt;number&gt;</format>
+      <description>Bytes</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;&lt;suffix&gt;</format>
+      <description>Bytes with scaling suffix (kb, mb, gb)</description>
+    </valueHelp>
+  </properties>
+  <defaultValue>15k</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/codel-quantum.xml.i b/interface-definitions/include/qos/codel-quantum.xml.i
new file mode 100644
index 000000000..bc24630b6
--- /dev/null
+++ b/interface-definitions/include/qos/codel-quantum.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from qos/codel-quantum.xml.i -->
+<leafNode name="codel-quantum">
+  <properties>
+    <help>Deficit in the fair queuing algorithm</help>
+    <valueHelp>
+      <format>u32:0-1048576</format>
+      <description>Number of bytes used as 'deficit'</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-1048576"/>
+    </constraint>
+    <constraintErrorMessage>Interval must be in range 0 to 1048576</constraintErrorMessage>
+  </properties>
+  <defaultValue>1514</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/dscp.xml.i b/interface-definitions/include/qos/dscp.xml.i
new file mode 100644
index 000000000..bb90850ac
--- /dev/null
+++ b/interface-definitions/include/qos/dscp.xml.i
@@ -0,0 +1,143 @@
+<!-- include start from qos/dscp.xml.i -->
+<leafNode name="dscp">
+  <properties>
+    <help>Match on Differentiated Services Codepoint (DSCP)</help>
+    <completionHelp>
+      <list>default reliability throughput lowdelay priority immediate flash flash-override critical internet network AF11 AF12 AF13 AF21 AF22 AF23 AF31 AF32 AF33 AF41 AF42 AF43 CS1 CS2 CS3 CS4 CS5 CS6 CS7 EF</list>
+    </completionHelp>
+    <valueHelp>
+      <format>u32:0-63</format>
+      <description>Differentiated Services Codepoint (DSCP) value </description>
+    </valueHelp>
+    <valueHelp>
+      <format>default</format>
+      <description>match DSCP (000000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>reliability</format>
+      <description>match DSCP (000001)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>throughput</format>
+      <description>match DSCP (000010)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>lowdelay</format>
+      <description>match DSCP (000100)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>priority</format>
+      <description>match DSCP (001000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>immediate</format>
+      <description>match DSCP (010000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>flash</format>
+      <description>match DSCP (011000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>flash-override</format>
+      <description>match DSCP (100000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>critical</format>
+      <description>match DSCP (101000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>internet</format>
+      <description>match DSCP (110000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>network</format>
+      <description>match DSCP (111000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF11</format>
+      <description>High-throughput data</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF12</format>
+      <description>High-throughput data</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF13</format>
+      <description>High-throughput data</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF21</format>
+      <description>Low-latency data</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF22</format>
+      <description>Low-latency data</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF23</format>
+      <description>Low-latency data</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF31</format>
+      <description>Multimedia streaming</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF32</format>
+      <description>Multimedia streaming</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF33</format>
+      <description>Multimedia streaming</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF41</format>
+      <description>Multimedia conferencing</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF42</format>
+      <description>Multimedia conferencing</description>
+    </valueHelp>
+    <valueHelp>
+      <format>AF43</format>
+      <description>Multimedia conferencing</description>
+    </valueHelp>
+    <valueHelp>
+      <format>CS1</format>
+      <description>Low-priority data</description>
+    </valueHelp>
+    <valueHelp>
+      <format>CS2</format>
+      <description>OAM</description>
+    </valueHelp>
+    <valueHelp>
+      <format>CS3</format>
+      <description>Broadcast video</description>
+    </valueHelp>
+    <valueHelp>
+      <format>CS4</format>
+      <description>Real-time interactive</description>
+    </valueHelp>
+    <valueHelp>
+      <format>CS5</format>
+      <description>Signaling</description>
+    </valueHelp>
+    <valueHelp>
+      <format>CS6</format>
+      <description>Network control</description>
+    </valueHelp>
+    <valueHelp>
+      <format>CS7</format>
+      <description></description>
+    </valueHelp>
+    <valueHelp>
+      <format>EF</format>
+      <description>Expedited Forwarding</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-63"/>
+      <regex>(default|reliability|throughput|lowdelay|priority|immediate|flash|flash-override|critical|internet|network|AF11|AF12|AF13|AF21|AF22|AF23|AF31|AF32|AF33|AF41|AF42|AF43|CS1|CS2|CS3|CS4|CS5|CS6|CS7|EF)</regex>
+    </constraint>
+    <constraintErrorMessage>Priority must be between 0 and 63</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/flows.xml.i b/interface-definitions/include/qos/flows.xml.i
new file mode 100644
index 000000000..a7d7c6422
--- /dev/null
+++ b/interface-definitions/include/qos/flows.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from qos/flows.xml.i -->
+<leafNode name="flows">
+  <properties>
+    <help>Number of flows into which the incoming packets are classified</help>
+    <valueHelp>
+      <format>u32:1-65536</format>
+      <description>Number of flows</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65536"/>
+    </constraint>
+    <constraintErrorMessage>Interval must be in range 1 to 65536</constraintErrorMessage>
+  </properties>
+  <defaultValue>1024</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/hfsc-d.xml.i b/interface-definitions/include/qos/hfsc-d.xml.i
new file mode 100644
index 000000000..2a513509c
--- /dev/null
+++ b/interface-definitions/include/qos/hfsc-d.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from qos/hfsc-d.xml.i -->
+<leafNode name="d">
+  <properties>
+    <help>Service curve delay</help>
+    <valueHelp>
+      <format>&lt;number&gt;</format>
+      <description>Time in milliseconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-65535"/>
+    </constraint>
+    <constraintErrorMessage>Priority must be between 0 and 65535</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/hfsc-m1.xml.i b/interface-definitions/include/qos/hfsc-m1.xml.i
new file mode 100644
index 000000000..749d01f57
--- /dev/null
+++ b/interface-definitions/include/qos/hfsc-m1.xml.i
@@ -0,0 +1,32 @@
+<!-- include start from qos/hfsc-m1.xml.i -->
+<leafNode name="m1">
+  <properties>
+    <help>Linkshare m1 parameter for class traffic</help>
+    <valueHelp>
+      <format>&lt;number&gt;</format>
+      <description>Rate in kbit (kilobit per second)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;%%</format>
+      <description>Percentage of overall rate</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;bit</format>
+      <description>bit(1), kbit(10^3), mbit(10^6), gbit, tbit</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;ibit</format>
+      <description>kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;ibps</format>
+      <description>kibps(1024*8), mibps(1024^2*8), gibps, tibps - Byte/sec</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;bps</format>
+      <description>bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps - Byte/sec</description>
+    </valueHelp>
+  </properties>
+  <defaultValue>100%</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/hfsc-m2.xml.i b/interface-definitions/include/qos/hfsc-m2.xml.i
new file mode 100644
index 000000000..24e8f5d63
--- /dev/null
+++ b/interface-definitions/include/qos/hfsc-m2.xml.i
@@ -0,0 +1,32 @@
+<!-- include start from qos/hfsc-m2.xml.i -->
+<leafNode name="m2">
+  <properties>
+    <help>Linkshare m2 parameter for class traffic</help>
+    <valueHelp>
+      <format>&lt;number&gt;</format>
+      <description>Rate in kbit (kilobit per second)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;%%</format>
+      <description>Percentage of overall rate</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;bit</format>
+      <description>bit(1), kbit(10^3), mbit(10^6), gbit, tbit</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;ibit</format>
+      <description>kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;ibps</format>
+      <description>kibps(1024*8), mibps(1024^2*8), gibps, tibps - Byte/sec</description>
+    </valueHelp>
+    <valueHelp>
+      <format>&lt;number&gt;bps</format>
+      <description>bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps - Byte/sec</description>
+    </valueHelp>
+  </properties>
+  <defaultValue>100%</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/interval.xml.i b/interface-definitions/include/qos/interval.xml.i
new file mode 100644
index 000000000..41896ac9c
--- /dev/null
+++ b/interface-definitions/include/qos/interval.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from qos/interval.xml.i -->
+<leafNode name="interval">
+  <properties>
+    <help>Interval used to measure the delay</help>
+    <valueHelp>
+      <format>u32</format>
+      <description>Interval in milliseconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4294967295"/>
+    </constraint>
+    <constraintErrorMessage>Interval must be in range 0 to 4294967295</constraintErrorMessage>
+  </properties>
+  <defaultValue>100</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/match.xml.i b/interface-definitions/include/qos/match.xml.i
new file mode 100644
index 000000000..7d89e4460
--- /dev/null
+++ b/interface-definitions/include/qos/match.xml.i
@@ -0,0 +1,221 @@
+<!-- include start from qos/match.xml.i -->
+<tagNode name="match">
+  <properties>
+    <help>Class matching rule name</help>
+    <constraint>
+      <regex>[^-].*</regex>
+    </constraint>
+    <constraintErrorMessage>Match queue name cannot start with hyphen (-)</constraintErrorMessage>
+  </properties>
+  <children>
+    #include <include/generic-description.xml.i>
+    <node name="ether">
+      <properties>
+        <help>Ethernet header match</help>
+      </properties>
+      <children>
+        <leafNode name="destination">
+          <properties>
+            <help>Ethernet destination address for this match</help>
+            <valueHelp>
+              <format>macaddr</format>
+              <description>MAC address to match</description>
+            </valueHelp>
+            <constraint>
+              <validator name="mac-address"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="protocol">
+          <properties>
+            <help>Ethernet protocol for this match</help>
+            <!-- this refers to /etc/protocols -->
+            <completionHelp>
+              <list>all 802.1Q 802_2 802_3 aarp aoe arp atalk dec ip ipv6 ipx lat localtalk rarp snap x25</list>
+            </completionHelp>
+            <valueHelp>
+              <format>u32:0-65535</format>
+              <description>Ethernet protocol number</description>
+            </valueHelp>
+            <valueHelp>
+              <format>txt</format>
+              <description>Ethernet protocol name</description>
+            </valueHelp>
+            <valueHelp>
+              <format>all</format>
+              <description>Any protocol</description>
+            </valueHelp>
+            <valueHelp>
+              <format>ip</format>
+              <description>Internet IP (IPv4)</description>
+            </valueHelp>
+            <valueHelp>
+              <format>ipv6</format>
+              <description>Internet IP (IPv6)</description>
+            </valueHelp>
+            <valueHelp>
+              <format>arp</format>
+              <description>Address Resolution Protocol</description>
+            </valueHelp>
+            <valueHelp>
+              <format>atalk</format>
+              <description>Appletalk</description>
+            </valueHelp>
+            <valueHelp>
+              <format>ipx</format>
+              <description>Novell Internet Packet Exchange</description>
+            </valueHelp>
+            <valueHelp>
+              <format>802.1Q</format>
+              <description>802.1Q VLAN tag</description>
+            </valueHelp>
+            <constraint>
+              <validator name="ip-protocol"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="source">
+          <properties>
+            <help>Ethernet source address for this match</help>
+            <valueHelp>
+              <format>macaddr</format>
+              <description>MAC address to match</description>
+            </valueHelp>
+            <constraint>
+              <validator name="mac-address"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+    #include <include/generic-interface.xml.i>
+    <node name="ip">
+      <properties>
+        <help>Match IP protocol header</help>
+      </properties>
+      <children>
+        <node name="destination">
+          <properties>
+            <help>Match on destination port or address</help>
+          </properties>
+          <children>
+            <leafNode name="address">
+              <properties>
+                <help>IPv4 destination address for this match</help>
+                <valueHelp>
+                  <format>ipv4net</format>
+                  <description>IPv4 address and prefix length</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv4"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            #include <include/port-number.xml.i>
+          </children>
+        </node>
+        #include <include/qos/dscp.xml.i>
+        #include <include/qos/max-length.xml.i>
+        #include <include/ip-protocol.xml.i>
+        <node name="source">
+          <properties>
+            <help>Match on source port or address</help>
+          </properties>
+          <children>
+            <leafNode name="address">
+              <properties>
+                <help>IPv4 source address for this match</help>
+                <valueHelp>
+                  <format>ipv4net</format>
+                  <description>IPv4 address and prefix length</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv4"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            #include <include/port-number.xml.i>
+          </children>
+        </node>
+        #include <include/qos/tcp-flags.xml.i>
+      </children>
+    </node>
+    <node name="ipv6">
+      <properties>
+        <help>Match IPv6 protocol header</help>
+      </properties>
+      <children>
+        <node name="destination">
+          <properties>
+            <help>Match on destination port or address</help>
+          </properties>
+          <children>
+            <leafNode name="address">
+              <properties>
+                <help>IPv6 destination address for this match</help>
+                <valueHelp>
+                  <format>ipv6net</format>
+                  <description>IPv6 address and prefix length</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv6"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            #include <include/port-number.xml.i>
+          </children>
+        </node>
+        #include <include/qos/dscp.xml.i>
+        #include <include/qos/max-length.xml.i>
+        #include <include/ip-protocol.xml.i>
+        <node name="source">
+          <properties>
+            <help>Match on source port or address</help>
+          </properties>
+          <children>
+            <leafNode name="address">
+              <properties>
+                <help>IPv6 source address for this match</help>
+                <valueHelp>
+                  <format>ipv6net</format>
+                  <description>IPv6 address and prefix length</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="ipv6"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            #include <include/port-number.xml.i>
+          </children>
+        </node>
+        #include <include/qos/tcp-flags.xml.i>
+      </children>
+    </node>
+    <leafNode name="mark">
+      <properties>
+        <help>Match on mark applied by firewall</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>FW mark to match</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0x0-0xffff"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="vif">
+      <properties>
+        <help>Virtual Local Area Network (VLAN) ID for this match</help>
+        <valueHelp>
+          <format>u32:0-4095</format>
+          <description>Virtual Local Area Network (VLAN) tag </description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4095"/>
+        </constraint>
+        <constraintErrorMessage>VLAN ID must be between 0 and 4095</constraintErrorMessage>
+      </properties>
+    </leafNode>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/max-length.xml.i b/interface-definitions/include/qos/max-length.xml.i
new file mode 100644
index 000000000..4cc20f8c4
--- /dev/null
+++ b/interface-definitions/include/qos/max-length.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from qos/max-length.xml.i -->
+<leafNode name="max-length">
+  <properties>
+    <help>Maximum packet length (ipv4)</help>
+    <valueHelp>
+      <format>u32:0-65535</format>
+      <description>Maximum packet/payload length</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-65535"/>
+    </constraint>
+    <constraintErrorMessage>Maximum IPv4 total packet length is 65535</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/queue-limit-1-4294967295.xml.i b/interface-definitions/include/qos/queue-limit-1-4294967295.xml.i
new file mode 100644
index 000000000..2f2d44631
--- /dev/null
+++ b/interface-definitions/include/qos/queue-limit-1-4294967295.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from qos/queue-limit-1-4294967295.xml.i -->
+<leafNode name="queue-limit">
+  <properties>
+    <help>Maximum queue size</help>
+    <valueHelp>
+      <format>u32:1-4294967295</format>
+      <description>Queue size in packets</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-4294967295"/>
+    </constraint>
+    <constraintErrorMessage>Queue limit must be greater than zero</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/queue-limit-2-10999.xml.i b/interface-definitions/include/qos/queue-limit-2-10999.xml.i
new file mode 100644
index 000000000..7a9c8266b
--- /dev/null
+++ b/interface-definitions/include/qos/queue-limit-2-10999.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from qos/queue-limit.xml.i -->
+<leafNode name="queue-limit">
+  <properties>
+    <help>Upper limit of the queue</help>
+    <valueHelp>
+      <format>u32:2-10999</format>
+      <description>Queue size in packets</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 2-10999"/>
+    </constraint>
+    <constraintErrorMessage>Queue limit must greater than 1 and less than 11000</constraintErrorMessage>
+  </properties>
+  <defaultValue>10240</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/queue-type.xml.i b/interface-definitions/include/qos/queue-type.xml.i
new file mode 100644
index 000000000..634f61024
--- /dev/null
+++ b/interface-definitions/include/qos/queue-type.xml.i
@@ -0,0 +1,30 @@
+<!-- include start from qos/queue-type.xml.i -->
+<leafNode name="queue-type">
+  <properties>
+    <help>Queue type for default traffic</help>
+    <completionHelp>
+      <list>fq-codel fair-queue drop-tail random-detect</list>
+    </completionHelp>
+    <valueHelp>
+      <format>fq-codel</format>
+      <description>Fair Queue Codel</description>
+    </valueHelp>
+    <valueHelp>
+      <format>fair-queue</format>
+      <description>Stochastic Fair Queue (SFQ)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>drop-tail</format>
+      <description>First-In-First-Out (FIFO)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>random-detect</format>
+      <description>Random Early Detection (RED)</description>
+    </valueHelp>
+    <constraint>
+      <regex>(fq-codel|fair-queue|drop-tail|random-detect)</regex>
+    </constraint>
+  </properties>
+  <defaultValue>drop-tail</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/set-dscp.xml.i b/interface-definitions/include/qos/set-dscp.xml.i
new file mode 100644
index 000000000..55c0ea44d
--- /dev/null
+++ b/interface-definitions/include/qos/set-dscp.xml.i
@@ -0,0 +1,63 @@
+<!-- include start from qos/set-dscp.xml.i -->
+<leafNode name="set-dscp">
+  <properties>
+    <help>Change the Differentiated Services (DiffServ) field in the IP header</help>
+    <completionHelp>
+      <list>default reliability throughput lowdelay priority immediate flash flash-override critical internet network</list>
+    </completionHelp>
+    <valueHelp>
+      <format>u32:0-63</format>
+      <description>Priority order for bandwidth pool</description>
+    </valueHelp>
+    <valueHelp>
+      <format>default</format>
+      <description>match DSCP (000000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>reliability</format>
+      <description>match DSCP (000001)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>throughput</format>
+      <description>match DSCP (000010)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>lowdelay</format>
+      <description>match DSCP (000100)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>priority</format>
+      <description>match DSCP (001000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>immediate</format>
+      <description>match DSCP (010000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>flash</format>
+      <description>match DSCP (011000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>flash-override</format>
+      <description>match DSCP (100000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>critical</format>
+      <description>match DSCP (101000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>internet</format>
+      <description>match DSCP (110000)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>network</format>
+      <description>match DSCP (111000)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-63"/>
+      <regex>(default|reliability|throughput|lowdelay|priority|immediate|flash|flash-override|critical|internet|network)</regex>
+    </constraint>
+    <constraintErrorMessage>Priority must be between 0 and 63</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/target.xml.i b/interface-definitions/include/qos/target.xml.i
new file mode 100644
index 000000000..bf6342ac9
--- /dev/null
+++ b/interface-definitions/include/qos/target.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from qos/target.xml.i -->
+<leafNode name="target">
+  <properties>
+    <help>Acceptable minimum standing/persistent queue delay</help>
+    <valueHelp>
+      <format>u32</format>
+      <description>Queue delay in milliseconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4294967295"/>
+    </constraint>
+    <constraintErrorMessage>Delay must be in range 0 to 4294967295</constraintErrorMessage>
+  </properties>
+  <defaultValue>5</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/qos/tcp-flags.xml.i b/interface-definitions/include/qos/tcp-flags.xml.i
new file mode 100644
index 000000000..81d70d1f3
--- /dev/null
+++ b/interface-definitions/include/qos/tcp-flags.xml.i
@@ -0,0 +1,21 @@
+<!-- include start from qos/tcp-flags.xml.i -->
+<node name="tcp">
+  <properties>
+    <help>TCP Flags matching</help>
+  </properties>
+  <children>
+    <leafNode name="ack">
+      <properties>
+        <help>Match TCP ACK</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="syn">
+      <properties>
+        <help>Match TCP SYN</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index b98f4b960..20ece5137 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -207,6 +207,8 @@
               </constraint>
             </properties>
           </leafNode>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vif-s.xml.i>
           #include <include/interface/vif.xml.i>
           #include <include/interface/xdp.xml.i>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index fabfb917a..6957067cd 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -210,6 +210,8 @@
               <valueless/>
             </properties>
           </leafNode>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vif.xml.i>
         </children>
       </tagNode>
diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in
index 3bca8b950..109ed1b50 100644
--- a/interface-definitions/interfaces-dummy.xml.in
+++ b/interface-definitions/interfaces-dummy.xml.in
@@ -30,6 +30,8 @@
             </children>
           </node>
           #include <include/interface/netns.xml.i>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index be7bddfa4..7d28912c0 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -196,6 +196,8 @@
               </leafNode>
             </children>
           </node>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vif-s.xml.i>
           #include <include/interface/vif.xml.i>
           #include <include/interface/vrf.xml.i>
diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in
index dd4d324d4..aa5809e60 100644
--- a/interface-definitions/interfaces-geneve.xml.in
+++ b/interface-definitions/interfaces-geneve.xml.in
@@ -50,6 +50,8 @@
               </node>
             </children>
           </node>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/tunnel-remote.xml.i>
           #include <include/vni.xml.i>
         </children>
diff --git a/interface-definitions/interfaces-input.xml.in b/interface-definitions/interfaces-input.xml.in
new file mode 100644
index 000000000..f2eb01c58
--- /dev/null
+++ b/interface-definitions/interfaces-input.xml.in
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="interfaces">
+    <children>
+      <tagNode name="input" owner="${vyos_conf_scripts_dir}/interfaces-input.py">
+        <properties>
+          <help>Input Functional Block (IFB) interface name</help>
+          <!-- before real devices that redirect -->
+          <priority>310</priority>
+          <constraint>
+            <regex>ifb[0-9]+</regex>
+          </constraint>
+          <constraintErrorMessage>Input interface must be named ifbN</constraintErrorMessage>
+          <valueHelp>
+            <format>ifbN</format>
+            <description>Input interface name</description>
+          </valueHelp>
+        </properties>
+        <children>
+          #include <include/interface/description.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/interface-firewall.xml.i>
+          #include <include/interface/interface-policy.xml.i>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
+        </children>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index ba9bcb0a2..124863653 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -125,6 +125,7 @@
               </constraint>
             </properties>
           </leafNode>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
diff --git a/interface-definitions/interfaces-loopback.xml.in b/interface-definitions/interfaces-loopback.xml.in
index 7be15ab89..ffffc0220 100644
--- a/interface-definitions/interfaces-loopback.xml.in
+++ b/interface-definitions/interfaces-loopback.xml.in
@@ -26,6 +26,8 @@
               #include <include/interface/source-validation.xml.i>
             </children>
           </node>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-macsec.xml.in b/interface-definitions/interfaces-macsec.xml.in
index 7206e57b1..311e95c2f 100644
--- a/interface-definitions/interfaces-macsec.xml.in
+++ b/interface-definitions/interfaces-macsec.xml.in
@@ -122,6 +122,8 @@
             <defaultValue>1460</defaultValue>
           </leafNode>
           #include <include/source-interface-ethernet.xml.i>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index eb574eb52..73e30e590 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -816,6 +816,8 @@
               <valueless/>
             </properties>
           </leafNode>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index ed0e45840..1d888236e 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -49,7 +49,6 @@
           #include <include/interface/dhcpv6-options.xml.i>
           #include <include/interface/description.xml.i>
           #include <include/interface/disable.xml.i>
-          #include <include/interface/vrf.xml.i>
           <leafNode name="idle-timeout">
             <properties>
               <help>Delay before disconnecting idle session (in seconds)</help>
@@ -134,6 +133,9 @@
               <constraintErrorMessage>Service name must be alphanumeric only</constraintErrorMessage>
             </properties>
           </leafNode>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in
index bf7055f8d..7baeac537 100644
--- a/interface-definitions/interfaces-pseudo-ethernet.xml.in
+++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in
@@ -59,6 +59,8 @@
             <defaultValue>private</defaultValue>
           </leafNode>
           #include <include/interface/mtu-68-16000.xml.i>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vif-s.xml.i>
           #include <include/interface/vif.xml.i>
         </children>
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index eb1708aaa..bc9297c86 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -20,7 +20,6 @@
           #include <include/interface/address-ipv4-ipv6.xml.i>
           #include <include/interface/disable.xml.i>
           #include <include/interface/disable-link-detect.xml.i>
-          #include <include/interface/vrf.xml.i>
           #include <include/interface/mtu-64-8024.xml.i>
           <leafNode name="mtu">
             <defaultValue>1476</defaultValue>
@@ -288,6 +287,9 @@
               </node>
             </children>
           </node>
+          #include <include/interface/vrf.xml.i>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-vti.xml.in b/interface-definitions/interfaces-vti.xml.in
index f03c7476d..538194c2b 100644
--- a/interface-definitions/interfaces-vti.xml.in
+++ b/interface-definitions/interfaces-vti.xml.in
@@ -34,6 +34,8 @@
           #include <include/interface/ipv4-options.xml.i>
           #include <include/interface/ipv6-options.xml.i>
           #include <include/interface/mtu-68-16000.xml.i>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vrf.xml.i>
           #include <include/interface/interface-firewall.xml.i>
           #include <include/interface/interface-policy.xml.i>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index 0546b4199..18abf9f20 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -99,6 +99,8 @@
           #include <include/source-address-ipv4-ipv6.xml.i>
           #include <include/source-interface.xml.i>
           #include <include/interface/tunnel-remote-multi.xml.i>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vrf.xml.i>
           #include <include/vni.xml.i>
         </children>
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index 1b4b4a816..2f130c6f2 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -19,7 +19,6 @@
           #include <include/interface/address-ipv4-ipv6.xml.i>
           #include <include/interface/description.xml.i>
           #include <include/interface/disable.xml.i>
-          #include <include/interface/vrf.xml.i>
           #include <include/port-number.xml.i>
           #include <include/interface/mtu-68-16000.xml.i>
           #include <include/interface/interface-firewall.xml.i>
@@ -120,6 +119,9 @@
               </leafNode>
             </children>
           </tagNode>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index 9db9fd757..eebe8f841 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -778,6 +778,8 @@
             </properties>
             <defaultValue>monitor</defaultValue>
           </leafNode>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
           #include <include/interface/vif.xml.i>
           #include <include/interface/vif-s.xml.i>
         </children>
diff --git a/interface-definitions/interfaces-wwan.xml.in b/interface-definitions/interfaces-wwan.xml.in
index 03554feed..7007a67ae 100644
--- a/interface-definitions/interfaces-wwan.xml.in
+++ b/interface-definitions/interfaces-wwan.xml.in
@@ -30,7 +30,6 @@
           #include <include/interface/authentication.xml.i>
           #include <include/interface/description.xml.i>
           #include <include/interface/disable.xml.i>
-          #include <include/interface/vrf.xml.i>
           #include <include/interface/disable-link-detect.xml.i>
           #include <include/interface/mtu-68-1500.xml.i>
           <leafNode name="mtu">
@@ -41,6 +40,9 @@
           #include <include/interface/dial-on-demand.xml.i>
           #include <include/interface/interface-firewall.xml.i>
           #include <include/interface/interface-policy.xml.i>
+          #include <include/interface/redirect.xml.i>
+          #include <include/interface/traffic-policy.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/qos.xml.in b/interface-definitions/qos.xml.in
new file mode 100644
index 000000000..d4468543c
--- /dev/null
+++ b/interface-definitions/qos.xml.in
@@ -0,0 +1,721 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="traffic-policy" owner="${vyos_conf_scripts_dir}/qos.py">
+    <properties>
+      <help>Quality of Service (QOS) policy type</help>
+      <priority>900</priority>
+    </properties>
+    <children>
+      <tagNode name="drop-tail">
+        <properties>
+          <help>Packet limited First In, First Out queue</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          #include <include/generic-description.xml.i>
+          #include <include/qos/queue-limit-1-4294967295.xml.i>
+        </children>
+      </tagNode>
+      <tagNode name="fair-queue">
+        <properties>
+          <help>Stochastic Fairness Queueing</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          #include <include/generic-description.xml.i>
+          <leafNode name="hash-interval">
+            <properties>
+              <help>Interval in seconds for queue algorithm perturbation</help>
+              <valueHelp>
+                <format>u32:0</format>
+                <description>No perturbation</description>
+              </valueHelp>
+              <valueHelp>
+                <format>u32:1-127</format>
+                <description>Interval in seconds for queue algorithm perturbation (advised: 10)</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-127"/>
+              </constraint>
+              <constraintErrorMessage>Interval must be in range 0 to 127</constraintErrorMessage>
+            </properties>
+            <defaultValue>0</defaultValue>
+          </leafNode>
+          <leafNode name="queue-limit">
+            <properties>
+              <help>Upper limit of the SFQ</help>
+              <valueHelp>
+                <format>u32:2-127</format>
+                <description>Queue size in packets</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 2-127"/>
+              </constraint>
+              <constraintErrorMessage>Queue limit must greater than 1 and less than 128</constraintErrorMessage>
+            </properties>
+            <defaultValue>127</defaultValue>
+          </leafNode>
+        </children>
+      </tagNode>
+      <tagNode name="fq-codel">
+        <properties>
+          <help>Fair Queuing Controlled Delay</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          #include <include/generic-description.xml.i>
+          #include <include/qos/codel-quantum.xml.i>
+          #include <include/qos/flows.xml.i>
+          #include <include/qos/interval.xml.i>
+          #include <include/qos/queue-limit-2-10999.xml.i>
+          #include <include/qos/target.xml.i>
+        </children>
+      </tagNode>
+      <tagNode name="limiter">
+        <properties>
+          <help>Traffic input limiting policy</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          <tagNode name="class">
+            <properties>
+              <help>Class ID</help>
+              <valueHelp>
+                <format>u32:1-4090</format>
+                <description>Class Identifier</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-4090"/>
+              </constraint>
+              <constraintErrorMessage>Class identifier must be between 1 and 4090</constraintErrorMessage>
+            </properties>
+            <children>
+              #include <include/qos/bandwidth.xml.i>
+              #include <include/qos/burst.xml.i>
+              #include <include/generic-description.xml.i>
+              #include <include/qos/match.xml.i>
+              <leafNode name="priority">
+                <properties>
+                  <help>Priority for rule evaluation</help>
+                  <valueHelp>
+                    <format>u32:0-20</format>
+                    <description>Priority for match rule evaluation</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-20"/>
+                  </constraint>
+                  <constraintErrorMessage>Priority must be between 0 and 20</constraintErrorMessage>
+                </properties>
+                <defaultValue>20</defaultValue>
+              </leafNode>
+            </children>
+          </tagNode>
+          <node name="default">
+            <properties>
+              <help>Default policy</help>
+            </properties>
+            <children>
+              #include <include/qos/bandwidth.xml.i>
+              #include <include/qos/burst.xml.i>
+            </children>
+          </node>
+          #include <include/generic-description.xml.i>
+        </children>
+      </tagNode>
+      <tagNode name="network-emulator">
+        <properties>
+          <help>Network emulator policy</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          #include <include/qos/bandwidth.xml.i>
+          #include <include/qos/burst.xml.i>
+          #include <include/generic-description.xml.i>
+          <leafNode name="network-delay">
+            <properties>
+              <help>Adds delay to packets outgoing to chosen network interface</help>
+              <valueHelp>
+                <format>&lt;number&gt;</format>
+                <description>Time in milliseconds</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-65535"/>
+              </constraint>
+              <constraintErrorMessage>Priority must be between 0 and 65535</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <leafNode name="packet-corruption">
+            <properties>
+              <help>Introducing error in a random position for chosen percent of packets</help>
+              <valueHelp>
+                <format>&lt;number&gt;</format>
+                <description>Percentage of packets affected</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-100"/>
+              </constraint>
+              <constraintErrorMessage>Priority must be between 0 and 100</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <leafNode name="packet-loss">
+            <properties>
+              <help>Add independent loss probability to the packets outgoing to chosen network interface</help>
+              <valueHelp>
+                <format>&lt;number&gt;</format>
+                <description>Percentage of packets affected</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-100"/>
+              </constraint>
+              <constraintErrorMessage>Must be between 0 and 100</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <leafNode name="packet-loss">
+            <properties>
+              <help>Add independent loss probability to the packets outgoing to chosen network interface</help>
+              <valueHelp>
+                <format>&lt;number&gt;</format>
+                <description>Percentage of packets affected</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-100"/>
+              </constraint>
+              <constraintErrorMessage>Must be between 0 and 100</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <leafNode name="packet-loss">
+            <properties>
+              <help>Packet reordering percentage</help>
+              <valueHelp>
+                <format>&lt;number&gt;</format>
+                <description>Percentage of packets affected</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-100"/>
+              </constraint>
+              <constraintErrorMessage>Must be between 0 and 100</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          #include <include/qos/queue-limit-1-4294967295.xml.i>
+        </children>
+      </tagNode>
+      <tagNode name="priority-queue">
+        <properties>
+          <help>Priority queuing based policy</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          <tagNode name="class">
+            <properties>
+              <help>Class Handle</help>
+              <valueHelp>
+                <format>u32:1-7</format>
+                <description>Priority</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-7"/>
+              </constraint>
+              <constraintErrorMessage>Class handle must be between 1 and 7</constraintErrorMessage>
+            </properties>
+            <children>
+              #include <include/generic-description.xml.i>
+              #include <include/qos/codel-quantum.xml.i>
+              #include <include/qos/flows.xml.i>
+              #include <include/qos/interval.xml.i>
+              #include <include/qos/match.xml.i>
+              #include <include/qos/queue-limit-2-10999.xml.i>
+              #include <include/qos/target.xml.i>
+              #include <include/qos/queue-type.xml.i>
+            </children>
+          </tagNode>
+          <node name="default">
+            <properties>
+              <help>Default policy</help>
+            </properties>
+            <children>
+              #include <include/generic-description.xml.i>
+              #include <include/qos/codel-quantum.xml.i>
+              #include <include/qos/flows.xml.i>
+              #include <include/qos/interval.xml.i>
+              #include <include/qos/queue-limit-2-10999.xml.i>
+              #include <include/qos/target.xml.i>
+              #include <include/qos/queue-type.xml.i>
+            </children>
+          </node>
+          #include <include/generic-description.xml.i>
+        </children>
+      </tagNode>
+      <tagNode name="random-detect">
+        <properties>
+          <help>Priority queuing based policy</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          #include <include/qos/bandwidth.xml.i>
+          <leafNode name="bandwidth">
+            <defaultValue>auto</defaultValue>
+          </leafNode>
+          #include <include/generic-description.xml.i>
+          <tagNode name="precedence">
+            <properties>
+              <help>IP precedence</help>
+              <valueHelp>
+                <format>u32:0-7</format>
+                <description>IP precedence value</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-7"/>
+              </constraint>
+              <constraintErrorMessage>IP precedence value must be between 0 and 7</constraintErrorMessage>
+            </properties>
+            <children>
+              #include <include/qos/queue-limit-1-4294967295.xml.i>
+              <leafNode name="average-packet">
+                <properties>
+                  <help>Average packet size (bytes)</help>
+                  <valueHelp>
+                    <format>u32:16-10240</format>
+                    <description>Average packet size in bytes</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-100"/>
+                  </constraint>
+                  <constraintErrorMessage>Average packet size must be between 16 and 10240</constraintErrorMessage>
+                </properties>
+                <defaultValue>1024</defaultValue>
+              </leafNode>
+              <leafNode name="mark-probability">
+                <properties>
+                  <help>Mark probability for this precedence</help>
+                  <valueHelp>
+                    <format>&lt;number&gt;</format>
+                    <description>Numeric value (1/N)</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--positive"/>
+                  </constraint>
+                  <constraintErrorMessage>Mark probability must be greater than 0</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="maximum-threshold">
+                <properties>
+                  <help>Maximum threshold for random detection</help>
+                  <valueHelp>
+                    <format>u32:0-4096</format>
+                    <description>Maximum Threshold in packets</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-4096"/>
+                  </constraint>
+                  <constraintErrorMessage>Threshold must be between 0 and 4096</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="minimum-threshold">
+                <properties>
+                  <help>Minimum  threshold for random detection</help>
+                  <valueHelp>
+                    <format>u32:0-4096</format>
+                    <description>Maximum Threshold in packets</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-4096"/>
+                  </constraint>
+                  <constraintErrorMessage>Threshold must be between 0 and 4096</constraintErrorMessage>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
+        </children>
+      </tagNode>
+      <tagNode name="rate-control">
+        <properties>
+          <help>Rate limiting policy (Token Bucket Filter)</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          #include <include/qos/bandwidth.xml.i>
+          #include <include/generic-description.xml.i>
+          #include <include/qos/burst.xml.i>
+          <leafNode name="latency">
+            <properties>
+              <help>Maximum latency</help>
+              <valueHelp>
+                <format>&lt;number&gt;</format>
+                <description>Time in milliseconds</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-4096"/>
+              </constraint>
+              <constraintErrorMessage>Threshold must be between 0 and 4096</constraintErrorMessage>
+            </properties>
+            <defaultValue>50</defaultValue>
+          </leafNode>
+        </children>
+      </tagNode>
+      <tagNode name="round-robin">
+        <properties>
+          <help>Round-Robin based policy</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          #include <include/generic-description.xml.i>
+          <tagNode name="class">
+            <properties>
+              <help>Class ID</help>
+              <valueHelp>
+                <format>u32:1-4095</format>
+                <description>Class Identifier</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-4095"/>
+              </constraint>
+              <constraintErrorMessage>Class identifier must be between 1 and 4095</constraintErrorMessage>
+            </properties>
+            <children>
+              #include <include/qos/codel-quantum.xml.i>
+              #include <include/generic-description.xml.i>
+              #include <include/qos/flows.xml.i>
+              #include <include/qos/interval.xml.i>
+              #include <include/qos/match.xml.i>
+              <leafNode name="quantum">
+                <properties>
+                  <help>Packet scheduling quantum</help>
+                  <valueHelp>
+                    <format>u32:1-4294967295</format>
+                    <description>Packet scheduling quantum (bytes)</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-4294967295"/>
+                  </constraint>
+                  <constraintErrorMessage>Quantum must be in range 1 to 4294967295</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              #include <include/qos/queue-limit-1-4294967295.xml.i>
+              #include <include/qos/queue-type.xml.i>
+              #include <include/qos/target.xml.i>
+            </children>
+          </tagNode>
+        </children>
+      </tagNode>
+      <tagNode name="shaper-hfsc">
+        <properties>
+          <help>Hierarchical Fair Service Curve's policy</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          #include <include/qos/bandwidth.xml.i>
+          <leafNode name="bandwidth">
+            <defaultValue>auto</defaultValue>
+          </leafNode>
+          #include <include/generic-description.xml.i>
+          <tagNode name="class">
+            <properties>
+              <help>Class ID</help>
+              <valueHelp>
+                <format>u32:1-4095</format>
+                <description>Class Identifier</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-4095"/>
+              </constraint>
+              <constraintErrorMessage>Class identifier must be between 1 and 4095</constraintErrorMessage>
+            </properties>
+            <children>
+              #include <include/generic-description.xml.i>
+              <node name="linkshare">
+                <properties>
+                  <help>Linkshare class settings</help>
+                </properties>
+                <children>
+                  #include <include/qos/hfsc-d.xml.i>
+                  #include <include/qos/hfsc-m1.xml.i>
+                  #include <include/qos/hfsc-m2.xml.i>
+                </children>
+              </node>
+              #include <include/qos/match.xml.i>
+              <node name="realtime">
+                <properties>
+                  <help>Realtime class settings</help>
+                </properties>
+                <children>
+                  #include <include/qos/hfsc-d.xml.i>
+                  #include <include/qos/hfsc-m1.xml.i>
+                  #include <include/qos/hfsc-m2.xml.i>
+                </children>
+              </node>
+              <node name="upperlimit">
+                <properties>
+                  <help>Upperlimit class settings</help>
+                </properties>
+                <children>
+                  #include <include/qos/hfsc-d.xml.i>
+                  #include <include/qos/hfsc-m1.xml.i>
+                  #include <include/qos/hfsc-m2.xml.i>
+                </children>
+              </node>
+            </children>
+          </tagNode>
+          <node name="default">
+            <properties>
+              <help>Default policy</help>
+            </properties>
+            <children>
+              <node name="linkshare">
+                <properties>
+                  <help>Linkshare class settings</help>
+                </properties>
+                <children>
+                  #include <include/qos/hfsc-d.xml.i>
+                  #include <include/qos/hfsc-m1.xml.i>
+                  #include <include/qos/hfsc-m2.xml.i>
+                </children>
+              </node>
+              <node name="realtime">
+                <properties>
+                  <help>Realtime class settings</help>
+                </properties>
+                <children>
+                  #include <include/qos/hfsc-d.xml.i>
+                  #include <include/qos/hfsc-m1.xml.i>
+                  #include <include/qos/hfsc-m2.xml.i>
+                </children>
+              </node>
+              <node name="upperlimit">
+                <properties>
+                  <help>Upperlimit class settings</help>
+                </properties>
+                <children>
+                  #include <include/qos/hfsc-d.xml.i>
+                  #include <include/qos/hfsc-m1.xml.i>
+                  #include <include/qos/hfsc-m2.xml.i>
+                </children>
+              </node>
+            </children>
+          </node>
+        </children>
+      </tagNode>
+      <tagNode name="shaper">
+        <properties>
+          <help>Traffic shaping based policy (Hierarchy Token Bucket)</help>
+          <valueHelp>
+            <format>txt</format>
+            <description>Policy name</description>
+          </valueHelp>
+          <constraint>
+            <regex>[[:alnum:]][-_[:alnum:]]*</regex>
+          </constraint>
+          <constraintErrorMessage>Only alpha-numeric policy name allowed</constraintErrorMessage>
+        </properties>
+        <children>
+          #include <include/qos/bandwidth.xml.i>
+          <leafNode name="bandwidth">
+            <defaultValue>auto</defaultValue>
+          </leafNode>
+          <tagNode name="class">
+            <properties>
+              <help>Class ID</help>
+              <valueHelp>
+                <format>u32:2-4095</format>
+                <description>Class Identifier</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 2-4095"/>
+              </constraint>
+              <constraintErrorMessage>Class identifier must be between 2 and 4095</constraintErrorMessage>
+            </properties>
+            <children>
+              #include <include/qos/bandwidth.xml.i>
+              <leafNode name="bandwidth">
+                <defaultValue>100%</defaultValue>
+              </leafNode>
+              #include <include/qos/burst.xml.i>
+              <leafNode name="ceiling">
+                <properties>
+                  <help>Bandwidth limit for this class</help>
+                  <valueHelp>
+                    <format>&lt;number&gt;</format>
+                    <description>Rate in kbit (kilobit per second)</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>&lt;number&gt;%%</format>
+                    <description>Percentage of overall rate</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>&lt;number&gt;bit</format>
+                    <description>bit(1), kbit(10^3), mbit(10^6), gbit, tbit</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>&lt;number&gt;ibit</format>
+                    <description>kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>&lt;number&gt;ibps</format>
+                    <description>kibps(1024*8), mibps(1024^2*8), gibps, tibps - Byte/sec</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>&lt;number&gt;bps</format>
+                    <description>bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps - Byte/sec</description>
+                  </valueHelp>
+                </properties>
+              </leafNode>
+              #include <include/qos/codel-quantum.xml.i>
+              #include <include/generic-description.xml.i>
+              #include <include/qos/flows.xml.i>
+              #include <include/qos/interval.xml.i>
+              #include <include/qos/match.xml.i>
+              <leafNode name="priority">
+                <properties>
+                  <help>Priority for usage of excess bandwidth</help>
+                  <valueHelp>
+                    <format>u32:0-7</format>
+                    <description>Priority order for bandwidth pool</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-7"/>
+                  </constraint>
+                  <constraintErrorMessage>Priority must be between 0 and 7</constraintErrorMessage>
+                </properties>
+                <defaultValue>20</defaultValue>
+              </leafNode>
+              #include <include/qos/queue-limit-1-4294967295.xml.i>
+              #include <include/qos/queue-type.xml.i>
+              #include <include/qos/set-dscp.xml.i>
+              #include <include/qos/target.xml.i>
+            </children>
+          </tagNode>
+          #include <include/generic-description.xml.i>
+          <node name="default">
+            <properties>
+              <help>Default policy</help>
+            </properties>
+            <children>
+              #include <include/qos/bandwidth.xml.i>
+              #include <include/qos/burst.xml.i>
+              <leafNode name="ceiling">
+                <properties>
+                  <help>Bandwidth limit for this class</help>
+                  <valueHelp>
+                    <format>&lt;number&gt;</format>
+                    <description>Rate in kbit (kilobit per second)</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>&lt;number&gt;%%</format>
+                    <description>Percentage of overall rate</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>&lt;number&gt;bit</format>
+                    <description>bit(1), kbit(10^3), mbit(10^6), gbit, tbit</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>&lt;number&gt;ibit</format>
+                    <description>kibit(1024), mibit(1024^2), gibit(1024^3), tbit(1024^4)</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>&lt;number&gt;ibps</format>
+                    <description>kibps(1024*8), mibps(1024^2*8), gibps, tibps - Byte/sec</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>&lt;number&gt;bps</format>
+                    <description>bps(8),kbps(8*10^3),mbps(8*10^6), gbps, tbps - Byte/sec</description>
+                  </valueHelp>
+                </properties>
+              </leafNode>
+              #include <include/qos/codel-quantum.xml.i>
+              #include <include/generic-description.xml.i>
+              #include <include/qos/flows.xml.i>
+              #include <include/qos/interval.xml.i>
+              <leafNode name="priority">
+                <properties>
+                  <help>Priority for usage of excess bandwidth</help>
+                  <valueHelp>
+                    <format>u32:0-7</format>
+                    <description>Priority order for bandwidth pool</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-7"/>
+                  </constraint>
+                  <constraintErrorMessage>Priority must be between 0 and 7</constraintErrorMessage>
+                </properties>
+                <defaultValue>20</defaultValue>
+              </leafNode>
+              #include <include/qos/queue-limit-1-4294967295.xml.i>
+              #include <include/qos/queue-type.xml.i>
+              #include <include/qos/set-dscp.xml.i>
+              #include <include/qos/target.xml.i>
+            </children>
+          </node>
+        </children>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>
-- 
cgit v1.2.3