2 files changed, 9 insertions, 24 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..96fa7bef4 100644
--- a/smoketest/configs/qos-basic
+++ b/smoketest/configs/qos-basic
@@ -16,6 +16,11 @@ interfaces {
         traffic-policy {
             out MY-HTB
         }
+        vif 200 {
+            traffic-policy {
+                out foo-emulate
+            }
+        }
     }
     loopback lo {
     }
@@ -198,6 +203,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"