X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FConstants.py;h=f8c4c7fae920ed2071fa4463e2bcfa6c1689a5c1;hp=f6e4f580060ccf041dcc941b84257c9509671f24;hb=813375246758d1695be4e577ba9cd3f0791ea9e3;hpb=d255d2545ee6cdc871bc35314fad72c3c48b225b

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index f6e4f58006..f8c4c7fae9 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -117,12 +117,7 @@ def get_optimistic_bool_from_env(env_var_names):
 
 
 class Constants:
-    """Constants used in CSIT.
-
-    TODO: Yaml files are easier for humans to edit.
-    Figure out how to set the attributes by parsing a file
-    that works regardless of current working directory.
-    """
+    """Constants used in CSIT."""
 
     # OpenVPP testing directory location at topology nodes
     REMOTE_FW_DIR = u"/tmp/openvpp-testing"
@@ -196,7 +191,6 @@ class Constants:
     # TRex install directory
     TREX_INSTALL_DIR = u"/opt/trex-core-2.88"
 
-    # TODO: Find the right way how to use it in trex profiles
     # TRex pcap files directory
     TREX_PCAP_DIR = f"{TREX_INSTALL_DIR}/scripts/avl"
 
@@ -293,8 +287,6 @@ class Constants:
 
     # Mapping from NIC name to its bps limit.
     NIC_NAME_TO_BPS_LIMIT = {
-        u"Cisco-VIC-1227": 10000000000,
-        u"Cisco-VIC-1385": 24500000000,
         u"Intel-X520-DA2": 10000000000,
         u"Intel-X553": 10000000000,
         u"Intel-X710": 10000000000,
@@ -308,8 +300,6 @@ class Constants:
 
     # Mapping from NIC name to its pps limit.
     NIC_NAME_TO_PPS_LIMIT = {
-        u"Cisco-VIC-1227": 14880952,
-        u"Cisco-VIC-1385": 18750000,
         u"Intel-X520-DA2": 14880952,
         u"Intel-X553": 14880952,
         u"Intel-X710": 14880952,
@@ -329,8 +319,6 @@ class Constants:
 
     # Suite file names use codes for NICs.
     NIC_NAME_TO_CODE = {
-        u"Cisco-VIC-1227": u"10ge2p1vic1227",
-        u"Cisco-VIC-1385": u"40ge2p1vic1385",
         u"Intel-X520-DA2": u"10ge2p1x520",
         u"Intel-X553": u"10ge2p1x553",
         u"Intel-X710": u"10ge2p1x710",
@@ -343,16 +331,14 @@ class Constants:
 
     # Not each driver is supported by each NIC.
     NIC_NAME_TO_DRIVER = {
-        u"Cisco-VIC-1227": [u"vfio-pci"],
-        u"Cisco-VIC-1385": [u"vfio-pci"],
-        u"Intel-X520-DA2": [u"vfio-pci"],
-        u"Intel-X553": [u"vfio-pci"],
-        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"Intel-E810CQ": [u"vfio-pci", u"avf"],
+        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-E810CQ": [u"vfio-pci", u"avf", u"af_xdp"],
         u"Amazon-Nitro-50G": [u"vfio-pci"],
-        u"Mellanox-CX556A": [u"rdma-core"],
+        u"Mellanox-CX556A": [u"rdma-core", u"af_xdp"],
     }
 
     # Each driver needs different prugin to work.
@@ -360,6 +346,7 @@ class Constants:
         u"vfio-pci": u"dpdk_plugin.so",
         u"avf": u"avf_plugin.so",
         u"rdma-core": u"rdma_plugin.so",
+        u"af_xdp": u"af_xdp_plugin.so",
     }
 
     # Tags to differentiate tests for different NIC driver.
@@ -367,6 +354,7 @@ class Constants:
         u"vfio-pci": u"DRV_VFIO_PCI",
         u"avf": u"DRV_AVF",
         u"rdma-core": u"DRV_RDMA_CORE",
+        u"af_xdp": u"DRV_AF_XDP",
     }
 
     # Suite names have to be different, add prefix.
@@ -374,6 +362,7 @@ class Constants:
         u"vfio-pci": u"",
         u"avf": u"avf-",
         u"rdma-core": u"rdma-",
+        u"af_xdp": u"af-xdp-",
     }
 
     # Number of virtual functions of physical nic.
@@ -381,12 +370,11 @@ class Constants:
         u"vfio-pci": u"nic_vfs}= | 0",
         u"avf": u"nic_vfs}= | 1",
         u"rdma-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"Cisco-VIC-1227": [u"vfio-pci"],
-        u"Cisco-VIC-1385": [u"vfio-pci"],
         u"Intel-X520-DA2": [u"vfio-pci"],
         u"Intel-X553": [u"vfio-pci"],
         u"Intel-X710": [u"vfio-pci"],
@@ -436,8 +424,6 @@ class Constants:
     PERF_TYPE_TO_SUITE_DOC_VER = {
         u"mrr": u'''fication:* In MaxReceivedRate tests TG sends traffic\\
 | ... | at line rate and reports total received packets over trial period.\\''',
-        # TODO: Figure out how to include the full "*[Ver] TG verification:*"
-        # while keeping this readable and without breaking line length limit.
         u"ndrpdr": u'''ication:* TG finds and reports throughput NDR (Non Drop\\
 | ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\\
 | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\\