diff options
| author |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2019-03-10 10:04:23 -0700 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2019-03-11 08:11:16 +0000 |
| commit | a7427ec6f86cbeba7594f98e41fecab291d66b73 (patch) | |
| tree | a1fe195ee4ccdecd420cd908c0752a33ebf3aa19 /test/test_lb.py | |
| parent | 0f6602cb246894ea98253e16aae198094bf78694 (diff) | |
VPP-1508: Use scapy.compat to manage packet level library differences.
Change-Id: Icdf6abc9e53d33b26fd1d531c7dda6be0bb9cb55
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test/test_lb.py')
| -rw-r--r-- | test/test_lb.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/test_lb.py b/test/test_lb.py index 86e7cb46ad3..fa179504855 100644 --- a/test/test_lb.py +++ b/test/test_lb.py @@ -1,5 +1,6 @@ import socket +import scapy.compat from scapy.layers.inet import IP, UDP from scapy.layers.inet6 import IPv6 from scapy.layers.l2 import Ether, GRE @@ -93,11 +94,12 @@ class TestLB(VppTestCase): self.assertEqual(gre.proto, 0x0800 if isv4 else 0x86DD) self.assertEqual(gre.flags, 0) self.assertEqual(gre.version, 0) - inner = IPver(str(gre.payload)) + inner = IPver(scapy.compat.raw(gre.payload)) payload_info = self.payload_to_info(inner[Raw]) self.info = self.packet_infos[payload_info.index] self.assertEqual(payload_info.src, self.pg0.sw_if_index) - self.assertEqual(str(inner), str(self.info.data[IPver])) + self.assertEqual(scapy.compat.raw(inner), + scapy.compat.raw(self.info.data[IPver])) def checkCapture(self, encap, isv4): self.pg0.assert_nothing_captured() @@ -135,7 +137,7 @@ class TestLB(VppTestCase): ) self.assertEqual(ip.nh, 47) # self.assertEqual(len(ip.options), 0) - gre = GRE(str(p[IPv6].payload)) + gre = GRE(scapy.compat.raw(p[IPv6].payload)) self.checkInner(gre, isv4) elif (encap == 'l3dsr'): ip = p[IP] @@ -174,7 +176,7 @@ class TestLB(VppTestCase): ) self.assertEqual(ip.nh, 17) self.assertGreaterEqual(ip.hlim, 63) - udp = UDP(str(p[IPv6].payload)) + udp = UDP(scapy.compat.raw(p[IPv6].payload)) self.assertEqual(udp.dport, 3307) load[asid] += 1 except: |