Merge branch 'current' into goodnetnick-shloginotp-T4754

1 files changed, 194 insertions, 0 deletions

diff --git a/smoketest/configs/basic-qos b/smoketest/configs/basic-qos
new file mode 100644
index 000000000..d9baa4a1f
--- /dev/null
+++ b/smoketest/configs/basic-qos
@@ -0,0 +1,194 @@
+interfaces {
+    ethernet eth0 {
+        address 100.64.0.1/20
+        duplex auto
+        smp-affinity auto
+        speed auto
+    }
+    ethernet eth1 {
+        duplex auto
+        speed auto
+        vif 10 {
+            traffic-policy {
+                in M2
+            }
+        }
+        vif 20 {
+            traffic-policy {
+                out FS
+            }
+        }
+        vif 30 {
+            traffic-policy {
+                out MY-HTB
+            }
+        }
+        vif 40 {
+            traffic-policy {
+                out SHAPER-FOO
+            }
+        }
+    }
+}
+system {
+    config-management {
+        commit-revisions 100
+    }
+    console {
+        device ttyS0 {
+            speed 115200
+        }
+    }
+    host-name vyos
+    login {
+        user vyos {
+            authentication {
+                encrypted-password $6$O5gJRlDYQpj$MtrCV9lxMnZPMbcxlU7.FI793MImNHznxGoMFgm3Q6QP3vfKJyOSRCt3Ka/GzFQyW1yZS4NS616NLHaIPPFHc0
+                plaintext-password ""
+            }
+        }
+    }
+    name-server 192.168.0.1
+    syslog {
+        global {
+            archive {
+                file 5
+                size 512
+            }
+            facility all {
+                level info
+            }
+        }
+    }
+    time-zone Europe/Berlin
+}
+traffic-policy {
+    limiter M2 {
+        class 10 {
+            bandwidth 120mbit
+            burst 15k
+            match ADDRESS10 {
+                ip {
+                    dscp CS4
+                }
+            }
+            priority 20
+        }
+        default {
+            bandwidth 100mbit
+            burst 15k
+        }
+    }
+    shaper FS {
+        bandwidth auto
+        class 10 {
+            bandwidth 100%
+            burst 15k
+            match ADDRESS10 {
+                ip {
+                    source {
+                        address 172.17.1.2/32
+                    }
+                }
+            }
+            queue-type fair-queue
+            set-dscp CS4
+        }
+        class 20 {
+            bandwidth 100%
+            burst 15k
+            match ADDRESS20 {
+                ip {
+                    source {
+                        address 172.17.1.3/32
+                    }
+                }
+            }
+            queue-type fair-queue
+            set-dscp CS5
+        }
+        class 30 {
+            bandwidth 100%
+            burst 15k
+            match ADDRESS30 {
+                ip {
+                    source {
+                        address 172.17.1.4/32
+                    }
+                }
+            }
+            queue-type fair-queue
+            set-dscp CS6
+        }
+        default {
+            bandwidth 10%
+            burst 15k
+            ceiling 100%
+            priority 7
+            queue-type fair-queue
+        }
+    }
+    shaper MY-HTB {
+        bandwidth 10mbit
+        class 30 {
+            bandwidth 10%
+            burst 15k
+            ceiling 50%
+            match ADDRESS30 {
+                ip {
+                    source {
+                        address 10.1.1.0/24
+                    }
+                }
+            }
+            priority 5
+            queue-type fair-queue
+        }
+        class 40 {
+            bandwidth 90%
+            burst 15k
+            ceiling 100%
+            match ADDRESS40 {
+                ip {
+                    dscp CS4
+                    source {
+                        address 10.2.1.0/24
+                    }
+                }
+            }
+            priority 5
+            queue-type fair-queue
+        }
+        class 50 {
+            bandwidth 100%
+            burst 15k
+            match ADDRESS50 {
+                ip {
+                    dscp CS5
+                }
+            }
+            queue-type fair-queue
+            set-dscp CS7
+        }
+        default {
+            bandwidth 10%
+            burst 15k
+            ceiling 100%
+            priority 7
+            queue-type fair-queue
+            set-dscp CS1
+        }
+    }
+    shaper SHAPER-FOO {
+        bandwidth 1000mbit
+        default {
+            bandwidth 100mbit
+            burst 15k
+            queue-type fair-queue
+            set-dscp CS4
+        }
+    }
+}
+// Warning: Do not remove the following line.
+// vyos-config-version: "broadcast-relay@1:cluster@1:config-management@1:conntrack@3:conntrack-sync@2:dhcp-relay@2:dhcp-server@6:dhcpv6-server@1:dns-forwarding@3:firewall@5:https@2:interfaces@22:ipoe-server@1:ipsec@5:isis@1:l2tp@3:lldp@1:mdns@1:nat@5:ntp@1:pppoe-server@5:pptp@2:qos@1:quagga@8:rpki@1:salt@1:snmp@2:ssh@2:sstp@3:system@21:vrrp@2:vyos-accel-ppp@2:wanloadbalance@3:webproxy@2:zone-policy@1"
+// Release version: 1.3.2