X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FConstants.py;h=ae1a64d2d22f52426176fc770c6b0d25d7f77a15;hb=bfbdfaedb044b7643b81f47e76285baedfee9e25;hp=566dec74211fa9666991b0c2470af8c382fda23b;hpb=b33b1461fe815b1a09267118644538a5b9351c60;p=csit.git

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 566dec7421..ae1a64d2d2 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.1"
+    MODEL_VERSION = u"1.1.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-22.03"
+    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"
@@ -312,6 +312,7 @@ class Constants:
         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,
@@ -326,6 +327,7 @@ class Constants:
         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,
@@ -340,6 +342,7 @@ class Constants:
         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",
@@ -353,6 +356,7 @@ class Constants:
         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",
@@ -366,6 +370,7 @@ class Constants:
         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"],
@@ -411,6 +416,7 @@ class Constants:
         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"],
@@ -442,6 +448,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",
     }