From 1daa6fdc0bae284dee1b61f34534e59b60b7526a Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Mon, 25 Apr 2022 10:22:05 +0200 Subject: feat(astf): Support framesizes for ASTF - No support for IMIX. + Fix a bad bug in padding (most ASTF profiles had wrong frame sizes). + Fix a big typo in TCP PPS profiles (s->c was not data, just RST). + Control transaction size via ASTF_N_DATA_FRAMES env variable. - Default value 5 leads to transactions smaller than before. + It ensures transaction is one burst (per direction) even for jumbo. + Edit autogen to set supported frame sizes based on suite id. + Both TCP and UDP use the same values: + 64B for CPS (exact for UDP, nominal for TCP). + 100B, 1518B and 9000B for TPUT and PPS. - TCP TPUT achievable minimum is 70B. + Used 100B to leave room for possible IPv6 ASTF tests. + Separate function for code reused by vpp and trex tests. - I do not really like the new "copy and edit" approach added here. + But it is a quick edit, better autogen refactor is low priority. + Consider both established and transitory sessions as valid. - Mostly for compatibility with 2202 behavior and to avoid ramp-ups. - Assuming both session states have similar enough VPP CPU overhead. + Added a TODO to investigate and maybe reconsider later. + Update the state timeout value to 240s. + That is the default for TCP (for transitory state). - UDP could keep using 300s. + But I prefer UDP and TCP to behave as similarly as possible. + Use TRex tunables to get the exact frame size (for data packets). - It is not clear why the recipe for MSS has to be this complicated. + Move code away from profile init, as frame size is not known there. + Change internal profile API, so values related to MSS are passed. + Lower ramp-up rate for TCP TPUT tests. + Because without lower rate, jumbo fails on packet loss in ramp-up. + UDP TPUT ramp-up rate also lowered (just to keep suites more similar). + Distinguish one-direction and aggregated average frame size. + Update keyword documentation where the distiction matters. + One-direction is needed for turning bandwidth limit to TPS limit. + Aggregated is needed for correct NDRPDR bandwidth result value. - TCP TPUT will always be few percent below bidirectional maximum. + That is unavoidable, as one direction sends more control packets. + Add runtime consistency checks so future refactors are safer. + Fail if padding requested would be negative. + Fail if suite claims unexpected values for packets per transaction. + Edit the 4 types of ASTF profiles to keep them similar to each other. + Move UDP TPUT limit value from a field back to direct argument. + Stop pretending first UDP packet is not data. + Apply small improvements where convenient. + Replace "aggregate" with "aggregated" where possible. + To lower probability of any future typos in variable names. + Avoid calling Set Numeric Frame Sizes twice. + Code formatting, keyword documentation, code comments, ... + Add TODOs for less important code quality improvements. - Postpone updating of methodology pages to a subsequent change. Change-Id: I4b381e5210e69669f972326202fdcc5a2c9c923b Signed-off-by: Vratko Polak --- .../trex/trex-astf-ethip4udp-1024h.py | 58 ++++++++++------------ 1 file changed, 27 insertions(+), 31 deletions(-) (limited to 'GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py') diff --git a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py index 78ee8f31fc..a1282adf2f 100644 --- a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py +++ b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later # @@ -49,26 +49,6 @@ from profile_trex_astf_base_class import TrafficProfileBaseClass class TrafficProfile(TrafficProfileBaseClass): """Traffic profile.""" - def __init__(self): - """Initialization and setting of profile parameters.""" - - super(TrafficProfileBaseClass, self).__init__() - - # IPs used in packet headers. - self.p1_src_start_ip = u"192.168.0.0" - self.p1_src_end_ip = u"192.168.3.255" - self.p1_dst_start_ip = u"20.0.0.0" - self.p1_dst_end_ip = u"20.0.3.255" - - # UDP messages - self.udp_req = u"GET" - self.udp_res = u"ACK" - - # Headers length - self.headers_size = 42 # 14B l2 + 20B ipv4 + 8B udp - - # No need to set keepalive, both programs end just after start&send. - def define_profile(self): """Define profile to be used by advanced stateful traffic generator. @@ -78,13 +58,29 @@ class TrafficProfile(TrafficProfileBaseClass): :returns: IP generator and profile templates ASTFProfile(). :rtype: tuple """ - self.udp_req += self._gen_padding(self.headers_size + len(self.udp_req)) - self.udp_res += self._gen_padding(self.headers_size + len(self.udp_res)) + # IPs used in packet headers. + p1_src_start_ip = u"192.168.0.0" + p1_src_end_ip = u"192.168.3.255" + p1_dst_start_ip = u"20.0.0.0" + p1_dst_end_ip = u"20.0.3.255" + + # Headers length + headers_size = 46 # 18B L2 + 20B IPv4 + 8B UDP. + + # UDP messages, not padded yet. + udp_req = u"GET" + udp_res = u"ACK" + + # Padd to the required frame size. + udp_req += self._gen_padding(headers_size + len(udp_req)) + udp_res += self._gen_padding(headers_size + len(udp_res)) + + # No need to set keepalive, both programs end just after start&send. # client commands prog_c = ASTFProgram(stream=False) # send REQ message - prog_c.send_msg(self.udp_req) + prog_c.send_msg(udp_req) # No need to process the response, seeing L2 counter is enough. # Client program can end here. @@ -93,22 +89,22 @@ class TrafficProfile(TrafficProfileBaseClass): # When server instance is created means REQ is visible in L2 counter. # No need to receive explicitly? # send RES message - prog_s.send_msg(self.udp_res) + prog_s.send_msg(udp_res) # Server program can end here. # ip generators ip_gen_c = ASTFIPGenDist( - ip_range=[self.p1_src_start_ip, self.p1_src_end_ip], - distribution=u"seq" + ip_range=[p1_src_start_ip, p1_src_end_ip], + distribution=u"seq", ) ip_gen_s = ASTFIPGenDist( - ip_range=[self.p1_dst_start_ip, self.p1_dst_end_ip], - distribution=u"seq" + ip_range=[p1_dst_start_ip, p1_dst_end_ip], + distribution=u"seq", ) ip_gen = ASTFIPGen( glob=ASTFIPGenGlobal(ip_offset=u"0.0.0.1"), dist_client=ip_gen_c, - dist_server=ip_gen_s + dist_server=ip_gen_s, ) # server association @@ -119,7 +115,7 @@ class TrafficProfile(TrafficProfileBaseClass): program=prog_c, ip_gen=ip_gen, limit=64512, # TODO: set via input parameter ? - port=8080 + port=8080, ) temp_s = ASTFTCPServerTemplate(program=prog_s, assoc=s_assoc) template = ASTFTemplate(client_template=temp_c, server_template=temp_s) -- cgit 1.2.3-korg