X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_qos.py;h=02941a163b4050d1eb30831adff8f81840ca014d;hb=b4e5e50fe;hp=149a9ebbe6ed9e0739abd7d1e3906fe3cf4bd9ab;hpb=83832e7ced8be8b7de394415feaba70c32e3c38d;p=vpp.git diff --git a/test/test_qos.py b/test/test_qos.py index 149a9ebbe6e..02941a163b4 100644 --- a/test/test_qos.py +++ b/test/test_qos.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import unittest @@ -515,15 +515,27 @@ class TestQOS(VppTestCase): UDP(sport=1234, dport=1234) / Raw(scapy.compat.chb(100) * NUM_PKTS)) + p_v3 = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) / + Dot1Q(vlan=11, prio=1, id=1) / + IP(src="1.1.1.1", dst="10.0.0.2", tos=2) / + UDP(sport=1234, dport=1234) / + Raw(scapy.compat.chb(100) * NUM_PKTS)) + rx = self.send_and_expect(self.pg1, p_v2 * NUM_PKTS, self.pg0) for p in rx: - self.assertEqual(p[Dot1Q].prio, 6) + self.assertEqual(p[Dot1Q].prio, 7) + self.assertEqual(p[Dot1Q].id, 0) + + rx = self.send_and_expect(self.pg0, p_v3 * NUM_PKTS, self.pg1) + + for p in rx: + self.assertEqual(p[IP].tos, 252) rx = self.send_and_expect(self.pg0, p_v1 * NUM_PKTS, self.pg1) for p in rx: - self.assertEqual(p[IP].tos, 254) + self.assertEqual(p[IP].tos, 253) p_v1 = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) / Dot1Q(vlan=11, prio=2) / @@ -539,12 +551,13 @@ class TestQOS(VppTestCase): rx = self.send_and_expect(self.pg1, p_v2 * NUM_PKTS, self.pg0) for p in rx: - self.assertEqual(p[Dot1Q].prio, 6) + self.assertEqual(p[Dot1Q].prio, 7) + self.assertEqual(p[Dot1Q].id, 0) rx = self.send_and_expect(self.pg0, p_v1 * NUM_PKTS, self.pg1) for p in rx: - self.assertEqual(p[IPv6].tc, 253) + self.assertEqual(p[IPv6].tc, 251) # # cleanup