From a765b82b5bb2a88086503d0cf54b86770d9ffe74 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Fri, 6 Mar 2020 18:15:26 +0000 Subject: rls2001 perf: fix hoststack test packet sizes - TCP packet size is 1460B not 9000B - QUIC packet size is 1280B not 9000B Change-Id: I6604a74fa533db4ac782782c85ea54038688627a Signed-off-by: Dave Wallace --- resources/libraries/python/autogen/Regenerator.py | 10 ++++++++-- resources/libraries/python/autogen/Testcase.py | 10 +++++----- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'resources/libraries/python') diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py index 8278bf00aa..6d6f3f157f 100644 --- a/resources/libraries/python/autogen/Regenerator.py +++ b/resources/libraries/python/autogen/Regenerator.py @@ -457,7 +457,10 @@ class Regenerator: {u"frame_size": 0, u"phy_cores": i} for i in (1, 2, 4) ] hs_bps_kwargs_list = [ - {u"frame_size": 0, u"phy_cores": 1}, + {u"frame_size": 1460, u"phy_cores": 1}, + ] + hs_quic_kwargs_list = [ + {u"frame_size": 1280, u"phy_cores": 1}, ] for in_filename in glob(pattern): @@ -486,7 +489,10 @@ class Regenerator: elif in_filename[-10:] in (u"-cps.robot", u"-rps.robot"): write_tcp_files(in_filename, in_prolog, hs_wrk_kwargs_list) elif in_filename.endswith(u"-bps.robot"): - write_tcp_files(in_filename, in_prolog, hs_bps_kwargs_list) + hoststack_kwargs_list = \ + hs_quic_kwargs_list if u"quic" in in_filename \ + else hs_bps_kwargs_list + write_tcp_files(in_filename, in_prolog, hoststack_kwargs_list) else: raise RuntimeError( f"Error in {in_filename}: non-primary suite type found." diff --git a/resources/libraries/python/autogen/Testcase.py b/resources/libraries/python/autogen/Testcase.py index d419b2993b..c4ed60685b 100644 --- a/resources/libraries/python/autogen/Testcase.py +++ b/resources/libraries/python/autogen/Testcase.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -110,8 +110,8 @@ class Testcase: | | phy_cores=${{cores_num}} ''' else: - template_string = \ - f"\n| ${{tc_num}}-9000B-${{cores_str}}c-{suite_id[:-4]}" \ - f"-{suite_id[-3:]}\n" \ - f"| | [Tags] | ${{cores_str}}C\n| | phy_cores=${{cores_num}}\n" + template_string = f''' +| ${{tc_num}}-${{frame_str}}-${{cores_str}}c-{suite_id[:-4]}-{suite_id[-3:]} +| | [Tags] | ${{cores_str}}C\n| | phy_cores=${{cores_num}} +''' return cls(template_string) -- cgit 1.2.3-korg