X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FConstants.py;h=0b0d6f866e3b0bd23d3b9a9ba73c1b8c17bcdd7b;hb=eaf3cde2f590ba2da28b415c5f7463af8827b1d4;hp=9606a10fad188b15fc5470e68f184fd0de3cfce4;hpb=e310a40eab90bb5ecd8471dbbccc1d02daf2dea3;p=csit.git

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 9606a10fad..0b0d6f866e 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -184,11 +184,8 @@ class Constants(object):
     # Docker container arm SUT image
     DOCKER_SUT_IMAGE_UBUNTU_ARM = 'snergster/csit-arm-sut:latest'
 
-    # TRex install version
-    TREX_INSTALL_VERSION = '2.54'
-
     # TRex install directory
-    TREX_INSTALL_DIR = '/opt/trex-core-2.54'
+    TREX_INSTALL_DIR = '/opt/trex-core-2.61'
 
     # Honeycomb directory location at topology nodes:
     REMOTE_HC_DIR = '/opt/honeycomb'
@@ -228,13 +225,14 @@ class Constants(object):
     #  /tmp directory is inside the DUT1 docker.
     DUT1_UUID = get_str_from_env("DUT1_UUID", "")
 
+    # Default path to VPP API Stats socket.
+    SOCKSTAT_PATH = "/run/vpp/stats.sock"
+
     # Global "kill switch" for CRC checking during runtime.
-    FAIL_ON_CRC_MISMATCH = get_optimistic_bool_from_env("FAIL_ON_CRC_MISMATCH")
+    FAIL_ON_CRC_MISMATCH = get_pessimistic_bool_from_env("FAIL_ON_CRC_MISMATCH")
 
     # Mapping from NIC name to its bps limit.
-    # TODO: Implement logic to lower limits to TG NIC or software. Or PCI.
-    NIC_NAME_TO_LIMIT = {
-        # TODO: Explain why ~40Gbps NICs are using ~25Gbps limit.
+    NIC_NAME_TO_BPS_LIMIT = {
         "Cisco-VIC-1227": 10000000000,
         "Cisco-VIC-1385": 24500000000,
         "Intel-X520-DA2": 10000000000,
@@ -242,10 +240,24 @@ class Constants(object):
         "Intel-X710": 10000000000,
         "Intel-XL710": 24500000000,
         "Intel-XXV710": 24500000000,
+        "Mellanox-CX556A": 100000000000,
         "virtual": 100000000,
     }
 
-    # Suite file names use somewhat more rich (less readable) codes for NICs.
+    # Mapping from NIC name to its pps limit.
+    NIC_NAME_TO_PPS_LIMIT = {
+        "Cisco-VIC-1227": 14880952,
+        "Cisco-VIC-1385": 18750000,
+        "Intel-X520-DA2": 14880952,
+        "Intel-X553": 14880952,
+        "Intel-X710": 14880952,
+        "Intel-XL710": 18750000,
+        "Intel-XXV710": 18750000,
+        "Mellanox-CX556A": 60000000, #148809523,
+        "virtual": 14880952,
+    }
+
+    # Suite file names use codes for NICs.
     NIC_NAME_TO_CODE = {
         "Cisco-VIC-1227": "10ge2p1vic1227",
         "Cisco-VIC-1385": "40ge2p1vic1385",
@@ -254,6 +266,7 @@ class Constants(object):
         "Intel-X710": "10ge2p1x710",
         "Intel-XL710": "40ge2p1xl710",
         "Intel-XXV710": "25ge2p1xxv710",
+        "Mellanox-CX556A": "100ge2p1cx556a",
     }
 
     # TODO CSIT-1481: Crypto HW should be read from topology file instead.
@@ -292,3 +305,4 @@ class Constants(object):
         "ndrpdr": '''Measure NDR and PDR values using MLRsearch algorithm.\\''',
         "soak": '''Estimate critical rate using PLRsearch algorithm.\\''',
     }
+