Merge branch 'master' into capture

Signed-off-by: imarom <imarom@cisco.com>

Conflicts:
	scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
	scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
	scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
	src/main_dpdk.cpp

6 files changed, 132 insertions, 20 deletions

diff --git a/scripts/automation/regression/setups/kiwi02/benchmark.yaml b/scripts/automation/regression/setups/kiwi02/benchmark.yaml
index 4e091d53..1eefccaf 100644
--- a/scripts/automation/regression/setups/kiwi02/benchmark.yaml
+++ b/scripts/automation/regression/setups/kiwi02/benchmark.yaml
@@ -4,6 +4,24 @@
 
 #### common templates ###
 
+test_short_flow:
+    multiplier          : 20000
+    cores               : 4
+    bw_per_core         : 1000
+
+test_short_flow_high_active:
+    multiplier          : 20000
+    cores               : 4
+    bw_per_core         : 1000
+    active_flows        : 4000000
+
+test_short_flow_high_active2:
+    multiplier          : 15000
+    cores               : 4
+    bw_per_core         : 1000
+    active_flows        : 4000000
+
+
 stat_route_dict: &stat_route_dict
     clients_start           : 16.0.0.1
     servers_start           : 48.0.0.1
@@ -254,7 +272,7 @@ test_performance_vm_single_cpu:
     cfg:
         mult                    : "90%"
         mpps_per_core_golden    : 
-                                   min: 11.5
+                                   min: 11.2
                                    max: 13.1
 
 
@@ -262,7 +280,7 @@ test_performance_vm_single_cpu_cached:
     cfg:
         mult                    : "90%"
         mpps_per_core_golden    : 
-                                   min: 22.0
+                                   min: 20.5
                                    max: 25.0
 
 
@@ -271,7 +289,7 @@ test_performance_syn_attack_single_cpu:
      cfg:
         mult                    : "90%"
         mpps_per_core_golden    :
-                                  min: 9.5
+                                  min: 9.3
                                   max: 11.5
 
 test_performance_vm_multi_cpus:
@@ -296,6 +314,6 @@ test_performance_syn_attack_multi_cpus:
         core_count             : 4
         mult                   : "90%"
         mpps_per_core_golden   :
-                                  min: 8.5
+                                  min: 8.4
                                   max: 10.5
 
diff --git a/scripts/automation/regression/setups/trex07/benchmark.yaml b/scripts/automation/regression/setups/trex07/benchmark.yaml
index 26588ba7..7abc2e4d 100644
--- a/scripts/automation/regression/setups/trex07/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex07/benchmark.yaml
@@ -4,6 +4,24 @@
 
 #### common templates ###
 
+test_short_flow:
+    multiplier          : 25000
+    cores               : 7
+    bw_per_core         : 1000
+
+test_short_flow_high_active:
+    multiplier          : 20000
+    cores               : 7
+    bw_per_core         : 1000
+    active_flows        : 4000000
+
+test_short_flow_high_active2:
+    multiplier          : 10000
+    cores               : 7
+    bw_per_core         : 1000
+    active_flows        : 4000000
+
+
 test_jumbo:
     multiplier          : 120
     cores               : 4
@@ -190,7 +208,7 @@ test_performance_vm_single_cpu_cached:
     cfg:
         mult                    : "10%"
         mpps_per_core_golden    : 
-                                   min: 16.0
+                                   min: 20.0
                                    max: 25.0
 
 
@@ -199,7 +217,7 @@ test_performance_syn_attack_single_cpu:
      cfg:
         mult                    : "90%"
         mpps_per_core_golden    :
-                                  min: 9.0
+                                  min: 8.4
                                   max: 14.0
 
 test_performance_vm_multi_cpus:
@@ -216,8 +234,8 @@ test_performance_vm_multi_cpus_cached:
         core_count             : 7
         mult                   : "35%"
         mpps_per_core_golden   :
-                                  min: 9.0
-                                  max: 15.0
+                                  min: 24.5
+                                  max: 27.0
 
 test_performance_syn_attack_multi_cpus:
     cfg:
@@ -225,9 +243,10 @@ test_performance_syn_attack_multi_cpus:
         mult                   : "90%"
         mpps_per_core_golden   :
                                   min: 8.0
-                                  max: 16.0
+                                  max: 11.0
                                   
 
 test_all_profiles :
         mult          : "5%"
+        skip          : ['udp_rand_len_9k.py', 'udp_inc_len_9k.py']
         
diff --git a/scripts/automation/regression/setups/trex08/benchmark.yaml b/scripts/automation/regression/setups/trex08/benchmark.yaml
index 70995b21..f409edb8 100644
--- a/scripts/automation/regression/setups/trex08/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex08/benchmark.yaml
@@ -4,6 +4,25 @@
 
 ### stateful ###
 
+test_short_flow:
+    multiplier          : 50000
+    cores               : 7
+    bw_per_core         : 1000
+
+test_short_flow_high_active:
+    multiplier          : 40000
+    cores               : 7
+    bw_per_core         : 1000
+    active_flows        : 4000000
+
+test_short_flow_high_active2:
+    multiplier          : 30000
+    cores               : 7
+    bw_per_core         : 1000
+    active_flows        : 4000000
+    
+
+
 test_jumbo:
     multiplier          : 150
     cores               : 2
@@ -183,7 +202,7 @@ test_performance_vm_single_cpu:
     cfg:
         mult                    : "90%"
         mpps_per_core_golden    : 
-                                   min: 15.1
+                                   min: 15.5
                                    max: 20.3
 
 
@@ -191,7 +210,7 @@ test_performance_vm_single_cpu_cached:
     cfg:
         mult                    : "10%"
         mpps_per_core_golden    : 
-                                   min: 29.1
+                                   min: 28.0
                                    max: 32.0
 
 
diff --git a/scripts/automation/regression/setups/trex09/benchmark.yaml b/scripts/automation/regression/setups/trex09/benchmark.yaml
index d8623811..79dab3e8 100644
--- a/scripts/automation/regression/setups/trex09/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex09/benchmark.yaml
@@ -195,7 +195,7 @@ test_performance_vm_single_cpu_cached:
     cfg:
         mult                    : "90%"
         mpps_per_core_golden    : 
-                                   min: 28.5
+                                   min: 28.3
                                    max: 31.2
 
 
@@ -204,7 +204,7 @@ test_performance_syn_attack_single_cpu:
      cfg:
         mult                    : "90%"
         mpps_per_core_golden    :
-                                  min: 12.9
+                                  min: 12.5
                                   max: 14.5
 
 test_performance_vm_multi_cpus:
@@ -212,7 +212,7 @@ test_performance_vm_multi_cpus:
         core_count             : 2
         mult                   : "90%"
         mpps_per_core_golden   :
-                                  min: 15.2
+                                  min: 14.4
                                   max: 16.3
 
 
@@ -221,14 +221,14 @@ test_performance_vm_multi_cpus_cached:
         core_count             : 2
         mult                   : "90%"
         mpps_per_core_golden   :
-                                  min: 26.8
-                                  max: 29.5
+                                  min: 29.5
+                                  max: 31.5
 
 test_performance_syn_attack_multi_cpus:
     cfg:
         core_count             : 2
         mult                   : "90%"
         mpps_per_core_golden   :
-                                  min: 13.0
+                                  min: 12.5
                                   max: 13.8
 
diff --git a/scripts/automation/regression/setups/trex11/benchmark.yaml b/scripts/automation/regression/setups/trex11/benchmark.yaml
index 5ebcdd55..87654a35 100644
--- a/scripts/automation/regression/setups/trex11/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex11/benchmark.yaml
@@ -183,4 +183,54 @@ test_CPU_benchmark:
 test_all_profiles :
         mult          : "5%"
         skip          : ['udp_rand_len_9k.py','udp_inc_len_9k.py'] # due to VIC 9K defect trex-282
-        
+
+
+test_performance_vm_single_cpu:
+    cfg:
+        mult                    : "5%"
+        mpps_per_core_golden    : 
+                                   min: 9.5
+                                   max: 11.5
+
+
+test_performance_vm_single_cpu_cached:
+    cfg:
+        mult                    : "5%"
+        mpps_per_core_golden    : 
+                                   min: 26.5
+                                   max: 29.0
+
+
+
+test_performance_syn_attack_single_cpu:
+     cfg:
+        mult                    : "5%"
+        mpps_per_core_golden    :
+                                  min: 8.5
+                                  max: 10.0
+
+test_performance_vm_multi_cpus:
+    cfg:
+        core_count             : 1
+        mult                   : "5%"
+        mpps_per_core_golden   :
+                                  min: 9.0
+                                  max: 11.5
+
+
+test_performance_vm_multi_cpus_cached:
+    cfg:
+        core_count             : 1
+        mult                   : "5%"
+        mpps_per_core_golden   :
+                                  min: 26.5
+                                  max: 29.0
+
+test_performance_syn_attack_multi_cpus:
+    cfg:
+        core_count             : 1
+        mult                   : "5%"
+        mpps_per_core_golden   :
+                                  min: 8.0
+                                  max: 10.0
+
diff --git a/scripts/automation/regression/setups/trex25/benchmark.yaml b/scripts/automation/regression/setups/trex25/benchmark.yaml
index f8fd0bee..2c677b81 100644
--- a/scripts/automation/regression/setups/trex25/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex25/benchmark.yaml
@@ -79,7 +79,7 @@ test_nat_learning:
     nat_opened          : 40000
 
 
-test_nbar_simple:
+test_nbar_simple: &nbar_simple
     multiplier          : 6
     cores               : 1
     bw_per_core         : 16.645
@@ -100,6 +100,12 @@ test_nbar_simple:
         rtsp            : 0.04
         unknown         : 28.52
 
+test_client_cfg_nbar: &client_cfg_nbar
+    <<                : *nbar_simple
+
+test_client_cfg_vlan:
+    cores               : 1
+    multiplier          : 10
 
 test_rx_check_http: &rx_http
     multiplier          : 8800
@@ -118,7 +124,7 @@ test_rx_check_http_negative:
 
 
 test_rx_check_sfr: &rx_sfr
-    multiplier          : 6.8
+    multiplier          : 3.2
     cores               : 1
     rx_sample_rate      : 16
     bw_per_core         : 16.063