2 files changed, 17 insertions, 45 deletions
diff --git a/smoketest/configs/dialup-router-medium-vpn b/smoketest/configs/dialup-router-medium-vpn
index 56722d222..503280017 100644
--- a/smoketest/configs/dialup-router-medium-vpn
+++ b/smoketest/configs/dialup-router-medium-vpn
@@ -68,9 +68,6 @@ interfaces {
             mtu 1500
             name-server auto
             password password
-            traffic-policy {
-                out shape-17mbit
-            }
             user-id vyos
             password vyos
         }
@@ -96,9 +93,6 @@ interfaces {
         }
         smp-affinity auto
         speed auto
-        traffic-policy {
-            out shape-94mbit
-        }
     }
     loopback lo {
     }
@@ -719,24 +713,6 @@ system {
     }
     time-zone Pacific/Auckland
 }
-traffic-policy {
-    shaper shape-17mbit {
-        bandwidth 17mbit
-        default {
-            bandwidth 100%
-            burst 15k
-            queue-type fq-codel
-        }
-    }
-    shaper shape-94mbit {
-        bandwidth 94mbit
-        default {
-            bandwidth 100%
-            burst 15k
-            queue-type fq-codel
-        }
-    }
-}
 /* Warning: Do not remove the following line. */
 /* === vyatta-config-version: "broadcast-relay@1:cluster@1:config-management@1:conntrack-sync@1:conntrack@1:dhcp-relay@2:dhcp-server@5:dns-forwarding@1:firewall@5:ipsec@5:l2tp@1:mdns@1:nat@4:ntp@1:pptp@1:qos@1:quagga@6:snmp@1:ssh@1:system@9:vrrp@2:wanloadbalance@3:webgui@1:webproxy@1:webproxy@2:zone-policy@1" === */
 /* Release version: 1.2.6 */
diff --git a/smoketest/configs/qos-basic b/smoketest/configs/qos-basic
index f94a5650d..c279cbf67 100644
--- a/smoketest/configs/qos-basic
+++ b/smoketest/configs/qos-basic
@@ -16,19 +16,14 @@ interfaces {
         traffic-policy {
             out MY-HTB
         }
-    }
-    loopback lo {
-    }
-}
-protocols {
-    static {
-        route 0.0.0.0/0 {
-            next-hop 10.9.9.2 {
-            }
-            next-hop 10.1.1.1 {
+        vif 200 {
+            traffic-policy {
+                out foo-emulate
             }
         }
     }
+    loopback lo {
+    }
 }
 system {
     config-management {
@@ -84,13 +79,14 @@ traffic-policy {
         class 10 {
             bandwidth 100%
             burst 15k
-            match ADDRESS10 {
+            match ssh4 {
                 ip {
-                    dscp CS4
+                    destination {
+                        port 22
+                    }
                 }
             }
             queue-type fair-queue
-            set-dscp CS5
         }
         default {
             bandwidth 10mbit
@@ -120,7 +116,6 @@ traffic-policy {
             ceiling 100%
             match ADDRESS40 {
                 ip {
-                    dscp CS4
                     source {
                         address 10.2.1.0/24
                     }
@@ -133,12 +128,13 @@ traffic-policy {
             bandwidth 100%
             burst 15k
             match ADDRESS50 {
-                ip {
-                    dscp CS5
+                ipv6 {
+                    source {
+                        address "2001:db8::1/64"
+                    }
                 }
             }
             queue-type fair-queue
-            set-dscp CS7
         }
         default {
             bandwidth 10%
@@ -146,7 +142,6 @@ traffic-policy {
             ceiling 100%
             priority 7
             queue-type fair-queue
-            set-dscp CS1
         }
     }
     shaper FS {
@@ -162,7 +157,6 @@ traffic-policy {
                 }
             }
             queue-type fair-queue
-            set-dscp CS4
         }
         class 20 {
             bandwidth 100%
@@ -175,7 +169,6 @@ traffic-policy {
                 }
             }
             queue-type fair-queue
-            set-dscp CS5
         }
         class 30 {
             bandwidth 100%
@@ -188,7 +181,6 @@ traffic-policy {
                 }
             }
             queue-type fair-queue
-            set-dscp CS6
         }
         default {
             bandwidth 10%
@@ -198,6 +190,10 @@ traffic-policy {
             queue-type fair-queue
         }
     }
+    network-emulator foo-emulate {
+        bandwidth 300mbit
+        burst 20000
+    }
 }
 // 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"