summaryrefslogtreecommitdiffstats
path: root/test/test_ip4.py
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2019-03-06 11:58:06 -0800
committerOle Trøan <otroan@employees.org>2019-03-07 22:29:44 +0000
commiteaea421e1fefedc47325f970475c5d48c899433c (patch)
treed325f642804865b6a57bf75f8ba2897bd438a8a2 /test/test_ip4.py
parentea2450fa2d1e8ba0295ea9861a404796100dad1e (diff)
Tests: Refactor payload_to_info()
All callers of payload_to_info were required to wrap payload with str(). Refactor to call scapy's payload.load for raw payloads or specify the specific fieldname. Change-Id: I1c80599d4df8dc129dbb8274733afaad406d5bcf Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test/test_ip4.py')
-rw-r--r--test/test_ip4.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/test_ip4.py b/test/test_ip4.py
index b6553dba7c2..492e96a99e3 100644
--- a/test/test_ip4.py
+++ b/test/test_ip4.py
@@ -168,7 +168,7 @@ class TestIPv4(VppTestCase):
try:
ip = packet[IP]
udp = packet[UDP]
- payload_info = self.payload_to_info(str(packet[Raw]))
+ payload_info = self.payload_to_info(packet[Raw])
packet_index = payload_info.index
self.assertEqual(payload_info.dst, dst_sw_if_index)
self.logger.debug(
@@ -351,8 +351,8 @@ class TestIPv4FibCrud(VppTestCase):
def _find_ip_match(self, find_in, pkt):
for p in find_in:
- if self.payload_to_info(str(p[Raw])) == \
- self.payload_to_info(str(pkt[Raw])):
+ if self.payload_to_info(p[Raw]) == \
+ self.payload_to_info(pkt[Raw]):
if p[IP].src != pkt[IP].src:
break
if p[IP].dst != pkt[IP].dst: