X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FConstants.py;h=0ae92f68ac78752d6671bf7677d658ae40f449c4;hb=d4464a39149e2d71e625e46dee70678980ad164a;hp=2ecf50b77030cdb400fd574897a451341e926491;hpb=5c51731ef45b84c2aab7b16d7daabc63ff2b21e2;p=csit.git

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 2ecf50b770..0ae92f68ac 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.2.0"
 
     # Global off-switch in case JSON export is large or slow.
     EXPORT_JSON = get_optimistic_bool_from_env(u"EXPORT_JSON")
@@ -186,16 +186,16 @@ 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.07"
 
     # Docker container SUT image
-    DOCKER_SUT_IMAGE_UBUNTU = u"csit_sut-ubuntu2004:local"
+    DOCKER_SUT_IMAGE_UBUNTU = u"csit_sut-ubuntu2204:local"
 
     # Docker container arm SUT image
-    DOCKER_SUT_IMAGE_UBUNTU_ARM = u"csit_sut-ubuntu2004:local"
+    DOCKER_SUT_IMAGE_UBUNTU_ARM = u"csit_sut-ubuntu2204:local"
 
     # TRex install directory
-    TREX_INSTALL_DIR = u"/opt/trex-core-2.97"
+    TREX_INSTALL_DIR = u"/opt/trex-core-3.00"
 
     # TRex pcap files directory
     TREX_PCAP_DIR = f"{TREX_INSTALL_DIR}/scripts/avl"
@@ -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"
@@ -304,11 +307,11 @@ class Constants:
     # Mapping from NIC name to its bps limit.
     NIC_NAME_TO_BPS_LIMIT = {
         u"Intel-X520-DA2": 10000000000,
-        u"Intel-X553": 10000000000,
         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,
@@ -318,11 +321,11 @@ class Constants:
     # Mapping from NIC name to its pps limit.
     NIC_NAME_TO_PPS_LIMIT = {
         u"Intel-X520-DA2": 14880952,
-        u"Intel-X553": 14880952,
         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,
@@ -332,11 +335,11 @@ class Constants:
     # Suite file names use codes for NICs.
     NIC_NAME_TO_CODE = {
         u"Intel-X520-DA2": u"10ge2p1x520",
-        u"Intel-X553": u"10ge2p1x553",
         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",
@@ -345,11 +348,11 @@ class Constants:
     # Shortened lowercase NIC model name, useful for presentation.
     NIC_CODE_TO_SHORT_NAME = {
         u"10ge2p1x520": u"x520",
-        u"10ge2p1x553": u"x553",
         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,11 +361,11 @@ class Constants:
     # Not each driver is supported by each NIC.
     NIC_NAME_TO_DRIVER = {
         u"Intel-X520-DA2": [u"vfio-pci", u"af_xdp"],
-        u"Intel-X553": [u"vfio-pci", u"af_xdp"],
         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"],
@@ -403,11 +406,11 @@ class Constants:
     # Not each driver is supported by each NIC.
     DPDK_NIC_NAME_TO_DRIVER = {
         u"Intel-X520-DA2": [u"vfio-pci"],
-        u"Intel-X553": [u"vfio-pci"],
         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"],
@@ -438,7 +441,7 @@ class Constants:
 
     # TODO CSIT-1481: Crypto HW should be read from topology file instead.
     NIC_NAME_TO_CRYPTO_HW = {
-        u"Intel-X553": u"HW_C3xxx",
+        u"Intel-E822CQ": u"HW_C4xxx",
         u"Intel-X710": u"HW_DH895xcc",
         u"Intel-XL710": u"HW_DH895xcc",
     }