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_wireguard.py

diff --git a/test/test_wireguard.py b/test/test_wireguard.py
index e809dae..481aa55 100644
--- a/test/test_wireguard.py
+++ b/test/test_wireguard.py
@@ -261,7 +261,7 @@
     def mk_cookie(self, p, tx_itf, is_resp=False, is_ip6=False):
         self.verify_header(p, is_ip6)
 
-        wg_pkt = Wireguard(p[Raw])
+        wg_pkt = Wireguard(bytes(p[Raw]))
 
         if is_resp:
             self._test.assertEqual(wg_pkt[Wireguard].message_type, 2)
@@ -310,7 +310,7 @@
     def consume_cookie(self, p, is_ip6=False):
         self.verify_header(p, is_ip6)
 
-        cookie_reply = Wireguard(p[Raw])
+        cookie_reply = Wireguard(bytes(p[Raw]))
 
         self._test.assertEqual(cookie_reply[Wireguard].message_type, 3)
         self._test.assertEqual(cookie_reply[Wireguard].reserved_zero, 0)
@@ -390,7 +390,7 @@
         self.noise_init(self.itf.public_key)
         self.verify_header(p, is_ip6)
 
-        init = Wireguard(p[Raw])
+        init = Wireguard(bytes(p[Raw]))
 
         self._test.assertEqual(init[Wireguard].message_type, 1)
         self._test.assertEqual(init[Wireguard].reserved_zero, 0)
@@ -438,9 +438,7 @@
 
     def consume_response(self, p, is_ip6=False):
         self.verify_header(p, is_ip6)
-
-        resp = Wireguard(p[Raw])
-
+        resp = Wireguard(bytes(p[Raw]))
         self._test.assertEqual(resp[Wireguard].message_type, 2)
         self._test.assertEqual(resp[Wireguard].reserved_zero, 0)
         self._test.assertEqual(
@@ -456,7 +454,7 @@
     def decrypt_transport(self, p, is_ip6=False):
         self.verify_header(p, is_ip6)
 
-        p = Wireguard(p[Raw])
+        p = Wireguard(bytes(p[Raw]))
         self._test.assertEqual(p[Wireguard].message_type, 4)
         self._test.assertEqual(p[Wireguard].reserved_zero, 0)
         self._test.assertEqual(
@@ -501,7 +499,7 @@
 
 
 def is_handshake_init(p):
-    wg_p = Wireguard(p[Raw])
+    wg_p = Wireguard(bytes(p[Raw]))
 
     return wg_p[Wireguard].message_type == 1