regression: add disconnects + delay before running examples + at end of regression

revert profile udp_1ptk_simple.py and add new upd_for_benchmarks.py

2 files changed, 40 insertions, 14 deletions

diff --git a/scripts/stl/udp_1pkt_simple.py b/scripts/stl/udp_1pkt_simple.py
index b84626a1..0407f9c9 100644
--- a/scripts/stl/udp_1pkt_simple.py
+++ b/scripts/stl/udp_1pkt_simple.py
@@ -2,21 +2,18 @@ from trex_stl_lib.api import *
 
 class STLS1(object):
 
-    def create_stream (self, packet_len, packet_count):
-        base_pkt = Ether()/IP(src="16.0.0.1",dst="48.0.0.1")/UDP(dport=12,sport=1025)
-        base_pkt_len = len(base_pkt)
-        base_pkt /= 'x' * max(0, packet_len - base_pkt_len)
-        packets = []
-        for i in range(packet_count):
-            packets.append(STLStream(
-                packet = STLPktBuilder(pkt = base_pkt),
-                mode = STLTXCont()
-                ))
-        return packets
-
-    def get_streams (self, direction = 0, packet_len = 64, packet_count = 1, **kwargs):
+    def create_stream (self):
+        return STLStream( 
+            packet = 
+                    STLPktBuilder(
+                        pkt = Ether()/IP(src="16.0.0.1",dst="48.0.0.1")/
+                                UDP(dport=12,sport=1025)/(10*'x')
+                    ),
+             mode = STLTXCont())
+
+    def get_streams (self, direction = 0, **kwargs):
         # create 1 stream 
-        return self.create_stream(packet_len - 4, packet_count)
+        return [ self.create_stream() ]
 
 
 # dynamic load - used for trex console or simulator
diff --git a/scripts/stl/udp_for_benchmarks.py b/scripts/stl/udp_for_benchmarks.py
new file mode 100644
index 00000000..2033e80e
--- /dev/null
+++ b/scripts/stl/udp_for_benchmarks.py
@@ -0,0 +1,29 @@
+from trex_stl_lib.api import *
+
+class STLS1(object):
+    '''
+    Generalization of udp_1pkt_simple, can specify number of streams and packet length
+    '''
+    def create_stream (self, packet_len, stream_count):
+        base_pkt = Ether()/IP(src="16.0.0.1",dst="48.0.0.1")/UDP(dport=12,sport=1025)
+        base_pkt_len = len(base_pkt)
+        base_pkt /= 'x' * max(0, packet_len - base_pkt_len)
+        packets = []
+        for i in range(stream_count):
+            packets.append(STLStream(
+                packet = STLPktBuilder(pkt = base_pkt),
+                mode = STLTXCont()
+                ))
+        return packets
+
+    def get_streams (self, direction = 0, packet_len = 64, stream_count = 1, **kwargs):
+        # create 1 stream 
+        return self.create_stream(packet_len - 4, stream_count)
+
+
+# dynamic load - used for trex console or simulator
+def register():
+    return STLS1()
+
+
+