merging with latest master

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

Conflicts:
	src/main_dpdk.cpp

13 files changed, 366 insertions, 33 deletions

diff --git a/scripts/automation/regression/cfg/client_cfg.yaml b/scripts/automation/regression/cfg/client_cfg.yaml
new file mode 100644
index 00000000..5c3d19ef
--- /dev/null
+++ b/scripts/automation/regression/cfg/client_cfg.yaml
@@ -0,0 +1,48 @@
+#vlan: true
+vlan: false
+
+groups:
+
+-    ip_start  : 16.0.0.1
+     ip_end    : 16.0.1.255
+     initiator :
+                 next_hop: 1.1.1.1
+                 src_ip  : 1.1.1.2
+     responder :
+                 next_hop: 1.1.2.1
+                 src_ip  : 1.1.2.2
+
+     count     : 1
+
+-    ip_start  : 17.0.0.1
+     ip_end    : 17.0.1.255
+     initiator :
+                 next_hop: 1.1.3.1
+                 src_ip  : 1.1.3.2
+     responder :
+                 next_hop: 1.1.4.1
+                 src_ip  : 1.1.4.2
+
+     count     : 1
+
+-    ip_start  : 18.0.0.1
+     ip_end    : 18.0.1.255
+     initiator :
+                 next_hop: 1.1.5.1
+                 src_ip  : 1.1.5.2
+     responder :
+                 next_hop: 1.1.6.1
+                 src_ip  : 1.1.6.2
+
+     count     : 1
+
+-    ip_start  : 19.0.0.1
+     ip_end    : 19.0.1.255
+     initiator :
+                 next_hop: 1.1.7.1
+                 src_ip  : 1.1.7.2
+     responder :
+                 next_hop: 1.1.8.1
+                 src_ip  : 1.1.8.2
+
+     count     : 1
diff --git a/scripts/automation/regression/setups/trex15/benchmark.yaml b/scripts/automation/regression/setups/trex03/benchmark.yaml
index b366b3fb..b366b3fb 100644
--- a/scripts/automation/regression/setups/trex15/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex03/benchmark.yaml
diff --git a/scripts/automation/regression/setups/trex15/config.yaml b/scripts/automation/regression/setups/trex03/config.yaml
index c5fc3b22..17c4c91e 100644
--- a/scripts/automation/regression/setups/trex15/config.yaml
+++ b/scripts/automation/regression/setups/trex03/config.yaml
@@ -34,6 +34,6 @@
 # expected_bw    - the "golden" bandwidth (in Gbps) results planned on receiving from the test
 
 trex:
-  hostname       : csi-trex-15
+  hostname       : csi-trex-03
   cores          : 1
   modes          : [loopback, virt_nics, VM]
diff --git a/scripts/automation/regression/setups/trex17/benchmark.yaml b/scripts/automation/regression/setups/trex06/benchmark.yaml
index 8bc9d29c..2f51a3fd 100644
--- a/scripts/automation/regression/setups/trex17/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex06/benchmark.yaml
@@ -140,7 +140,7 @@ test_CPU_benchmark:
         bw_per_core     : 1
 
       - name            : stl/pcap.py
-        kwargs          : {ipg_usec: 2, loop_count: 0}
+        kwargs          : {ipg_usec: 3, loop_count: 0}
         cpu_util        : 1
         bw_per_core     : 1
 
diff --git a/scripts/automation/regression/setups/trex17/config.yaml b/scripts/automation/regression/setups/trex06/config.yaml
index 7ad6a20a..da0eb2dd 100644
--- a/scripts/automation/regression/setups/trex17/config.yaml
+++ b/scripts/automation/regression/setups/trex06/config.yaml
@@ -34,6 +34,6 @@
 # expected_bw    - the "golden" bandwidth (in Gbps) results planned on receiving from the test
 
 trex:
-  hostname       : csi-trex-17
+  hostname       : csi-trex-06
   cores          : 1
   modes          : [loopback, virt_nics, VM]
diff --git a/scripts/automation/regression/setups/trex09/benchmark.yaml b/scripts/automation/regression/setups/trex09/benchmark.yaml
index d1f5f56c..1d2b57c8 100644
--- a/scripts/automation/regression/setups/trex09/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex09/benchmark.yaml
@@ -187,7 +187,7 @@ test_performance_vm_single_cpu:
     cfg:
         mult                    : "90%"
         mpps_per_core_golden    : 
-                                   min: 16.2
+                                   min: 16.0
                                    max: 17.3
 
 
@@ -195,7 +195,7 @@ test_performance_vm_single_cpu_cached:
     cfg:
         mult                    : "90%"
         mpps_per_core_golden    : 
-                                   min: 29.5
+                                   min: 28.5
                                    max: 31.2
 
 
diff --git a/scripts/automation/regression/setups/trex11/backup/benchmark.yaml b/scripts/automation/regression/setups/trex11/backup/benchmark.yaml
new file mode 100644
index 00000000..b366b3fb
--- /dev/null
+++ b/scripts/automation/regression/setups/trex11/backup/benchmark.yaml
@@ -0,0 +1,155 @@
+################################################################
+####           TRex benchmark configuration file           ####
+################################################################
+
+### stateful ###
+
+test_jumbo:
+    multiplier          : 2.8
+    cores               : 1
+    bw_per_core         : 106.652
+
+
+test_routing_imix:
+    multiplier          : 0.5
+    cores               : 1
+    bw_per_core         : 11.577
+
+
+test_routing_imix_64:
+    multiplier          : 28
+    cores               : 1
+    bw_per_core         : 2.030
+
+
+test_static_routing_imix_asymmetric:
+    multiplier          : 0.8
+    cores               : 1
+    bw_per_core         : 13.742
+
+
+
+### stateless ###
+
+test_CPU_benchmark:
+    profiles:
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 64}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 64, stream_count: 10}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 64, stream_count: 100}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+# causes queue full
+#      - name            : stl/udp_for_benchmarks.py
+#        kwargs          : {packet_len: 64, stream_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
+
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 128}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 256}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 512}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 1500}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 4000}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 9000}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 9000, stream_count: 10}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_for_benchmarks.py
+        kwargs          : {packet_len: 9000, stream_count: 100}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+# not enough memory + queue full if memory increase
+#      - name            : stl/udp_for_benchmarks.py
+#        kwargs          : {packet_len: 9000, stream_count: 1000}
+#        cpu_util        : 1
+#        bw_per_core     : 1
+
+      - name            : stl/imix.py
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_1pkt_tuple_gen.py
+        kwargs          : {packet_len: 64}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_1pkt_tuple_gen.py
+        kwargs          : {packet_len: 128}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_1pkt_tuple_gen.py
+        kwargs          : {packet_len: 256}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_1pkt_tuple_gen.py
+        kwargs          : {packet_len: 512}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_1pkt_tuple_gen.py
+        kwargs          : {packet_len: 1500}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_1pkt_tuple_gen.py
+        kwargs          : {packet_len: 4000}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_1pkt_tuple_gen.py
+        kwargs          : {packet_len: 9000}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/pcap.py
+        kwargs          : {ipg_usec: 4, loop_count: 0}
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/udp_rand_len_9k.py
+        cpu_util        : 1
+        bw_per_core     : 1
+
+      - name            : stl/hlt/hlt_udp_rand_len_9k.py
+        cpu_util        : 1
+        bw_per_core     : 1
+
+
diff --git a/scripts/automation/regression/setups/trex11/backup/config.yaml b/scripts/automation/regression/setups/trex11/backup/config.yaml
new file mode 100644
index 00000000..782b7542
--- /dev/null
+++ b/scripts/automation/regression/setups/trex11/backup/config.yaml
@@ -0,0 +1,38 @@
+################################################################
+####         TRex nightly test configuration file          ####
+################################################################
+
+
+### TRex configuration:
+# hostname       - can be DNS name or IP for the TRex machine for ssh to the box
+# password       - root password for TRex machine
+# is_dual        - should the TRex inject with -p ?
+# version_path   - path to the TRex version and executable
+# cores          - how many cores should be used
+# latency        - rate of latency packets injected by the TRex
+# modes          - list of modes (tagging) of this setup (loopback, virtual etc.)
+# 	  * loopback - Trex works via loopback. Router and TFTP configurations may be skipped.
+#     * virtual  - virtual OS (accept low CPU utilization in tests)
+
+### Router configuration:
+# hostname       - the router hostname as apears in ______# cli prefix
+# ip_address     - the router's ip that can be used to communicate with
+# image          - the desired imaged wished to be loaded as the router's running config
+# line_password  - router password when access via Telent
+# en_password    - router password when changing to "enable" mode
+# interfaces     - an array of client-server pairs, representing the interfaces configurations of the router
+# configurations - an array of configurations that could possibly loaded into the router during the test. 
+#                  The "clean" configuration is a mandatory configuration the router will load with to run the basic test bench
+
+### TFTP configuration:
+# hostname       - the tftp hostname
+# ip_address     - the tftp's ip address
+# images_path    - the tftp's relative path in which the router's images are located
+
+### Test_misc configuration:
+# expected_bw    - the "golden" bandwidth (in Gbps) results planned on receiving from the test
+
+trex:
+  hostname       : csi-trex-11
+  cores          : 1
+  modes          : ['loopback', 'VM', 'virt_nics']
diff --git a/scripts/automation/regression/setups/trex11/benchmark.yaml b/scripts/automation/regression/setups/trex11/benchmark.yaml
index b366b3fb..a4969d2d 100644
--- a/scripts/automation/regression/setups/trex11/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex11/benchmark.yaml
@@ -1,31 +1,44 @@
-################################################################
+###############################################################
 ####           TRex benchmark configuration file           ####
-################################################################
+###############################################################
 
-### stateful ###
+#### common templates ###
 
-test_jumbo:
-    multiplier          : 2.8
-    cores               : 1
-    bw_per_core         : 106.652
+#test_jumbo:
+#    multiplier          : 2.8
+#    cores               : 1
+#    bw_per_core         : 962.464
 
 
 test_routing_imix:
     multiplier          : 0.5
     cores               : 1
-    bw_per_core         : 11.577
+    bw_per_core         : 48.130
 
 
 test_routing_imix_64:
     multiplier          : 28
     cores               : 1
-    bw_per_core         : 2.030
+    bw_per_core         : 12.699
 
 
 test_static_routing_imix_asymmetric:
-    multiplier          : 0.8
+    multiplier          : 0.5
     cores               : 1
-    bw_per_core         : 13.742
+    bw_per_core         : 50.561
+
+
+test_ipv6_simple:
+    multiplier          : 0.5
+    cores               : 1
+    bw_per_core         : 19.5
+
+
+test_rx_check_http: &rx_http
+    multiplier          : 1000
+    cores               : 1
+    rx_sample_rate      : 128
+    bw_per_core         : 49.464
 
 
 
@@ -140,16 +153,21 @@ test_CPU_benchmark:
         bw_per_core     : 1
 
       - name            : stl/pcap.py
-        kwargs          : {ipg_usec: 4, loop_count: 0}
+        kwargs          : {ipg_usec: 2, loop_count: 0}
         cpu_util        : 1
         bw_per_core     : 1
 
-      - name            : stl/udp_rand_len_9k.py
-        cpu_util        : 1
-        bw_per_core     : 1
+      #- name            : stl/udp_rand_len_9k.py
+      #  cpu_util        : 1
+      #  bw_per_core     : 1
 
-      - name            : stl/hlt/hlt_udp_rand_len_9k.py
-        cpu_util        : 1
-        bw_per_core     : 1
+      #- name            : stl/hlt/hlt_udp_rand_len_9k.py
+      #  cpu_util        : 1
+      #  bw_per_core     : 1
 
+                                  
 
+test_all_profiles :
+        mult          : "5%"
+        skip          : ['udp_rand_len_9k.py','udp_inc_len_9k.py'] # due to VIC 9K defect trex-282
+        
diff --git a/scripts/automation/regression/setups/trex11/config.yaml b/scripts/automation/regression/setups/trex11/config.yaml
index 782b7542..393c8749 100644
--- a/scripts/automation/regression/setups/trex11/config.yaml
+++ b/scripts/automation/regression/setups/trex11/config.yaml
@@ -4,15 +4,16 @@
 
 
 ### TRex configuration:
-# hostname       - can be DNS name or IP for the TRex machine for ssh to the box
-# password       - root password for TRex machine
-# is_dual        - should the TRex inject with -p ?
-# version_path   - path to the TRex version and executable
-# cores          - how many cores should be used
-# latency        - rate of latency packets injected by the TRex
-# modes          - list of modes (tagging) of this setup (loopback, virtual etc.)
-# 	  * loopback - Trex works via loopback. Router and TFTP configurations may be skipped.
-#     * virtual  - virtual OS (accept low CPU utilization in tests)
+# hostname        - can be DNS name or IP for the TRex machine for ssh to the box
+# password        - root password for TRex machine
+# is_dual         - should the TRex inject with -p ?
+# version_path    - path to the TRex version and executable
+# cores           - how many cores should be used
+# latency         - rate of latency packets injected by the TRex
+# modes           - list of modes (tagging) of this setup (loopback etc.)
+# 	  * loopback  - Trex works via loopback. Router and TFTP configurations may be skipped.
+#     * VM        - Virtual OS (accept low CPU utilization in tests, latency can get spikes)
+#     * virt_nics - NICs are virtual (VMXNET3 etc.)
 
 ### Router configuration:
 # hostname       - the router hostname as apears in ______# cli prefix
@@ -35,4 +36,6 @@
 trex:
   hostname       : csi-trex-11
   cores          : 1
-  modes          : ['loopback', 'VM', 'virt_nics']
+  modes          : ['loopback']
+
+
diff --git a/scripts/automation/regression/stateful_tests/trex_client_cfg_test.py b/scripts/automation/regression/stateful_tests/trex_client_cfg_test.py
new file mode 100644
index 00000000..852e745d
--- /dev/null
+++ b/scripts/automation/regression/stateful_tests/trex_client_cfg_test.py
@@ -0,0 +1,52 @@
+#!/router/bin/python
+from .trex_general_test import CTRexGeneral_Test, CTRexScenario
+from CPlatform import CStaticRouteConfig
+from .tests_exceptions import *
+#import sys
+import time
+from nose.tools import nottest
+
+# Testing client cfg ARP resolve. Actually, just need to check that TRex run finished with no errors.
+# If resolve will fail, TRex will exit with exit code != 0
+class CTRexClientCfg_Test(CTRexGeneral_Test):
+    """This class defines the IMIX testcase of the TRex traffic generator"""
+    def __init__(self, *args, **kwargs):
+        # super(CTRexClientCfg_Test, self).__init__()
+        CTRexGeneral_Test.__init__(self, *args, **kwargs)
+
+    def setUp(self):
+        if CTRexScenario.setup_name == 'kiwi02':
+            self.skip("Can't run currently on kiwi02")
+        super(CTRexClientCfg_Test, self).setUp() # launch super test class setUp process
+        pass
+
+    def test_client_cfg(self):
+        # test initializtion
+        if self.is_loopback:
+            return
+        else:
+            self.router.configure_basic_interfaces()
+            self.router.config_pbr(mode = "config")
+
+        ret = self.trex.start_trex(
+            c = 1,
+            m = 1,
+            d = 10,
+            f = 'cap2/dns.yaml',
+            v = 3,
+            client_cfg = 'automation/regression/cfg/client_cfg.yaml',
+            l = 1000)
+
+        trex_res = self.trex.sample_to_run_finish()
+
+        print("\nLATEST RESULT OBJECT:")
+        print(trex_res)
+
+        self.check_general_scenario_results(trex_res)
+
+    def tearDown(self):
+        CTRexGeneral_Test.tearDown(self)
+        pass
+
+if __name__ == "__main__":
+    pass
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,
+                        },
+
                   
                 }