From 38d1255a52f789770e49c722e718476c6b8edeaf Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 10 Feb 2020 16:44:19 +0900 Subject: [PATCH] test-network: add tests for qdisc Handle= --- test/test-network/conf/25-qdisc-fq-codel.network | 1 + test/test-network/conf/25-qdisc-netem-and-fqcodel.network | 1 + test/test-network/conf/25-qdisc-tbf-and-sfq.network | 1 + test/test-network/conf/25-qdisc-teql.network | 1 + test/test-network/systemd-networkd-tests.py | 8 ++++---- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/test-network/conf/25-qdisc-fq-codel.network b/test/test-network/conf/25-qdisc-fq-codel.network index de74c1b5d2b..42c8dfa7f9d 100644 --- a/test/test-network/conf/25-qdisc-fq-codel.network +++ b/test/test-network/conf/25-qdisc-fq-codel.network @@ -7,6 +7,7 @@ Address=10.1.2.3/16 [FairQueueing] Parent=root +Handle=0003 PacketLimit=1000 FlowLimit=200 Quantum=1500 diff --git a/test/test-network/conf/25-qdisc-netem-and-fqcodel.network b/test/test-network/conf/25-qdisc-netem-and-fqcodel.network index f6e1f2b9588..de03d0d8874 100644 --- a/test/test-network/conf/25-qdisc-netem-and-fqcodel.network +++ b/test/test-network/conf/25-qdisc-netem-and-fqcodel.network @@ -7,6 +7,7 @@ Address=10.1.2.3/16 [NetworkEmulator] Parent=root +Handle=001f DelaySec=50ms DelayJitterSec=10ms LossRate=20% diff --git a/test/test-network/conf/25-qdisc-tbf-and-sfq.network b/test/test-network/conf/25-qdisc-tbf-and-sfq.network index e10317de911..c960886b8e1 100644 --- a/test/test-network/conf/25-qdisc-tbf-and-sfq.network +++ b/test/test-network/conf/25-qdisc-tbf-and-sfq.network @@ -7,6 +7,7 @@ Address=10.1.2.4/16 [TokenBucketFilter] Parent=root +Handle=003f Rate=1G Burst=5K LatencySec=70msec diff --git a/test/test-network/conf/25-qdisc-teql.network b/test/test-network/conf/25-qdisc-teql.network index e506bb17a2f..c8bb9034a29 100644 --- a/test/test-network/conf/25-qdisc-teql.network +++ b/test/test-network/conf/25-qdisc-teql.network @@ -7,4 +7,5 @@ Address=10.1.2.3/16 [TrivialLinkEqualizer] Parent=root +Handle=0002 Id=1 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index c1a84ca9ec0..7def8840be3 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -2243,13 +2243,13 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): output = check_output('tc qdisc show dev dummy98') print(output) - self.assertRegex(output, 'qdisc netem') + self.assertRegex(output, 'qdisc netem 1f:') self.assertRegex(output, 'limit 100 delay 50.0ms 10.0ms loss 20%') self.assertRegex(output, 'qdisc fq_codel') self.assertRegex(output, 'limit 20480p flows 2048 quantum 1400 target 10.0ms ce_threshold 100.0ms interval 200.0ms memory_limit 64Mb ecn') output = check_output('tc qdisc show dev test1') print(output) - self.assertRegex(output, 'qdisc tbf') + self.assertRegex(output, 'qdisc tbf 3f:') self.assertRegex(output, 'rate 1Gbit burst 5000b peakrate 100Gbit minburst 987500b lat 70.0ms') self.assertRegex(output, 'qdisc sfq') self.assertRegex(output, 'perturb 5sec') @@ -2263,7 +2263,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): output = check_output('tc qdisc show dev dummy98') print(output) - self.assertRegex(output, 'qdisc fq') + self.assertRegex(output, 'qdisc fq 3:') self.assertRegex(output, 'limit 1000p flow_limit 200p buckets 512 orphan_mask 511') self.assertRegex(output, 'quantum 1500') self.assertRegex(output, 'initial_quantum 13000') @@ -2299,7 +2299,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): output = check_output('tc qdisc show dev dummy98') print(output) - self.assertRegex(output, 'qdisc teql1') + self.assertRegex(output, 'qdisc teql1 2:') class NetworkdStateFileTests(unittest.TestCase, Utilities): links = [ -- 2.47.3