merging with latest master

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

Conflicts:
	src/main_dpdk.cpp

2 files changed, 19 insertions, 0 deletions

diff --git a/scripts/automation/regression/stateless_tests/stl_client_test.py b/scripts/automation/regression/stateless_tests/stl_client_test.py
index acf5dc61..73dac734 100644
--- a/scripts/automation/regression/stateless_tests/stl_client_test.py
+++ b/scripts/automation/regression/stateless_tests/stl_client_test.py
@@ -241,6 +241,7 @@ class STLClient_Test(CStlGeneral_Test):
             return
 
         default_mult  = self.get_benchmark_param('mult',default="30%")
+        skip_tests     = self.get_benchmark_param('skip',default=[])
 
         try:
             print("\n");
@@ -248,6 +249,17 @@ class STLClient_Test(CStlGeneral_Test):
 
             for profile in self.profiles:
 
+                skip=False
+                if skip_tests:
+                    for  skip_test in skip_tests:
+                        if skip_test in profile:
+                           skip=True;
+                           break;
+                if skip:
+                    print("skipping testing profile due to config file {0}...\n".format(profile))
+                    continue;
+
+                
                 print("now testing profile {0}...\n".format(profile))
 
                 p1 = STLProfile.load(profile, port_id = self.tx_port)
diff --git a/scripts/automation/regression/stateless_tests/stl_rx_test.py b/scripts/automation/regression/stateless_tests/stl_rx_test.py
index d28fca54..4dad712f 100644
--- a/scripts/automation/regression/stateless_tests/stl_rx_test.py
+++ b/scripts/automation/regression/stateless_tests/stl_rx_test.py
@@ -61,6 +61,13 @@ class STLRX_Test(CStlGeneral_Test):
                         'latency_9k_max_latency': 250,
                         },
 
+                 'rte_enic_pmd': {
+                        'rate_percent': 1,
+                        'total_pkts': 50,
+                        'rate_latency': 1,
+                        'latency_9k_enable': False,
+                        },
+
                   
                 }