From 27f7cc1e5e3d750e830253a1986ffb315b3751b7 Mon Sep 17 00:00:00 2001 From: Anton Kiselev Date: Tue, 8 Nov 2016 16:12:47 +0700 Subject: fixup template_code payload generation Signed-off-by: Anton Kiselev --- .../trex_control_plane/stl/services/scapy_server/scapy_service.py | 2 +- .../stl/services/scapy_server/unit_tests/test_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/automation/trex_control_plane/stl/services') diff --git a/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py b/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py index 5a31410a..f889bb93 100755 --- a/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py +++ b/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py @@ -329,7 +329,7 @@ def generate_bytes(bytes_definition): elif gen_type == 'template': return generate_bytes_from_template(bytes_size, b64_to_bytes(bytes_definition["template_base64"])) elif gen_type == 'template_code': - return generate_bytes_from_template(bytes_size, bytes_definition["template_code"]) + return generate_bytes_from_template(bytes_size, parse_template_code(bytes_definition["template_code"])) class ScapyException(Exception): pass diff --git a/scripts/automation/trex_control_plane/stl/services/scapy_server/unit_tests/test_utils.py b/scripts/automation/trex_control_plane/stl/services/scapy_server/unit_tests/test_utils.py index c1fb0478..e9fbcc80 100644 --- a/scripts/automation/trex_control_plane/stl/services/scapy_server/unit_tests/test_utils.py +++ b/scripts/automation/trex_control_plane/stl/services/scapy_server/unit_tests/test_utils.py @@ -54,7 +54,7 @@ def test_generate_template_code(): print(res) assert(res == bytearray.fromhex('DE AD BE EF DE AD')) -def test_generate_template_code(): +def test_generate_template_base64(): res = generate_bytes({"generate":"template", "template_base64": bytes_to_b64(b'hi'), "size": 5}) print(res) assert(res == b'hihih') -- cgit 1.2.3-korg