X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FConstants.py;h=0e8ac42638a55aa956d35019c77f870f9ec99112;hp=6e44d39e80b8d989d2463e6151b3b7f38af4296e;hb=6ec31b8aa67f4af2b963b3984f047e94ba790b3d;hpb=e08706e85b412b1307df3789fdbe747b43c2bd95

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 6e44d39e80..0e8ac42638 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -139,8 +139,8 @@ class Constants:
     # Kubernetes templates location
     RESOURCES_TPL_K8S = u"resources/templates/kubernetes"
 
-    # KernelVM templates location
-    RESOURCES_TPL_VM = u"resources/templates/vm"
+    # Templates location
+    RESOURCES_TPL = u"resources/templates"
 
     # Container templates location
     RESOURCES_TPL_CONTAINER = u"resources/templates/container"
@@ -179,13 +179,13 @@ class Constants:
     QEMU_VM_DPDK = u"/opt/dpdk-20.02"
 
     # Docker container SUT image
-    DOCKER_SUT_IMAGE_UBUNTU = u"snergster/csit-sut:latest"
+    DOCKER_SUT_IMAGE_UBUNTU = u"csit_sut-ubuntu1804:local"
 
     # Docker container arm SUT image
-    DOCKER_SUT_IMAGE_UBUNTU_ARM = u"snergster/csit-arm-sut:latest"
+    DOCKER_SUT_IMAGE_UBUNTU_ARM = u"csit_sut-ubuntu1804:local"
 
     # TRex install directory
-    TREX_INSTALL_DIR = u"/opt/trex-core-2.82"
+    TREX_INSTALL_DIR = u"/opt/trex-core-2.88"
 
     # TODO: Find the right way how to use it in trex profiles
     # TRex pcap files directory
@@ -215,7 +215,10 @@ class Constants:
     CORE_DUMP_DIR = u"/tmp"
 
     # Perf stat events (comma separated).
-    PERF_STAT_EVENTS = u"L1-icache-load-misses"
+    PERF_STAT_EVENTS = get_str_from_env(
+        u"PERF_STAT_EVENTS",
+        u"cpu-clock,context-switches,cpu-migrations,page-faults,"
+        u"cycles,instructions,branches,branch-misses,L1-icache-load-misses")
 
     # Equivalent to ~0 used in vpp code
     BITWISE_NON_ZERO = 0xffffffff
@@ -229,6 +232,9 @@ class Constants:
     # Duration of one trial in MRR test.
     PERF_TRIAL_DURATION = get_float_from_env(u"PERF_TRIAL_DURATION", 1.0)
 
+    # Whether to use latency streams in main search trials.
+    PERF_USE_LATENCY = get_pessimistic_bool_from_env(u"PERF_USE_LATENCY")
+
     # Duration of one latency-specific trial in NDRPDR test.
     PERF_TRIAL_LATENCY_DURATION = get_float_from_env(
         u"PERF_TRIAL_LATENCY_DURATION", 5.0)
@@ -282,7 +288,13 @@ class Constants:
         u"Intel-XL710": 18750000,
         u"Intel-XXV710": 18750000,
         u"Intel-E810CQ": 58500000,
-        u"Mellanox-CX556A": 60000000, # 148809523,
+        # 2n-clx testbeds show duration stretching on high rates,
+        # depending on encapsulation TRex has to generate.
+        # 40 Mpps is still too much for dot1q (~8% stretching).
+        # 36 Mpps is around the maximal VPP throughput (l2patch 4c8t).
+        # Vxlan traffic will still show stretching at 36 Mpps (>12%),
+        # but we do not care about those tests that much.
+        u"Mellanox-CX556A": 36000000, # 148809523,
         u"Amazon-Nitro-50G": 1500000,
         u"virtual": 14880952,
     }