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_gre.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_gre.py')
| -rw-r--r-- | test/test_gre.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/test_gre.py b/test/test_gre.py index ccd66c428e8..694f819308e 100644 --- a/test/test_gre.py +++ b/test/test_gre.py @@ -2,6 +2,7 @@ import unittest +import scapy.compat from scapy.packet import Raw from scapy.layers.l2 import Ether, Dot1Q, GRE from scapy.layers.inet import IP, UDP @@ -146,7 +147,8 @@ class TestGRE(VppTestCase): GRE() / Ether(dst=RandMAC('*:*:*:*:*:*'), src=RandMAC('*:*:*:*:*:*')) / - IP(src=str(RandIP()), dst=str(RandIP())) / + IP(src=scapy.compat.raw(RandIP()), + dst=scapy.compat.raw(RandIP())) / UDP(sport=1234, dport=1234) / Raw(payload)) info.data = p.copy() @@ -165,7 +167,8 @@ class TestGRE(VppTestCase): Ether(dst=RandMAC('*:*:*:*:*:*'), src=RandMAC('*:*:*:*:*:*')) / Dot1Q(vlan=vlan) / - IP(src=str(RandIP()), dst=str(RandIP())) / + IP(src=scapy.compat.raw(RandIP()), + dst=scapy.compat.raw(RandIP())) / UDP(sport=1234, dport=1234) / Raw(payload)) info.data = p.copy() @@ -217,7 +220,7 @@ class TestGRE(VppTestCase): self.assertEqual(rx_ip.src, tunnel_src) self.assertEqual(rx_ip.dst, tunnel_dst) - rx_gre = GRE(str(rx_ip[IPv6].payload)) + rx_gre = GRE(scapy.compat.raw(rx_ip[IPv6].payload)) rx_ip = rx_gre[IPv6] self.assertEqual(rx_ip.src, tx_ip.src) @@ -243,7 +246,7 @@ class TestGRE(VppTestCase): self.assertEqual(rx_ip.src, tunnel_src) self.assertEqual(rx_ip.dst, tunnel_dst) - rx_gre = GRE(str(rx_ip[IPv6].payload)) + rx_gre = GRE(scapy.compat.raw(rx_ip[IPv6].payload)) tx_ip = tx[IP] rx_ip = rx_gre[IP] @@ -270,7 +273,7 @@ class TestGRE(VppTestCase): self.assertEqual(rx_ip.src, tunnel_src) self.assertEqual(rx_ip.dst, tunnel_dst) - rx_gre = GRE(str(rx_ip[IP].payload)) + rx_gre = GRE(scapy.compat.raw(rx_ip[IP].payload)) rx_ip = rx_gre[IPv6] tx_ip = tx[IPv6] |