From a7427ec6f86cbeba7594f98e41fecab291d66b73 Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Sun, 10 Mar 2019 10:04:23 -0700 Subject: VPP-1508: Use scapy.compat to manage packet level library differences. Change-Id: Icdf6abc9e53d33b26fd1d531c7dda6be0bb9cb55 Signed-off-by: Paul Vinciguerra --- test/test_punt.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test/test_punt.py') diff --git a/test/test_punt.py b/test/test_punt.py index 7959b981837..e265dc01f9b 100644 --- a/test/test_punt.py +++ b/test/test_punt.py @@ -11,6 +11,7 @@ import struct from struct import unpack, unpack_from from util import ppp, ppc from re import compile +import scapy.compat from scapy.packet import Raw from scapy.layers.l2 import Ether from scapy.layers.inet import IP, UDP, ICMP @@ -20,12 +21,12 @@ from framework import VppTestCase, VppTestRunner # Format MAC Address def get_mac_addr(bytes_addr): - return ':'.join('%02x' % ord(b) for b in bytes_addr) + return ':'.join('%02x' % scapy.compat.orb(b) for b in bytes_addr) # Format IP Address def ipv4(bytes_addr): - return '.'.join('%d' % ord(b) for b in bytes_addr) + return '.'.join('%d' % scapy.compat.orb(b) for b in bytes_addr) # Unpack Ethernet Frame -- cgit 1.2.3-korg