ASTF: Lessen L7 processing in UDP_CPS profiles

Change-Id: I8b154156120821adb24273db2a232fa82200c0fe
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
(cherry picked from commit 780612e1eaa2414808fb2cd6c88f7d428a8e3eed)
(cherry picked from commit d818ea2fcc9f644a1a3483007a4648266c16b7dc)

5 files changed, 30 insertions, 40 deletions

diff --git a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py
index dbe97cc440..ebcf17e59e 100644
--- a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py
+++ b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py
@@ -57,8 +57,7 @@ class TrafficProfile(TrafficProfileBaseClass):
         # Headers length
         self.headers_size = 42  # 14B l2 + 20B ipv4 + 8B udp
 
-        # Required UDP keepalive value for T-Rex
-        self.udp_keepalive = 2000*1000*100  # 200000s (200,000,000 msec)
+        # 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.
@@ -74,19 +73,18 @@ class TrafficProfile(TrafficProfileBaseClass):
 
         # client commands
         prog_c = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.udp_keepalive)
         # send REQ message
         prog_c.send_msg(self.udp_req)
-        # receive RES message
-        prog_c.recv_msg(1)
+        # No need to process the response, seeing L2 counter is enough.
+        # Client program can end here.
 
         # server commands
         prog_s = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.udp_keepalive)
-        # receive REQ message
-        prog_s.recv_msg(1)
+        # 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)
+        # Server program can end here.
 
         # ip generators
         ip_gen_c = ASTFIPGenDist(
diff --git a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-16384h.py b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-16384h.py
index 7acebaaeaf..3f13cbdda3 100644
--- a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-16384h.py
+++ b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-16384h.py
@@ -57,8 +57,7 @@ class TrafficProfile(TrafficProfileBaseClass):
         # Headers length
         self.headers_size = 42  # 14B l2 + 20B ipv4 + 8B udp
 
-        # Required UDP keepalive value for T-Rex
-        self.udp_keepalive = 2000*1000*100  # 200000s (200,000,000 msec)
+        # 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.
@@ -74,19 +73,18 @@ class TrafficProfile(TrafficProfileBaseClass):
 
         # client commands
         prog_c = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.udp_keepalive)
         # send REQ message
         prog_c.send_msg(self.udp_req)
-        # receive RES message
-        prog_c.recv_msg(1)
+        # No need to process the response, seeing L2 counter is enough.
+        # Client program can end here.
 
         # server commands
         prog_s = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.udp_keepalive)
-        # receive REQ message
-        prog_s.recv_msg(1)
+        # 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)
+        # Server program can end here.
 
         # ip generators
         ip_gen_c = ASTFIPGenDist(
diff --git a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-262144h.py b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-262144h.py
index e8796ec166..8149a27cb9 100644
--- a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-262144h.py
+++ b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-262144h.py
@@ -57,8 +57,7 @@ class TrafficProfile(TrafficProfileBaseClass):
         # Headers length
         self.headers_size = 42  # 14B l2 + 20B ipv4 + 8B udp
 
-        # Required UDP keepalive value for T-Rex
-        self.udp_keepalive = 2000*1000*100  # 200000s (200,000,000 msec)
+        # 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.
@@ -74,19 +73,18 @@ class TrafficProfile(TrafficProfileBaseClass):
 
         # client commands
         prog_c = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.udp_keepalive)
         # send REQ message
         prog_c.send_msg(self.udp_req)
-        # receive RES message
-        prog_c.recv_msg(1)
+        # No need to process the response, seeing L2 counter is enough.
+        # Client program can end here.
 
         # server commands
         prog_s = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.udp_keepalive)
-        # receive REQ message
-        prog_s.recv_msg(1)
+        # 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)
+        # Server program can end here.
 
         # ip generators
         ip_gen_c = ASTFIPGenDist(
diff --git a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-4096h.py b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-4096h.py
index da367b4ca4..cd81cb96ee 100644
--- a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-4096h.py
+++ b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-4096h.py
@@ -57,8 +57,7 @@ class TrafficProfile(TrafficProfileBaseClass):
         # Headers length
         self.headers_size = 42  # 14B l2 + 20B ipv4 + 8B udp
 
-        # Required UDP keepalive value for T-Rex
-        self.udp_keepalive = 2000*1000*100  # 200000s (200,000,000 msec)
+        # 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.
@@ -74,19 +73,18 @@ class TrafficProfile(TrafficProfileBaseClass):
 
         # client commands
         prog_c = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.udp_keepalive)
         # send REQ message
         prog_c.send_msg(self.udp_req)
-        # receive RES message
-        prog_c.recv_msg(1)
+        # No need to process the response, seeing L2 counter is enough.
+        # Client program can end here.
 
         # server commands
         prog_s = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.udp_keepalive)
-        # receive REQ message
-        prog_s.recv_msg(1)
+        # 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)
+        # Server program can end here.
 
         # ip generators
         ip_gen_c = ASTFIPGenDist(
diff --git a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-65536h.py b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-65536h.py
index 9aba56a3e4..56215ddece 100644
--- a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-65536h.py
+++ b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-65536h.py
@@ -57,8 +57,7 @@ class TrafficProfile(TrafficProfileBaseClass):
         # Headers length
         self.headers_size = 42  # 14B l2 + 20B ipv4 + 8B udp
 
-        # Required UDP keepalive value for T-Rex
-        self.udp_keepalive = 2000*1000*100  # 200000s (200,000,000 msec)
+        # 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.
@@ -74,19 +73,18 @@ class TrafficProfile(TrafficProfileBaseClass):
 
         # client commands
         prog_c = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.udp_keepalive)
         # send REQ message
         prog_c.send_msg(self.udp_req)
-        # receive RES message
-        prog_c.recv_msg(1)
+        # No need to process the response, seeing L2 counter is enough.
+        # Client program can end here.
 
         # server commands
         prog_s = ASTFProgram(stream=False)
-        prog_c.set_keepalive_msg(self.udp_keepalive)
-        # receive REQ message
-        prog_s.recv_msg(1)
+        # 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)
+        # Server program can end here.
 
         # ip generators
         ip_gen_c = ASTFIPGenDist(