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 <vrpolak@cisco.com>

1 files changed, 39 insertions, 43 deletions

diff --git a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-4096h-pps.py b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-4096h-pps.py
index 00dbeee308..5de25273ef 100644
--- a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-4096h-pps.py
+++ b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-4096h-pps.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
 #
@@ -46,84 +46,80 @@ from profile_trex_astf_base_class import TrafficProfileBaseClass
 class TrafficProfile(TrafficProfileBaseClass):
     """Traffic profile."""
 
-    def __init__(self, **kwargs):
-        """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.15.255"
-        self.p1_dst_start_ip = u"20.0.0.0"
-        self.p1_dst_end_ip = u"20.0.15.255"
-
-        self.headers_size = 42  # 14B l2 + 20B ipv4 + 8B UDP
-
-        self.udp_data = u""
-
-        self.n_data = 32  # TODO: set via input parameter
-        self.m_delay = 2000000  # delay 2000s (2,000,000 ms)
-        self.u_delay = 1000 * self.m_delay  # delay 2000s (2,000,000,000 us)
-        self.limit = 258048
-
     def define_profile(self):
         """Define profile to be used by advanced stateful traffic generator.
 
         This method MUST return:
 
-            return ip_gen, templates
+            return ip_gen, templates, None
 
         :returns: IP generator and profile templates for ASTFProfile().
         :rtype: tuple
         """
-        if self.framesize == 64:
-            self.udp_data += self._gen_padding(self.headers_size, 72)
-        if self.framesize == 1518:
-            self.udp_data += self._gen_padding(self.headers_size, 1514)
+        # IPs used in packet headers.
+        p1_src_start_ip = u"192.168.0.0"
+        p1_src_end_ip = u"192.168.15.255"
+        p1_dst_start_ip = u"20.0.0.0"
+        p1_dst_end_ip = u"20.0.15.255"
+
+        # The difference between data size and frame size.
+        headers_size = 46  # 18B L2 + 20B IPv4 + 8B UDP.
+
+        # TODO: Use the "connection protocol" from CPS traffic profile?
+        # Currently, the first data packet is all DUT sees about the session.
+
+        # Avoid sending keepalives.
+        m_delay = 2000000  # delay 2000s (2,000,000 ms)
+
+        # Data, not padded yet.
+        udp_data = u""
+        # Pad the data to achieve the intended frame size.
+        udp_data += self._gen_padding(headers_size)
+
+        # Safety check, the current programs send at least 1 packet.
+        if self.n_data_frames < 1:
+            raise RuntimeError("n_data_frames < 1: {self.n_data_frames}")
 
         # Client program.
         prog_c = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.m_delay)
-        prog_c.send_msg(self.udp_data)
-        # No delay, PPS tests combine connect and data send (no data receive).
-        prog_c.set_var(u"var1", self.n_data)
+        prog_c.set_keepalive_msg(m_delay)
+        prog_c.set_var(u"var1", self.n_data_frames)
         prog_c.set_label(u"a:")
-        prog_c.send_msg(self.udp_data)
+        prog_c.send_msg(udp_data)
         prog_c.jmp_nz(u"var1", u"a:")
         # We should read the server response,
         # but no reason to overload client workers even more.
 
         # Server program.
         prog_s = ASTFProgram(stream=False)
-        prog_s.set_keepalive_msg(self.m_delay)
+        prog_s.set_keepalive_msg(m_delay)
         # If server closes too soon, new instances are started
         # leading in too much replies. To prevent that, we need to recv all.
-        prog_s.recv_msg(1 + self.n_data)
+        prog_s.recv_msg(self.n_data_frames)
         # In packet loss scenarios, some instances never get here.
         # This maybe increases server traffic duration,
         # but no other way if we want to avoid
         # TRex creating a second instance of the same server.
-        prog_s.send_msg(self.udp_data)
-        prog_s.set_var(u"var2", self.n_data)
+        prog_s.set_var(u"var2", self.n_data_frames)
         prog_s.set_label(u"b:")
-        prog_s.send_msg(self.udp_data)
+        prog_s.send_msg(udp_data)
         prog_s.jmp_nz(u"var2", u"b:")
         # VPP never duplicates packets,
         # so it is safe to close the server instance now.
 
         # 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
@@ -133,8 +129,8 @@ class TrafficProfile(TrafficProfileBaseClass):
         temp_c = ASTFTCPClientTemplate(
             program=prog_c,
             ip_gen=ip_gen,
-            limit=self.limit,
-            port=8080
+            limit=258048,  # TODO: Any benefit of making this configurable?
+            port=8080,
         )
         temp_s = ASTFTCPServerTemplate(program=prog_s, assoc=s_assoc)
         template = ASTFTemplate(client_template=temp_c, server_template=temp_s)