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

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index ae1a64d2d2..01e3a0154a 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -120,7 +120,7 @@ class Constants:
     """Constants used in CSIT."""
 
     # Version for CSIT data model. See docs/model/.
-    MODEL_VERSION = u"1.1.0"
+    MODEL_VERSION = u"1.4.0"
 
     # Global off-switch in case JSON export is large or slow.
     EXPORT_JSON = get_optimistic_bool_from_env(u"EXPORT_JSON")
@@ -143,9 +143,6 @@ class Constants:
     # Templates location
     RESOURCES_TPL = u"resources/templates"
 
-    # vat templates location
-    RESOURCES_TPL_VAT = u"resources/templates/vat"
-
     # Kubernetes templates location
     RESOURCES_TPL_K8S = u"resources/templates/kubernetes"
 
@@ -161,9 +158,6 @@ class Constants:
     # VPP Communications Library LD_PRELOAD library
     VCL_LDPRELOAD_LIBRARY = u"/usr/lib/x86_64-linux-gnu/libvcl_ldpreload.so"
 
-    # OpenVPP VAT binary name
-    VAT_BIN_NAME = u"vpp_api_test"
-
     # VPP service unit name
     VPP_UNIT = u"vpp"
 
@@ -307,7 +301,6 @@ 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,
@@ -322,7 +315,6 @@ 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,
@@ -337,7 +329,6 @@ 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",
@@ -351,7 +342,6 @@ 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",
@@ -365,7 +355,6 @@ 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"],
@@ -373,14 +362,15 @@ class Constants:
         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"],
+        u"Mellanox-CX556A": [u"rdma-core", u"mlx5_core", u"af_xdp"],
     }
 
-    # Each driver needs different prugin to work.
+    # Each driver needs different plugin to work.
     NIC_DRIVER_TO_PLUGINS = {
         u"vfio-pci": u"dpdk_plugin.so",
         u"avf": u"avf_plugin.so",
         u"rdma-core": u"rdma_plugin.so",
+        u"mlx5_core": u"dpdk_plugin.so",
         u"af_xdp": u"af_xdp_plugin.so",
     }
 
@@ -389,6 +379,7 @@ class Constants:
         u"vfio-pci": u"DRV_VFIO_PCI",
         u"avf": u"DRV_AVF",
         u"rdma-core": u"DRV_RDMA_CORE",
+        u"mlx5_core": u"DRV_MLX5_CORE",
         u"af_xdp": u"DRV_AF_XDP",
     }
 
@@ -397,6 +388,7 @@ class Constants:
         u"vfio-pci": u"",
         u"avf": u"avf-",
         u"rdma-core": u"rdma-",
+        u"mlx5_core": u"mlx5-",
         u"af_xdp": u"af-xdp-",
     }
 
@@ -405,13 +397,13 @@ class Constants:
         u"vfio-pci": u"nic_vfs}= | 0",
         u"avf": u"nic_vfs}= | 1",
         u"rdma-core": u"nic_vfs}= | 0",
+        u"mlx5_core": u"nic_vfs}= | 0",
         u"af_xdp": u"nic_vfs}= | 0",
     }
 
     # 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"],
@@ -447,7 +439,6 @@ 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",