X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FConstants.py;h=7f45efe4e81672a24ccfabf26e28d2d9e4a955dd;hb=8e3a326cba182b4ab9054263625c7e40cdd6f2e3;hp=99c1e87d559556f455d724adf19d05da0ed58309;hpb=1ff1a79c8b4a1fa081fcf383bdb0d8b06823a4fe;p=csit.git

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 99c1e87d55..7f45efe4e8 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -179,7 +179,7 @@ class Constants:
     QEMU_VM_IMAGE = u"/var/lib/vm/vhost-nested.img"
 
     # QEMU VM DPDK path
-    QEMU_VM_DPDK = u"/opt/dpdk-stable-19.08.2"
+    QEMU_VM_DPDK = u"/opt/dpdk-20.02"
 
     # Docker container SUT image
     DOCKER_SUT_IMAGE_UBUNTU = u"snergster/csit-sut:latest"
@@ -191,13 +191,17 @@ class Constants:
     TREX_INSTALL_DIR = u"/opt/trex-core-2.73"
 
     # TRex limit memory.
-    TREX_LIMIT_MEMORY = get_int_from_env(u"TREX_LIMIT_MEMORY", 4096)
+    TREX_LIMIT_MEMORY = get_int_from_env(u"TREX_LIMIT_MEMORY", 8192)
 
     # TRex number of cores
-    TREX_CORE_COUNT = get_int_from_env(u"TREX_CORE_COUNT", 7)
+    TREX_CORE_COUNT = get_int_from_env(u"TREX_CORE_COUNT", 15)
+
+    # Trex force start regardles ports state
+    TREX_SEND_FORCE = get_pessimistic_bool_from_env(u"TREX_SEND_FORCE")
 
     # TRex extra commandline arguments
-    TREX_EXTRA_CMDLINE = get_str_from_env(u"TREX_EXTRA_CMDLINE", u"")
+    TREX_EXTRA_CMDLINE = get_str_from_env(
+        u"TREX_EXTRA_CMDLINE", u"--mbuf-factor 32")
 
     # Sysctl kernel.core_pattern
     KERNEL_CORE_PATTERN = u"/tmp/%p-%u-%g-%s-%t-%h-%e.core"
@@ -255,6 +259,8 @@ class Constants:
     }
 
     # Mapping from NIC name to its pps limit.
+    # The values are unidirectional, assuming the test
+    # uses two ports on the same NIC.
     NIC_NAME_TO_PPS_LIMIT = {
         u"Cisco-VIC-1227": 14880952,
         u"Cisco-VIC-1385": 18750000,
@@ -263,7 +269,9 @@ class Constants:
         u"Intel-X710": 14880952,
         u"Intel-XL710": 18750000,
         u"Intel-XXV710": 18750000,
-        u"Mellanox-CX556A": 60000000, # 148809523,
+        # The Mellanox card is able to do more, but the current TRex version
+        # shows non-negligible duration stretching, depending on cores used.
+        u"Mellanox-CX556A": 47000000,  # 148809523,
         u"Amazon-Nitro-50G": 1500000,
         u"virtual": 14880952,
     }
@@ -277,6 +285,7 @@ class Constants:
         u"Intel-X710": u"10ge2p1x710",
         u"Intel-XL710": u"40ge2p1xl710",
         u"Intel-XXV710": u"25ge2p1xxv710",
+        u"Amazon-Nitro-50G": u"50ge1p1ENA",
         u"Mellanox-CX556A": u"100ge2p1cx556a",
     }
 
@@ -289,6 +298,7 @@ class Constants:
         u"Intel-X710": [u"vfio-pci", u"avf"],
         u"Intel-XL710": [u"vfio-pci", u"avf"],
         u"Intel-XXV710": [u"vfio-pci", u"avf"],
+        u"Amazon-Nitro-50G": [u"vfio-pci"],
         u"Mellanox-CX556A": [u"rdma-core"],
     }
 
@@ -321,12 +331,11 @@ class Constants:
         prefix for prefix in NIC_DRIVER_TO_SUITE_PREFIX.values() if prefix
     ]
 
-    # Additional step for perf needs to know driver type.
-    # Contains part of suite setup line, matching both single and double link.
-    NIC_DRIVER_TO_SETUP_ARG = {
-        u"vfio-pci": u"le link | performance",
-        u"avf": u"le link | performance_avf",
-        u"rdma-core": u"le link | performance_rdma",
+    # Number of virtual functions of physical nic.
+    NIC_DRIVER_TO_VFS = {
+        u"vfio-pci": u"nic_vfs}= | 0",
+        u"avf": u"nic_vfs}= | 1",
+        u"rdma-core": u"nic_vfs}= | 0",
     }
 
     # TODO CSIT-1481: Crypto HW should be read from topology file instead.