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/framework.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'test/framework.py') diff --git a/test/framework.py b/test/framework.py index dc7d6107722..778832f401d 100644 --- a/test/framework.py +++ b/test/framework.py @@ -746,16 +746,18 @@ class VppTestCase(unittest.TestCase): info.ip, info.proto) @staticmethod - def payload_to_info(payload): + def payload_to_info(payload, payload_field='load'): """ Convert packet payload to _PacketInfo object :param payload: packet payload - + :type: + :param: payload_field: packet fieldname of payload "load" for + :returns: _PacketInfo object containing de-serialized data from payload """ - numbers = payload.split() + numbers = getattr(payload, payload_field).split() info = _PacketInfo() info.index = int(numbers[0]) info.src = int(numbers[1]) -- cgit 1.2.3-korg