commit a7427ec6f86cbeba7594f98e41fecab291d66b73
author Paul Vinciguerra <pvinci@vinciconsulting.com> Sun Mar 10 10:04:23 2019 -0700
committer Ole Trøan <otroan@employees.org> Mon Mar 11 08:11:16 2019 +0000
tree a1fe195ee4ccdecd420cd908c0752a33ebf3aa19
parent 0f6602cb246894ea98253e16aae198094bf78694

VPP-1508: Use scapy.compat to manage packet level library differences.

Change-Id: Icdf6abc9e53d33b26fd1d531c7dda6be0bb9cb55
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>

test/test_ipsec_nat.py

diff --git a/test/test_ipsec_nat.py b/test/test_ipsec_nat.py
index cdb9cb4..e364f5f 100644
--- a/test/test_ipsec_nat.py
+++ b/test/test_ipsec_nat.py
@@ -2,9 +2,11 @@
 
 import socket
 
+import scapy.compat
 from scapy.layers.l2 import Ether
 from scapy.layers.inet import ICMP, IP, TCP, UDP
 from scapy.layers.ipsec import SecurityAssociation, ESP
+
 from util import ppp, ppc
 from template_ipsec import TemplateIpsec
 from vpp_ipsec import VppIpsecSA, VppIpsecSpd, VppIpsecSpdEntry,\
@@ -126,9 +128,9 @@
     def verify_capture_encrypted(self, capture, sa):
         for packet in capture:
             try:
-                copy = packet.__class__(str(packet))
+                copy = packet.__class__(scapy.compat.raw(packet))
                 del copy[UDP].len
-                copy = packet.__class__(str(copy))
+                copy = packet.__class__(scapy.compat.raw(copy))
                 self.assert_equal(packet[UDP].len, copy[UDP].len,
                                   "UDP header length")
                 self.assert_packet_checksums_valid(packet)