diff --git a/conf/iavf_driver_package.cfg b/conf/iavf_driver_package.cfg
index 2d3b841b..d8d08af7 100644
--- a/conf/iavf_driver_package.cfg
+++ b/conf/iavf_driver_package.cfg
@@ -1,4 +1,4 @@
 [suite]
-# cvl_rss common options ice driver file loacation
+# ice_rss common options ice driver file loacation
 ice_driver_ice_10_rc17_driver=/home/ice-0.10.0_rc17/src/ice.ko
 ice_driver_file_location_latest=/home/zhe12/DRRC2/nd_linux-cpk/ice-0.0.0_5134_glinux_ice_0.16.0_rc25_18_g90bd9a1_dirty/src/ice.ko
diff --git a/conf/cvl_advanced_iavf_rss_package.cfg b/conf/ice_advanced_iavf_rss_package.cfg
similarity index 78%
rename from conf/cvl_advanced_iavf_rss_package.cfg
rename to conf/ice_advanced_iavf_rss_package.cfg
index 228d481f..3d102511 100644
--- a/conf/cvl_advanced_iavf_rss_package.cfg
+++ b/conf/ice_advanced_iavf_rss_package.cfg
@@ -1,4 +1,4 @@
 [suite]
-# cvl_advanced_iavf_rss ice package file location
+# ice_advanced_iavf_rss ice package file location
 os_default_package_file_location=/lib/firmware/updates/intel/ice/ddp/ice-1.3.13.0.pkg
 comms_package_file_location=/lib/firmware/updates/intel/ice/ddp/ice_comms-1.3.16.0.pkg
diff --git a/conf/cvl_advanced_rss_pppoe.cfg b/conf/ice_advanced_rss_pppoe.cfg
similarity index 82%
rename from conf/cvl_advanced_rss_pppoe.cfg
rename to conf/ice_advanced_rss_pppoe.cfg
index d317282e..1062e6e2 100644
--- a/conf/cvl_advanced_rss_pppoe.cfg
+++ b/conf/ice_advanced_rss_pppoe.cfg
@@ -1,5 +1,5 @@
 [suite]
-# cvl_advanced_rss_pppoe_vlan_ah_l2tp_pfcp ice package file location
+# ice_advanced_rss_pppoe_vlan_ah_l2tp_pfcp ice package file location
 ice_driver_file_location=/lib/modules/4.18.0-193.14.2.el8_2.x86_64/updates/drivers/net/ethernet/intel/ice/ice.ko
 os_default_package_file_location=/lib/firmware/updates/intel/ice/ddp/ice-1.3.18.0.pkg
 comms_package_file_location=/lib/firmware/updates/intel/ice/ddp/ice_comms-1.3.22.0.pkg
diff --git a/conf/cvl_dcf_switch_filter.cfg b/conf/ice_dcf_switch_filter.cfg
similarity index 89%
rename from conf/cvl_dcf_switch_filter.cfg
rename to conf/ice_dcf_switch_filter.cfg
index ec5fa93e..93f89aef 100644
--- a/conf/cvl_dcf_switch_filter.cfg
+++ b/conf/ice_dcf_switch_filter.cfg
@@ -1,5 +1,5 @@
 [suite]
-# cvl_dcf_switch_filter common options ice driver file location
+# ice_dcf_switch_filter common options ice driver file location
 ice_driver_file_location="/home/lunannan/nd_linux-cpk/ice-1.1.0_rc30_3_g9d15683_dirty/src/ice.ko"
 # os default package file location
 os_default_package_file_location="/lib/firmware/updates/intel/ice/ddp/ice-1.3.16.0.pkg"
diff --git a/conf/iavf_fdir.cfg b/conf/ice_iavf_fdir.cfg
similarity index 88%
rename from conf/iavf_fdir.cfg
rename to conf/ice_iavf_fdir.cfg
index cfd84192..50767ee2 100644
--- a/conf/iavf_fdir.cfg
+++ b/conf/ice_iavf_fdir.cfg
@@ -1,5 +1,5 @@
 [suite]
-# cvl_iavf_fdir common options ice driver file location
+# ice_iavf_fdir common options ice driver file location
 ice_driver_file_location = "/home/pengyuan/nd/nd_linux-cpk/ice-0.16.0_rc35_1_g7fb2b219_dirty/src/ice.ko"
 # os default package file location
 os_default_package_file_location="/lib/firmware/updates/intel/ice/ddp/ice-1.3.11.0.pkg"
diff --git a/conf/cvl_switch_filter.cfg b/conf/ice_switch_filter.cfg
similarity index 87%
rename from conf/cvl_switch_filter.cfg
rename to conf/ice_switch_filter.cfg
index 11b44d0a..b03044e6 100644
--- a/conf/cvl_switch_filter.cfg
+++ b/conf/ice_switch_filter.cfg
@@ -1,5 +1,5 @@
 [suite]
-# cvl_switch_filter common options ice driver file location
+# ice_switch_filter common options ice driver file location
 ice_driver_file_location="/home/lunannan/nd_linux-cpk/ice-1.1.0_rc40_7_gd24495d/src/ice.ko"
 # os default package file location
 os_default_package_file_location="/lib/firmware/updates/intel/ice/ddp/ice-1.3.16.0.pkg"
diff --git a/conf/l3fwd.cfg b/conf/l3fwd.cfg
index 5801acd3..66274d8c 100644
--- a/conf/l3fwd.cfg
+++ b/conf/l3fwd.cfg
@@ -23,7 +23,7 @@
 #  - expected_throughput is a dictionary defining expected throughput
 # numbers based on NIC, and the pattern is
 #   {
-#       'columbiaville_100g':
+#       'ICE_100G-E810C_QSFP':
 #           {
 #               'Numbers of Cores/Sockets/Queues #1':
 #                   {
@@ -69,7 +69,7 @@ test_parameters = {
     '4C/4T-4Q': ['64', '128', '256', '512', '1024', '1280', '1518',],}
 expected_throughput = {
     'test_perf_throughput_ipv4_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
@@ -111,7 +111,7 @@ expected_throughput = {
                  '1280': '0.00',
                  '1518': '0.00', },},},
     'test_perf_throughput_ipv4_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
@@ -153,7 +153,7 @@ expected_throughput = {
                  '1280': '0.00',
                  '1518': '0.00', },},},
     'test_perf_throughput_ipv6_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
@@ -195,7 +195,7 @@ expected_throughput = {
                  '1280': '0.00',
                  '1518': '0.00', },},},
     'test_perf_throughput_ipv6_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
@@ -238,7 +238,7 @@ expected_throughput = {
                  '1518': '0.00', },},},}
 expected_rfc2544 = {
     'test_perf_rfc2544_ipv4_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
@@ -280,7 +280,7 @@ expected_rfc2544 = {
                 '1280': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '1518': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } } },},},
     'test_perf_rfc2544_ipv4_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
@@ -322,7 +322,7 @@ expected_rfc2544 = {
                 '1280': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '1518': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } } },},},
     'test_perf_rfc2544_ipv6_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
@@ -364,7 +364,7 @@ expected_rfc2544 = {
                 '1280': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '1518': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } } },},},
     'test_perf_rfc2544_ipv6_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
diff --git a/conf/l3fwd_em.cfg b/conf/l3fwd_em.cfg
index cfbf4e61..cc236370 100644
--- a/conf/l3fwd_em.cfg
+++ b/conf/l3fwd_em.cfg
@@ -20,7 +20,7 @@
 #  - expected_throughput is a dictionary defining expected throughput
 # numbers based on NIC, and the pattern is
 #   {
-#       'columbiaville_100g':
+#       'ICE_100G-E810C_QSFP':
 #           {
 #               'Numbers of Cores/Sockets/Queues #1':
 #                   {
@@ -65,7 +65,7 @@ test_parameters = {
     '4C/4T-4Q': ['64', '128', '256', '512', '1024', '1280', '1518',],}
 expected_throughput = {
     'test_perf_throughput_ipv4_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
@@ -107,7 +107,7 @@ expected_throughput = {
                  '1280': '0.00',
                  '1518': '0.00', },},},
     'test_perf_throughput_ipv6_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
diff --git a/conf/l3fwd_lpm_ipv4.cfg b/conf/l3fwd_lpm_ipv4.cfg
index 1ceb5157..fd8cb95b 100644
--- a/conf/l3fwd_lpm_ipv4.cfg
+++ b/conf/l3fwd_lpm_ipv4.cfg
@@ -20,7 +20,7 @@
 #  - expected_throughput is a dictionary defining expected throughput
 # numbers based on NIC, and the pattern is
 #   {
-#       'columbiaville_100g': 
+#       'ICE_100G-E810C_QSFP':
 #           {
 #               'Numbers of Cores/Sockets/Queues #1':
 #                   {
@@ -65,7 +65,7 @@ test_parameters = {
     '4C/4T/4Q': ['64', '128', '256', '512', '1024', '1280', '1518',],}
 expected_throughput = {
     'test_perf_throughput_ipv4_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T/1Q': {
                  '64': '0.00',
                  '128': '0.00',
diff --git a/conf/l3fwd_lpm_ipv4_rfc2544.cfg b/conf/l3fwd_lpm_ipv4_rfc2544.cfg
index 1d767716..4c1ee00e 100644
--- a/conf/l3fwd_lpm_ipv4_rfc2544.cfg
+++ b/conf/l3fwd_lpm_ipv4_rfc2544.cfg
@@ -20,7 +20,7 @@
 #  - expected_throughput is a dictionary defining expected throughput
 # numbers based on NIC, and the pattern is
 #   {
-#       'columbiaville_100g': 
+#       'ICE_100G-E810C_QSFP':
 #           {
 #               'Numbers of Cores/Sockets/Queues #1':
 #                   {
@@ -65,7 +65,7 @@ test_parameters = {
     '4C/4T-4Q': ['64', '128', '256', '512', '1024', '1280', '1518',],}
 expected_rfc2544 = {
     'test_perf_rfc2544_ipv4_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
diff --git a/conf/l3fwd_lpm_ipv6.cfg b/conf/l3fwd_lpm_ipv6.cfg
index 2bbd47fe..103a5104 100644
--- a/conf/l3fwd_lpm_ipv6.cfg
+++ b/conf/l3fwd_lpm_ipv6.cfg
@@ -20,7 +20,7 @@
 #  - expected_throughput is a dictionary defining expected throughput
 # numbers based on NIC, and the pattern is
 #   {
-#       'columbiaville_100g': 
+#       'ICE_100G-E810C_QSFP':
 #           {
 #               'Numbers of Cores/Sockets/Queues #1':
 #                   {
@@ -65,7 +65,7 @@ test_parameters = {
     '4C/4T-4Q': ['64', '128', '256', '512', '1024', '1280', '1518',],}
 expected_throughput = {
     'test_perf_throughput_ipv6_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
diff --git a/conf/nic_single_core_perf.cfg b/conf/nic_single_core_perf.cfg
index 4a1073f5..9cc72174 100644
--- a/conf/nic_single_core_perf.cfg
+++ b/conf/nic_single_core_perf.cfg
@@ -46,22 +46,22 @@ test_duration = 60
 throughput_stat_sample_interval = 2
 accepted_tolerance = 0.05
 expected_throughput = {
-    'fortville_spirit': {
+    'I40E_40G-QSFP_A': {
         '1C/1T': {64: {512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {512: 0.00, 2048: 0.00}}},
-    'fortville_eagle': {
+    'I40E_10G-SFP_XL710': {
         '1C/1T':{64: {512: 0.00, 2048: 0.00}},
         '1C/2T':{64: {512: 0.00, 2048: 0.00}}},
-    'niantic': {
+    'IXGBE_10G-82599_SFP': {
         '1C/1T': {64: {128: 0.00, 512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {128: 0.00, 512: 0.00, 2048: 0.00}}},
-    'fortville_25g': {
+    'I40E_25G-25G_SFP28': {
         '1C/1T': {64: {512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {512: 0.00, 2048: 0.00}}},
-    'columbiaville_100g': {
+    'ICE_100G-E810C_QSFP': {
         '1C/1T': {64: {512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {512: 0.00, 2048: 0.00}}},
-    'columbiaville_25g': {
+    'ICE_25G-E810C_SFP': {
         '1C/1T': {64: {512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {512: 0.00, 2048: 0.00}}},
     'ConnectX4_LX_MT4117': {'40G': {
diff --git a/conf/test_case_checklist.json b/conf/test_case_checklist.json
index 3caeb16b..2185fcaf 100644
--- a/conf/test_case_checklist.json
+++ b/conf/test_case_checklist.json
@@ -5,26 +5,26 @@
                 "ALL"
             ],
             "NIC": [
-                "bartonhills",
-                "powerville",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-		"columbiaville_25g",
-		"columbiaville_100g",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
-                "sagepond",
-                "kawela_4",
+                "IGB_1G-82580_COPPER",
+                "IGB_1G-I350_COPPER",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+		"ICE_25G-E810C_SFP",
+		"ICE_100G-E810C_QSFP",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
                 "cavium_a034",
                 "cavium_a011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-		"foxville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -39,13 +39,13 @@
                 "ALL"
             ],
             "NIC": [
-                "springville",
-                "ironpond",
-                "springfountain",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
                 "cavium_a034",
                 "cavium_a011",
-                "twinpond",
-                "foxville"
+                "IXGBE_10G-X540T",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -60,19 +60,19 @@
                 "ALL"
             ],
             "NIC": [
-                "bartonhills",
-                "powerville",
-                "fortville_spirit_single",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IGB_1G-82580_COPPER",
+                "IGB_1G-I350_COPPER",
+                "I40E_40G-QSFP_B",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_a011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-		"foxville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -87,19 +87,19 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "kawela_4",
-                "fortville_spirit_single",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "I40E_40G-QSFP_B",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_a011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "foxville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -114,19 +114,19 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_25g",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_a011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -141,25 +141,25 @@
                 "ALL"
             ],
             "NIC": [
-                "kawela_4",
-                "bartonhills",
-                "powerville",
-                "fortville_25g",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82580_COPPER",
+                "IGB_1G-I350_COPPER",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_a011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "foxville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -174,17 +174,17 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "fortville_spirit_single",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IXGBE_10G-82599_SFP",
+                "I40E_40G-QSFP_B",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_a011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -199,17 +199,17 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_spirit_single",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "I40E_40G-QSFP_B",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_a011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "foxville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -224,22 +224,22 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-		"columbiaville_100g",
-		"columbiaville_25g",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+		"ICE_100G-E810C_QSFP",
+		"ICE_25G-E810C_SFP",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_a011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "foxville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -254,19 +254,19 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "kawela_4",
-                "fortville_spirit_single",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "I40E_40G-QSFP_B",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_a011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "foxville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -281,21 +281,21 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "foxville",
-                "powerville",
-                "kawela_4",
-                "springville",
-                "fortville_25g",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "IGC-I225_LM",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
                 "cavium_a063",
                 "cavium_a064",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g"
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
@@ -310,17 +310,17 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
                 "cavium_a063",
                 "cavium_a064",
-                "carlsville",
-                "powerville",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "springville",
-	        "foxville"
+                "I40E_10G-10G_BASE_T_BC",
+                "IGB_1G-I350_COPPER",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IGB_1G-I210_COPPER",
+	        "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -335,10 +335,10 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "kawela_4",
-                "bartonhills",
-                "powerville"
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82580_COPPER",
+                "IGB_1G-I350_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -353,16 +353,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_spirit_single",
-                "powerville",
-                "kawela_4",
-                "springville",
-                "sageville",
-                "ironpond",
+                "I40E_40G-QSFP_B",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-82599_T3_LOM",
                 "cavium_a034",
                 "cavium_0011",
                 "cavium_a064",
-		"foxville"
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -377,8 +377,8 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_spirit_single",
-                "ironpond",
+                "I40E_40G-QSFP_B",
+                "IXGBE_10G-82599_T3_LOM",
                 "cavium_a034",
                 "cavium_0011"
             ],
@@ -397,7 +397,7 @@
             "NIC": [
                 "cavium_a034",
                 "cavium_0011",
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -412,14 +412,14 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
                 "cavium_a034",
                 "cavium_0011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-		"foxville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -432,11 +432,11 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -451,14 +451,14 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
                 "cavium_a034",
                 "cavium_0011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-		"foxville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -471,11 +471,11 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -490,14 +490,14 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
                 "cavium_a034",
                 "cavium_0011",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-		"foxville"
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -510,11 +510,11 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -529,12 +529,12 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
                 "cavium_a034",
                 "cavium_0011",
-		"foxville"
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -549,12 +549,12 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
                 "cavium_a034",
                 "cavium_0011",
-		"foxville"
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -569,14 +569,14 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "sagepond",
-                "sageville",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g"
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
@@ -591,14 +591,14 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "sagepond",
-                "sageville",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g"
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
@@ -626,12 +626,12 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_a011"
             ],
@@ -661,13 +661,13 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
-                "niantic",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-82599_SFP",
                 "cavium_a034",
                 "cavium_0011"
             ],
@@ -697,12 +697,12 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_0011"
             ],
@@ -732,15 +732,15 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_0011",
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -768,12 +768,12 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_0011"
             ],
@@ -803,13 +803,13 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
-                "niantic",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-82599_SFP",
                 "cavium_a034",
                 "cavium_0011"
             ],
@@ -839,12 +839,12 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_0011"
             ],
@@ -874,15 +874,15 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
                 "cavium_a034",
                 "cavium_0011",
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -897,17 +897,17 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
-                "niantic",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-		"foxville"
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-82599_SFP",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -922,11 +922,11 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain"
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP"
             ],
             "Target": [
                 "ALL"
@@ -955,11 +955,11 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
                 "cavium_a034",
                 "cavium_a011"
             ],
@@ -1280,11 +1280,11 @@
                 "ALL"
             ],
             "NIC": [
-                "springville",
+                "IGB_1G-I210_COPPER",
                 "cavium_a034",
                 "cavium_0011",
-                "columbiaville_25g",
-                "columbiaville_100g"
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
@@ -1299,11 +1299,11 @@
                 "ALL"
             ],
             "NIC": [
-                "springfountain",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -1316,10 +1316,10 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -1363,7 +1363,7 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_spirit_single",
+                "I40E_40G-QSFP_B",
                 "cavium_a064"
             ],
             "Target": [
@@ -1377,7 +1377,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "i686-native-linuxapp-gcc",
@@ -1406,7 +1406,7 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_spirit_single",
+                "I40E_40G-QSFP_B",
                 "cavium_a064"
             ],
             "Target": [
@@ -1420,7 +1420,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "i686-native-linuxapp-gcc",
@@ -1495,7 +1495,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -1523,7 +1523,7 @@
                 "ALL"
             ],
             "NIC": [
-	        "foxville"
+	        "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -1552,7 +1552,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -1581,7 +1581,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -1702,13 +1702,13 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond",
-                "niantic"
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -1723,12 +1723,12 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "kawela_4",
-                "springville",
-                "ironpond",
-                "springfountain",
-                "twinpond"
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X540T"
             ],
             "Target": [
                 "ALL"
@@ -1743,9 +1743,9 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-		"columbiaville_100g",
-		"columbiaville_25g"
+                "IGB_1G-I350_COPPER",
+		"ICE_100G-E810C_QSFP",
+		"ICE_25G-E810C_SFP"
             ],
             "Target": [
                 "ALL"
@@ -1760,9 +1760,9 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-		"columbiaville_100g",
-		"columbiaville_25g"
+                "IGB_1G-I350_COPPER",
+		"ICE_100G-E810C_QSFP",
+		"ICE_25G-E810C_SFP"
             ],
             "Target": [
                 "ALL"
@@ -1777,9 +1777,9 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-		"columbiaville_100g",
-		"columbiaville_25g"
+                "IGB_1G-I350_COPPER",
+		"ICE_100G-E810C_QSFP",
+		"ICE_25G-E810C_SFP"
             ],
             "Target": [
                 "ALL"
@@ -1794,14 +1794,14 @@
                 "ALL"
             ],
             "NIC": [
-                "columbiaville_100g",
-                "columbiaville_25g"
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "the case needs >=2 CVL NICs with different Serial Numbers"
+            "Comments": "the case needs >=2 supported NICs with different Serial Numbers"
         }
     ],
     "kernel_2pf_2vf_1vm_mac_add_filter": [
@@ -1810,7 +1810,7 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville"
+                "IGB_1G-I350_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -1825,7 +1825,7 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville"
+                "IGB_1G-I350_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -1980,7 +1980,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "arm64-thunderx-linuxapp-gcc"
@@ -2078,7 +2078,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2093,7 +2093,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2108,7 +2108,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2123,15 +2123,15 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortpark_TLV_vf",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-X722_A0",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IAVF_10G-X722_VF",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -2146,7 +2146,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2161,7 +2161,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2176,7 +2176,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2191,7 +2191,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2206,7 +2206,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2221,12 +2221,12 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville",
-		"fortpark_BASE-T"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+		"I40E_10G-10G_BASE_T_X722"
             ],
             "Target": [
                 "ALL"
@@ -2241,7 +2241,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2256,7 +2256,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2271,11 +2271,11 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -2290,17 +2290,17 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
                 "cavium_a034",
                 "cavium_a011",
                 "cavium_a063",
-                "fortville_25g",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
                 "cavium_a064",
-                "carlsville"
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -2315,16 +2315,16 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "sagepond",
-                "sageville",
-                "twinpond"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X540T"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "Niantic not support this case"
+            "Comments": "the nic not support this case"
         }
     ],
     "two_vms_uplink_and_downlink_mirror": [
@@ -2333,7 +2333,7 @@
                 "ALL"
             ],
             "NIC": [
-                "fortpark_BASE-T"
+                "I40E_10G-10G_BASE_T_X722"
             ],
             "Target": [
                 "ALL"
@@ -2348,7 +2348,7 @@
                 "ALL"
             ],
             "NIC": [
-                "fortpark_BASE-T"
+                "I40E_10G-10G_BASE_T_X722"
             ],
             "Target": [
                 "ALL"
@@ -2363,10 +2363,10 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "powerville",
-                "sagepond",
-                "sageville"
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-I350_COPPER",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -2381,10 +2381,10 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "powerville",
-                "sagepond",
-                "sageville"
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-I350_COPPER",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -2399,10 +2399,10 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "powerville",
-                "sagepond",
-                "sageville"
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-I350_COPPER",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -2417,20 +2417,20 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-X722_A0",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
                 "cavium_a063",
-                "fortpark_TLV_vf",
+                "IAVF_10G-X722_VF",
                 "cavium_a064",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "carlsville",
-		"foxville"
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "I40E_10G-10G_BASE_T_BC",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2445,7 +2445,7 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2460,14 +2460,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "powerville",
-                "twinpond",
-                "twinville",
-                "sagepond",
-                "sageville",
-		"foxville",
-		"springville"
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-I350_COPPER",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+		"IGC-I225_LM",
+		"IGB_1G-I210_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -2532,7 +2531,7 @@
             "NIC": [
                 "cavium_a063",
                 "cavium_a064",
-		"foxville"
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2562,8 +2561,8 @@
                 "ALL"
             ],
             "NIC": [
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
                 "cavium_a063",
                 "cavium_a064"
             ],
@@ -2580,8 +2579,8 @@
                 "ALL"
             ],
             "NIC": [
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
                 "cavium_a063",
                 "cavium_a064"
             ],
@@ -2598,8 +2597,8 @@
                 "ALL"
             ],
             "NIC": [
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
                 "cavium_a063",
                 "cavium_a064"
             ],
@@ -2616,10 +2615,10 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "sagepond",
-                "sageville",
-                "twinpond"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X540T"
             ],
             "Target": [
                 "ALL"
@@ -2636,7 +2635,7 @@
             "NIC": [
                 "cavium_a063",
                 "cavium_a064",
-		"foxville"
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2795,7 +2794,7 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville"
+                "IGB_1G-I350_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -2810,13 +2809,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-		        "sagepond",
-		        "sageville",
-                "twinpond",
-		"columbiaville_25g",
-		"columbiaville_100g",
-                "powerville"
+                "IXGBE_10G-82599_SFP",
+		        "IXGBE_10G-X550EM_X_10G_T",
+		        "IXGBE_10G-X550T",
+                "IXGBE_10G-X540T",
+		"ICE_25G-E810C_SFP",
+		"ICE_100G-E810C_QSFP",
+                "IGB_1G-I350_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -2831,13 +2830,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "sagepond",
-                "sageville",
-                "twinpond",
-		"columbiaville_25g",
-		"columbiaville_100g",
-                "powerville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X540T",
+		"ICE_25G-E810C_SFP",
+		"ICE_100G-E810C_QSFP",
+                "IGB_1G-I350_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -2852,7 +2851,7 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville"
+                "IGB_1G-I350_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -2867,7 +2866,7 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville"
+                "IGB_1G-I350_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -2882,11 +2881,11 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "springville",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "foxville"
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-I210_COPPER",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2901,19 +2900,19 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "springville",
-                "columbiaville_25g",
-                "columbiaville_100g",
-		"foxville",
-                "fortville_eagle",
-                "fortville_spirit",
-	        "fortville_spirit_single",
-	        "fortpark",
-	        "fortpark_TLV",
-                "fortpark_BASE-T",
-	        "fortville_25g",
-	        "carlsville"
+                "IGB_1G-I350_COPPER",
+                "IGB_1G-I210_COPPER",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+		"IGC-I225_LM",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+	        "I40E_40G-QSFP_B",
+	        "I40E_10G-X722_A0",
+	        "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+	        "I40E_25G-25G_SFP28",
+	        "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -2941,7 +2940,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2956,7 +2955,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2971,7 +2970,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2984,7 +2983,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "fortville_eagle"
+                "I40E_10G-SFP_XL710"
             ],
             "Target": [
                 "ALL"
@@ -2999,7 +2998,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3012,7 +3011,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "fortville_eagle"
+                "I40E_10G-SFP_XL710"
             ],
             "Target": [
                 "ALL"
@@ -3027,7 +3026,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3042,7 +3041,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3057,7 +3056,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3072,7 +3071,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3087,10 +3086,10 @@
                 "ALL"
             ],
             "NIC": [
-                "sagepond",
-                "niantic",
-                "springville",
-                "sageville"
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -3105,10 +3104,10 @@
                 "ALL"
             ],
             "NIC": [
-                "sagepond",
-                "niantic",
-                "springville",
-                "sageville"
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -3123,10 +3122,10 @@
                 "ALL"
             ],
             "NIC": [
-                "sagepond",
-                "niantic",
-                "springville",
-                "sageville"
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -3141,10 +3140,10 @@
                 "ALL"
             ],
             "NIC": [
-                "sagepond",
-                "niantic",
-                "springville",
-                "sageville"
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -3159,10 +3158,10 @@
                 "ALL"
             ],
             "NIC": [
-                "sagepond",
-                "niantic",
-                "springville",
-                "sageville"
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -3178,13 +3177,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "niantic not support this case"
+            "Comments": "the nic not support this case"
         }
     ],
     "perf_pvp_packed_ring_dequeue_zero_copy": [
@@ -3193,13 +3192,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "niantic not support this case"
+            "Comments": "the nic not support this case"
         }
     ],
     "check_double_VLAN_fields_in_RXD_8021ad": [
@@ -3209,13 +3208,13 @@
             ],
             "NIC": [
 
-                "columbiaville_100g"
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "CVL_100G kennel not support double VLAN"
+            "Comments": "the nic not support double VLAN"
         }
     ],
     "check_double_VLAN_fields_in_RXD_8021Q_2_VLAN_tag": [
@@ -3224,7 +3223,7 @@
                 "ALL"
             ],
             "NIC": [
-                "columbiaville_100g"
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
@@ -3239,7 +3238,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3252,7 +3251,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "fortville_eagle"
+                "I40E_10G-SFP_XL710"
             ],
             "Target": [
                 "ALL"
@@ -3267,7 +3266,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3280,7 +3279,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "fortville_eagle"
+                "I40E_10G-SFP_XL710"
             ],
             "Target": [
                 "ALL"
@@ -3295,7 +3294,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3310,7 +3309,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3323,7 +3322,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "fortville_eagle"
+                "I40E_10G-SFP_XL710"
             ],
             "Target": [
                 "ALL"
@@ -3338,7 +3337,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3351,7 +3350,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "fortville_eagle"
+                "I40E_10G-SFP_XL710"
             ],
             "Target": [
                 "ALL"
@@ -3366,7 +3365,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "fortville_eagle"
+                "I40E_10G-SFP_XL710"
             ],
             "Target": [
                 "ALL"
@@ -3381,7 +3380,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3394,7 +3393,7 @@
                 "freebsd"
             ],
             "NIC": [
-                "fortville_eagle"
+                "I40E_10G-SFP_XL710"
             ],
             "Target": [
                 "ALL"
@@ -3409,7 +3408,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3424,7 +3423,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3439,7 +3438,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3454,7 +3453,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3469,7 +3468,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3484,7 +3483,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3499,7 +3498,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3514,8 +3513,8 @@
                 "ALL"
             ],
             "NIC": [
-                "sagepond",
-                "foxville"
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3530,8 +3529,8 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-		"springville"
+                "IGB_1G-I350_COPPER",
+		"IGB_1G-I210_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -3546,14 +3545,14 @@
                 "ALL"
             ],
             "NIC": [
-                "columbiaville_100g",
-                "columbiaville_25g"
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "DPDK-18754",
-            "Comments": "CVL NIC doesn't support the VLAN in pkg ptype"
+            "Comments": "the NIC doesn't support the VLAN in pkg ptype"
         }
     ],
     "txoffload_port_all": [
@@ -3562,8 +3561,8 @@
                 "ALL"
             ],
             "NIC": [
-                "springville",
-                "sageville"
+                "IGB_1G-I210_COPPER",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -3578,13 +3577,13 @@
                 "ALL"
             ],
             "NIC": [
-                "springville"
+                "IGB_1G-I210_COPPER"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "springville not support this case"
+            "Comments": "Nic not support this case"
         }
     ],
     "txoffload_port_cmdline": [
@@ -3593,13 +3592,13 @@
                 "ALL"
             ],
             "NIC": [
-                "springville"
+                "IGB_1G-I210_COPPER"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "springville not support this case"
+            "Comments": "Nic not support this case"
         }
     ],
     "rxoffload_port_all": [
@@ -3608,7 +3607,7 @@
                 "ALL"
             ],
             "NIC": [
-                "sageville"
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -3623,7 +3622,7 @@
                 "ALL"
             ],
             "NIC": [
-                "sageville"
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -3654,14 +3653,14 @@
                 "ALL"
             ],
             "NIC": [
-                "columbiaville_100g",
-                "columbiaville_25g"
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "CVL not support DPDK PF + DPDK VF"
+            "Comments": "the nic not support DPDK PF + DPDK VF"
         }
     ],
     "txoffload_queue": [
@@ -3670,7 +3669,7 @@
                 "ALL"
             ],
             "NIC": [
-                "foxville"
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -3685,20 +3684,20 @@
                 "ALL"
             ],
             "NIC": [
-                "columbiaville_100g",
-                "columbiaville_25g",
-	        "fortville_eagle",
-		"fortville_spirit",
-		"fortpark_TLV",
-		"fortpark_BASE-T",
-		"fortville_25g",
-		"carlsville"
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
+	        "I40E_10G-SFP_XL710",
+		"I40E_40G-QSFP_A",
+		"I40E_10G-SFP_X722",
+		"I40E_10G-10G_BASE_T_X722",
+		"I40E_25G-25G_SFP28",
+		"I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "DPDK-24129",
-            "Comments": "CVL and FVL not support this case"
+            "Comments": "the nic not support this case"
         }
     ],
     "mtu_checks_100": [
@@ -3707,13 +3706,13 @@
                  "ALL"
              ],
              "NIC": [
-                 "niantic",
-                 "twinpond",
-                 "sageville",
-                 "sagepond",
-		 "springville",
-		 "powerville",
-                 "foxville"
+                 "IXGBE_10G-82599_SFP",
+                 "IXGBE_10G-X540T",
+                 "IXGBE_10G-X550T",
+                 "IXGBE_10G-X550EM_X_10G_T",
+		 "IGB_1G-I210_COPPER",
+		 "IGB_1G-I350_COPPER",
+                 "IGC-I225_LM"
              ],
              "Target": [
                  "ALL"
@@ -3728,11 +3727,11 @@
                  "ALL"
              ],
              "NIC": [
-                 "sageville",
-                 "sagepond",
-                 "springville",
-                 "powerville",
-                 "foxville"
+                 "IXGBE_10G-X550T",
+                 "IXGBE_10G-X550EM_X_10G_T",
+                 "IGB_1G-I210_COPPER",
+                 "IGB_1G-I350_COPPER",
+                 "IGC-I225_LM"
              ],
              "Target": [
                  "ALL"
@@ -3747,11 +3746,11 @@
                  "ALL"
              ],
              "NIC": [
-                 "sageville",
-                 "sagepond",
-                 "springville",
-                 "powerville",
-                 "foxville"
+                 "IXGBE_10G-X550T",
+                 "IXGBE_10G-X550EM_X_10G_T",
+                 "IGB_1G-I210_COPPER",
+                 "IGB_1G-I350_COPPER",
+                 "IGC-I225_LM"
              ],
              "Target": [
                  "ALL"
@@ -3766,10 +3765,10 @@
                  "ALL"
              ],
              "NIC": [
-                 "niantic",
-                 "foxville",
-		 "columbiaville_100g",
-		 "columbiaville_25g"
+                 "IXGBE_10G-82599_SFP",
+                 "IGC-I225_LM",
+		 "ICE_100G-E810C_QSFP",
+		 "ICE_25G-E810C_SFP"
              ],
              "Target": [
                  "ALL"
diff --git a/conf/test_case_supportlist.json b/conf/test_case_supportlist.json
index 7fa1cf90..08f4840c 100644
--- a/conf/test_case_supportlist.json
+++ b/conf/test_case_supportlist.json
@@ -5,16 +5,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on fortville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "dpdk_2pf_2vf_1vm_mac_add_filter": [
@@ -23,15 +23,15 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-		"fortville_spirit",
-		"fortville_25g"
+                "I40E_10G-SFP_XL710",
+		        "I40E_40G-QSFP_A",
+		        "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on fortville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "two_vms_prevent_rx_broadcast_on_vf": [
@@ -40,13 +40,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on niantic"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "two_vms_enalbe_or_disable_one_uta_mac_on_vf": [
@@ -55,13 +55,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on niantic"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "two_vms_pause_tx_queuse": [
@@ -70,13 +70,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on niantic"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "two_vms_pause_rx_queues": [
@@ -85,13 +85,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on niantic"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "two_vms_add_multi_uta_mac_on_vf": [
@@ -100,13 +100,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on niantic"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "two_vms_add_or_remove_uta_mac_on_vf": [
@@ -115,13 +115,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on niantic"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "l2pkt_detect": [
@@ -131,20 +131,20 @@
             ],
             "NIC": [
                 "forrpark_TLV",
-                "foxville",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-	        "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g"
+                "IGC-I225_LM",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+	            "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "l2 packet detect only support on FVL"
+            "Comments": "the nic on the environment not support l2 packet detect"
         }
     ],
     "IP_in_IPv4_tunnel": [
@@ -154,19 +154,19 @@
             ],
             "NIC": [
                 "forrpark_TLV",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-		"carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+		        "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "IP_in_IPv4 tunnel packet detect only support on FVL"
+            "Comments": "the nic on the environment not support IP_in_IPv4 tunnel packet detect"
         }
     ],
     "IPv6_in_IPv4_tunnel": [
@@ -175,24 +175,24 @@
                 "ALL"
             ],
             "NIC": [
-                "powerville",
-                "niantic",
-                "fortville_25g",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "foxville"
+                "IGB_1G-I350_COPPER",
+                "IXGBE_10G-82599_SFP",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "IPv6_in_IPv4 tunnel packet detect only support on Niantic/FVL/powerville/fortpark_TLV"
+            "Comments": "the nic on the environment not support IPv6_in_IPv4 tunnel packet detect"
         }
     ],
     "IP_in_IPv6_tunnel": [
@@ -202,19 +202,19 @@
             ],
             "NIC": [
                 "forrpark_TLV",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "IP_in_IPv6 tunnel packet detect only support on FVL"
+            "Comments": "the nic on the environment not support IP_in_IPv6 tunnel packet detect"
         }
     ],
     "NVGRE_tunnel": [
@@ -224,17 +224,17 @@
             ],
             "NIC": [
                 "forrpark_TLV",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "NVGRE tunnel packet detect only support on FVL"
+            "Comments": "the nic on the environment not support NVGRE tunnel packet detect"
         }
     ],
     "NVGRE_in_IPv6_tunnel": [
@@ -244,17 +244,17 @@
             ],
             "NIC": [
                 "forrpark_TLV",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "NVGRE in ipv6 tunnel packet detect only support on FVL"
+            "Comments": "the nic on the environment not support NVGRE in ipv6 tunnel packet detect"
         }
     ],
     "GRE_tunnel": [
@@ -264,19 +264,19 @@
             ],
             "NIC": [
                 "forrpark_TLV",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-		"carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+		"I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "GRE tunnel packet detect only support on FVL"
+            "Comments": "the nic on the environment not support GRE tunnel packet detect"
         }
     ],
     "Vxlan_tunnel": [
@@ -286,19 +286,19 @@
             ],
             "NIC": [
                 "forrpark_TLV",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-		"carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+		"I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "Vxlan  tunnel packet detect only support on FVL"
+            "Comments": "the nic on the environment not support Vxlan tunnel packet detect"
         }
     ],
     "outer_dst_contrl_gtpcq": [
@@ -307,16 +307,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "teid_contrl_gtpcq": [
@@ -325,16 +325,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "teid_contrl_gtpu_ipv4q": [
@@ -343,16 +343,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "sport_contrl_gtpu_ipv4q": [
@@ -361,16 +361,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "dport_contrl_gtpu_ipv4q": [
@@ -379,16 +379,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "inner_src_contrl_gtpu_ipv4q": [
@@ -397,16 +397,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "inner_dst_contrl_gtpu_ipv4q": [
@@ -415,16 +415,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "teid_contrl_gtpu_ipv6q": [
@@ -433,16 +433,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "sport_contrl_gtpu_ipv6q": [
@@ -451,16 +451,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "dport_contrl_gtpu_ipv6q": [
@@ -469,16 +469,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "inner_src_contrl_gtpu_ipv6q": [
@@ -487,16 +487,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "inner_dst_contrl_gtpu_ipv6q": [
@@ -505,16 +505,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
      "fdir_ipv6_tc": [
@@ -523,18 +523,18 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "foxville",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-		"carlsville"
+                "I40E_10G-SFP_XL710",
+                "IGC-I225_LM",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+		"I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "ipv4_tos_proto_ttl": [
@@ -543,18 +543,18 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "foxville",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-		"carlsville"
+                "I40E_10G-SFP_XL710",
+                "IGC-I225_LM",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+		"I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "fdir_ivlan": [
@@ -563,18 +563,18 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "foxville",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-		"carlsville"
+                "I40E_10G-SFP_XL710",
+                "IGC-I225_LM",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+		"I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "nsh": [
@@ -583,22 +583,22 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortpark_TLV_vf",
-                "fvl10g_vf",
-		"carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-X722_A0",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IAVF_10G-X722_VF",
+                "IAVF-VF",
+		"I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support i40e driver nic"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "set_key_keylen": [
@@ -607,19 +607,19 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "queue_region_with_rss_rule_api": [
@@ -628,19 +628,19 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
                 "carlsvile"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "queue_region_with_rss_rule_combination": [
@@ -649,19 +649,19 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "queue_region_with_invalid_parameter": [
@@ -670,19 +670,19 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "rxoffload_queue": [
@@ -691,17 +691,17 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "twinpond",
-                "sagepond",
-                "sageville",
-                "foxville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on niantic"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "txoffload_queue": [
@@ -710,23 +710,23 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "foxville",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-		"columbiaville_100g",
-		"columbiaville_25g",
-                "fortpark",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "IGC-I225_LM",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+		"ICE_100G-E810C_QSFP",
+		"ICE_25G-E810C_SFP",
+                "I40E_10G-X722_A0",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "tunnel_filter_vxlan": [
@@ -735,20 +735,20 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_25g",
-                "foxville",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "IGC-I225_LM",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "2_tuple_filter": [
@@ -757,20 +757,20 @@
                 "ALL"
             ],
             "NIC": [
-                "bartonhills",
-                "powerville",
-                "fortville_eagle",
-                "fortville_25g",
-		"columbiaville_100g",
-		"columbiaville_25g",
-                "fortville_spirit",
-                "foxville"
+                "IGB_1G-82580_COPPER",
+                "IGB_1G-I350_COPPER",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+		"ICE_100G-E810C_QSFP",
+		"ICE_25G-E810C_SFP",
+                "I40E_40G-QSFP_A",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on bartonhills and powerville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "fdir_for_nvgre": [
@@ -779,16 +779,15 @@
                 "ALL"
             ],
             "NIC": [
-                "twinville",
-                "sagepond",
-                "sageville",
-                "foxville"
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on twinville, sagepond and sageville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "fdir_for_mac_vlan": [
@@ -797,21 +796,20 @@
                 "ALL"
             ],
             "NIC": [
-                "twinville",
-                "fortville_eagle",
-                "fortville_25g",
-		"columbiaville_25g",
-		"columbiaville_100g",
-                "fortville_spirit",
-                "sagepond",
-                "sageville",
-                "foxville"
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+		        "ICE_25G-E810C_SFP",
+		        "ICE_100G-E810C_QSFP",
+                "I40E_40G-QSFP_A",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on twinville,sagepond and sageville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "n_tuple_filter": [
@@ -820,17 +818,16 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "kawela_4",
-                "kawela",
-                "twinville",
-                "foxville"
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82576_QUAD_COPPER",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on twinville,niantic,kawela_4 and kawela"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "fdir_for_ipv4": [
@@ -839,24 +836,23 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "foxville",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville"
+                "IXGBE_10G-82599_SFP",
+                "IGC-I225_LM",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on niantic,twinville,sagepond,sageville and FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "fdir_for_L2_payload": [
@@ -865,20 +861,20 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-		"foxville"
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "fdir_for_ipv6": [
@@ -887,24 +883,23 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "carlsville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on niantic,twinville,sagepond,sageville and FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "fdir_for_vxlan": [
@@ -913,16 +908,15 @@
                 "ALL"
             ],
             "NIC": [
-                "twinville",
-                "sagepond",
-                "sageville",
-                "foxville"
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on twinville,sagepond and sageville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "fdir_for_vlan": [
@@ -931,20 +925,20 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-		"foxville"
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "ethertype_filter": [
@@ -953,28 +947,27 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "kawela_4",
-                "kawela",
-                "bartonhills",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "powerville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "foxville"
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82576_QUAD_COPPER",
+                "IGB_1G-82580_COPPER",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGB_1G-I350_COPPER",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on niantic,kawela_4,kawela,bartonhills,twinville,sagepond,sageville,powerville and FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "flexbytes_filter": [
@@ -983,15 +976,15 @@
                 "ALL"
             ],
             "NIC": [
-                "bartonhills",
-                "powerville",
-                "foxville"
+                "IGB_1G-82580_COPPER",
+                "IGB_1G-I350_COPPER",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on bartonhills and powerville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "L2_tunnel_filter": [
@@ -1000,15 +993,15 @@
                 "ALL"
             ],
             "NIC": [
-                "sagepond",
-                "sageville",
-                "foxville"
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on sagepond and sageville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "fdir_for_flexbytes": [
@@ -1017,24 +1010,23 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-		"foxville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on niantic,twinville,sagepond,sageville and FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "tunnel_filter_nvgre": [
@@ -1043,20 +1035,20 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-		"foxville"
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case only support on FVL"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_1ports_atq_atomic_performance": [
@@ -1072,7 +1064,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_1ports_atq_parallel_performance": [
@@ -1088,7 +1080,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_1ports_atq_order_performance": [
@@ -1104,7 +1096,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_1ports_queue_atomic_performance": [
@@ -1120,7 +1112,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_1ports_queue_parallel_performance": [
@@ -1136,7 +1128,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_1ports_queue_order_performance": [
@@ -1152,7 +1144,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_2ports_atq_atomic_performance": [
@@ -1168,7 +1160,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_2ports_atq_parallel_performance": [
@@ -1184,7 +1176,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_2ports_atq_order_performance": [
@@ -1200,7 +1192,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_2ports_queue_atomic_performance": [
@@ -1216,7 +1208,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_2ports_queue_parallel_performance": [
@@ -1232,7 +1224,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_2ports_queue_order_performance": [
@@ -1248,7 +1240,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_4ports_atq_atomic_performance": [
@@ -1264,7 +1256,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_4ports_atq_parallel_performance": [
@@ -1280,7 +1272,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_4ports_atq_order_performance": [
@@ -1296,7 +1288,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_4ports_queue_atomic_performance": [
@@ -1312,7 +1304,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_4ports_queue_parallel_performance": [
@@ -1328,7 +1320,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_4ports_queue_order_performance": [
@@ -1344,7 +1336,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_pipeline_1ports_atomic_performance": [
@@ -1360,7 +1352,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_pipeline_1ports_parallel_performance": [
@@ -1376,7 +1368,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_pipeline_1ports_order_performance": [
@@ -1392,7 +1384,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_pipeline_2ports_atomic_performance": [
@@ -1408,7 +1400,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_pipeline_2ports_parallel_performance": [
@@ -1424,7 +1416,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_pipeline_2ports_order_performance": [
@@ -1440,7 +1432,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_pipeline_4ports_atomic_performance": [
@@ -1456,7 +1448,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_pipeline_4ports_parallel_performance": [
@@ -1472,7 +1464,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_eventdev_pipeline_4ports_order_performance": [
@@ -1488,7 +1480,7 @@
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "dcd_4tc_queue_map_i40e": [
@@ -1497,9 +1489,9 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -1514,9 +1506,9 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -1531,9 +1523,9 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -1548,9 +1540,9 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -1565,9 +1557,9 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -1582,9 +1574,9 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "sagepond",
-                "sageville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -1599,9 +1591,9 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "sagepond",
-                "sageville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -1616,9 +1608,9 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "sagepond",
-                "sageville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -1633,9 +1625,9 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "sagepond",
-                "sageville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T"
             ],
             "Target": [
                 "ALL"
@@ -1650,14 +1642,14 @@
                 "ALL"
             ],
             "NIC": [
-                "columbiaville_100g",
-                "columbiaville_25g"
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for columbiaville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "download_the_package_failed": [
@@ -1666,14 +1658,14 @@
                 "ALL"
             ],
             "NIC": [
-                "columbiaville_100g",
-                "columbiaville_25g"
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for columbiaville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_pvp_share_lib_of_fortville": [
@@ -1682,15 +1674,15 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for fortville_eagle/spirit/25g "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_pvp_share_lib_of_niantic": [
@@ -1699,13 +1691,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for niantic "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "packet_checking_scalar_mode": [
@@ -1716,15 +1708,15 @@
             "NIC": [
                 "cavium_a064",
                 "cavium_a063",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit"
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for cavium_a063 and cavium_a064 "
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "dcb_4tc_queue_map_i40e": [
@@ -1733,16 +1725,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on fortville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "dcb_8tc_queue_map_i40e": [
@@ -1751,16 +1743,16 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on fortville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "dcb_4tc_queue_map_ixgbe": [
@@ -1769,13 +1761,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for niantic"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "dcb_8tc_queue_map_ixgbe": [
@@ -1784,13 +1776,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic"
+                "IXGBE_10G-82599_SFP"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "This case currently support for niantic"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "perf_kernel_pf_dpdk_iavf_perf_host_only": [
@@ -1799,15 +1791,15 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
             ],
             "Bug ID": "",
-            "Comments": "this case only support on fortville"
+            "Comments": "the nic on the environment not support this case"
         }
     ],
     "ixgbe_vf_jumboframe": [
@@ -1816,8 +1808,8 @@
                 "ALL"
             ],
             "NIC": [
-                "sageville",
-		"twinpond"
+                "IXGBE_10G-X550T",
+		"IXGBE_10G-X540T"
             ],
             "Target": [
                 "ALL"
@@ -1832,14 +1824,14 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -1854,14 +1846,14 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -1876,14 +1868,14 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -1898,14 +1890,14 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -1920,14 +1912,14 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -1942,13 +1934,13 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -1963,13 +1955,13 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC"
             ],
             "Target": [
                 "ALL"
@@ -1984,13 +1976,13 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -2005,13 +1997,13 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -2026,13 +2018,13 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -2047,13 +2039,13 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -2068,13 +2060,13 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28"
             ],
             "Target": [
                 "ALL"
@@ -2089,15 +2081,14 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "ironpond",
-                "twinpond",
-                "twinville",
-                "sageville",
-                "sagepond",
-                "springville",
-                "powerville",
-		"foxville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IGB_1G-I210_COPPER",
+                "IGB_1G-I350_COPPER",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2112,14 +2103,13 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "ironpond",
-                "twinpond",
-                "twinville",
-                "sageville",
-                "sagepond",
-                "springville",
-                "powerville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IGB_1G-I210_COPPER",
+                "IGB_1G-I350_COPPER"
             ],
             "Target": [
                 "ALL"
@@ -2134,15 +2124,14 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "ironpond",
-                "twinpond",
-                "twinville",
-                "sageville",
-                "sagepond",
-                "springville",
-                "powerville",
-		"foxville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IGB_1G-I210_COPPER",
+                "IGB_1G-I350_COPPER",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2157,15 +2146,14 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "ironpond",
-                "twinpond",
-                "twinville",
-                "sageville",
-                "sagepond",
-                "springville",
-                "powerville",
-		"foxville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IGB_1G-I210_COPPER",
+                "IGB_1G-I350_COPPER",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2180,15 +2168,14 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "ironpond",
-                "twinpond",
-                "twinville",
-                "sageville",
-                "sagepond",
-                "springville",
-                "powerville",
-		"foxville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IGB_1G-I210_COPPER",
+                "IGB_1G-I350_COPPER",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2203,15 +2190,14 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "ironpond",
-                "twinpond",
-                "twinville",
-                "sageville",
-                "sagepond",
-                "springville",
-                "powerville",
-		"foxville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IGB_1G-I210_COPPER",
+                "IGB_1G-I350_COPPER",
+		"IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2226,15 +2212,14 @@
                 "ALL"
             ],
             "NIC": [
-                "niantic",
-                "ironpond",
-                "twinpond",
-                "twinville",
-                "sageville",
-                "sagepond",
-                "springville",
-                "powerville",
-                "foxville"
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IGB_1G-I210_COPPER",
+                "IGB_1G-I350_COPPER",
+                "IGC-I225_LM"
             ],
             "Target": [
                 "ALL"
@@ -2249,11 +2234,11 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "columbiaville_100g",
-                "columbiaville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP"
             ],
             "Target": [
                 "ALL"
@@ -2268,11 +2253,11 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "columbiaville_100g",
-                "columbiaville_25g"
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP"
             ],
             "Target": [
                 "ALL"
diff --git a/conf/testpmd_perf.cfg b/conf/testpmd_perf.cfg
index a39d3604..dc558435 100644
--- a/conf/testpmd_perf.cfg
+++ b/conf/testpmd_perf.cfg
@@ -59,7 +59,7 @@
 #     a dictionary defining expected rfc2544 values based on NIC, and the pattern is
 #
 #     {
-#      'columbiaville_100g':
+#      'ICE_100G-E810C_QSFP':
 #          {
 #              'values of Cores/Thread-Queues #1':
 #                  {
@@ -105,7 +105,7 @@ test_parameters = {
 
 expected_rfc2544 = {
     'test_perf_rfc2544_ipv4_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
@@ -147,7 +147,7 @@ expected_rfc2544 = {
                 '1280': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '1518': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } } },},},
     'test_perf_rfc2544_ipv6_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
diff --git a/conf/vf_l3fwd.cfg b/conf/vf_l3fwd.cfg
index 7c6ab803..69b716b8 100644
--- a/conf/vf_l3fwd.cfg
+++ b/conf/vf_l3fwd.cfg
@@ -1,2 +1,2 @@
 [suite]
-perf_params = {"frame_size": [64, 128, 256, 512, 1024, 1518], "queue_number": {"fortville_spirit" : 2, "fortville_25g" : 2, "fortville_eagle" : 1, "niantic" : 1, "columbiaville_25gx2" : 2, "columbiaville_25g" : 4, "columbiaville_100g" : 4}}
+perf_params = {"frame_size": [64, 128, 256, 512, 1024, 1518], "queue_number": {"I40E_40G-QSFP_A" : 2, "I40E_25G-25G_SFP28" : 2, "I40E_10G-SFP_XL710" : 1, "IXGBE_10G-82599_SFP" : 1, "ICE_25G-E810_XXV_SFP" : 2, "ICE_25G-E810C_SFP" : 4, "ICE_100G-E810C_QSFP" : 4}}
diff --git a/conf/vf_l3fwd_em_kernelpf.cfg b/conf/vf_l3fwd_em_kernelpf.cfg
index da9422b4..95e228cd 100644
--- a/conf/vf_l3fwd_em_kernelpf.cfg
+++ b/conf/vf_l3fwd_em_kernelpf.cfg
@@ -17,7 +17,7 @@ test_parameters = {
 
 expected_throughput = {
     'test_perf_vf_throughput_ipv4_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
@@ -59,7 +59,7 @@ expected_throughput = {
                  '1280': '0.00',
                  '1518': '0.00', },},},
     'test_perf_vf_throughput_ipv6_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
diff --git a/conf/vf_l3fwd_kernelpf.cfg b/conf/vf_l3fwd_kernelpf.cfg
index c86e4709..5b831f0a 100644
--- a/conf/vf_l3fwd_kernelpf.cfg
+++ b/conf/vf_l3fwd_kernelpf.cfg
@@ -20,7 +20,7 @@
 #  - expected_throughput is a dictionary defining expected throughput
 # numbers based on NIC, and the pattern is
 #   {
-#       'columbiaville_100g':
+#       'ICE_100G-E810C_QSFP':
 #           {
 #               'Numbers of Cores/Sockets/Queues #1':
 #                   {
@@ -65,7 +65,7 @@ test_parameters = {
 
 expected_throughput = {
     'test_perf_vf_throughput_ipv4_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
@@ -107,7 +107,7 @@ expected_throughput = {
                  '1280': '0.00',
                  '1518': '0.00', },},},
     'test_perf_vf_throughput_ipv4_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
@@ -149,7 +149,7 @@ expected_throughput = {
                  '1280': '0.00',
                  '1518': '0.00', },},},
     'test_perf_vf_throughput_ipv6_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
@@ -191,7 +191,7 @@ expected_throughput = {
                  '1280': '0.00',
                  '1518': '0.00', },},},
     'test_perf_vf_throughput_ipv6_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
@@ -235,7 +235,7 @@ expected_throughput = {
 
 expected_rfc2544 = {
     'test_perf_vf_rfc2544_ipv4_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
@@ -277,7 +277,7 @@ expected_rfc2544 = {
                 '1280': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '1518': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } } },},},
     'test_perf_vf_rfc2544_ipv4_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
@@ -319,7 +319,7 @@ expected_rfc2544 = {
                 '1280': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '1518': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } } },},},
     'test_perf_vf_rfc2544_ipv6_em': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
@@ -361,7 +361,7 @@ expected_rfc2544 = {
                 '1280': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '1518': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } } },},},
     'test_perf_vf_rfc2544_ipv6_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
diff --git a/conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg b/conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg
index 8390dd7a..6dcd07a2 100644
--- a/conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg
+++ b/conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg
@@ -17,7 +17,7 @@ test_parameters = {
 
 expected_throughput = {
     'test_perf_vf_throughput_ipv4_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
diff --git a/conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg b/conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg
index f39feb9e..6d70acf3 100644
--- a/conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg
+++ b/conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg
@@ -17,7 +17,7 @@ test_parameters = {
 
 expected_rfc2544 = {
     'test_perf_vf_rfc2544_ipv4_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                 '64': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
                 '128': { 'rate' :'100.00', 'traffic_opt': {'min_rate': '10.0', 'max_rate': '100.0', 'pdr': '0.01', 'accuracy': '5', } },
diff --git a/conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg b/conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg
index 1039c86f..47c4a36f 100644
--- a/conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg
+++ b/conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg
@@ -17,7 +17,7 @@ test_parameters = {
 
 expected_throughput = {
     'test_perf_vf_throughput_ipv6_lpm': {
-        'niantic': {
+        'IXGBE_10G-82599_SFP': {
             '1C/1T-1Q': {
                  '64': '0.00',
                  '128': '0.00',
diff --git a/conf/vf_single_core_perf.cfg b/conf/vf_single_core_perf.cfg
index 041faa87..b0546f48 100644
--- a/conf/vf_single_core_perf.cfg
+++ b/conf/vf_single_core_perf.cfg
@@ -35,22 +35,22 @@ test_parameters = {'1C/1T': {64: [512, 2048]},
 test_duration = 60
 accepted_tolerance = 1
 expected_throughput = {
-    'fortville_spirit': {
+    'I40E_40G-QSFP_A': {
         '1C/1T': {64: {512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {512: 0.00, 2048: 0.00}}},
-    'fortville_eagle': {
+    'I40E_10G-SFP_XL710': {
         '1C/1T':{64: {512: 0.00, 2048: 0.00}},
         '1C/2T':{64: {512: 0.00, 2048: 0.00}}},
-    'niantic': {
+    'IXGBE_10G-82599_SFP': {
         '1C/1T': {64: {128: 0.00, 512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {128: 0.00, 512: 0.00, 2048: 0.00}}},
-    'fortville_25g': {
+    'I40E_25G-25G_SFP28': {
         '1C/1T': {64: {512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {512: 0.00, 2048: 0.00}}},
-    'columbiaville_100g': {
+    'ICE_100G-E810C_QSFP': {
         '1C/1T': {64: {512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {512: 0.00, 2048: 0.00}}},
-    'columbiaville_25g': {
+    'ICE_25G-E810C_SFP': {
         '1C/1T': {64: {512: 0.00, 2048: 0.00}},
         '1C/2T': {64: {512: 0.00, 2048: 0.00}}},
     'ConnectX4_LX_MT4117': {'40G': {
diff --git a/conf/vhost_peer_conf.cfg b/conf/vhost_peer_conf.cfg
index 63346e99..020d3756 100644
--- a/conf/vhost_peer_conf.cfg
+++ b/conf/vhost_peer_conf.cfg
@@ -1,4 +1,4 @@
-# Connect two fortville 40G nic port directly on DUT
+# Connect two Intel® Ethernet Converged Network Adapter XL710-QDA2 nic port directly on DUT
 [peerconf]
 # pci of Port0
 pci=
