summaryrefslogtreecommitdiffstats
path: root/scripts/automation
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/automation')
-rwxr-xr-xscripts/automation/regression/functional_tests/trex_cfg_creator_test.py64
-rw-r--r--scripts/automation/regression/setups/kiwi02/benchmark.yaml50
-rw-r--r--scripts/automation/regression/setups/trex-dan/config.yaml4
-rw-r--r--scripts/automation/regression/setups/trex09/benchmark.yaml2
-rw-r--r--scripts/automation/regression/setups/trex25/config.yaml16
-rw-r--r--scripts/automation/regression/stateless_tests/stl_performance_test.py4
-rwxr-xr-xscripts/automation/regression/trex_unit_test.py2
7 files changed, 96 insertions, 46 deletions
diff --git a/scripts/automation/regression/functional_tests/trex_cfg_creator_test.py b/scripts/automation/regression/functional_tests/trex_cfg_creator_test.py
index ab6ab6f6..5ff6b318 100755
--- a/scripts/automation/regression/functional_tests/trex_cfg_creator_test.py
+++ b/scripts/automation/regression/functional_tests/trex_cfg_creator_test.py
@@ -102,10 +102,10 @@ class TRexCfgCreator_Test:
version: 2
interfaces: ['0b:00.0', '03:00.0']
port_info:
- - dest_mac: [0x00, 0x0c, 0x29, 0x92, 0xf1, 0xca] # MAC OF LOOPBACK TO IT'S DUAL INTERFACE
- src_mac: [0x00, 0x0c, 0x29, 0x92, 0xf1, 0xd4]
- - dest_mac: [0x00, 0x0c, 0x29, 0x92, 0xf1, 0xd4]
- src_mac: [0x00, 0x0c, 0x29, 0x92, 0xf1, 0xca]
+ - dest_mac: 00:0c:29:92:f1:ca # MAC OF LOOPBACK TO IT'S DUAL INTERFACE
+ src_mac: 00:0c:29:92:f1:d4
+ - dest_mac: 00:0c:29:92:f1:d4
+ src_mac: 00:0c:29:92:f1:ca
platform:
master_thread_id: 0
@@ -291,20 +291,20 @@ class TRexCfgCreator_Test:
interfaces: ['02:00.0', '02:00.1', '84:00.0', '84:00.1', '05:00.0', '05:00.1']
port_bandwidth_gb: 40
port_info:
- - dest_mac: [0x02, 0x00, 0x02, 0x00, 0x00, 0x00]
- src_mac: [0x01, 0x00, 0x01, 0x00, 0x00, 0x00]
- - dest_mac: [0x01, 0x00, 0x01, 0x00, 0x00, 0x00]
- src_mac: [0x02, 0x00, 0x02, 0x00, 0x00, 0x00]
+ - dest_mac: 02:00:02:00:00:00
+ src_mac: 01:00:01:00:00:00
+ - dest_mac: 01:00:01:00:00:00
+ src_mac: 02:00:02:00:00:00
- - dest_mac: [0x04, 0x00, 0x04, 0x00, 0x00, 0x00]
- src_mac: [0x03, 0x00, 0x03, 0x00, 0x00, 0x00]
- - dest_mac: [0x03, 0x00, 0x03, 0x00, 0x00, 0x00]
- src_mac: [0x04, 0x00, 0x04, 0x00, 0x00, 0x00]
+ - dest_mac: 04:00:04:00:00:00
+ src_mac: 03:00:03:00:00:00
+ - dest_mac: 03:00:03:00:00:00
+ src_mac: 04:00:04:00:00:00
- - dest_mac: [0x06, 0x00, 0x06, 0x00, 0x00, 0x00]
- src_mac: [0x05, 0x00, 0x05, 0x00, 0x00, 0x00]
- - dest_mac: [0x05, 0x00, 0x05, 0x00, 0x00, 0x00]
- src_mac: [0x06, 0x00, 0x06, 0x00, 0x00, 0x00]
+ - dest_mac: 06:00:06:00:00:00
+ src_mac: 05:00:05:00:00:00
+ - dest_mac: 05:00:05:00:00:00
+ src_mac: 06:00:06:00:00:00
platform:
master_thread_id: 0
@@ -431,15 +431,15 @@ class TRexCfgCreator_Test:
interfaces: ['02:00.0', '02:00.1', '84:00.0', '84:00.1']
port_bandwidth_gb: 40
port_info:
- - dest_mac: [0x02, 0x00, 0x02, 0x00, 0x00, 0x00]
- src_mac: [0x01, 0x00, 0x01, 0x00, 0x00, 0x00]
- - dest_mac: [0x01, 0x00, 0x01, 0x00, 0x00, 0x00]
- src_mac: [0x02, 0x00, 0x02, 0x00, 0x00, 0x00]
+ - dest_mac: 02:00:02:00:00:00
+ src_mac: 01:00:01:00:00:00
+ - dest_mac: 01:00:01:00:00:00
+ src_mac: 02:00:02:00:00:00
- - dest_mac: [0x04, 0x00, 0x04, 0x00, 0x00, 0x00]
- src_mac: [0x03, 0x00, 0x03, 0x00, 0x00, 0x00]
- - dest_mac: [0x03, 0x00, 0x03, 0x00, 0x00, 0x00]
- src_mac: [0x04, 0x00, 0x04, 0x00, 0x00, 0x00]
+ - dest_mac: 04:00:04:00:00:00
+ src_mac: 03:00:03:00:00:00
+ - dest_mac: 03:00:03:00:00:00
+ src_mac: 04:00:04:00:00:00
platform:
master_thread_id: 0
@@ -563,15 +563,15 @@ class TRexCfgCreator_Test:
interfaces: ['02:00.0', '02:00.1', '05:00.0', '05:00.1']
port_bandwidth_gb: 40
port_info:
- - dest_mac: [0x02, 0x00, 0x02, 0x00, 0x00, 0x00]
- src_mac: [0x01, 0x00, 0x01, 0x00, 0x00, 0x00]
- - dest_mac: [0x01, 0x00, 0x01, 0x00, 0x00, 0x00]
- src_mac: [0x02, 0x00, 0x02, 0x00, 0x00, 0x00]
+ - dest_mac: 02:00:02:00:00:00
+ src_mac: 01:00:01:00:00:00
+ - dest_mac: 01:00:01:00:00:00
+ src_mac: 02:00:02:00:00:00
- - dest_mac: [0x04, 0x00, 0x04, 0x00, 0x00, 0x00]
- src_mac: [0x03, 0x00, 0x03, 0x00, 0x00, 0x00]
- - dest_mac: [0x03, 0x00, 0x03, 0x00, 0x00, 0x00]
- src_mac: [0x04, 0x00, 0x04, 0x00, 0x00, 0x00]
+ - dest_mac: 04:00:04:00:00:00
+ src_mac: 03:00:03:00:00:00
+ - dest_mac: 03:00:03:00:00:00
+ src_mac: 04:00:04:00:00:00
platform:
master_thread_id: 0
diff --git a/scripts/automation/regression/setups/kiwi02/benchmark.yaml b/scripts/automation/regression/setups/kiwi02/benchmark.yaml
index e6621085..41688906 100644
--- a/scripts/automation/regression/setups/kiwi02/benchmark.yaml
+++ b/scripts/automation/regression/setups/kiwi02/benchmark.yaml
@@ -246,3 +246,53 @@ test_CPU_benchmark:
bw_per_core : 1
+
+test_performance_vm_single_cpu:
+ cfg:
+ mult : "90%"
+ mpps_per_core_golden :
+ min: 11.5
+ max: 13.1
+
+
+test_performance_vm_single_cpu_cached:
+ cfg:
+ mult : "90%"
+ mpps_per_core_golden :
+ min: 22.0
+ max: 25.0
+
+
+
+test_performance_syn_attack_single_cpu:
+ cfg:
+ mult : "90%"
+ mpps_per_core_golden :
+ min: 9.5
+ max: 11.5
+
+test_performance_vm_multi_cpus:
+ cfg:
+ core_count : 4
+ mult : "90%"
+ mpps_per_core_golden :
+ min: 9.7
+ max: 12.5
+
+
+test_performance_vm_multi_cpus_cached:
+ cfg:
+ core_count : 4
+ mult : "90%"
+ mpps_per_core_golden :
+ min: 19.0
+ max: 22.0
+
+test_performance_syn_attack_multi_cpus:
+ cfg:
+ core_count : 4
+ mult : "90%"
+ mpps_per_core_golden :
+ min: 8.5
+ max: 10.5
+
diff --git a/scripts/automation/regression/setups/trex-dan/config.yaml b/scripts/automation/regression/setups/trex-dan/config.yaml
index d147502f..fbed3cb7 100644
--- a/scripts/automation/regression/setups/trex-dan/config.yaml
+++ b/scripts/automation/regression/setups/trex-dan/config.yaml
@@ -54,11 +54,11 @@ router:
- client :
name : GigabitEthernet0/0/1
src_mac_addr : 0000.0001.0000
- dest_ipv6_mac_addr : 0000.0001.0000
+ dest_ipv6_mac_addr : a036.9f20.e6ce
server :
name : GigabitEthernet0/0/2
src_mac_addr : 0000.0001.0000
- dest_ipv6_mac_addr : 0000.0001.0000
+ dest_ipv6_mac_addr : a036.9f20.e6cf
vrf_name : null
tftp:
diff --git a/scripts/automation/regression/setups/trex09/benchmark.yaml b/scripts/automation/regression/setups/trex09/benchmark.yaml
index 86f169ed..d1f5f56c 100644
--- a/scripts/automation/regression/setups/trex09/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex09/benchmark.yaml
@@ -204,7 +204,7 @@ test_performance_syn_attack_single_cpu:
cfg:
mult : "90%"
mpps_per_core_golden :
- min: 13.8
+ min: 12.9
max: 14.5
test_performance_vm_multi_cpus:
diff --git a/scripts/automation/regression/setups/trex25/config.yaml b/scripts/automation/regression/setups/trex25/config.yaml
index c4b3743d..c8190636 100644
--- a/scripts/automation/regression/setups/trex25/config.yaml
+++ b/scripts/automation/regression/setups/trex25/config.yaml
@@ -52,38 +52,38 @@ router:
- client :
name : GigabitEthernet0/1/0
src_mac_addr : 0000.0001.0000
- dest_ipv6_mac_addr : 0000.0001.0000
+ dest_ipv6_mac_addr : a036.9f4d.6a3c
server :
name : GigabitEthernet0/1/1
src_mac_addr : 0000.0001.0000
- dest_ipv6_mac_addr : 0000.0001.0000
+ dest_ipv6_mac_addr : a036.9f4d.6a3d
vrf_name :
- client :
name : GigabitEthernet0/1/2
src_mac_addr : 0000.0001.0000
- dest_ipv6_mac_addr : 0000.0001.0000
+ dest_ipv6_mac_addr : a036.9f4d.6a3e
server :
name : GigabitEthernet0/1/4
src_mac_addr : 0000.0001.0000
- dest_ipv6_mac_addr : 0000.0001.0000
+ dest_ipv6_mac_addr : a036.9f4d.6a3f
vrf_name :
- client :
name : GigabitEthernet0/1/5
src_mac_addr : 0000.0001.0000
- dest_ipv6_mac_addr : 0000.0001.0000
+ dest_ipv6_mac_addr : a036.9f4d.6b78
server :
name : GigabitEthernet0/1/3
src_mac_addr : 0000.0001.0000
- dest_ipv6_mac_addr : 0000.0001.0000
+ dest_ipv6_mac_addr : a036.9f4d.6b79
vrf_name :
- client :
name : GigabitEthernet0/1/6
src_mac_addr : 0000.0001.0000
- dest_ipv6_mac_addr : 0000.0001.0000
+ dest_ipv6_mac_addr : a036.9f4d.6b7a
server :
name : GigabitEthernet0/1/7
src_mac_addr : 0000.0001.0000
- dest_ipv6_mac_addr : 0000.0001.0000
+ dest_ipv6_mac_addr : a036.9f4d.6b7b
vrf_name :
tftp:
diff --git a/scripts/automation/regression/stateless_tests/stl_performance_test.py b/scripts/automation/regression/stateless_tests/stl_performance_test.py
index 62a1912f..a556daf3 100644
--- a/scripts/automation/regression/stateless_tests/stl_performance_test.py
+++ b/scripts/automation/regression/stateless_tests/stl_performance_test.py
@@ -61,7 +61,7 @@ class PerformanceReport(object):
SetupName = self.machine_name,
TestType = 'performance',
Mppspc = self.avg_mpps_per_core,
- ActionNumber = '<fill_me>',
+ ActionNumber = os.getenv("BUILD_ID","n/a"),
GoldenMin = golden_mpps['min'],
GoldenMax = golden_mpps['max'])
@@ -322,7 +322,7 @@ class STLPerformance_Test(CStlGeneral_Test):
- avg_values = {k:avg(v) for k, v in samples.iteritems()}
+ avg_values = {k:avg(v) for k, v in samples.items()}
avg_cpu = avg_values['cpu'] * scenario_cfg['core_count']
avg_gbps = avg_values['bps'] / 1e9
avg_mpps = avg_values['pps'] / 1e6
diff --git a/scripts/automation/regression/trex_unit_test.py b/scripts/automation/regression/trex_unit_test.py
index 7a6c4260..daa1abaf 100755
--- a/scripts/automation/regression/trex_unit_test.py
+++ b/scripts/automation/regression/trex_unit_test.py
@@ -270,7 +270,7 @@ class CTRexTestConfiguringPlugin(Plugin):
def finalize(self, result):
if self.functional or self.collect_only:
return
- CTRexScenario.is_init = False
+ #CTRexScenario.is_init = False
if self.stateful:
CTRexScenario.trex = None
if self.stateless: