summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorPrashant Maheshwari <pmahesh2@cisco.com>2019-07-31 21:37:33 +0530
committerNeale Ranns <nranns@cisco.com>2019-08-06 08:13:33 +0000
commit3bcf1a940a3699ba3cda6aaecd21b14573709adc (patch)
tree1a3f11ffa5690c987b3503c57068d0519f5f70bb /test
parentec757593859bd8c16839ea8a81a2ef4eb8b29539 (diff)
ethernet: change to mark the CFI bit in the L2 header.
Type: fix Fixes: 039cbfe2 Signed-off-by: Prashant Maheshwari <pmahesh2@cisco.com> Change-Id: Idca91c73758824688dd6ce61df994be66753d838
Diffstat (limited to 'test')
-rw-r--r--test/test_dhcp.py2
-rw-r--r--test/test_qos.py21
2 files changed, 18 insertions, 5 deletions
diff --git a/test/test_dhcp.py b/test/test_dhcp.py
index 16b0f470b0a..175f6493eb7 100644
--- a/test/test_dhcp.py
+++ b/test/test_dhcp.py
@@ -1653,7 +1653,7 @@ class TestDHCP(VppTestCase):
rx = self.pg3.get_capture(1)
self.assertEqual(rx[0][Dot1Q].vlan, 100)
- self.assertEqual(rx[0][Dot1Q].prio, 4)
+ self.assertEqual(rx[0][Dot1Q].prio, 2)
self.verify_orig_dhcp_discover(rx[0], self.pg3, hostname,
dscp=vdscp.IP_API_DSCP_EF)
diff --git a/test/test_qos.py b/test/test_qos.py
index 149a9ebbe6e..ef4e495fbea 100644
--- a/test/test_qos.py
+++ b/test/test_qos.py
@@ -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