commit cf9356d642ce131c6562fcd281c01e51af888ec3
author Dave Wallace <dwallacelf@gmail.com> Tue Jul 23 01:28:19 2024 -0400
committer Beno�t Ganne <bganne@cisco.com> Wed Aug 07 09:15:17 2024 +0000
tree 8a57da79b102ee9a6c4fa3d8c834591ddfdbaff0
parent 0a3b0b231d8d2978c3322cc5ba8e1d2746a6d730

tests: update scapy to version 2.4.5

- Required for Ubuntu 24.04 LTS jobs
- temporarily disable TestIpsecEsp1 and
  TestIpsecAhAll tests until a patch can
  be added to fix them

Type: test

Change-Id: I1ae7b170117182c3252629bbbb770775e2c496c9
Signed-off-by: Benoît Ganne <bganne@cisco.com>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

test/test_udp.py

diff --git a/test/test_udp.py b/test/test_udp.py
index 2c0710b..6315f0e 100644
--- a/test/test_udp.py
+++ b/test/test_udp.py
@@ -633,9 +633,9 @@
         )
 
         rx = self.send_and_expect(self.pg0, p_4 * NUM_PKTS, self.pg0)
-        p_4 = IP(p_4["UDP"].payload)
+        p_4 = IP(bytes(p_4["UDP"].payload))
         for p in rx:
-            p = IP(p["Ether"].payload)
+            p = IP(bytes(p["Ether"].payload))
             self.validate_inner4(p, p_4, ttl=63)
 
         #
@@ -651,10 +651,10 @@
         )
 
         rx = self.send_and_expect(self.pg1, p_6 * NUM_PKTS, self.pg1)
-        p_6 = IPv6(p_6["UDP"].payload)
-        p = IPv6(rx[0]["Ether"].payload)
+        p_6 = IPv6(bytes(p_6["UDP"].payload))
+        p = IPv6(bytes(rx[0]["Ether"].payload))
         for p in rx:
-            p = IPv6(p["Ether"].payload)
+            p = IPv6(bytes(p["Ether"].payload))
             self.validate_inner6(p, p_6, hlim=63)
 
         #
@@ -673,9 +673,9 @@
         self.pg2.enable_mpls()
         rx = self.send_and_expect(self.pg2, p_mo4 * NUM_PKTS, self.pg2)
         self.pg2.disable_mpls()
-        p_mo4 = IP(MPLS(p_mo4["UDP"].payload).payload)
+        p_mo4 = IP(bytes(MPLS(bytes(p_mo4["UDP"].payload)).payload))
         for p in rx:
-            p = IP(p["Ether"].payload)
+            p = IP(bytes(p["Ether"].payload))
             self.validate_inner4(p, p_mo4, ttl=63)