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_srv6_ad.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test_srv6_ad.py') diff --git a/test/test_srv6_ad.py b/test/test_srv6_ad.py index 6dafa9f6b3f..728ecd8a796 100644 --- a/test/test_srv6_ad.py +++ b/test/test_srv6_ad.py @@ -729,14 +729,14 @@ class TestSRv6(VppTestCase): # but packet[Raw] gives the complete payload # (incl L2 header) for the T.Encaps L2 case try: - payload_info = self.payload_to_info(str(packet[Raw])) + payload_info = self.payload_to_info(packet[Raw]) except: # remote L2 header from packet[Raw]: # take packet[Raw], convert it to an Ether layer # and then extract Raw from it payload_info = self.payload_to_info( - str(Ether(str(packet[Raw]))[Raw])) + Ether(str(packet[Raw]))[Raw]) return payload_info -- cgit 1.2.3-korg