From eaea421e1fefedc47325f970475c5d48c899433c Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Wed, 6 Mar 2019 11:58:06 -0800 Subject: 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 --- test/test_acl_plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test_acl_plugin.py') diff --git a/test/test_acl_plugin.py b/test/test_acl_plugin.py index ccf495ced1b..fa92513cbb5 100644 --- a/test/test_acl_plugin.py +++ b/test/test_acl_plugin.py @@ -380,10 +380,10 @@ class TestACLplugin(VppTestCase): # Raw data for ICMPv6 are stored in ICMPv6EchoRequest.data if traffic_type == self.ICMP and ip_type == self.IPV6: payload_info = self.payload_to_info( - packet[ICMPv6EchoRequest].data) + packet[ICMPv6EchoRequest], 'data') payload = packet[ICMPv6EchoRequest] else: - payload_info = self.payload_to_info(str(packet[Raw])) + payload_info = self.payload_to_info(packet[Raw]) payload = packet[self.proto_map[payload_info.proto]] except: self.logger.error(ppp("Unexpected or invalid packet " -- cgit 1.2.3-korg