regression: add bw per core for trex-dan, trex08, trex14, trex17, trex25

flush printing buffer at beginning and end of tests

1 files changed, 101 insertions, 142 deletions

diff --git a/scripts/automation/regression/setups/trex25/benchmark.yaml b/scripts/automation/regression/setups/trex25/benchmark.yaml
index bd0a7e03..57992f25 100644
--- a/scripts/automation/regression/setups/trex25/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex25/benchmark.yaml
@@ -2,161 +2,120 @@
 ####           TRex benchmark configuration file           ####
 ###############################################################
 
-test_nbar_simple :
-  multiplier        : 6
-  cores             : 1
-  exp_gbps          : 0.5
-  cpu_to_core_ratio : 20800000
-  cpu2core_custom_dev: YES
-  cpu2core_dev : 0.07
-  exp_max_latency   : 1000
-
-  nbar_classification:
-    http          : 24.55
-    rtp           : 19.15
-    sqlnet        : 10.38
-    secure-http   : 5.11
-    citrix        : 4.68
-    mapi          : 4.04
-    dns           : 1.56
-    sctp          : 0.66
-    smtp          : 0.48
-    pop3          : 0.30
-    novadigm      : 0.09
-    sip           : 0.08
-    h323          : 0.05
-    rtsp          : 0.04
-    unknown       : 28.52
-
-test_rx_check :
-  multiplier        : 3.2
-  cores             : 1
-  rx_sample_rate    : 128
-  exp_gbps          : 0.5
-  cpu_to_core_ratio : 37270000
-  exp_bw            : 1
-  exp_latency       : 1
-
-test_nat_simple  : &test_nat_simple
-  stat_route_dict :
+#### common templates ###
+
+stat_route_dict: &stat_route_dict
     clients_start           : 16.0.0.1
     servers_start           : 48.0.0.1
     dual_port_mask          : 1.0.0.0
     client_destination_mask : 255.0.0.0
     server_destination_mask : 255.0.0.0
-  nat_dict :
+
+nat_dict: &nat_dict
     clients_net_start        : 16.0.0.0
     client_acl_wildcard_mask : 0.0.0.255
     dual_port_mask           : 1.0.0.0
     pool_start               : 200.0.0.0
     pool_netmask             : 255.255.255.0
-  multiplier        : 2200
-  cores             : 1
-  cpu_to_core_ratio : 37270000
-  exp_bw            : 1
-  exp_latency       : 1
-  allow_timeout_dev : YES
-
-test_nat_simple_mode1 : *test_nat_simple
-test_nat_simple_mode2 : *test_nat_simple
-
-test_nat_learning  : 
-  stat_route_dict :
-    clients_start           : 16.0.0.1
-    servers_start           : 48.0.0.1
-    dual_port_mask          : 1.0.0.0
-    client_destination_mask : 255.0.0.0
-    server_destination_mask : 255.0.0.0
-  multiplier        : 2200 
-  cores             : 1
-  nat_opened        : 40000
-  cpu_to_core_ratio : 270
-  exp_bw            : 1
-  exp_latency       : 1
-  allow_timeout_dev : YES
-
-test_routing_imix_64    :
-  multiplier        : 600
-  cores             : 1
-  cpu_to_core_ratio : 280
-  exp_latency       : 1
-
-test_routing_imix   :
-  multiplier        : 4
-  cores             : 1
-  cpu_to_core_ratio : 1800
-  exp_latency       : 1
-
-test_static_routing_imix    :
-  stat_route_dict :
-    clients_start           : 16.0.0.1
-    servers_start           : 48.0.0.1
-    dual_port_mask          : 1.0.0.0
-    client_destination_mask : 255.0.0.0
-    server_destination_mask : 255.0.0.0
-  multiplier        : 2.8
-  cores             : 1
-  cpu_to_core_ratio : 1800
-  exp_latency       : 1
+
+
+### tests ###
+
+test_jumbo:
+    multiplier          : 6
+    cores               : 1
+    bw_per_core         : 443970
+
+
+test_routing_imix:
+    multiplier          : 4
+    cores               : 1
+    bw_per_core         : 26509
+
+
+test_routing_imix_64:
+    multiplier          : 600
+    cores               : 1
+    bw_per_core         : 6391
+
+
+test_static_routing_imix:
+    stat_route_dict     : *stat_route_dict
+    multiplier          : 2.8
+    cores               : 1
+    bw_per_core         : 24510
+
+
 
 test_static_routing_imix_asymmetric:
-  stat_route_dict :
-    clients_start           : 16.0.0.1
-    servers_start           : 48.0.0.1
-    dual_port_mask          : 1.0.0.0
-    client_destination_mask : 255.0.0.0
-    server_destination_mask : 255.0.0.0
-  multiplier        : 3.2
-  cores             : 1
-  cpu_to_core_ratio : 1800
-  exp_latency       : 1
+    stat_route_dict     : *stat_route_dict
+    multiplier          : 3.2
+    cores               : 1
+    bw_per_core         : 28229
+
 
 test_ipv6_simple:
-  multiplier        : 6
-  cores             : 1
-  cpu_to_core_ratio : 30070000
-  cpu2core_custom_dev: YES
-  cpu2core_dev : 0.07
-
-
-test_rx_check_sfr:
-    multiplier        : 6.8
-    cores             : 1
-    rx_sample_rate    : 16
-
-test_rx_check_http:
-    multiplier        : 8800
-    cores             : 1
-    rx_sample_rate    : 16
-
-test_rx_check_sfr_ipv6:
-    multiplier        : 6.8
-    cores             : 1
-    rx_sample_rate    : 16
-
-test_rx_check_http_ipv6:
-    multiplier        : 8800
-    cores             : 1
-    rx_sample_rate    : 16
-
-test_rx_check_http_negative:
-    multiplier        : 8800
-    cores             : 1
-    rx_sample_rate    : 16
-    stat_route_dict :
-        clients_start           : 16.0.0.1
-        servers_start           : 48.0.0.1
-        dual_port_mask          : 1.0.0.0
-        client_destination_mask : 255.0.0.0
-        server_destination_mask : 255.0.0.0
-    nat_dict :
-        clients_net_start        : 16.0.0.0
-        client_acl_wildcard_mask : 0.0.0.255
-        dual_port_mask           : 1.0.0.0
-        pool_start               : 200.0.0.0
-        pool_netmask             : 255.255.255.0
+    multiplier          : 6
+    cores               : 1
+    bw_per_core         : 19185
+
+
+test_nat_simple_mode1: &test_nat_simple
+    stat_route_dict     : *stat_route_dict
+    nat_dict            : *nat_dict
+    multiplier          : 2200
+    cores               : 1
+    bw_per_core         : 32171
+
+test_nat_simple_mode2: *test_nat_simple
+
+test_nat_learning: * test_nat_simple
+    nat_opened          : 40000
+
+
+test_nbar_simple:
+    multiplier          : 6
+    cores               : 1
+    bw_per_core         : 16645
+    nbar_classification:
+        http            : 24.55
+        rtp             : 19.15
+        sqlnet          : 10.38
+        secure-http     : 5.11
+        citrix          : 4.68
+        mapi            : 4.04
+        dns             : 1.56
+        sctp            : 0.66
+        smtp            : 0.48
+        pop3            : 0.30
+        novadigm        : 0.09
+        sip             : 0.08
+        h323            : 0.05
+        rtsp            : 0.04
+        unknown         : 28.52
+
+
+test_rx_check_http: &rx_http
+    multiplier          : 8800
+    cores               : 1
+    rx_sample_rate      : 16
+    bw_per_core         : 31389
+
+test_rx_check_http_ipv6: *rx_http
+    bw_per_core         : 37114
+
+test_rx_check_http_negative: *rx_http
+    stat_route_dict     : *stat_route_dict
+    nat_dict            : *nat_dict
+
+
+test_rx_check_sfr: &rx_sfr
+    multiplier          : 6.8
+    cores               : 1
+    rx_sample_rate      : 16
+    bw_per_core         : 16063
+
+test_rx_check_sfr_ipv6: *rx_sfr
+    bw_per_core         : 19663
 
 
-test_jumbo:
-    multiplier : 6
-    cores      : 1