X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FConstants.py;h=ace8e550c03bd63b55c8fe4115eab8fbf041dfb9;hp=7289c9c5a4d353f1b9ab51f92342ae6574aa11fb;hb=ed0473f9ac01522470fb8a2260720214b72ca47f;hpb=48d0b3ea0445da0b69347f610f17e67d471b77e3

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 7289c9c5a4..ace8e550c0 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -120,7 +120,7 @@ class Constants:
     """Constants used in CSIT."""
 
     # Version for CSIT data model. See docs/model/.
-    MODEL_VERSION = u"1.0.0"
+    MODEL_VERSION = u"1.0.1"
 
     # Global off-switch in case JSON export is large or slow.
     EXPORT_JSON = get_optimistic_bool_from_env(u"EXPORT_JSON")
@@ -186,7 +186,7 @@ class Constants:
     QEMU_VM_IMAGE = u"/var/lib/vm/image.iso"
 
     # QEMU VM DPDK path
-    QEMU_VM_DPDK = u"/opt/dpdk-21.11"
+    QEMU_VM_DPDK = u"/opt/dpdk-22.03"
 
     # Docker container SUT image
     DOCKER_SUT_IMAGE_UBUNTU = u"csit_sut-ubuntu2004:local"
@@ -204,7 +204,7 @@ class Constants:
     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", 8)
+    TREX_CORE_COUNT = get_int_from_env(u"TREX_CORE_COUNT", 16)
 
     # TRex set number of RX/TX descriptors
     # Set to 0 to use default values
@@ -246,6 +246,12 @@ class Constants:
     # Default path to VPP API socket.
     SOCKSVR_PATH = u"/run/vpp/api.sock"
 
+    # Default path to VPP CLI socket.
+    SOCKCLI_PATH = u"/run/vpp/cli.sock"
+
+    # Default path to VPP API Stats socket.
+    SOCKSTAT_PATH = u"/run/vpp/stats.sock"
+
     # Number of trials to execute in MRR test.
     PERF_TRIAL_MULTIPLICITY = get_int_from_env(u"PERF_TRIAL_MULTIPLICITY", 10)
 
@@ -287,9 +293,6 @@ class Constants:
     #  /tmp directory is inside the DUT1 docker.
     DUT1_UUID = get_str_from_env(u"DUT1_UUID", u"")
 
-    # Default path to VPP API Stats socket.
-    SOCKSTAT_PATH = u"/run/vpp/stats.sock"
-
     # Global "kill switch" for CRC checking during runtime.
     FAIL_ON_CRC_MISMATCH = get_pessimistic_bool_from_env(
         u"FAIL_ON_CRC_MISMATCH"
@@ -308,6 +311,8 @@ class Constants:
         u"Intel-X710": 10000000000,
         u"Intel-XL710": 24500000000,
         u"Intel-XXV710": 24500000000,
+        u"Intel-E810XXV": 24500000000,
+        u"Intel-E822CQ": 24500000000,
         u"Intel-E810CQ": 100000000000,
         u"Mellanox-CX556A": 100000000000,
         u"Amazon-Nitro-50G": 10000000000,
@@ -321,6 +326,8 @@ class Constants:
         u"Intel-X710": 14880952,
         u"Intel-XL710": 18750000,
         u"Intel-XXV710": 18750000,
+        u"Intel-E810XXV": 29000000,
+        u"Intel-E822CQ": 29000000,
         u"Intel-E810CQ": 58500000,
         u"Mellanox-CX556A": 148809523,
         u"Amazon-Nitro-50G": 1200000,
@@ -334,6 +341,8 @@ class Constants:
         u"Intel-X710": u"10ge2p1x710",
         u"Intel-XL710": u"40ge2p1xl710",
         u"Intel-XXV710": u"25ge2p1xxv710",
+        u"Intel-E810XXV": u"25ge2p1e810xxv",
+        u"Intel-E822CQ": u"25ge2p1e822cq",
         u"Intel-E810CQ": u"100ge2p1e810cq",
         u"Amazon-Nitro-50G": u"50ge1p1ena",
         u"Mellanox-CX556A": u"100ge2p1cx556a",
@@ -346,6 +355,8 @@ class Constants:
         u"10ge2p1x710": u"x710",
         u"40ge2p1xl710": u"xl710",
         u"25ge2p1xxv710": u"xxv710",
+        u"25ge2p1e810xxv": u"e810xxv",
+        u"25ge2p1e822cq": u"e822cq",
         u"100ge2p1e810cq": u"e810cq",
         u"50ge1p1ena": u"ena",
         u"100ge2p1cx556a": u"cx556a",
@@ -358,6 +369,8 @@ class Constants:
         u"Intel-X710": [u"vfio-pci", u"avf", u"af_xdp"],
         u"Intel-XL710": [u"vfio-pci", u"avf", u"af_xdp"],
         u"Intel-XXV710": [u"vfio-pci", u"avf", u"af_xdp"],
+        u"Intel-E810XXV": [u"vfio-pci", u"avf", u"af_xdp"],
+        u"Intel-E822CQ": [u"vfio-pci", u"avf", u"af_xdp"],
         u"Intel-E810CQ": [u"vfio-pci", u"avf", u"af_xdp"],
         u"Amazon-Nitro-50G": [u"vfio-pci"],
         u"Mellanox-CX556A": [u"rdma-core", u"af_xdp"],
@@ -402,6 +415,8 @@ class Constants:
         u"Intel-X710": [u"vfio-pci"],
         u"Intel-XL710": [u"vfio-pci"],
         u"Intel-XXV710": [u"vfio-pci"],
+        u"Intel-E810XXV": [u"vfio-pci"],
+        u"Intel-E822CQ": [u"vfio-pci"],
         u"Intel-E810CQ": [u"vfio-pci"],
         u"Amazon-Nitro-50G": [u"vfio-pci"],
         u"Mellanox-CX556A": [u"mlx5_core"],