diff mbox series

[V1,3/6] framework/*: update framework after removed fm10k

Message ID 20210615104613.14658-3-junx.dong@intel.com (mailing list archive)
State Accepted
Headers show
Series [V1,1/6] dts/*: remove fm10k related modules and patch | expand

Commit Message

Jun Dong June 15, 2021, 10:46 a.m. UTC
1. update framework/dut,remove fm10k related description. 
 2. update framework/project_dpdk,remove fm10k related build option. 
 3. update framework/settings,remove fm10k related NICs. 
 4. update framework/test_capabilities,remove fm10k. 
 5. update framework/test_case,remove redrockcanyou branch from function.

Signed-off-by: Jun Dong <junx.dong@intel.com>
---
 framework/dut.py               |  2 +-
 framework/project_dpdk.py      |  3 +--
 framework/settings.py          | 11 +----------
 framework/test_capabilities.py |  2 +-
 framework/test_case.py         |  2 --
 5 files changed, 4 insertions(+), 16 deletions(-)
diff mbox series

Patch

diff --git a/framework/dut.py b/framework/dut.py
index ca1c9089..f5481d06 100644
--- a/framework/dut.py
+++ b/framework/dut.py
@@ -459,7 +459,7 @@  class Dut(Crb):
 
     def stop_ports(self):
         """
-        After all execution done, some special nic like fm10k should be stop
+        After all execution done, the nic should be stop
         """
         for (pci_bus, pci_id) in self.pci_devices_info:
             driver = settings.get_nic_driver(pci_id)
diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py
index f7946664..31827991 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -203,8 +203,7 @@  class DPDKdut(Dut):
                                         'RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC': 'n'})
             elif mode == 'novector':
                 self.set_build_options({'RTE_IXGBE_INC_VECTOR': 'n',
-                                        'RTE_LIBRTE_I40E_INC_VECTOR': 'n',
-                                        'RTE_LIBRTE_FM10K_INC_VECTOR': 'n'})
+                                        'RTE_LIBRTE_I40E_INC_VECTOR': 'n'})
             elif mode == 'avx512':
                 self.logger.warning(RED('*********AVX512 is not supported by makefile!!!********'))
         else:
diff --git a/framework/settings.py b/framework/settings.py
index 23eb0075..9ceffe2e 100644
--- a/framework/settings.py
+++ b/framework/settings.py
@@ -83,24 +83,20 @@  NICS = {
     'fortville_eagle': '8086:1572',
     'fortville_spirit': '8086:1583',
     'fortville_spirit_single': '8086:1584',
-    'redrockcanyou': '8086:15a4',
     'fortpark': '8086:374c',
     'fortpark_1g': '8086:37d1',
     'fortpark_TLV': '8086:37d0',
     'fortpark_BASE-T': '8086:37d2',
     'fortpark_TLV_vf': '8086:37cd',
     'fvl10g_vf': '8086:154c',
-    'atwood': '8086:15d5',
     'ConnectX3_MT4103': '15b3:1007',
     'ConnectX4_MT4115': '15b3:1013',
     'ConnectX4_LX_MT4117': '15b3:1015',
     'ConnectX5_MT4119': '15b3:1017',
     'ConnectX5_MT4121': '15b3:1019',
-    'boulderrapid': '8086:15d0',
     'fortville_25g': '8086:158b',
     'cavium_a034': '177d:a034',
     'cavium_0011': '177d:0011',
-    'hi1822': '19e5:1822',
     'fortvile_bdw_de': '8086:15ac',
     'cavium_a063': '177d:a063',
     'cavium_a064': '177d:a064',
@@ -151,24 +147,20 @@  DRIVERS = {
     'fortville_eagle': 'i40e',
     'fortville_spirit': 'i40e',
     'fortville_spirit_single': 'i40e',
-    'redrockcanyou': 'fm10k',
     'fortpark': 'i40e',
     'fortpark_1g': 'i40e',
     'fortpark_TLV': 'i40e',
     'fortpark_BASE-T': 'i40e',
     'fortpark_TLV_vf': 'i40evf',
     'fvl10g_vf': 'i40evf',
-    'atwood': 'fm10k',
     'ConnectX3_MT4103': 'mlx4_core',
     'ConnectX4_MT4115': 'mlx5_core',
     'ConnectX4_LX_MT4117': 'mlx5_core',
     'ConnectX5_MT4119': 'mlx5_core',
     'ConnectX5_MT4121': 'mlx5_core',
-    'boulderrapid': 'fm10k',
     'fortville_25g': 'i40e',
     'cavium_a034': 'thunder-nicvf',
     'cavium_0011': 'thunder-nicvf',
-    'hi1822': 'hinic',
     'fortvile_bdw_de': 'ixgbe',
     'cavium_a063': 'octeontx2-nicpf',
     'cavium_a064': 'octeontx2-nicvf',
@@ -295,9 +287,8 @@  def get_nic_driver(pci_id):
     """
     Return linux driver for specified pci device
     """
-    driverlist = dict(list(zip(list(NICS.values()), list(DRIVERS.keys()))))
     try:
-        driver = DRIVERS[driverlist[pci_id]]
+        driver = DRIVERS[{NICS[key]:key for key in NICS}[pci_id]]
     except Exception as e:
         driver = None
     return driver
diff --git a/framework/test_capabilities.py b/framework/test_capabilities.py
index 79a6dee6..350e7ee3 100644
--- a/framework/test_capabilities.py
+++ b/framework/test_capabilities.py
@@ -3,7 +3,7 @@ 
 Dict used to skip parts of tests if NIC is known not to support them
 """
 DRIVER_TEST_LACK_CAPA = {
-	'sctp_tx_offload' : ['thunder-nicvf', 'fm10k', 'qede']
+	'sctp_tx_offload' : ['thunder-nicvf', 'qede']
 }
 
 
diff --git a/framework/test_case.py b/framework/test_case.py
index 3347adad..98b716b9 100644
--- a/framework/test_case.py
+++ b/framework/test_case.py
@@ -507,8 +507,6 @@  class TestCase(object):
             bitrate *= 10
         elif nic == 'fortpark_TLV':
             bitrate *= 10
-        elif nic == 'redrockcanyou':
-            bitrate *= 40
         elif driver == 'thunder-nicvf':
             bitrate *= 10
         elif nic == 'fortville_25g':