test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [0/6] modify about codename replacement
@ 2022-05-10  9:54 Jun Dong
  2022-05-10  9:54 ` [dts] [1/6] conf/*: replace codename in configuration in conf directory Jun Dong
                   ` (5 more replies)
  0 siblings, 6 replies; 8+ messages in thread
From: Jun Dong @ 2022-05-10  9:54 UTC (permalink / raw)
  To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong

Codenames are not approved legal names, they are for ``Intel use only``. 
Howerver DTS widely use Codemanes, so replacement is necessary.

Jun Dong (6):
  conf/*: replace codename in configuration in conf directory
  doc/*: replace codename in doc
  executions/*: replace codename in executeion configurations
  framework/*: replace codename in framework
  test_plans/*: replace codename in test plans
  tests/*: replace codename in test suites

 conf/iavf_driver_package.cfg                  |    2 +-
 ....cfg => ice_advanced_iavf_rss_package.cfg} |    2 +-
 ...s_pppoe.cfg => ice_advanced_rss_pppoe.cfg} |    2 +-
 ...h_filter.cfg => ice_dcf_switch_filter.cfg} |    2 +-
 conf/{iavf_fdir.cfg => ice_iavf_fdir.cfg}     |    2 +-
 ...witch_filter.cfg => ice_switch_filter.cfg} |    2 +-
 conf/l3fwd.cfg                                |   18 +-
 conf/l3fwd_em.cfg                             |    6 +-
 conf/l3fwd_lpm_ipv4.cfg                       |    4 +-
 conf/l3fwd_lpm_ipv4_rfc2544.cfg               |    4 +-
 conf/l3fwd_lpm_ipv6.cfg                       |    4 +-
 conf/nic_single_core_perf.cfg                 |   12 +-
 conf/test_case_checklist.json                 | 1117 ++++++++-------
 conf/test_case_supportlist.json               | 1213 ++++++++---------
 conf/testpmd_perf.cfg                         |    6 +-
 conf/vf_l3fwd.cfg                             |    2 +-
 conf/vf_l3fwd_em_kernelpf.cfg                 |    4 +-
 conf/vf_l3fwd_kernelpf.cfg                    |   18 +-
 conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg           |    2 +-
 conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg   |    2 +-
 conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg           |    2 +-
 conf/vf_single_core_perf.cfg                  |   12 +-
 conf/vhost_peer_conf.cfg                      |    2 +-
 doc/dts_gsg/quick_start.rst                   |    4 +-
 doc/dts_gsg/usr_guide/intro.rst               |    2 +-
 doc/dts_gsg/usr_guide/ixia.rst                |    6 +-
 doc/dts_gsg/usr_guide/results.rst             |    4 +-
 doc/dts_gsg/usr_guide/trex.rst                |    8 +-
 doc/dts_gsg/usr_guide/usage.rst               |    2 +-
 executions/execution.cfg                      |    2 +-
 executions/execution_FVL.cfg                  |    2 +-
 executions/execution_fm10k.cfg                |    2 +-
 executions/execution_smoke.cfg                |    2 +-
 framework/crbs.py                             |    2 +-
 framework/excel_reporter.py                   |    6 +-
 framework/pmd_output.py                       |    2 +-
 framework/settings.py                         |  196 +--
 framework/test_case.py                        |   26 +-
 nics/net_device.py                            |    2 +-
 test_plans/NICStatistics_test_plan.rst        |    4 +-
 test_plans/bbdev_test_plan.rst                |   19 +-
 test_plans/blocklist_test_plan.rst            |    7 -
 .../cloud_filter_with_l4_port_test_plan.rst   |    2 +-
 test_plans/dcf_lifecycle_test_plan.rst        |    6 +-
 test_plans/ddp_gtp_qregion_test_plan.rst      |   10 +-
 test_plans/ddp_gtp_test_plan.rst              |   19 +-
 test_plans/ddp_l2tpv3_test_plan.rst           |    5 +-
 test_plans/ddp_mpls_test_plan.rst             |   19 +-
 test_plans/ddp_ppp_l2tp_test_plan.rst         |    9 +-
 test_plans/dual_vlan_test_plan.rst            |    2 +-
 test_plans/dynamic_flowtype_test_plan.rst     |   10 +-
 test_plans/eeprom_dump_test_plan.rst          |    4 +-
 ...ckage_download_in_ice_driver_test_plan.rst |    6 +-
 test_plans/floating_veb_test_plan.rst         |   21 +-
 test_plans/generic_flow_api_test_plan.rst     |   48 +-
 ..._plan.rst => i40e_rss_input_test_plan.rst} |    6 +-
 .../iavf_flexible_descriptor_test_plan.rst    |    9 +-
 ..._package_driver_error_handle_test_plan.rst |   14 +-
 test_plans/iavf_test_plan.rst                 |    4 +-
 ...plan.rst => ice_1pps_signal_test_plan.rst} |   14 +-
 ...e_advanced_iavf_rss_gtpogre_test_plan.rst} |    6 +-
 ... ice_advanced_iavf_rss_gtpu_test_plan.rst} |    9 +-
 ...anced_iavf_rss_pppol2tpoudp_test_plan.rst} |    7 +-
 ...st => ice_advanced_iavf_rss_test_plan.rst} |   21 +-
 ...f_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst} |    4 +-
 ...=> ice_advanced_rss_gtpogre_test_plan.rst} |    9 +-
 ...st => ice_advanced_rss_gtpu_test_plan.rst} |    9 +-
 ...t => ice_advanced_rss_pppoe_test_plan.rst} |    4 +-
 ...lan.rst => ice_advanced_rss_test_plan.rst} |   13 +-
 ...d_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst} |    4 +-
 ...n.rst => ice_dcf_acl_filter_test_plan.rst} |    4 +-
 ...an.rst => ice_dcf_date_path_test_plan.rst} |    0
 ...st => ice_dcf_flow_priority_test_plan.rst} |    4 +-
 ...est_plan.rst => ice_dcf_qos_test_plan.rst} |    5 +-
 ... ice_dcf_switch_filter_gtpu_test_plan.rst} |    6 +-
 ...ice_dcf_switch_filter_pppoe_test_plan.rst} |    6 +-
 ...st => ice_dcf_switch_filter_test_plan.rst} |   10 +-
 ..._test_plan.rst => ice_ecpri_test_plan.rst} |   10 +-
 ...r_test_plan.rst => ice_fdir_test_plan.rst} |    4 +-
 ...an.rst => ice_flow_priority_test_plan.rst} |   17 +-
 ...st => ice_iavf_fdir_gtpogre_test_plan.rst} |    6 +-
 ... ice_iavf_fdir_pppol2tpoudp_test_plan.rst} |    4 +-
 ...t_plan.rst => ice_iavf_fdir_test_plan.rst} |    4 +-
 ...e_iavf_ip_fragment_rte_flow_test_plan.rst} |    4 +-
 ...t => ice_iavf_rss_configure_test_plan.rst} |    2 +-
 ...=> ice_ip_fragment_rte_flow_test_plan.rst} |    4 +-
 ...rst => ice_limit_value_test_test_plan.rst} |   18 +-
 ...q_test_plan.rst => ice_qinq_test_plan.rst} |   14 +-
 ...an.rst => ice_rss_configure_test_plan.rst} |    6 +-
 ... => ice_switch_filter_pppoe_test_plan.rst} |    6 +-
 ...an.rst => ice_switch_filter_test_plan.rst} |   10 +-
 ...f_support_multicast_address_test_plan.rst} |    4 +-
 test_plans/index.rst                          |   68 +-
 test_plans/inline_ipsec_test_plan.rst         |    2 +-
 test_plans/ipfrag_test_plan.rst               |    2 +-
 test_plans/ipgre_test_plan.rst                |   12 +-
 test_plans/ipv4_reassembly_test_plan.rst      |    2 +-
 ..._get_extra_queue_information_test_plan.rst |    2 +-
 test_plans/l2tp_esp_coverage_test_plan.rst    |    8 +-
 test_plans/l3fwd_test_plan.rst                |    2 +-
 test_plans/large_vf_test_plan.rst             |    4 +-
 test_plans/macsec_for_ixgbe_test_plan.rst     |   12 +-
 ...ious_driver_event_indication_test_plan.rst |    6 +-
 test_plans/metrics_test_plan.rst              |    2 +-
 test_plans/multicast_test_plan.rst            |    2 +-
 test_plans/nic_single_core_perf_test_plan.rst |   42 +-
 test_plans/nvgre_test_plan.rst                |   19 +-
 test_plans/pf_smoke_test_plan.rst             |    2 +-
 test_plans/pmd_bonded_test_plan.rst           |    4 +-
 test_plans/pmd_test_plan.rst                  |    6 +-
 test_plans/pmdpcap_test_plan.rst              |    4 +-
 test_plans/pmdrss_hash_test_plan.rst          |   25 +-
 test_plans/pmdrssreta_test_plan.rst           |    6 +-
 test_plans/port_control_test_plan.rst         |    6 +-
 test_plans/ptpclient_test_plan.rst            |    6 +-
 test_plans/ptype_mapping_test_plan.rst        |    6 +-
 test_plans/pvp_share_lib_test_plan.rst        |   12 +-
 test_plans/qinq_filter_test_plan.rst          |   28 +-
 test_plans/queue_region_test_plan.rst         |   29 +-
 test_plans/queue_start_stop_test_plan.rst     |    2 +-
 test_plans/rss_to_rte_flow_test_plan.rst      |    4 +-
 test_plans/rteflow_priority_test_plan.rst     |    3 +-
 ...ntime_vf_queue_number_kernel_test_plan.rst |    2 +-
 ...time_vf_queue_number_maxinum_test_plan.rst |   12 +-
 .../runtime_vf_queue_number_test_plan.rst     |    2 +-
 test_plans/rxtx_offload_test_plan.rst         |   10 +-
 test_plans/stats_checks_test_plan.rst         |    4 +-
 test_plans/tso_test_plan.rst                  |    2 +-
 test_plans/tx_preparation_test_plan.rst       |    4 +-
 test_plans/uni_pkt_test_plan.rst              |   66 +-
 test_plans/userspace_ethtool_test_plan.rst    |   10 +-
 test_plans/veb_switch_test_plan.rst           |   21 +-
 test_plans/vf_daemon_test_plan.rst            |    2 +-
 test_plans/vf_kernel_test_plan.rst            |    6 +-
 test_plans/vf_pf_reset_test_plan.rst          |    2 +-
 test_plans/vf_rss_test_plan.rst               |    8 +-
 test_plans/vf_single_core_perf_test_plan.rst  |   20 +-
 test_plans/vf_smoke_test_plan.rst             |    2 +-
 .../vlan_ethertype_config_test_plan.rst       |    2 +-
 test_plans/vm_power_manager_test_plan.rst     |    2 +-
 test_plans/vmdq_dcb_test_plan.rst             |    6 +-
 test_plans/vmdq_test_plan.rst                 |   14 +-
 ...paths_performance_with_cbdma_test_plan.rst |    2 +-
 test_plans/vxlan_test_plan.rst                |   18 +-
 tests/TestSuite_af_xdp_2.py                   |    2 +-
 tests/TestSuite_checksum_offload.py           |    8 +-
 tests/TestSuite_cloud_filter_with_l4_port.py  |   14 +-
 tests/TestSuite_ddp_gtp.py                    |    8 +-
 tests/TestSuite_ddp_gtp_qregion.py            |    6 +-
 tests/TestSuite_ddp_l2tpv3.py                 |    4 +-
 tests/TestSuite_ddp_mpls.py                   |   10 +-
 tests/TestSuite_ddp_ppp_l2tp.py               |    6 +-
 tests/TestSuite_dual_vlan.py                  |  126 +-
 tests/TestSuite_dynamic_flowtype.py           |    8 +-
 tests/TestSuite_dynamic_queue.py              |    4 +-
 tests/TestSuite_eeprom_dump.py                |    6 +-
 ...e_enable_package_download_in_ice_driver.py |    7 +-
 tests/TestSuite_flexible_rxd.py               |    8 +-
 tests/TestSuite_floating_veb.py               |    8 +-
 tests/TestSuite_generic_flow_api.py           |  607 +++++----
 tests/TestSuite_hotplug.py                    |    4 +-
 ...s_input.py => TestSuite_i40e_rss_input.py} |   24 +-
 tests/TestSuite_iavf_flexible_descriptor.py   |   12 +-
 ...tSuite_iavf_package_driver_error_handle.py |    2 +-
 ...signal.py => TestSuite_ice_1pps_signal.py} |    4 +-
 ....py => TestSuite_ice_advanced_iavf_rss.py} |    0
 ...estSuite_ice_advanced_iavf_rss_gtpogre.py} |    2 +-
 ...> TestSuite_ice_advanced_iavf_rss_gtpu.py} |    4 +-
 ...ite_ice_advanced_iavf_rss_pppol2tpoudp.py} |    2 +-
 ...dvanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py} |    2 +-
 ...d_rss.py => TestSuite_ice_advanced_rss.py} |    0
 ... => TestSuite_ice_advanced_rss_gtpogre.py} |    2 +-
 ....py => TestSuite_ice_advanced_rss_gtpu.py} |    4 +-
 ...py => TestSuite_ice_advanced_rss_pppoe.py} |    0
 ...ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py} |    0
 ...ter.py => TestSuite_ice_dcf_acl_filter.py} |   13 +-
 ...path.py => TestSuite_ice_dcf_date_path.py} |    0
 ....py => TestSuite_ice_dcf_flow_priority.py} |    4 +-
 ...vl_dcf_qos.py => TestSuite_ice_dcf_qos.py} |   10 +-
 ....py => TestSuite_ice_dcf_switch_filter.py} |    4 +-
 ...> TestSuite_ice_dcf_switch_filter_gtpu.py} |    4 +-
 ... TestSuite_ice_dcf_switch_filter_pppoe.py} |    4 +-
 ...te_cvl_ecpri.py => TestSuite_ice_ecpri.py} |    2 +-
 ...uite_cvl_fdir.py => TestSuite_ice_fdir.py} |    4 +-
 ...rity.py => TestSuite_ice_flow_priority.py} |    4 +-
 ...avf_fdir.py => TestSuite_ice_iavf_fdir.py} |   34 +-
 ....py => TestSuite_ice_iavf_fdir_gtpogre.py} |    2 +-
 ...> TestSuite_ice_iavf_fdir_pppol2tpoudp.py} |    4 +-
 ...estSuite_ice_iavf_ip_fragment_rte_flow.py} |    2 +-
 ...py => TestSuite_ice_iavf_rss_configure.py} |    0
 ... => TestSuite_ice_ip_fragment_rte_flow.py} |    2 +-
 ...t.py => TestSuite_ice_limit_value_test.py} |   57 +-
 ...uite_cvl_qinq.py => TestSuite_ice_qinq.py} |    4 +-
 ...gure.py => TestSuite_ice_rss_configure.py} |    2 +-
 ...lter.py => TestSuite_ice_switch_filter.py} |    6 +-
 ...y => TestSuite_ice_switch_filter_pppoe.py} |    6 +-
 ...Suite_ice_vf_support_multicast_address.py} |    2 +-
 tests/TestSuite_inline_ipsec.py               |    3 +-
 tests/TestSuite_ipgre.py                      |   21 +-
 ...te_ixgbe_vf_get_extra_queue_information.py |    6 +-
 tests/TestSuite_jumboframes.py                |    7 +-
 tests/TestSuite_kernelpf_iavf.py              |    6 +-
 tests/TestSuite_l2fwd_jobstats.py             |   12 +-
 tests/TestSuite_l2tp_esp_coverage.py          |    6 +-
 tests/TestSuite_large_vf.py                   |    2 +-
 tests/TestSuite_link_flowctrl.py              |   12 +-
 tests/TestSuite_link_status_interrupt.py      |   14 +-
 tests/TestSuite_mac_filter.py                 |    2 +-
 tests/TestSuite_macsec_for_ixgbe.py           |    4 +-
 tests/TestSuite_metering_and_policing.py      |    2 +-
 tests/TestSuite_mtu_update.py                 |    5 +-
 tests/TestSuite_nic_single_core_perf.py       |   34 +-
 tests/TestSuite_nvgre.py                      |   30 +-
 tests/TestSuite_pmdrss_hash.py                |   23 +-
 tests/TestSuite_pmdrssreta.py                 |   34 +-
 tests/TestSuite_port_control.py               |    4 +-
 tests/TestSuite_port_representor.py           |   14 +-
 tests/TestSuite_ptype_mapping.py              |   14 +-
 tests/TestSuite_pvp_share_lib.py              |    8 +-
 tests/TestSuite_pvp_vhost_user_reconnect.py   |    8 +-
 tests/TestSuite_qinq_filter.py                |   16 +-
 tests/TestSuite_queue_region.py               |   24 +-
 tests/TestSuite_rss_key_update.py             |   68 +-
 tests/TestSuite_rss_to_rte_flow.py            |  307 +++--
 ...estSuite_runtime_vf_queue_number_kernel.py |   20 +-
 ...stSuite_runtime_vf_queue_number_maxinum.py |   38 +-
 tests/TestSuite_rxtx_offload.py               |  113 +-
 tests/TestSuite_scatter.py                    |   34 +-
 tests/TestSuite_shutdown_api.py               |   52 +-
 tests/TestSuite_softnic.py                    |    6 +-
 tests/TestSuite_sriov_kvm.py                  |   24 +-
 tests/TestSuite_testpmd_perf.py               |   10 +-
 tests/TestSuite_tso.py                        |   16 +-
 tests/TestSuite_uni_pkt.py                    |  229 ++--
 tests/TestSuite_userspace_ethtool.py          |   33 +-
 tests/TestSuite_veb_switch.py                 |   14 +-
 tests/TestSuite_vf_interrupt_pmd.py           |   28 +-
 tests/TestSuite_vf_kernel.py                  |   15 +-
 tests/TestSuite_vf_l3fwd.py                   |   13 +-
 tests/TestSuite_vf_macfilter.py               |   13 +-
 tests/TestSuite_vf_packet_rxtx.py             |   14 +-
 tests/TestSuite_vf_rss.py                     |   40 +-
 tests/TestSuite_vf_single_core_perf.py        |   12 +-
 tests/TestSuite_vf_vlan.py                    |    8 +-
 tests/TestSuite_vlan_ethertype_config.py      |   10 +-
 tests/TestSuite_vmdq.py                       |    8 +-
 tests/TestSuite_vxlan.py                      |   30 +-
 tests/TestSuite_vxlan_gpe_support_in_i40e.py  |   12 +-
 tests/flexible_common.py                      |    2 +-
 tests/perf_test_base.py                       |   25 +-
 tests/rte_flow_common.py                      |   35 +-
 251 files changed, 3226 insertions(+), 3103 deletions(-)
 rename conf/{cvl_advanced_iavf_rss_package.cfg => ice_advanced_iavf_rss_package.cfg} (78%)
 rename conf/{cvl_advanced_rss_pppoe.cfg => ice_advanced_rss_pppoe.cfg} (82%)
 rename conf/{cvl_dcf_switch_filter.cfg => ice_dcf_switch_filter.cfg} (89%)
 rename conf/{iavf_fdir.cfg => ice_iavf_fdir.cfg} (88%)
 rename conf/{cvl_switch_filter.cfg => ice_switch_filter.cfg} (87%)
 rename test_plans/{fortville_rss_input_test_plan.rst => i40e_rss_input_test_plan.rst} (99%)
 rename test_plans/{cvl_1pps_signal_test_plan.rst => ice_1pps_signal_test_plan.rst} (90%)
 rename test_plans/{cvl_advanced_iavf_rss_gtpogre_test_plan.rst => ice_advanced_iavf_rss_gtpogre_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_iavf_rss_gtpu_test_plan.rst => ice_advanced_iavf_rss_gtpu_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_iavf_rss_pppol2tpoudp_test_plan.rst => ice_advanced_iavf_rss_pppol2tpoudp_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_iavf_rss_test_plan.rst => ice_advanced_iavf_rss_test_plan.rst} (99%)
 mode change 100755 => 100644
 rename test_plans/{cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst => ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_rss_gtpogre_test_plan.rst => ice_advanced_rss_gtpogre_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_rss_gtpu_test_plan.rst => ice_advanced_rss_gtpu_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_rss_pppoe_test_plan.rst => ice_advanced_rss_pppoe_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_rss_test_plan.rst => ice_advanced_rss_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst => ice_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst} (99%)
 rename test_plans/{cvl_dcf_acl_filter_test_plan.rst => ice_dcf_acl_filter_test_plan.rst} (99%)
 rename test_plans/{cvl_dcf_date_path_test_plan.rst => ice_dcf_date_path_test_plan.rst} (100%)
 mode change 100755 => 100644
 rename test_plans/{cvl_dcf_flow_priority_test_plan.rst => ice_dcf_flow_priority_test_plan.rst} (99%)
 mode change 100755 => 100644
 rename test_plans/{cvl_dcf_qos_test_plan.rst => ice_dcf_qos_test_plan.rst} (99%)
 rename test_plans/{cvl_dcf_switch_filter_gtpu_test_plan.rst => ice_dcf_switch_filter_gtpu_test_plan.rst} (99%)
 rename test_plans/{cvl_dcf_switch_filter_pppoe_test_plan.rst => ice_dcf_switch_filter_pppoe_test_plan.rst} (99%)
 rename test_plans/{cvl_dcf_switch_filter_test_plan.rst => ice_dcf_switch_filter_test_plan.rst} (99%)
 rename test_plans/{cvl_ecpri_test_plan.rst => ice_ecpri_test_plan.rst} (99%)
 rename test_plans/{cvl_fdir_test_plan.rst => ice_fdir_test_plan.rst} (99%)
 rename test_plans/{cvl_flow_priority_test_plan.rst => ice_flow_priority_test_plan.rst} (98%)
 rename test_plans/{iavf_fdir_gtpogre_test_plan.rst => ice_iavf_fdir_gtpogre_test_plan.rst} (99%)
 rename test_plans/{cvl_iavf_fdir_pppol2tpoudp_test_plan.rst => ice_iavf_fdir_pppol2tpoudp_test_plan.rst} (99%)
 rename test_plans/{iavf_fdir_test_plan.rst => ice_iavf_fdir_test_plan.rst} (99%)
 rename test_plans/{cvl_iavf_ip_fragment_rte_flow_test_plan.rst => ice_iavf_ip_fragment_rte_flow_test_plan.rst} (99%)
 rename test_plans/{cvl_iavf_rss_configure_test_plan.rst => ice_iavf_rss_configure_test_plan.rst} (99%)
 mode change 100755 => 100644
 rename test_plans/{cvl_ip_fragment_rte_flow_test_plan.rst => ice_ip_fragment_rte_flow_test_plan.rst} (99%)
 rename test_plans/{cvl_limit_value_test_test_plan.rst => ice_limit_value_test_test_plan.rst} (97%)
 rename test_plans/{cvl_qinq_test_plan.rst => ice_qinq_test_plan.rst} (99%)
 rename test_plans/{cvl_rss_configure_test_plan.rst => ice_rss_configure_test_plan.rst} (99%)
 rename test_plans/{cvl_switch_filter_pppoe_test_plan.rst => ice_switch_filter_pppoe_test_plan.rst} (99%)
 rename test_plans/{cvl_switch_filter_test_plan.rst => ice_switch_filter_test_plan.rst} (99%)
 rename test_plans/{cvl_vf_support_multicast_address_test_plan.rst => ice_vf_support_multicast_address_test_plan.rst} (99%)
 rename tests/{TestSuite_fortville_rss_input.py => TestSuite_i40e_rss_input.py} (99%)
 rename tests/{TestSuite_cvl_1pps_signal.py => TestSuite_ice_1pps_signal.py} (98%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_advanced_iavf_rss.py => TestSuite_ice_advanced_iavf_rss.py} (100%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_advanced_iavf_rss_gtpogre.py => TestSuite_ice_advanced_iavf_rss_gtpogre.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_advanced_iavf_rss_gtpu.py => TestSuite_ice_advanced_iavf_rss_gtpu.py} (99%)
 rename tests/{TestSuite_cvl_advanced_iavf_rss_pppol2tpoudp.py => TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py} (99%)
 rename tests/{TestSuite_cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py => TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py} (99%)
 rename tests/{TestSuite_cvl_advanced_rss.py => TestSuite_ice_advanced_rss.py} (100%)
 rename tests/{TestSuite_cvl_advanced_rss_gtpogre.py => TestSuite_ice_advanced_rss_gtpogre.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_advanced_rss_gtpu.py => TestSuite_ice_advanced_rss_gtpu.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_advanced_rss_pppoe.py => TestSuite_ice_advanced_rss_pppoe.py} (100%)
 rename tests/{TestSuite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py => TestSuite_ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py} (100%)
 rename tests/{TestSuite_cvl_dcf_acl_filter.py => TestSuite_ice_dcf_acl_filter.py} (99%)
 rename tests/{TestSuite_cvl_dcf_date_path.py => TestSuite_ice_dcf_date_path.py} (100%)
 rename tests/{TestSuite_cvl_dcf_flow_priority.py => TestSuite_ice_dcf_flow_priority.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_dcf_qos.py => TestSuite_ice_dcf_qos.py} (99%)
 rename tests/{TestSuite_cvl_dcf_switch_filter.py => TestSuite_ice_dcf_switch_filter.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_dcf_switch_filter_gtpu.py => TestSuite_ice_dcf_switch_filter_gtpu.py} (99%)
 rename tests/{TestSuite_cvl_dcf_switch_filter_pppoe.py => TestSuite_ice_dcf_switch_filter_pppoe.py} (99%)
 rename tests/{TestSuite_cvl_ecpri.py => TestSuite_ice_ecpri.py} (99%)
 rename tests/{TestSuite_cvl_fdir.py => TestSuite_ice_fdir.py} (99%)
 rename tests/{TestSuite_cvl_flow_priority.py => TestSuite_ice_flow_priority.py} (99%)
 rename tests/{TestSuite_iavf_fdir.py => TestSuite_ice_iavf_fdir.py} (99%)
 rename tests/{TestSuite_iavf_fdir_gtpogre.py => TestSuite_ice_iavf_fdir_gtpogre.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_iavf_fdir_pppol2tpoudp.py => TestSuite_ice_iavf_fdir_pppol2tpoudp.py} (99%)
 rename tests/{TestSuite_cvl_iavf_ip_fragment_rte_flow.py => TestSuite_ice_iavf_ip_fragment_rte_flow.py} (99%)
 rename tests/{TestSuite_cvl_iavf_rss_configure.py => TestSuite_ice_iavf_rss_configure.py} (100%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_ip_fragment_rte_flow.py => TestSuite_ice_ip_fragment_rte_flow.py} (99%)
 rename tests/{TestSuite_cvl_limit_value_test.py => TestSuite_ice_limit_value_test.py} (96%)
 rename tests/{TestSuite_cvl_qinq.py => TestSuite_ice_qinq.py} (99%)
 rename tests/{TestSuite_cvl_rss_configure.py => TestSuite_ice_rss_configure.py} (99%)
 rename tests/{TestSuite_cvl_switch_filter.py => TestSuite_ice_switch_filter.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_switch_filter_pppoe.py => TestSuite_ice_switch_filter_pppoe.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_vf_support_multicast_address.py => TestSuite_ice_vf_support_multicast_address.py} (99%)

-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [dts] [1/6] conf/*: replace codename in configuration in conf directory
  2022-05-10  9:54 [dts] [0/6] modify about codename replacement Jun Dong
@ 2022-05-10  9:54 ` Jun Dong
  2022-05-10  9:54 ` [dts] [2/6] doc/*: replace codename in doc Jun Dong
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Jun Dong @ 2022-05-10  9:54 UTC (permalink / raw)
  To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong

Signed-off-by: Jun Dong <junx.dong@intel.com>
---
 conf/iavf_driver_package.cfg                  |    2 +-
 ....cfg => ice_advanced_iavf_rss_package.cfg} |    2 +-
 ...s_pppoe.cfg => ice_advanced_rss_pppoe.cfg} |    2 +-
 ...h_filter.cfg => ice_dcf_switch_filter.cfg} |    2 +-
 conf/{iavf_fdir.cfg => ice_iavf_fdir.cfg}     |    2 +-
 ...witch_filter.cfg => ice_switch_filter.cfg} |    2 +-
 conf/l3fwd.cfg                                |   18 +-
 conf/l3fwd_em.cfg                             |    6 +-
 conf/l3fwd_lpm_ipv4.cfg                       |    4 +-
 conf/l3fwd_lpm_ipv4_rfc2544.cfg               |    4 +-
 conf/l3fwd_lpm_ipv6.cfg                       |    4 +-
 conf/nic_single_core_perf.cfg                 |   12 +-
 conf/test_case_checklist.json                 | 1117 ++++++++-------
 conf/test_case_supportlist.json               | 1213 ++++++++---------
 conf/testpmd_perf.cfg                         |    6 +-
 conf/vf_l3fwd.cfg                             |    2 +-
 conf/vf_l3fwd_em_kernelpf.cfg                 |    4 +-
 conf/vf_l3fwd_kernelpf.cfg                    |   18 +-
 conf/vf_l3fwd_lpm_ipv4_kernelpf.cfg           |    2 +-
 conf/vf_l3fwd_lpm_ipv4_rfc2544_kernelpf.cfg   |    2 +-
 conf/vf_l3fwd_lpm_ipv6_kernelpf.cfg           |    2 +-
 conf/vf_single_core_perf.cfg                  |   12 +-
 conf/vhost_peer_conf.cfg                      |    2 +-
 23 files changed, 1212 insertions(+), 1228 deletions(-)
 rename conf/{cvl_advanced_iavf_rss_package.cfg => ice_advanced_iavf_rss_package.cfg} (78%)
 rename conf/{cvl_advanced_rss_pppoe.cfg => ice_advanced_rss_pppoe.cfg} (82%)
 rename conf/{cvl_dcf_switch_filter.cfg => ice_dcf_switch_filter.cfg} (89%)
 rename conf/{iavf_fdir.cfg => ice_iavf_fdir.cfg} (88%)
 rename conf/{cvl_switch_filter.cfg => ice_switch_filter.cfg} (87%)

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=
-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [dts] [2/6] doc/*: replace codename in doc
  2022-05-10  9:54 [dts] [0/6] modify about codename replacement Jun Dong
  2022-05-10  9:54 ` [dts] [1/6] conf/*: replace codename in configuration in conf directory Jun Dong
@ 2022-05-10  9:54 ` Jun Dong
  2022-05-10  9:54 ` [dts] [3/6] executions/*: replace codename in executeion configurations Jun Dong
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Jun Dong @ 2022-05-10  9:54 UTC (permalink / raw)
  To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong

Signed-off-by: Jun Dong <junx.dong@intel.com>
---
 doc/dts_gsg/quick_start.rst       | 4 ++--
 doc/dts_gsg/usr_guide/intro.rst   | 2 +-
 doc/dts_gsg/usr_guide/ixia.rst    | 6 +++---
 doc/dts_gsg/usr_guide/results.rst | 4 ++--
 doc/dts_gsg/usr_guide/trex.rst    | 8 ++++----
 doc/dts_gsg/usr_guide/usage.rst   | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/doc/dts_gsg/quick_start.rst b/doc/dts_gsg/quick_start.rst
index cedb676d..4a30f360 100644
--- a/doc/dts_gsg/quick_start.rst
+++ b/doc/dts_gsg/quick_start.rst
@@ -246,7 +246,7 @@ As we have prepared the zipped dpdk file and configuration file, just type the f
              dut.192.168.1.1: CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static x86_64-native-linuxapp-gcc
              ...
              dut.192.168.1.1: usertools/dpdk-devbind.py --force --bind=vfio-pci 0000:af:00.0 0000:af:00.1
-                        dts: NIC :        fortville_25g
+                        dts: NIC :        I40E_25G-25G_SFP28
              dut.192.168.1.1: meson configure -Dexamples=helloworld x86_64-native-linuxapp-gcc
              dut.192.168.1.1: ninja -C x86_64-native-linuxapp-gcc
              dut.192.168.1.1: ls x86_64-native-linuxapp-gcc/examples/dpdk-helloworld
@@ -295,7 +295,7 @@ The result files are generated in dts/output.
                 "driver": "vfio-pci",
                 "firmware": "8.00 0x80008c1a 1.2766.0",
                 "kdriver": "i40e-2.13.10",
-                "name": "fortville_25g"
+                "name": "I40E_25G-25G_SFP28"
             },
             "x86_64-native-linuxapp-gcc": {
                 "hello_world/test_hello_world_all_core": "passed"
diff --git a/doc/dts_gsg/usr_guide/intro.rst b/doc/dts_gsg/usr_guide/intro.rst
index dc4c0bfa..ce0a7dfd 100644
--- a/doc/dts_gsg/usr_guide/intro.rst
+++ b/doc/dts_gsg/usr_guide/intro.rst
@@ -84,7 +84,7 @@ Please see test cases, which are included in the DPDK compliance test suites:
     +---------------------+----------------------------------------------------------------------------------------------------------------------------+
     | jumbo_frame         | Tests jumbo frames features by Poll Mode Drivers                                                                           |
     +---------------------+----------------------------------------------------------------------------------------------------------------------------+
-    | testpmd             | Provides benchmark tests for the Intel Ethernet Controller (Niantic) Poll Mode Driver.                                     |
+    | testpmd             | Provides benchmark tests for the Intel Ethernet Controller (82599) Poll Mode Driver.                                       |
     +---------------------+----------------------------------------------------------------------------------------------------------------------------+
     | L3fwd               | Verifies Layer-3 Forwarding results using ``l3fwd`` application.                                                           |
     +---------------------+----------------------------------------------------------------------------------------------------------------------------+
diff --git a/doc/dts_gsg/usr_guide/ixia.rst b/doc/dts_gsg/usr_guide/ixia.rst
index bd665652..5bea0039 100644
--- a/doc/dts_gsg/usr_guide/ixia.rst
+++ b/doc/dts_gsg/usr_guide/ixia.rst
@@ -100,7 +100,7 @@ You can set the test parameters according to your test needs.
    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}}}}
 
@@ -215,7 +215,7 @@ After the Test Suite finished the validation, we can find the result files as be
 
 .. code-block:: console
 
-   fortville_25g_single_core_perf.json  dts.log  TestNicSingleCorePerf.log test_results.json
+   I40E_25G-25G_SFP28_single_core_perf.json  dts.log  TestNicSingleCorePerf.log test_results.json
 
 The performance case will save the data results in the jison file.
 And the pattern is "nic name + suite name.json".
@@ -223,7 +223,7 @@ Below is the json file of nic_single_core:
 
 .. code-block:: console
 
-      vim fortville_25g_single_core_perf.json
+      vim I40E_25G-25G_SFP28_single_core_perf.json
 
       {"test_perf_nic_single_core": [{
                 "performance": [{"name": "Throughput", "value": 69.505, "unit": "Mpps", "delta": 69.505}],
diff --git a/doc/dts_gsg/usr_guide/results.rst b/doc/dts_gsg/usr_guide/results.rst
index 3ec08d86..244b579e 100644
--- a/doc/dts_gsg/usr_guide/results.rst
+++ b/doc/dts_gsg/usr_guide/results.rst
@@ -51,7 +51,7 @@ Both of them contain case names and results, also the failure reasons.
                 "driver": "vfio-pci",
                 "firmware": "8.00 0x80008c1a 1.2766.0",
                 "kdriver": "i40e-2.13.10",
-                "name": "fortville_25g"
+                "name": "I40E_25G-25G_SFP28"
             },
             "x86_64-native-linuxapp-gcc": {
                 "hello_world/test_hello_world_all_core": "passed"
@@ -76,7 +76,7 @@ Please see example for TestHelloWorld suite log as the following. This log file
 
    31/12/2020 11:04:00                 INFO:
    TEST SUITE : TestHelloWorld
-   31/12/2020 11:04:00                 INFO: NIC :       fortville_25g
+   31/12/2020 11:04:00                 INFO: NIC :       I40E_25G-25G_SFP28
    31/12/2020 11:04:00        SUITE_DUT_CMD: meson configure -Dexamples=helloworld x86_64-native-linuxapp-gcc
    31/12/2020 11:04:01        SUITE_DUT_CMD: ninja -C x86_64-native-linuxapp-gcc
    31/12/2020 11:04:07     SUITE_DUT_OUTPUT: ninja: Entering directory `x86_64-native-linuxapp-gcc'^M
diff --git a/doc/dts_gsg/usr_guide/trex.rst b/doc/dts_gsg/usr_guide/trex.rst
index 8dfa66bd..738ea5e4 100644
--- a/doc/dts_gsg/usr_guide/trex.rst
+++ b/doc/dts_gsg/usr_guide/trex.rst
@@ -310,11 +310,11 @@ failed for hugepage error.
          EAL: Error - exiting with code: 1
            Cause: Invalid EAL arguments
 
-trex quit when using Niantic
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+trex quit when using 82599
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-when bind dut NNT port to igb_uio, peer port will get a link down status, then
-trex server using NNT nic will quit.
+when bind dut 82599/500 Series port to igb_uio, peer port will get a link down status, then
+trex server using 82599/500 Series nic will quit.
 
 .. code-block:: console
 
diff --git a/doc/dts_gsg/usr_guide/usage.rst b/doc/dts_gsg/usr_guide/usage.rst
index ba714703..e59d1544 100644
--- a/doc/dts_gsg/usr_guide/usage.rst
+++ b/doc/dts_gsg/usr_guide/usage.rst
@@ -32,7 +32,7 @@ First of all, you must configure execution.cfg as below:
 
   * nic_type: it is the type of the NIC to use. The types are defined in the file settings.py.
     There's a special type named as **cfg**, which mean network information will be loaded from file $DTS_CFG_FOLDER/ports.cfg.
-    If use NIC type such as niantic, fortville_25g, it requires all DUT are the same types and no any same devices connected to Tester,
+    If use NIC type such as 82599, Intel® Ethernet Network Adapter XXV710-DA2 , it requires all DUT are the same types and no any same devices connected to Tester,
     as DTS will test all devices connected to Tester. Therefore, recommend using **cfg**.
   * func=true: run only functional test.
   * perf=true: run only performance test.
-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [dts] [3/6] executions/*: replace codename in executeion configurations
  2022-05-10  9:54 [dts] [0/6] modify about codename replacement Jun Dong
  2022-05-10  9:54 ` [dts] [1/6] conf/*: replace codename in configuration in conf directory Jun Dong
  2022-05-10  9:54 ` [dts] [2/6] doc/*: replace codename in doc Jun Dong
@ 2022-05-10  9:54 ` Jun Dong
  2022-05-10  9:54 ` [dts] [4/6] framework/*: replace codename in framework Jun Dong
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Jun Dong @ 2022-05-10  9:54 UTC (permalink / raw)
  To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong

Signed-off-by: Jun Dong <junx.dong@intel.com>
---
 executions/execution.cfg       | 2 +-
 executions/execution_FVL.cfg   | 2 +-
 executions/execution_fm10k.cfg | 2 +-
 executions/execution_smoke.cfg | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/executions/execution.cfg b/executions/execution.cfg
index 73ff0be2..bc9c7fa3 100644
--- a/executions/execution.cfg
+++ b/executions/execution.cfg
@@ -44,4 +44,4 @@ test_suites=
     pmd
 targets=
     x86_64-native-linuxapp-gcc
-parameters=nic_type=niantic:perf=true
+parameters=nic_type=IXGBE_10G-82599_SFP:perf=true
diff --git a/executions/execution_FVL.cfg b/executions/execution_FVL.cfg
index 8a71bbea..ae10df48 100644
--- a/executions/execution_FVL.cfg
+++ b/executions/execution_FVL.cfg
@@ -45,4 +45,4 @@ test_suites=
     pmd
 targets=
     x86_64-native-linuxapp-gcc
-parameters=nic_type=niantic:perf=true
+parameters=nic_type=IXGBE_10G-82599_SFP:perf=true
diff --git a/executions/execution_fm10k.cfg b/executions/execution_fm10k.cfg
index b535d78f..779d9032 100644
--- a/executions/execution_fm10k.cfg
+++ b/executions/execution_fm10k.cfg
@@ -26,4 +26,4 @@ test_suites=
     l3fwd,
 targets=
     x86_64-native-linuxapp-gcc
-parameters=nic_type=niantic:perf=true
+parameters=nic_type=IXGBE_10G-82599_SFP:perf=true
diff --git a/executions/execution_smoke.cfg b/executions/execution_smoke.cfg
index 6f35578d..c7b5cbb3 100644
--- a/executions/execution_smoke.cfg
+++ b/executions/execution_smoke.cfg
@@ -29,4 +29,4 @@ test_suites=
     blocklist
 targets=
     x86_64-native-linuxapp-gcc
-parameters=nic_type=niantic:func=true
+parameters=nic_type=IXGBE_10G-82599_SFP:func=true
-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [dts] [4/6] framework/*: replace codename in framework
  2022-05-10  9:54 [dts] [0/6] modify about codename replacement Jun Dong
                   ` (2 preceding siblings ...)
  2022-05-10  9:54 ` [dts] [3/6] executions/*: replace codename in executeion configurations Jun Dong
@ 2022-05-10  9:54 ` Jun Dong
  2022-05-10  9:54 ` [dts] [5/6] test_plans/*: replace codename in test plans Jun Dong
  2022-05-10  9:54 ` [dts] [6/6] tests/*: replace codename in test suites Jun Dong
  5 siblings, 0 replies; 8+ messages in thread
From: Jun Dong @ 2022-05-10  9:54 UTC (permalink / raw)
  To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong

Signed-off-by: Jun Dong <junx.dong@intel.com>
---
 framework/crbs.py           |   2 +-
 framework/excel_reporter.py |   6 +-
 framework/pmd_output.py     |   2 +-
 framework/settings.py       | 196 +++++++++++++++++++-----------------
 framework/test_case.py      |  26 +++--
 nics/net_device.py          |   2 +-
 6 files changed, 128 insertions(+), 106 deletions(-)

diff --git a/framework/crbs.py b/framework/crbs.py
index 14315ad2..5d5f0e1e 100644
--- a/framework/crbs.py
+++ b/framework/crbs.py
@@ -11,7 +11,7 @@ crbs_desc = {
         L3 D-cache (shared across physical cores).
       - 8x DDR3 DIMMs @ 1333 MHz of 4GB each. Each of the 4 memory channels of each
         CPU is populated with 2 DIMMs.
-      - 4x Intel 82599 (Niantic) NICs (2x 10GbE full duplex optical ports per NIC)
+      - 4x Intel 82599 NICs (2x 10GbE full duplex optical ports per NIC)
         plugged into the available PCIe Gen2 8-lane slots. To avoid PCIe bandwidth
         bottlenecks at high packet rates, a single optical port from each NIC is
         connected to the traffic  generator.
diff --git a/framework/excel_reporter.py b/framework/excel_reporter.py
index 3a6bdb5d..6f614b93 100644
--- a/framework/excel_reporter.py
+++ b/framework/excel_reporter.py
@@ -45,9 +45,9 @@ Example:
 
 Result:
     execl will be formatted as
-    DUT             Target                      NIC      Test suite Test case Results
-    10.239.128.117  x86_64-native-linuxapp-gcc  niantic
-                                                         SUITE      CASE      PASSED
+    DUT             Target                      NIC                    Test suite Test case Results
+    10.239.128.117  x86_64-native-linuxapp-gcc  IXGBE_10G-82599_SFP
+                                                                       SUITE      CASE      PASSED
 
 
 """
diff --git a/framework/pmd_output.py b/framework/pmd_output.py
index f27c2513..2d0643a3 100644
--- a/framework/pmd_output.py
+++ b/framework/pmd_output.py
@@ -285,7 +285,7 @@ class PmdOutput:
 
     def check_tx_bytes(self, tx_bytes, exp_bytes=0):
         """
-        fortville nic will send lldp packet when nic setup with testpmd.
+        Intel® Ethernet 700 Series nic will send lldp packet when nic setup with testpmd.
         so should used (tx_bytes - exp_bytes) % PROTOCOL_PACKET_SIZE['lldp']
         for check tx_bytes count right
         """
diff --git a/framework/settings.py b/framework/settings.py
index 14aac9e0..e0a1a3bc 100644
--- a/framework/settings.py
+++ b/framework/settings.py
@@ -49,133 +49,145 @@ FOLDERS = {
 Nics and its identifiers supported by the framework.
 """
 NICS = {
-    "kawela": "8086:10e8",
-    "kawela_2": "8086:10c9",
-    "kawela_4": "8086:1526",
-    "bartonhills": "8086:150e",
-    "powerville": "8086:1521",
-    "powerville_vf": "8086:1520",
-    "ophir": "8086:105e",
-    "niantic": "8086:10fb",
-    "niantic_vf": "8086:10ed",
-    "ironpond": "8086:151c",
-    "twinpond": "8086:1528",
-    "twinpond_vf": "8086:1515",
-    "twinville": "8086:1512",
-    "sageville": "8086:1563",
-    "sageville_vf": "8086:1565",
-    "sagepond": "8086:15ad",
-    "sagepond_vf": "8086:15a8",
-    "magnolia_park": "8086:15ce",
-    "hartwell": "8086:10d3",
-    "82545EM": "8086:100f",
-    "82540EM": "8086:100e",
-    "springville": "8086:1533",
-    "springfountain": "8086:154a",
+    "IGB_1G-82576_QUAD_COPPER": "8086:10e8",
+    "IGB_1G-82576": "8086:10c9",
+    "IGB_1G-82576_QUAD_COPPER_ET2": "8086:1526",
+    "IGB_1G-82580_COPPER": "8086:150e",
+    "IGB_1G-I350_COPPER": "8086:1521",
+    "IGB-I350_VF": "8086:1520",
+    "IGB_1G-82571EB_COPPER": "8086:105e",
+    "IXGBE_10G-82599_SFP": "8086:10fb",
+    "IXGBE_10G-82599_VF": "8086:10ed",
+    "IXGBE_10G-82599_T3_LOM": "8086:151c",
+    "IXGBE_10G-X540T": "8086:1528",
+    "IXGBE_10G-X540_VF": "8086:1515",
+    "IXGBE_10G-X550T": "8086:1563",
+    "IXGBE_10G-X550_VF": "8086:1565",
+    "IXGBE_10G-X550EM_X_10G_T": "8086:15ad",
+    "IXGBE_10G-X550EM_X_VF": "8086:15a8",
+    "IXGBE_10G-X550EM_A_SFP": "8086:15ce",
+    "IGB_1G-82574L": "8086:10d3",
+    "IGB_1G-82545EM_COPPER": "8086:100f",
+    "IGB_1G-82540EM": "8086:100e",
+    "IGB_1G-I210_COPPER": "8086:1533",
+    "IXGBE_10G-82599_SFP_SF_QP": "8086:154a",
     "virtio": "1af4:1000",
-    "avoton": "8086:1f41",
-    "avoton2c5": "8086:1f45",
-    "I217V": "8086:153b",
-    "I217LM": "8086:153a",
-    "I218V": "8086:1559",
-    "I218LM": "8086:155a",
-    "fortville_eagle": "8086:1572",
-    "fortville_spirit": "8086:1583",
-    "fortville_spirit_single": "8086:1584",
-    "fortpark": "8086:374c",
-    "fortpark_1g": "8086:37d1",
-    "fortpark_TLV": "8086:37d0",
-    "fortpark_BASE-T": "8086:37d2",
-    "fortpark_TLV_vf": "8086:37cd",
-    "fvl10g_vf": "8086:154c",
+    "IGB_1G-I354_SGMII": "8086:1f41",
+    "IGB_2.5G-I354_BACKPLANE_2_5GBPS": "8086:1f45",
+    "IGB_1G-PCH_LPT_I217_V": "8086:153b",
+    "IGB_1G-PCH_LPT_I217_LM": "8086:153a",
+    "IGB_1G-PCH_LPTLP_I218_V": "8086:1559",
+    "IGB_1G-PCH_LPTLP_I218_LM": "8086:155a",
+    "I40E_10G-SFP_XL710": "8086:1572",
+    "I40E_40G-QSFP_A": "8086:1583",
+    "I40E_40G-QSFP_B": "8086:1584",
+    "I40E_10G-X722_A0": "8086:374c",
+    "I40E_1G-1G_BASE_T_X722": "8086:37d1",
+    "I40E_10G-SFP_X722": "8086:37d0",
+    "I40E_10G-10G_BASE_T_X722": "8086:37d2",
+    "IAVF_10G-X722_VF": "8086:37cd",
+    "IAVF-VF": "8086:154c",
     "ConnectX3_MT4103": "15b3:1007",
     "ConnectX4_MT4115": "15b3:1013",
     "ConnectX4_LX_MT4117": "15b3:1015",
     "ConnectX5_MT4119": "15b3:1017",
     "ConnectX5_MT4121": "15b3:1019",
-    "fortville_25g": "8086:158b",
+    "I40E_25G-25G_SFP28": "8086:158b",
     "cavium_a034": "177d:a034",
     "cavium_0011": "177d:0011",
-    "fortvile_bdw_de": "8086:15ac",
+    "IXGBE_10G-X550EM_X_SFP": "8086:15ac",
     "cavium_a063": "177d:a063",
     "cavium_a064": "177d:a064",
-    "columbiaville_100g": "8086:1592",
-    "columbiaville_25g": "8086:1593",
-    "columbiaville_25gx2": "8086:159b",
-    "columbiaville_vf": "8086:1889",
+    "ICE_100G-E810C_QSFP": "8086:1592",
+    "ICE_25G-E810C_SFP": "8086:1593",
+    "ICE_25G-E810_XXV_SFP": "8086:159b",
+    "IAVF-ADAPTIVE_VF": "8086:1889",
     "fastlinq_ql45000": "1077:1656",
     "fastlinq_ql45000_vf": "1077:1664",
     "fastlinq_ql41000": "1077:8070",
     "fastlinq_ql41000_vf": "1077:8090",
-    "carlsville": "8086:15ff",
+    "I40E_10G-10G_BASE_T_BC": "8086:15ff",
     "hi1822": "19e5:1822",
-    "foxville": "8086:15f2",
+    "IGC-I225_LM": "8086:15f2",
     "brcm_57414": "14e4:16d7",
     "brcm_P2100G": "14e4:1750",
 }
 
+ETH_700_SERIES = (
+    "I40E_10G-SFP_XL710",
+    "I40E_40G-QSFP_A",
+    "I40E_40G-QSFP_B",
+    "I40E_25G-25G_SFP28",
+)
+
+ETH_800_SERIES = (
+    "ICE_100G-E810C_QSFP",
+    "ICE_25G-E810C_SFP",
+    "ICE_25G-E810_XXV_SFP",
+    "IAVF-ADAPTIVE_VF",
+)
+
 DRIVERS = {
-    "kawela": "igb",
-    "kawela_2": "igb",
-    "kawela_4": "igb",
-    "bartonhills": "igb",
-    "powerville": "igb",
-    "powerville_vf": "igbvf",
-    "ophir": "igb",
-    "niantic": "ixgbe",
-    "niantic_vf": "ixgbevf",
-    "ironpond": "ixgbe",
-    "twinpond": "ixgbe",
-    "twinpond_vf": "ixgbevf",
-    "twinville": "ixgbe",
-    "sageville": "ixgbe",
-    "sageville_vf": "ixgbevf",
-    "sagepond": "ixgbe",
-    "sagepond_vf": "ixgbevf",
-    "magnolia_park": "ixgbe",
-    "hartwell": "igb",
-    "82545EM": "igb",
-    "82540EM": "igb",
-    "springville": "igb",
-    "springfountain": "ixgbe",
+    "IGB_1G-82576_QUAD_COPPER": "igb",
+    "IGB_1G-82576": "igb",
+    "IGB_1G-82576_QUAD_COPPER_ET2": "igb",
+    "IGB_1G-82580_COPPER": "igb",
+    "IGB_1G-I350_COPPER": "igb",
+    "IGB-I350_VF": "igbvf",
+    "IGB_1G-82571EB_COPPER": "igb",
+    "IXGBE_10G-82599_SFP": "ixgbe",
+    "IXGBE_10G-82599_VF": "ixgbevf",
+    "IXGBE_10G-82599_T3_LOM": "ixgbe",
+    "IXGBE_10G-X540T": "ixgbe",
+    "IXGBE_10G-X540_VF": "ixgbevf",
+    "IXGBE_10G-X550T": "ixgbe",
+    "IXGBE_10G-X550_VF": "ixgbevf",
+    "IXGBE_10G-X550EM_X_10G_T": "ixgbe",
+    "IXGBE_10G-X550EM_X_VF": "ixgbevf",
+    "IXGBE_10G-X550EM_A_SFP": "ixgbe",
+    "IGB_1G-82574L": "igb",
+    "IGB_1G-82545EM_COPPER": "igb",
+    "IGB_1G-82540EM": "igb",
+    "IGB_1G-I210_COPPER": "igb",
+    "IXGBE_10G-82599_SFP_SF_QP": "ixgbe",
     "virtio": "virtio-pci",
-    "avoton": "igb",
-    "avoton2c5": "igb",
-    "I217V": "igb",
-    "I217LM": "igb",
-    "I218V": "igb",
-    "I218LM": "igb",
-    "fortville_eagle": "i40e",
-    "fortville_spirit": "i40e",
-    "fortville_spirit_single": "i40e",
-    "fortpark": "i40e",
-    "fortpark_1g": "i40e",
-    "fortpark_TLV": "i40e",
-    "fortpark_BASE-T": "i40e",
-    "fortpark_TLV_vf": "iavf",
-    "fvl10g_vf": "iavf",
+    "IGB_1G-I354_SGMII": "igb",
+    "IGB_2.5G-I354_BACKPLANE_2_5GBPS": "igb",
+    "IGB_1G-PCH_LPT_I217_V": "igb",
+    "IGB_1G-PCH_LPT_I217_LM": "igb",
+    "IGB_1G-PCH_LPTLP_I218_V": "igb",
+    "IGB_1G-PCH_LPTLP_I218_LM": "igb",
+    "I40E_10G-SFP_XL710": "i40e",
+    "I40E_40G-QSFP_A": "i40e",
+    "I40E_40G-QSFP_B": "i40e",
+    "I40E_10G-X722_A0": "i40e",
+    "I40E_1G-1G_BASE_T_X722": "i40e",
+    "I40E_10G-SFP_X722": "i40e",
+    "I40E_10G-10G_BASE_T_X722": "i40e",
+    "IAVF_10G-X722_VF": "iavf",
+    "IAVF-VF": "iavf",
     "ConnectX3_MT4103": "mlx4_core",
     "ConnectX4_MT4115": "mlx5_core",
     "ConnectX4_LX_MT4117": "mlx5_core",
     "ConnectX5_MT4119": "mlx5_core",
     "ConnectX5_MT4121": "mlx5_core",
-    "fortville_25g": "i40e",
+    "I40E_25G-25G_SFP28": "i40e",
     "cavium_a034": "thunder-nicvf",
     "cavium_0011": "thunder-nicvf",
-    "fortvile_bdw_de": "ixgbe",
+    "IXGBE_10G-X550EM_X_SFP": "ixgbe",
     "cavium_a063": "octeontx2-nicpf",
     "cavium_a064": "octeontx2-nicvf",
-    "columbiaville_100g": "ice",
-    "columbiaville_25g": "ice",
-    "columbiaville_25gx2": "ice",
-    "columbiaville_vf": "iavf",
+    "ICE_100G-E810C_QSFP": "ice",
+    "ICE_25G-E810C_SFP": "ice",
+    "ICE_25G-E810_XXV_SFP": "ice",
+    "IAVF-ADAPTIVE_VF": "iavf",
     "fastlinq_ql45000": "qede",
     "fastlinq_ql41000": "qede",
     "fastlinq_ql45000_vf": "qede",
     "fastlinq_ql41000_vf": "qede",
-    "carlsville": "i40e",
+    "I40E_10G-10G_BASE_T_BC": "i40e",
     "hi1822": "hinic",
-    "foxville": "igc",
+    "IGC-I225_LM": "igc",
     "brcm_57414": "bnxt_en",
     "brcm_P2100G": "bnxt_en",
 }
diff --git a/framework/test_case.py b/framework/test_case.py
index 1f5d383b..7343da67 100644
--- a/framework/test_case.py
+++ b/framework/test_case.py
@@ -48,6 +48,8 @@ from .settings import (
     DEBUG_CASE_SETTING,
     DEBUG_SETTING,
     DRIVERS,
+    ETH_700_SERIES,
+    ETH_800_SERIES,
     FUNC_SETTING,
     HOST_DRIVER_SETTING,
     NICS,
@@ -528,23 +530,23 @@ class TestCase(object):
 
         if driver == "ixgbe":
             bitrate *= 10  # 10 Gb NICs
-        elif nic == "avoton2c5":
+        elif nic == "IGB_2.5G-I354_BACKPLANE_2_5GBPS":
             bitrate *= 2.5  # 2.5 Gb NICs
-        elif nic in ["fortville_spirit", "fortville_spirit_single"]:
+        elif nic in ["I40E_40G-QSFP_A", "I40E_40G-QSFP_B"]:
             bitrate *= 40
-        elif nic == "fortville_eagle":
+        elif nic == "I40E_10G-SFP_XL710":
             bitrate *= 10
-        elif nic == "fortpark_TLV":
+        elif nic == "I40E_10G-SFP_X722":
             bitrate *= 10
         elif driver == "thunder-nicvf":
             bitrate *= 10
-        elif nic == "fortville_25g":
+        elif nic == "I40E_25G-25G_SFP28":
             bitrate *= 25
-        elif nic == "columbiaville_25g":
+        elif nic == "ICE_25G-E810C_SFP":
             bitrate *= 25
-        elif nic == "columbiaville_25gx2":
+        elif nic == "ICE_25G-E810_XXV_SFP":
             bitrate *= 25
-        elif nic == "columbiaville_100g":
+        elif nic == "ICE_100G-E810C_QSFP":
             bitrate *= 100
 
         return bitrate * num_ports / 8 / (frame_size + 20)
@@ -557,6 +559,14 @@ class TestCase(object):
             if driver_new != driver_now:
                 netdev.bind_driver(driver=driver_new)
 
+    def is_eth_series_nic(self, series_num: int):
+        series_nic_tuple = globals().get(f"ETH_{series_num}_SERIES")
+        for series_item in series_nic_tuple:
+            if series_item == self.nic:
+                return True
+        else:
+            return False
+
 
 def skip_unsupported_pkg(pkgs):
     """
diff --git a/nics/net_device.py b/nics/net_device.py
index 4ef755e0..18139859 100644
--- a/nics/net_device.py
+++ b/nics/net_device.py
@@ -500,7 +500,7 @@ class NetDevice(object):
         Enable ipv6 address of specified pci device on linux.
         """
         self.__send_expect("sysctl net.ipv6.conf.%s.disable_ipv6=0" % intf, "# ")
-        # FVL interface need down and up for re-enable ipv6
+        # Intel® Ethernet 700 Series interface need down and up for re-enable ipv6
         if self.default_driver == "i40e":
             self.__send_expect("ifconfig %s down" % intf, "# ")
             self.__send_expect("ifconfig %s up" % intf, "# ")
-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [dts] [5/6] test_plans/*: replace codename in test plans
  2022-05-10  9:54 [dts] [0/6] modify about codename replacement Jun Dong
                   ` (3 preceding siblings ...)
  2022-05-10  9:54 ` [dts] [4/6] framework/*: replace codename in framework Jun Dong
@ 2022-05-10  9:54 ` Jun Dong
  2022-05-10  9:54 ` [dts] [6/6] tests/*: replace codename in test suites Jun Dong
  5 siblings, 0 replies; 8+ messages in thread
From: Jun Dong @ 2022-05-10  9:54 UTC (permalink / raw)
  To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong

Signed-off-by: Jun Dong <junx.dong@intel.com>
---
 test_plans/NICStatistics_test_plan.rst        |  4 +-
 test_plans/bbdev_test_plan.rst                | 19 +++---
 test_plans/blocklist_test_plan.rst            |  7 --
 .../cloud_filter_with_l4_port_test_plan.rst   |  2 +-
 test_plans/dcf_lifecycle_test_plan.rst        |  6 +-
 test_plans/ddp_gtp_qregion_test_plan.rst      | 10 +--
 test_plans/ddp_gtp_test_plan.rst              | 19 +++---
 test_plans/ddp_l2tpv3_test_plan.rst           |  5 +-
 test_plans/ddp_mpls_test_plan.rst             | 19 +++---
 test_plans/ddp_ppp_l2tp_test_plan.rst         |  9 +--
 test_plans/dual_vlan_test_plan.rst            |  2 +-
 test_plans/dynamic_flowtype_test_plan.rst     | 10 +--
 test_plans/eeprom_dump_test_plan.rst          |  4 +-
 ...ckage_download_in_ice_driver_test_plan.rst |  6 +-
 test_plans/floating_veb_test_plan.rst         | 21 +++---
 test_plans/generic_flow_api_test_plan.rst     | 48 ++++++-------
 ..._plan.rst => i40e_rss_input_test_plan.rst} |  6 +-
 .../iavf_flexible_descriptor_test_plan.rst    |  9 +--
 ..._package_driver_error_handle_test_plan.rst | 14 ++--
 test_plans/iavf_test_plan.rst                 |  4 +-
 ...plan.rst => ice_1pps_signal_test_plan.rst} | 14 ++--
 ...e_advanced_iavf_rss_gtpogre_test_plan.rst} |  6 +-
 ... ice_advanced_iavf_rss_gtpu_test_plan.rst} |  9 +--
 ...anced_iavf_rss_pppol2tpoudp_test_plan.rst} |  7 +-
 ...st => ice_advanced_iavf_rss_test_plan.rst} | 21 +++---
 ...f_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst} |  4 +-
 ...=> ice_advanced_rss_gtpogre_test_plan.rst} |  9 +--
 ...st => ice_advanced_rss_gtpu_test_plan.rst} |  9 +--
 ...t => ice_advanced_rss_pppoe_test_plan.rst} |  4 +-
 ...lan.rst => ice_advanced_rss_test_plan.rst} | 13 ++--
 ...d_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst} |  4 +-
 ...n.rst => ice_dcf_acl_filter_test_plan.rst} |  4 +-
 ...an.rst => ice_dcf_date_path_test_plan.rst} |  0
 ...st => ice_dcf_flow_priority_test_plan.rst} |  4 +-
 ...est_plan.rst => ice_dcf_qos_test_plan.rst} |  5 +-
 ... ice_dcf_switch_filter_gtpu_test_plan.rst} |  6 +-
 ...ice_dcf_switch_filter_pppoe_test_plan.rst} |  6 +-
 ...st => ice_dcf_switch_filter_test_plan.rst} | 10 +--
 ..._test_plan.rst => ice_ecpri_test_plan.rst} | 10 +--
 ...r_test_plan.rst => ice_fdir_test_plan.rst} |  4 +-
 ...an.rst => ice_flow_priority_test_plan.rst} | 17 ++---
 ...st => ice_iavf_fdir_gtpogre_test_plan.rst} |  6 +-
 ... ice_iavf_fdir_pppol2tpoudp_test_plan.rst} |  4 +-
 ...t_plan.rst => ice_iavf_fdir_test_plan.rst} |  4 +-
 ...e_iavf_ip_fragment_rte_flow_test_plan.rst} |  4 +-
 ...t => ice_iavf_rss_configure_test_plan.rst} |  2 +-
 ...=> ice_ip_fragment_rte_flow_test_plan.rst} |  4 +-
 ...rst => ice_limit_value_test_test_plan.rst} | 18 ++---
 ...q_test_plan.rst => ice_qinq_test_plan.rst} | 14 ++--
 ...an.rst => ice_rss_configure_test_plan.rst} |  6 +-
 ... => ice_switch_filter_pppoe_test_plan.rst} |  6 +-
 ...an.rst => ice_switch_filter_test_plan.rst} | 10 +--
 ...f_support_multicast_address_test_plan.rst} |  4 +-
 test_plans/index.rst                          | 68 +++++++++----------
 test_plans/inline_ipsec_test_plan.rst         |  2 +-
 test_plans/ipfrag_test_plan.rst               |  2 +-
 test_plans/ipgre_test_plan.rst                | 12 +++-
 test_plans/ipv4_reassembly_test_plan.rst      |  2 +-
 ..._get_extra_queue_information_test_plan.rst |  2 +-
 test_plans/l2tp_esp_coverage_test_plan.rst    |  8 ++-
 test_plans/l3fwd_test_plan.rst                |  2 +-
 test_plans/large_vf_test_plan.rst             |  4 +-
 test_plans/macsec_for_ixgbe_test_plan.rst     | 12 ++--
 ...ious_driver_event_indication_test_plan.rst |  6 +-
 test_plans/metrics_test_plan.rst              |  2 +-
 test_plans/multicast_test_plan.rst            |  2 +-
 test_plans/nic_single_core_perf_test_plan.rst | 42 ++++++------
 test_plans/nvgre_test_plan.rst                | 19 +++---
 test_plans/pf_smoke_test_plan.rst             |  2 +-
 test_plans/pmd_bonded_test_plan.rst           |  4 +-
 test_plans/pmd_test_plan.rst                  |  6 +-
 test_plans/pmdpcap_test_plan.rst              |  4 +-
 test_plans/pmdrss_hash_test_plan.rst          | 25 +++----
 test_plans/pmdrssreta_test_plan.rst           |  6 +-
 test_plans/port_control_test_plan.rst         |  6 +-
 test_plans/ptpclient_test_plan.rst            |  6 +-
 test_plans/ptype_mapping_test_plan.rst        |  6 +-
 test_plans/pvp_share_lib_test_plan.rst        | 12 ++--
 test_plans/qinq_filter_test_plan.rst          | 28 ++++----
 test_plans/queue_region_test_plan.rst         | 29 ++++----
 test_plans/queue_start_stop_test_plan.rst     |  2 +-
 test_plans/rss_to_rte_flow_test_plan.rst      |  4 +-
 test_plans/rteflow_priority_test_plan.rst     |  3 +-
 ...ntime_vf_queue_number_kernel_test_plan.rst |  2 +-
 ...time_vf_queue_number_maxinum_test_plan.rst | 12 ++--
 .../runtime_vf_queue_number_test_plan.rst     |  2 +-
 test_plans/rxtx_offload_test_plan.rst         | 10 +--
 test_plans/stats_checks_test_plan.rst         |  4 +-
 test_plans/tso_test_plan.rst                  |  2 +-
 test_plans/tx_preparation_test_plan.rst       |  4 +-
 test_plans/uni_pkt_test_plan.rst              | 66 +++++++++---------
 test_plans/userspace_ethtool_test_plan.rst    | 10 +--
 test_plans/veb_switch_test_plan.rst           | 21 +++---
 test_plans/vf_daemon_test_plan.rst            |  2 +-
 test_plans/vf_kernel_test_plan.rst            |  6 +-
 test_plans/vf_pf_reset_test_plan.rst          |  2 +-
 test_plans/vf_rss_test_plan.rst               |  8 +--
 test_plans/vf_single_core_perf_test_plan.rst  | 20 +++---
 test_plans/vf_smoke_test_plan.rst             |  2 +-
 .../vlan_ethertype_config_test_plan.rst       |  2 +-
 test_plans/vm_power_manager_test_plan.rst     |  2 +-
 test_plans/vmdq_dcb_test_plan.rst             |  6 +-
 test_plans/vmdq_test_plan.rst                 | 14 ++--
 ...paths_performance_with_cbdma_test_plan.rst |  2 +-
 test_plans/vxlan_test_plan.rst                | 18 ++---
 105 files changed, 526 insertions(+), 491 deletions(-)
 rename test_plans/{fortville_rss_input_test_plan.rst => i40e_rss_input_test_plan.rst} (99%)
 rename test_plans/{cvl_1pps_signal_test_plan.rst => ice_1pps_signal_test_plan.rst} (90%)
 rename test_plans/{cvl_advanced_iavf_rss_gtpogre_test_plan.rst => ice_advanced_iavf_rss_gtpogre_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_iavf_rss_gtpu_test_plan.rst => ice_advanced_iavf_rss_gtpu_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_iavf_rss_pppol2tpoudp_test_plan.rst => ice_advanced_iavf_rss_pppol2tpoudp_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_iavf_rss_test_plan.rst => ice_advanced_iavf_rss_test_plan.rst} (99%)
 mode change 100755 => 100644
 rename test_plans/{cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst => ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_rss_gtpogre_test_plan.rst => ice_advanced_rss_gtpogre_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_rss_gtpu_test_plan.rst => ice_advanced_rss_gtpu_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_rss_pppoe_test_plan.rst => ice_advanced_rss_pppoe_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_rss_test_plan.rst => ice_advanced_rss_test_plan.rst} (99%)
 rename test_plans/{cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst => ice_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst} (99%)
 rename test_plans/{cvl_dcf_acl_filter_test_plan.rst => ice_dcf_acl_filter_test_plan.rst} (99%)
 rename test_plans/{cvl_dcf_date_path_test_plan.rst => ice_dcf_date_path_test_plan.rst} (100%)
 mode change 100755 => 100644
 rename test_plans/{cvl_dcf_flow_priority_test_plan.rst => ice_dcf_flow_priority_test_plan.rst} (99%)
 mode change 100755 => 100644
 rename test_plans/{cvl_dcf_qos_test_plan.rst => ice_dcf_qos_test_plan.rst} (99%)
 rename test_plans/{cvl_dcf_switch_filter_gtpu_test_plan.rst => ice_dcf_switch_filter_gtpu_test_plan.rst} (99%)
 rename test_plans/{cvl_dcf_switch_filter_pppoe_test_plan.rst => ice_dcf_switch_filter_pppoe_test_plan.rst} (99%)
 rename test_plans/{cvl_dcf_switch_filter_test_plan.rst => ice_dcf_switch_filter_test_plan.rst} (99%)
 rename test_plans/{cvl_ecpri_test_plan.rst => ice_ecpri_test_plan.rst} (99%)
 rename test_plans/{cvl_fdir_test_plan.rst => ice_fdir_test_plan.rst} (99%)
 rename test_plans/{cvl_flow_priority_test_plan.rst => ice_flow_priority_test_plan.rst} (98%)
 rename test_plans/{iavf_fdir_gtpogre_test_plan.rst => ice_iavf_fdir_gtpogre_test_plan.rst} (99%)
 rename test_plans/{cvl_iavf_fdir_pppol2tpoudp_test_plan.rst => ice_iavf_fdir_pppol2tpoudp_test_plan.rst} (99%)
 rename test_plans/{iavf_fdir_test_plan.rst => ice_iavf_fdir_test_plan.rst} (99%)
 rename test_plans/{cvl_iavf_ip_fragment_rte_flow_test_plan.rst => ice_iavf_ip_fragment_rte_flow_test_plan.rst} (99%)
 rename test_plans/{cvl_iavf_rss_configure_test_plan.rst => ice_iavf_rss_configure_test_plan.rst} (99%)
 mode change 100755 => 100644
 rename test_plans/{cvl_ip_fragment_rte_flow_test_plan.rst => ice_ip_fragment_rte_flow_test_plan.rst} (99%)
 rename test_plans/{cvl_limit_value_test_test_plan.rst => ice_limit_value_test_test_plan.rst} (97%)
 rename test_plans/{cvl_qinq_test_plan.rst => ice_qinq_test_plan.rst} (99%)
 rename test_plans/{cvl_rss_configure_test_plan.rst => ice_rss_configure_test_plan.rst} (99%)
 rename test_plans/{cvl_switch_filter_pppoe_test_plan.rst => ice_switch_filter_pppoe_test_plan.rst} (99%)
 rename test_plans/{cvl_switch_filter_test_plan.rst => ice_switch_filter_test_plan.rst} (99%)
 rename test_plans/{cvl_vf_support_multicast_address_test_plan.rst => ice_vf_support_multicast_address_test_plan.rst} (99%)

diff --git a/test_plans/NICStatistics_test_plan.rst b/test_plans/NICStatistics_test_plan.rst
index cfae7068..a5f00981 100644
--- a/test_plans/NICStatistics_test_plan.rst
+++ b/test_plans/NICStatistics_test_plan.rst
@@ -35,10 +35,10 @@ NIC Statistics Tests
 ====================
 
 This document provides benchmark tests for the userland Intel®
-82599 Gigabit Ethernet Controller (Niantic) Poll Mode Driver (PMD).
+82599 Gigabit Ethernet Controller Poll Mode Driver (PMD).
 The userland PMD application runs the ``IO forwarding mode`` test
 described in the PMD test plan document with different parameters for
-the configuration of Niantic NIC ports.
+the configuration of 82599 NIC ports.
 
 The core configuration description is:
 
diff --git a/test_plans/bbdev_test_plan.rst b/test_plans/bbdev_test_plan.rst
index 2ac4cbe9..88568ec3 100644
--- a/test_plans/bbdev_test_plan.rst
+++ b/test_plans/bbdev_test_plan.rst
@@ -30,9 +30,9 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-=============================================================
-Wireless device for ICX-D (bbdev) for Turbo decoding/encoding
-=============================================================
+===========================================================================
+Wireless device for Xeon SP 83xx/63xx-D (bbdev) for Turbo decoding/encoding
+===========================================================================
 Description
 ===========
 
@@ -50,17 +50,16 @@ Description
    and virtual (software) wireless acceleration functions.
 
    Physical bbdev devices are discovered during the PCI probe/enumeration of
-   the EAL function which is executed at DPDK initialization, based on
-   their PCI device identifier, each unique PCI BDF (bus/bridge, device,
-   function).
+   the EAL function which is executed at DPDK initialization, based on their
+   PCI device identifier, each unique PCI BDF (bus/bridge, device, function).
    Virtual devices can be created by two mechanisms, either using the EAL
    command line options or from within the application using an EAL API
    directly.
-   so it is required to perform validation of the framework divided into
-   2 stages:
+   so it is required to perform validation of the framework divided into 2
+   stages:
    Stage 1: Validation of the SW-only solution (turbo_sw)
-   Stage 2: Validation of the HW-accelerated solution (ICX-D TIP) on an ICX-D
-   platform.
+   Stage 2: Validation of the HW-accelerated solution (Xeon SP 83xx/63xx-D TIP)
+   on an Xeon SP 83xx/63xx-D platform.
    We now only support stage 1.
 
 Prerequisites
diff --git a/test_plans/blocklist_test_plan.rst b/test_plans/blocklist_test_plan.rst
index f1231331..f6bc854c 100644
--- a/test_plans/blocklist_test_plan.rst
+++ b/test_plans/blocklist_test_plan.rst
@@ -61,19 +61,16 @@ are bound and available::
   EAL: Device bound
   EAL: map PCI resource for device 0000:01:00.0
   EAL: PCI memory mapped at 0x7fe6b68c7000
-  EAL: probe driver: 8086:10fb rte_niantic_pmd
   EAL: unbind kernel driver /sys/bus/pci/devices/0000:01:00.1/driver/unbind
   EAL: bind PCI device 0000:01:00.1 to uio driver
   EAL: Device bound
   EAL: map PCI resource for device 0000:01:00.1
   EAL: PCI memory mapped at 0x7fe6b6847000
-  EAL: probe driver: 8086:10fb rte_niantic_pmd
   EAL: unbind kernel driver /sys/bus/pci/devices/0000:02:00.0/driver/unbind
   EAL: bind PCI device 0000:02:00.0 to uio driver
   EAL: Device bound
   EAL: map PCI resource for device 0000:02:00.0
   EAL: PCI memory mapped at 0x7fe6b6580000
-  EAL: probe driver: 8086:10fb rte_niantic_pmd
   EAL: unbind kernel driver /sys/bus/pci/devices/0000:02:00.1/driver/unbind
   EAL: bind PCI device 0000:02:00.1 to uio driver
   EAL: Device bound
@@ -96,19 +93,16 @@ Select first available port to be blocklisted and specify it with -b option. For
 Check that corresponding device is skipped for binding, and
 only 3 ports are available now:::
 
-  EAL: probe driver: 8086:10fb rte_niantic_pmd
   EAL: unbind kernel driver /sys/bus/pci/devices/0000:01:00.1/driver/unbind
   EAL: bind PCI device 0000:01:00.1 to uio driver
   EAL: Device bound
   EAL: map PCI resource for device 0000:01:00.1
   EAL: PCI memory mapped at 0x7f0037912000
-  EAL: probe driver: 8086:10fb rte_niantic_pmd
   EAL: unbind kernel driver /sys/bus/pci/devices/0000:02:00.0/driver/unbind
   EAL: bind PCI device 0000:02:00.0 to uio driver
   EAL: Device bound
   EAL: map PCI resource for device 0000:02:00.0
   EAL: PCI memory mapped at 0x7f0037892000
-  EAL: probe driver: 8086:10fb rte_niantic_pmd
   EAL: unbind kernel driver /sys/bus/pci/devices/0000:02:00.1/driver/unbind
   EAL: bind PCI device 0000:02:00.1 to uio driver
   EAL: Device bound
@@ -131,7 +125,6 @@ For the example above:::
 Check that 3 corresponding device is skipped for binding, and
 only 1 ports is available now:::
 
-  EAL: probe driver: 8086:10fb rte_niantic_pmd
   EAL: unbind kernel driver /sys/bus/pci/devices/0000:02:00.1/driver/unbind
   EAL: bind PCI device 0000:02:00.1 to uio driver
   EAL: Device bound
diff --git a/test_plans/cloud_filter_with_l4_port_test_plan.rst b/test_plans/cloud_filter_with_l4_port_test_plan.rst
index e9f226ac..7fbf5130 100644
--- a/test_plans/cloud_filter_with_l4_port_test_plan.rst
+++ b/test_plans/cloud_filter_with_l4_port_test_plan.rst
@@ -38,7 +38,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   Fortville
+   Intel® Ethernet 700 Series
 
 2. software:
    dpdk: http://dpdk.org/git/dpdk
diff --git a/test_plans/dcf_lifecycle_test_plan.rst b/test_plans/dcf_lifecycle_test_plan.rst
index 3e63a3a4..bd5f6927 100644
--- a/test_plans/dcf_lifecycle_test_plan.rst
+++ b/test_plans/dcf_lifecycle_test_plan.rst
@@ -32,7 +32,7 @@
 
 
 ============================
-CVL DCF Lifecycle Test Suite
+ICE DCF Lifecycle Test Suite
 ============================
 
 Description
@@ -1073,7 +1073,7 @@ TC34: ACL DCF mode is active, add ACL filters by way of host based configuration
     Added rule with ID 15871
 
 ===============================
-CVL DCF enable device reset API
+ICE DCF enable device reset API
 ===============================
 
 Description
@@ -1088,7 +1088,7 @@ Prerequisites
 
 Hardware
 --------
-Supportted NICs: columbiaville_25g/columbiaville_100g
+Supportted NICs: Intel® Ethernet Network Adapter E810-XXVDA4/Intel® Ethernet Network Adapter E810-CQDA2
 
 Software
 --------
diff --git a/test_plans/ddp_gtp_qregion_test_plan.rst b/test_plans/ddp_gtp_qregion_test_plan.rst
index 7e2b1816..6ea1f546 100644
--- a/test_plans/ddp_gtp_qregion_test_plan.rst
+++ b/test_plans/ddp_gtp_qregion_test_plan.rst
@@ -52,11 +52,11 @@ Requirements
 5. Requirements 1 and 2 should be possible for IPv6 addresses to use 64,
    48 or 32-bit prefixes instead of full address.
 
-FVL supports queue regions configuration for RSS, so different traffic 
-classes or different packet classification types can be separated to 
-different queue regions which includes several queues. Support to set 
-hash input set info for RSS flexible payload, then enable new 
-protocols' RSS.
+Intel® Ethernet 700 Series supports queue regions configuration for RSS,
+so different traffic classes or different packet classification types
+can be separated to different queue regions which includes several queues.
+Support to set hash input set info for RSS flexible payload, then enable
+new protocols' RSS.
 Dynamic flow type feature introduces GTP pctype and flow type, design 
 and add queue region/queue range mapping as below table. For more detailed 
 and relative information, please refer to dynamic flow type and queue 
diff --git a/test_plans/ddp_gtp_test_plan.rst b/test_plans/ddp_gtp_test_plan.rst
index 9ce797e3..f49d049b 100644
--- a/test_plans/ddp_gtp_test_plan.rst
+++ b/test_plans/ddp_gtp_test_plan.rst
@@ -30,15 +30,16 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-===============================
-Fortville DDP GTP-C/GTP-U Tests
-===============================
-
-FVL6 supports DDP (Dynamic Device Personalization) to program analyzer/parser
-via AdminQ. Profile can be used to update FVL configuration tables via MMIO
-configuration space, not microcode or firmware itself. For microcode/FW
-changes new HW/FW/NVM image must be uploaded to the NIC. Profiles will be
-stored in binary files and need to be passed to AQ to program FVL during
+================================================
+Intel® Ethernet 700 Series DDP GTP-C/GTP-U Tests
+================================================
+
+Intel® Ethernet 700 Series supports DDP (Dynamic Device Personalization) to
+program analyzer/parser via AdminQ. Profile can be used to update Intel®
+Ethernet 700 Series configuration tables via MMIO configuration space, not
+microcode or firmware itself. For microcode/FW changes new HW/FW/NVM image
+must be uploaded to the NIC. Profiles will be stored in binary files and
+need to be passed to AQ to program Intel® Ethernet 700 Series during
 initialization stage.
 
 GPRS Tunneling Protocol (GTP) is a group of IP-based communications 
diff --git a/test_plans/ddp_l2tpv3_test_plan.rst b/test_plans/ddp_l2tpv3_test_plan.rst
index d4ae0f55..7039119d 100644
--- a/test_plans/ddp_l2tpv3_test_plan.rst
+++ b/test_plans/ddp_l2tpv3_test_plan.rst
@@ -35,7 +35,8 @@ DDP L2TPV3
 ==========
 
 DDP profile 0x80000004 adds support for directing L2TPv3 packets based on
-their session ID for FVL NIC. For DDP introduction, please refer to :
+their session ID for Intel® Ethernet 700 Series NIC. For DDP introduction,
+please refer to :
 
  https://software.intel.com/en-us/articles/dynamic-device-personalization-for-intel-ethernet-700-series
 
@@ -62,7 +63,7 @@ Requirements as below
 =====================
 
 Flow API support for flow director rules based on L2TPv3 session ID
-The current scope is limited to FVL NIC
+The current scope is limited to Intel® Ethernet 700 Series NIC
 
 Prerequisites
 =============
diff --git a/test_plans/ddp_mpls_test_plan.rst b/test_plans/ddp_mpls_test_plan.rst
index c5962046..1902b80f 100644
--- a/test_plans/ddp_mpls_test_plan.rst
+++ b/test_plans/ddp_mpls_test_plan.rst
@@ -30,15 +30,16 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-====================================================
-Fortville DDP (Dynamic Device Personalization) Tests
-====================================================
-
-FVL6 supports DDP (Dynamic Device Personalization) to program analyzer/parser
-via AdminQ. Profile can be used to update FVL configuration tables via MMIO
-configuration space, not microcode or firmware itself. For microcode/FW
-changes new HW/FW/NVM image must be uploaded to the NIC. Profiles will be
-stored in binary files and need to be passed to AQ to program FVL during
+=====================================================================
+Intel® Ethernet 700 Series DDP (Dynamic Device Personalization) Tests
+=====================================================================
+
+Intel® Ethernet 700 Series supports DDP (Dynamic Device Personalization) to
+program analyzer/parser via AdminQ. Profile can be used to update Intel®
+Ethernet 700 Series configuration tables via MMIO configuration space, not
+microcode or firmware itself. For microcode/FW changes new HW/FW/NVM image
+must be uploaded to the NIC. Profiles will be stored in binary files and
+need to be passed to AQ to program Intel® Ethernet 700 Series during
 initialization stage.
 
 With DDP, MPLS (Multi-protocol Label Switching) can be supported by NVM with
diff --git a/test_plans/ddp_ppp_l2tp_test_plan.rst b/test_plans/ddp_ppp_l2tp_test_plan.rst
index 3f9c53b7..ccdddf31 100644
--- a/test_plans/ddp_ppp_l2tp_test_plan.rst
+++ b/test_plans/ddp_ppp_l2tp_test_plan.rst
@@ -34,8 +34,9 @@
 DDP PPPoE/L2TPv2/PPPoL2TPv2
 ===========================
 
-Fortville supports PPPoE/L2TPv2/PPPoL2TPv2 new protocols after loading profile.
-For DDP introduction, please refer to ddp gtp or ddp mpls test plan.
+Intel® Ethernet 700 Series supports PPPoE/L2TPv2/PPPoL2TPv2 new protocols
+after loading profile.For DDP introduction, please refer to ddp gtp or ddp
+mpls test plan.
 
 Requirements as below::
 
@@ -51,8 +52,8 @@ Requirements as below::
 
 Dynamic flow type mapping eliminates usage of number of hard-coded flow
 types in bulky if-else statements. For instance, when configure hash enable
-flags for RSS in i40e_config_hena() function and will make partitioning FVL
-in i40e PMD more scalable.
+flags for RSS in i40e_config_hena() function and will make partitioning
+Intel® Ethernet 700 Series in i40e PMD more scalable.
 
 I40e PCTYPEs are statically mapped to RTE_ETH_FLOW_* types in DPDK, defined in
 rte_eth_ctrl.h, flow types used to define ETH_RSS_* offload types in
diff --git a/test_plans/dual_vlan_test_plan.rst b/test_plans/dual_vlan_test_plan.rst
index a7e03bcc..d8cb28fa 100644
--- a/test_plans/dual_vlan_test_plan.rst
+++ b/test_plans/dual_vlan_test_plan.rst
@@ -294,7 +294,7 @@ Check whether the mode is set successfully::
       qinq(extend) on
 
 Set Tag Protocol ID ``0x1234`` on port ``0``.
-Nic only support inner model, except Fortville::
+Nic only support inner model, except Intel® Ethernet 700 Series::
 
     testpmd> vlan set inner tpid 0x1234 0
 
diff --git a/test_plans/dynamic_flowtype_test_plan.rst b/test_plans/dynamic_flowtype_test_plan.rst
index 5fda715e..eaf98cfe 100644
--- a/test_plans/dynamic_flowtype_test_plan.rst
+++ b/test_plans/dynamic_flowtype_test_plan.rst
@@ -30,9 +30,9 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-========================================================
-Fortville Dynamic Mapping of Flow Types to PCTYPEs Tests
-========================================================
+=========================================================================
+Intel® Ethernet 700 Series Dynamic Mapping of Flow Types to PCTYPEs Tests
+=========================================================================
 
 More protocols can be added dynamically using dynamic device personalization 
 profiles (DDP).
@@ -46,8 +46,8 @@ SW RTE_ETH_FLOW type mapping is proposed.
 
 Dynamic flow type mapping will eliminate usage of number of hard-coded flow 
 types in bulky if-else statements. For instance, when configure hash enable 
-flags for RSS in i40e_config_hena() function and will make partitioning FVL
-in i40e PMD more scalable. 
+flags for RSS in i40e_config_hena() function and will make partitioning
+Intel® Ethernet 700 Series in i40e PMD more scalable.
 
 I40e PCTYPEs are statically mapped to RTE_ETH_FLOW_* types in DPDK, defined in 
 rte_eth_ctrl.h, and flow types used to define ETH_RSS_* offload types in 
diff --git a/test_plans/eeprom_dump_test_plan.rst b/test_plans/eeprom_dump_test_plan.rst
index 6470297a..79d23a3a 100644
--- a/test_plans/eeprom_dump_test_plan.rst
+++ b/test_plans/eeprom_dump_test_plan.rst
@@ -68,7 +68,7 @@ Test Case : EEPROM Dump
 
     ethtool -e <interface_name> raw on length <length> >> <file_name>.txt
 
-3. If nic is columbiaville, store the output of the first 1000 lines from testpmd and ethtool into two files,
+3. If nic is Intel® Ethernet 800 Series, store the output of the first 1000 lines from testpmd and ethtool into two files,
    else store the output from testpmd and ethtool into two files. Then compare both files, verify they are the same.
 
 4. Delete all the files created during testing.
@@ -86,7 +86,7 @@ Test Case : Module EEPROM Dump
 
     ethtool -m <interface_name> raw on length <length> >> <file_name>.txt
 
-3. If nic is columbiaville, store the output of the first 16 lines from testpmd and ethtool into two files,
+3. If nic is Intel® Ethernet 800 Series, store the output of the first 16 lines from testpmd and ethtool into two files,
    else store the output from testpmd and ethtool into two files. Then compare both files, verify they are the same.
 
 4. Delete all the files created during testing.
diff --git a/test_plans/enable_package_download_in_ice_driver_test_plan.rst b/test_plans/enable_package_download_in_ice_driver_test_plan.rst
index b81e4e79..02837459 100644
--- a/test_plans/enable_package_download_in_ice_driver_test_plan.rst
+++ b/test_plans/enable_package_download_in_ice_driver_test_plan.rst
@@ -30,9 +30,9 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-==========================================================
-Flexible pipeline package processing on CPK NIC mode Tests
-==========================================================
+===========================================================
+Flexible pipeline package processing on E822 NIC mode Tests
+===========================================================
 
 Description
 ===========
diff --git a/test_plans/floating_veb_test_plan.rst b/test_plans/floating_veb_test_plan.rst
index bd6e1cd2..6ab99986 100644
--- a/test_plans/floating_veb_test_plan.rst
+++ b/test_plans/floating_veb_test_plan.rst
@@ -42,24 +42,25 @@ http://www.ieee802.org/802_tutorials/2009-11
 /evb-tutorial-draft-20091116_v09.pdf
 
 Virtual Ethernet Bridge (VEB) - This is an IEEE EVB term. A VEB is a VLAN
-Bridge internal to Fortville that bridges the traffic of multiple VSIs over
-an internal virtual network.
+Bridge internal to Intel® Ethernet 700 Series that bridges the traffic of
+multiple VSIs over an internal virtual network.
 
 Virtual Ethernet Port Aggregator (VEPA) - This is an IEEE EVB term. A VEPA
-multiplexes the traffic of one or more VSIs onto a single Fortville Ethernet
-port. The biggest difference between a VEB and a VEPA is that a VEB can
-switch packets internally between VSIs, whereas a VEPA cannot.
+multiplexes the traffic of one or more VSIs onto a single Intel® Ethernet
+700 Series Ethernet port. The biggest difference between a VEB and a VEPA
+is that a VEB can switch packets internally between VSIs, whereas a VEPA
+cannot.
 
 Virtual Station Interface (VSI) - This is an IEEE EVB term that defines
 the properties of a virtual machine's (or a physical machine's) connection
-to the network. Each downstream v-port on a Fortville VEB or VEPA defines
-a VSI. A standards-based definition of VSI properties enables network
-management tools to perform virtual machine migration and associated network
-re-configuration in a vendor-neutral manner.
+to the network. Each downstream v-port on a Intel® Ethernet 700 Series VEB
+or VEPA defines a VSI. A standards-based definition of VSI properties enables
+network management tools to perform virtual machine migration and associated
+network re-configuration in a vendor-neutral manner.
 
 My understanding of VEB is that it's an in-NIC switch(MAC/VLAN), and it can
 support VF->VF, PF->VF, VF->PF packet forwarding according to the NIC internal
-switch. It's similar as Niantic's SRIOV switch.
+switch. It's similar as 82599's SRIOV switch.
 
 Floating VEB Introduction
 =========================
diff --git a/test_plans/generic_flow_api_test_plan.rst b/test_plans/generic_flow_api_test_plan.rst
index 46950797..103d40e4 100644
--- a/test_plans/generic_flow_api_test_plan.rst
+++ b/test_plans/generic_flow_api_test_plan.rst
@@ -38,7 +38,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   Fortville and Niantic
+   Intel® Ethernet 700 Series and 82599
   
 2. software: 
    dpdk: http://dpdk.org/git/dpdk
@@ -52,8 +52,8 @@ Note: validate the rules first before create it in each case.
 All the rules that can be validated correctly should be created successfully.
 The rules can't be validated correctly shouldn't be created successfully.
 
-Test case: Fortville ethertype
-==============================
+Test case: Intel® Ethernet 700 Series ethertype
+===============================================
 
 1. Launch the app ``testpmd`` with the following arguments::
 
@@ -94,8 +94,8 @@ Test case: Fortville ethertype
     testpmd> flow list 0
 
 
-Test case: Fortville fdir for L2 payload
-========================================
+Test case: Intel® Ethernet 700 Series fdir for L2 payload
+=========================================================
 
 1. Launch the app ``testpmd`` with the following arguments::
 
@@ -128,8 +128,8 @@ Test case: Fortville fdir for L2 payload
     testpmd> flow list 0
 
 
-Test case: Fortville fdir for flexbytes
-=======================================
+Test case: Intel® Ethernet 700 Series fdir for flexbytes
+========================================================
 
 1. Launch the app ``testpmd`` with the following arguments::
 
@@ -205,8 +205,8 @@ Test case: Fortville fdir for flexbytes
     testpmd> flow create 0 ingress pattern eth / ipv4 src is 2.2.2.4 dst is 2.2.2.5 / sctp src is 42 / raw relative is 1 offset is 2 pattern is abcdefghijklmnop / end actions queue index 5 / end
     testpmd> flow create 0 ingress pattern eth / vlan tci is 1 / ipv6 src is 2001::1 dst is 2001::2 tc is 3 hop is 30 / tcp src is 32 dst is 33 / raw relative is 1 offset is 0 pattern is hijk / raw relative is 1 offset is 8 pattern is abcdefgh / end actions queue index 6 / end
 
-Test case: Fortville fdir for ipv4
-==================================
+Test case: Intel® Ethernet 700 Series fdir for ipv4
+===================================================
 
    Prerequisites:
    
@@ -310,8 +310,8 @@ Test case: Fortville fdir for ipv4
     testpmd> flow list 0
 
 
-Test case: Fortville fdir for ipv6
-==================================
+Test case: Intel® Ethernet 700 Series fdir for ipv6
+===================================================
 
    Prerequisites:
 
@@ -396,8 +396,8 @@ Test case: Fortville fdir for ipv6
     testpmd> flow list 0
 
 
-Test case: Fortville fdir wrong parameters
-==========================================
+Test case: Intel® Ethernet 700 Series fdir wrong parameters
+===========================================================
 
 1. Launch the app ``testpmd`` with the following arguments::
 
@@ -449,8 +449,8 @@ Note:
 /// not support IP fragment ///
 
 
-Test case: Fortville tunnel vxlan
-=================================
+Test case: Intel® Ethernet 700 Series tunnel vxlan
+==================================================
 
    Prerequisites:
 
@@ -552,8 +552,8 @@ Test case: Fortville tunnel vxlan
     testpmd> flow list 0
 
 
-Test case: Fortville tunnel nvgre
-=================================
+Test case: Intel® Ethernet 700 Series tunnel nvgre
+==================================================
 
    Prerequisites:
 
@@ -1494,8 +1494,8 @@ Test case: igb flexbytes
     testpmd> flow flush 0
     testpmd> flow list 0
 
-Test case: Fortville fdir for l2 mac
-====================================
+Test case: Intel® Ethernet 700 Series fdir for l2 mac
+=====================================================
     Prerequisites:
 
     bind the PF to dpdk driver::
@@ -2007,7 +2007,7 @@ Test case: Dual vlan(QinQ)
 
 1. config testpmd on DUT
 
-   1. set up testpmd with Fortville NICs::
+   1. set up testpmd with Intel® Ethernet 700 Series NICs::
 
          ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x1ffff -n 4 -- -i --coremask=0x1fffe --portmask=0x1 --rxq=16 --txq=16
 
@@ -2105,7 +2105,7 @@ Test Case: 10GB Multiple filters
 
 1. config testpmd on DUT
 
-   1. set up testpmd with Fortville NICs::
+   1. set up testpmd with Intel® Ethernet 700 Series NICs::
 
          ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -l 1,2,3,4,5,6,7,8 -n 4 -- -i --disable-rss --rxq=16 --txq=16
 
@@ -2179,7 +2179,7 @@ queue 1.
 Test Case: jumbo framesize filter
 ===================================
 
-This case is designed for NIC (niantic,I350, 82576 and 82580). Since
+This case is designed for NIC (82599, I350, 82576 and 82580). Since
 ``Testpmd`` could transmits packets with jumbo frame size , it also could
 transmit above packets on assigned queue.  Launch the app ``testpmd`` with the
 following arguments::
@@ -2216,7 +2216,7 @@ the packet are not received on the queue 2::
 Test Case: 64 queues
 ========================
 
-This case is designed for NIC(niantic). Default use 64 queues for test
+This case is designed for NIC(82599). Default use 64 queues for test
 
 Launch the app ``testpmd`` with the following arguments::
 
@@ -2230,7 +2230,7 @@ Launch the app ``testpmd`` with the following arguments::
     testpmd>vlan set filter off 1
 
 Create the 5-tuple Filters with different queues (32,63) on port 0 for
-niantic::
+82599::
 
     testpmd> set stat_qmap rx 0 32 1
     testpmd> flow create 0 ingress pattern eth / ipv4 dst is 2.2.2.5 src is 2.2.2.4 / tcp dst is 1 src is 1 / end actions queue index 32 / end
diff --git a/test_plans/fortville_rss_input_test_plan.rst b/test_plans/i40e_rss_input_test_plan.rst
similarity index 99%
rename from test_plans/fortville_rss_input_test_plan.rst
rename to test_plans/i40e_rss_input_test_plan.rst
index b8e9ea2f..badc98ad 100644
--- a/test_plans/fortville_rss_input_test_plan.rst
+++ b/test_plans/i40e_rss_input_test_plan.rst
@@ -31,9 +31,9 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-====================================================
-Fortville Configuration of RSS in RTE Flow Tests
-====================================================
+=================================================================
+Intel® Ethernet 700 Series Configuration of RSS in RTE Flow Tests
+=================================================================
 
 Description
 ===========
diff --git a/test_plans/iavf_flexible_descriptor_test_plan.rst b/test_plans/iavf_flexible_descriptor_test_plan.rst
index d03fbe41..f03f755a 100644
--- a/test_plans/iavf_flexible_descriptor_test_plan.rst
+++ b/test_plans/iavf_flexible_descriptor_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ============================
-CVL IAVF Flexible Descriptor
+ICE IAVF Flexible Descriptor
 ============================
 
 
@@ -39,15 +39,16 @@ Description
 ===========
 
 To carry more metadata to descriptor and fill them to mbuf to save CPU cost on packet parsing.
-CVL flexible descriptor capability can be used. iavf driver could negotiate descriptor format with PF driver by virtchnl.
-It is implemented in DPDK20.11, and requires ice base driver >= 1.3.0.
+Intel® Ethernet 800 Series flexible descriptor capability can be used. iavf driver could
+negotiate descriptor format with PF driver by virtchnl. It is implemented in DPDK20.11, and
+requires ice base driver >= 1.3.0.
 
 Prerequisites
 =============
 
 1. NIC requires
 
-   - Intel E810 series ethernet cards: columbiaville_25g, columbiaville_100g, etc.
+   - Intel® Ethernet 800 Series ethernet cards: E810-XXVDA4/E810-CQ, etc.
 
 2. Toplogy
 
diff --git a/test_plans/iavf_package_driver_error_handle_test_plan.rst b/test_plans/iavf_package_driver_error_handle_test_plan.rst
index 6c34b0a8..7d26c368 100644
--- a/test_plans/iavf_package_driver_error_handle_test_plan.rst
+++ b/test_plans/iavf_package_driver_error_handle_test_plan.rst
@@ -36,15 +36,19 @@ IAVF Flexible Package and driver error handle check
 
 Description
 ===========
-1. The feature is to check the CVL 100G and 25G NIC, when the using old version driver and latest DDP package, 
-   will cause to the RSS rule create fail, because the old version driver vers does not support RSS feature in iavf.
-2. The feature is to check the CVL 100G and 25G NIC, when the using old version ddp package or invalide ddp package and latest version driver,
-   wll cause to the VF start fail, because the old version package or invalid package does not support VF create for the IAVF
+1. The feature is to check the Intel® Ethernet 800 Series 100G and 25G NIC,
+   when the using old version driver and latest DDP package, will cause to
+   the RSS rule create fail, because the old version driver vers does not
+   support RSS feature in iavf.
+2. The feature is to check the Intel® Ethernet 800 Series 100G and 25G NIC,
+   when the using old version ddp package or invalide ddp package and latest
+   version driver, wll cause to the VF start fail, because the old version
+   package or invalid package does not support VF create for the IAVF
 
 Prerequisites
 =============
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
    dpdk: http://dpdk.org/git/dpdk
diff --git a/test_plans/iavf_test_plan.rst b/test_plans/iavf_test_plan.rst
index 9f657905..ee68a1f4 100644
--- a/test_plans/iavf_test_plan.rst
+++ b/test_plans/iavf_test_plan.rst
@@ -37,8 +37,8 @@ DPDK IAVF API Tests
 Intel Adaptive Virtual Function(IAVF)
 
 Hardwares
-=======================
-I40E driver NIC (Fortville XXV710, Fortville Spirit, Fortville Eagle)
+================================================================
+I40E driver NIC (Intel® Ethernet 700 Series XXV710, XL710, X710)
 
 
 Prerequisites
diff --git a/test_plans/cvl_1pps_signal_test_plan.rst b/test_plans/ice_1pps_signal_test_plan.rst
similarity index 90%
rename from test_plans/cvl_1pps_signal_test_plan.rst
rename to test_plans/ice_1pps_signal_test_plan.rst
index a6dfd49b..d3b17283 100644
--- a/test_plans/cvl_1pps_signal_test_plan.rst
+++ b/test_plans/ice_1pps_signal_test_plan.rst
@@ -31,16 +31,16 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =========================
-CVL 1PPS Signal Test Plan
+ICE 1PPS Signal Test Plan
 =========================
 
 Description
 ===========
-The E810 supports a total of four single-ended GPIO signals(SPD[20:23])plus one different GPIO signal (CLK_OUT_P/N),
-which is configured by default 1PPS(out). The SPD[20:23] is mapping to pin_id[0:3].
-This test plan is designed to check the value of related registers, which make up the 1PPS signal.
-The registers address depends on some hardware config.
-The test cases only give the example of Columbiaville_25g and Columbiaville_100g.
+The Intel® Ethernet 800 Series supports a total of four single-ended GPIO signals(SPD[20:23])plus
+one different GPIO signal (CLK_OUT_P/N), which is configured by default 1PPS(out). The SPD[20:23]
+is mapping to pin_id[0:3]. This test plan is designed to check the value of related registers,
+which make up the 1PPS signal. The registers address depends on some hardware config.
+The test cases only give the example of E810-XXVDA4 and E810-CQ.
 
 
 Prerequisites
@@ -52,7 +52,7 @@ DUT port 0 <----> Tester port 0
 
 Hardware
 --------
-Supported NICs: columbiaville_25g/columbiaville_100g
+Supported NICs: Intel® Ethernet 800 Series E810-XXVDA4/E810-CQ
 
 Software
 --------
diff --git a/test_plans/cvl_advanced_iavf_rss_gtpogre_test_plan.rst b/test_plans/ice_advanced_iavf_rss_gtpogre_test_plan.rst
similarity index 99%
rename from test_plans/cvl_advanced_iavf_rss_gtpogre_test_plan.rst
rename to test_plans/ice_advanced_iavf_rss_gtpogre_test_plan.rst
index 24e33b96..9f2b5094 100644
--- a/test_plans/cvl_advanced_iavf_rss_gtpogre_test_plan.rst
+++ b/test_plans/ice_advanced_iavf_rss_gtpogre_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===============================
-CVL IAVF Support GTPoGRE in RSS
+ICE IAVF Support GTPoGRE in RSS
 ===============================
 
 Description
@@ -47,7 +47,7 @@ As previous(dpdk-21.05) DDP limitation, the outer IP layer of an GTP over GRE pa
 while customers need the second IP layer.
 A new DDP package is required in dpdk-21.08, the new DDP's parser will be able to generate 3 layer's IP protocol header,
 so it will not allow a GTP over GRE packet to share the same profile with a normal GTP packet.
-And DPDK need to support both RSS and FDIR in CVL IAVF.
+And DPDK need to support both RSS and FDIR in Intel® Ethernet 800 Series IAVF.
 
 This test plan is designed to check the RSS of GTPoGRE.
 Supported input set: inner most l3/l4 src/dst
@@ -57,7 +57,7 @@ Supported function: toeplitz, symmetric
 Prerequisites
 =============
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series E810-XXVDA4/E810-CQ
 
 2. Software:
    dpdk: http://dpdk.org/git/dpdk
diff --git a/test_plans/cvl_advanced_iavf_rss_gtpu_test_plan.rst b/test_plans/ice_advanced_iavf_rss_gtpu_test_plan.rst
similarity index 99%
rename from test_plans/cvl_advanced_iavf_rss_gtpu_test_plan.rst
rename to test_plans/ice_advanced_iavf_rss_gtpu_test_plan.rst
index f5710532..61f23b8d 100644
--- a/test_plans/cvl_advanced_iavf_rss_gtpu_test_plan.rst
+++ b/test_plans/ice_advanced_iavf_rss_gtpu_test_plan.rst
@@ -31,13 +31,13 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===============================
-CVL IAVF: Advanced RSS For GTPU 
+ICE IAVF: Advanced RSS For GTPU
 ===============================
 
 Description
 ===========
 
-Enable RSS in CVL IAVF for GTP-U Up/Down Link sperately.
+Enable RSS in Intel® Ethernet 800 Series IAVF for GTP-U Up/Down Link sperately.
 IAVF RSS hash algorithm is based on 5 Tuple (Src IP Address/Dst IP Address/Src Port/Dst Port/l4 Protocol) using the DPDK RTE_FLOW rules for GTP-U packets.
 It can support ipv4+ipv6 combination of GTP-U packet.
 
@@ -186,7 +186,7 @@ Prerequisites
 
 1. Hardware:
 
-  - Intel E810 series ethernet cards: columbiaville_25g/columbiaville_100g/
+  - Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
 
@@ -195,7 +195,8 @@ Prerequisites
 
 .. note::
 
-    This rss feature designed for CVL NIC 25G and 100G, so below cases only support CVL NIC.
+    This rss feature designed for Intel® Ethernet 800 Series NIC 25G and 100G,
+    so below cases only support Intel® Ethernet 800 Series NIC.
 
 3. create a VF from a PF in DUT, set mac address for thi VF::
 
diff --git a/test_plans/cvl_advanced_iavf_rss_pppol2tpoudp_test_plan.rst b/test_plans/ice_advanced_iavf_rss_pppol2tpoudp_test_plan.rst
similarity index 99%
rename from test_plans/cvl_advanced_iavf_rss_pppol2tpoudp_test_plan.rst
rename to test_plans/ice_advanced_iavf_rss_pppol2tpoudp_test_plan.rst
index 11738250..4fa6acd2 100644
--- a/test_plans/cvl_advanced_iavf_rss_pppol2tpoudp_test_plan.rst
+++ b/test_plans/ice_advanced_iavf_rss_pppol2tpoudp_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =========================================
-CVL IAVF: Advanced RSS For PPPoL2TPv2oUDP
+ICE IAVF: Advanced RSS For PPPoL2TPv2oUDP
 =========================================
 
 Description
@@ -45,7 +45,7 @@ Prerequisites
 
 1. Hardware:
 
-  - Intel E810 series ethernet cards: columbiaville_25g/columbiaville_100g/
+  - Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
 
@@ -54,7 +54,8 @@ Prerequisites
 
 .. note::
 
-    This rss feature designed for CVL NIC 25G and 100G, so below cases only support CVL NIC.
+    This rss feature designed for Intel® Ethernet 800 Series NIC 25G and 100G,
+    so below cases only support Intel® Ethernet 800 Series NIC.
 
 3. load PPPoL2TPv2oUDP package
 
diff --git a/test_plans/cvl_advanced_iavf_rss_test_plan.rst b/test_plans/ice_advanced_iavf_rss_test_plan.rst
old mode 100755
new mode 100644
similarity index 99%
rename from test_plans/cvl_advanced_iavf_rss_test_plan.rst
rename to test_plans/ice_advanced_iavf_rss_test_plan.rst
index f991aaf7..fa02ddd6
--- a/test_plans/cvl_advanced_iavf_rss_test_plan.rst
+++ b/test_plans/ice_advanced_iavf_rss_test_plan.rst
@@ -31,15 +31,15 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ==============================
-CVL: IAVF Advanced RSS FOR CVL
+ICE: IAVF Advanced RSS FOR ICE
 ==============================
 
 Description
 ===========
 
 
-IAVF Advanced RSS support columbiaville nic with ice , throught create rule include related pattern and input-set
-to hash IP and ports domain, diversion the packets to the difference queues in VF.
+IAVF Advanced RSS support Intel® Ethernet 800 Series nic with ice , throught create rule include related
+pattern and input-set to hash IP and ports domain, diversion the packets to the difference queues in VF.
 
 * inner header hash for tunnel packets, including comms package.
 * symmetric hash by rte_flow RSS action.
@@ -47,15 +47,15 @@ to hash IP and ports domain, diversion the packets to the difference queues in V
 * For PFCP protocal, the destination port value of the outer UDP header is equal to 8805(0x2265).
   PFCP Node headers shall be identified when the Version field is equal to 001 and the S field is equal 0.
   PFCP Session headers shall be identified when the Version field is equal to 001 and the S field is equal 1.
-  CVL only support RSS hash for PFCP Session SEID value.
+  Intel® Ethernet 800 Series only support RSS hash for PFCP Session SEID value.
 * For L2TPv3 protocal, the IP proto id is equal to 115(0x73).
-  CVL only support RSS hash for L2TPv3 Session id value.
+  Intel® Ethernet 800 Series only support RSS hash for L2TPv3 Session id value.
 * For ESP protocal, the IP proto id is equal to 50(0x32).
-  CVL only support RSS hash for ESP SPI value.
+  Intel® Ethernet 800 Series only support RSS hash for ESP SPI value.
 * For AH protocal, the IP proto id is equal to 51(0x33).
-  CVL only support RSS hash for AH SPI value.
+  E810 series only support RSS hash for AH SPI value.
 * For NAT_T-ESP protocal, the destination port value of the outer UDP header is equal to 4500(0x1194).
-  CVL only support RSS hash for NAT_T-ESP SPI value.
+  Intel® Ethernet 800 Series only support RSS hash for NAT_T-ESP SPI value.
 
 Pattern and input set
 ---------------------
@@ -322,7 +322,7 @@ Prerequisites
 
 1. Hardware:
 
-   - Intel E810 series ethernet cards: columbiaville_25g/columbiaville_100g/
+   - Intel® Ethernet 810 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
 
@@ -331,7 +331,8 @@ Prerequisites
 
 .. note::
 
-   This rss feature designed for CVL NIC 25G and 100g, so below the case only support CVL nic.
+   This rss feature designed for Intel® Ethernet 800 Series NIC 25G and 100g,
+   so below the case only support Intel® Ethernet 800 Series nic.
 
 3. create a VF from a PF in DUT, set mac address for thi VF::
 
diff --git a/test_plans/cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst b/test_plans/ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
similarity index 99%
rename from test_plans/cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
rename to test_plans/ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
index b9229f19..a81329fa 100644
--- a/test_plans/cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
+++ b/test_plans/ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================================
-CVL IAVF: Advanced RSS FOR VLAN/ESP/AH/L2TP/PFCP
+ICE IAVF: Advanced RSS FOR VLAN/ESP/AH/L2TP/PFCP
 ================================================
 
 Description
@@ -90,7 +90,7 @@ Prerequisites
 
 1. Hardware:
 
-   - Intel E810 series ethernet cards: columbiaville_25g/columbiaville_100g
+   - Intel® Ethernet 810 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
 
diff --git a/test_plans/cvl_advanced_rss_gtpogre_test_plan.rst b/test_plans/ice_advanced_rss_gtpogre_test_plan.rst
similarity index 99%
rename from test_plans/cvl_advanced_rss_gtpogre_test_plan.rst
rename to test_plans/ice_advanced_rss_gtpogre_test_plan.rst
index 5c3e7c4d..59b49d19 100644
--- a/test_plans/cvl_advanced_rss_gtpogre_test_plan.rst
+++ b/test_plans/ice_advanced_rss_gtpogre_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =============================
-CVL: Advanced RSS FOR GTPoGRE
+ICE: Advanced RSS FOR GTPoGRE
 =============================
 
 Description
@@ -176,7 +176,7 @@ Prerequisites
 
 1. Hardware:
 
-   - Intel E810 series ethernet cards: columbiaville_25g/columbiaville_100g/
+   - Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
 
@@ -185,12 +185,13 @@ Prerequisites
 
 .. note::
 
-   This rss feature designed for CVL NIC 25G and 100g, so below the case only support CVL nic.
+   This rss feature designed for Intel® Ethernet 800 Series NIC 25G and 100g,
+   so below the case only support Intel® Ethernet 800 Series nic.
 
 3. Copy gtpogre pkg to /lib/firmware/updates/intel/ice/ddp/ice.pkg
    Then reload ice driver
 
-4. bind the CVL port to dpdk driver in DUT::
+4. bind the Intel® Ethernet 800 Series port to dpdk driver in DUT::
 
     modprobe vfio-pci
     usertools/dpdk-devbind.py --force --bind=vfio-pci 0000:3b:00.0
diff --git a/test_plans/cvl_advanced_rss_gtpu_test_plan.rst b/test_plans/ice_advanced_rss_gtpu_test_plan.rst
similarity index 99%
rename from test_plans/cvl_advanced_rss_gtpu_test_plan.rst
rename to test_plans/ice_advanced_rss_gtpu_test_plan.rst
index 96dad583..3be05f4c 100644
--- a/test_plans/cvl_advanced_rss_gtpu_test_plan.rst
+++ b/test_plans/ice_advanced_rss_gtpu_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ==========================
-CVL: Advanced RSS FOR GTPU
+ICE: Advanced RSS FOR GTPU
 ==========================
 
 Description
@@ -171,7 +171,7 @@ Prerequisites
 
 1. Hardware:
 
-   - Intel E810 series ethernet cards: columbiaville_25g/columbiaville_100g/
+   - Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
 
@@ -180,9 +180,10 @@ Prerequisites
 
 .. note::
 
-   This rss feature designed for CVL NIC 25G and 100g, so below the case only support CVL nic.
+   This rss feature designed for Intel® Ethernet 800 Series NIC 25G and 100g,
+   so below the case only support Intel® Ethernet 800 Series nic.
 
-3. bind the CVL port to dpdk driver in DUT::
+3. bind the Intel® Ethernet 800 Series port to dpdk driver in DUT::
 
     modprobe vfio-pci
     usertools/dpdk-devbind.py --force --bind=vfio-pci 0000:3b:00.0
diff --git a/test_plans/cvl_advanced_rss_pppoe_test_plan.rst b/test_plans/ice_advanced_rss_pppoe_test_plan.rst
similarity index 99%
rename from test_plans/cvl_advanced_rss_pppoe_test_plan.rst
rename to test_plans/ice_advanced_rss_pppoe_test_plan.rst
index c3f6ccad..05dd82b6 100644
--- a/test_plans/cvl_advanced_rss_pppoe_test_plan.rst
+++ b/test_plans/ice_advanced_rss_pppoe_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===========================
-CVL: Advanced RSS FOR PPPOE
+ICE: Advanced RSS FOR PPPOE
 ===========================
 
 Description
@@ -99,7 +99,7 @@ Prerequisites
 
 1. Hardware:
 
-   - Intel E810 series ethernet cards: columbiaville_25g/columbiaville_100g
+   - Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
 
diff --git a/test_plans/cvl_advanced_rss_test_plan.rst b/test_plans/ice_advanced_rss_test_plan.rst
similarity index 99%
rename from test_plans/cvl_advanced_rss_test_plan.rst
rename to test_plans/ice_advanced_rss_test_plan.rst
index 4e119422..84495696 100644
--- a/test_plans/cvl_advanced_rss_test_plan.rst
+++ b/test_plans/ice_advanced_rss_test_plan.rst
@@ -31,14 +31,14 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =========================
-CVL: Advanced RSS FOR CVL
+ICE: Advanced RSS FOR ICE
 =========================
 
 Description
 ===========
 
-Advanced RSS only support columbiaville nic with ice , through creating rules which include related pattern and input-set
-to hash IP and ports domain, diverting the packets to different queues.
+Advanced RSS only support Intel® Ethernet 800 Series nic with ice , through creating rules which include
+related pattern and input-set to hash IP and ports domain, diverting the packets to different queues.
 
 * inner header hash for tunnel packets, including comms package.
 * symmetric hash by rte_flow RSS func.
@@ -290,7 +290,7 @@ Prerequisites
 
 1. Hardware:
 
-   - Intel E810 series ethernet cards: columbiaville_25g/columbiaville_100g/
+   - Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
 
@@ -299,9 +299,10 @@ Prerequisites
 
 .. note::
 
-   This rss feature designed for CVL NIC 25G and 100g, so below the case only support CVL nic.
+   This rss feature designed for Intel® Ethernet 800 Series NIC 25G and 100g,
+   so below the case only support Intel® Ethernet 800 Series nic.
 
-3. bind the CVL port to dpdk driver in DUT::
+3. bind the Intel® Ethernet 800 Series port to dpdk driver in DUT::
 
     modprobe vfio-pci
     usertools/dpdk-devbind.py --force --bind=vfio-pci 0000:18:00.0
diff --git a/test_plans/cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst b/test_plans/ice_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
similarity index 99%
rename from test_plans/cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
rename to test_plans/ice_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
index ca22efda..092d8fe9 100644
--- a/test_plans/cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
+++ b/test_plans/ice_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===========================================
-CVL: Advanced RSS FOR VLAN/ESP/AH/L2TP/PFCP
+ICE: Advanced RSS FOR VLAN/ESP/AH/L2TP/PFCP
 ===========================================
 
 Description
@@ -90,7 +90,7 @@ Prerequisites
 
 1. Hardware:
 
-   - Intel E810 series ethernet cards: columbiaville_25g/columbiaville_100g
+   - Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
 
diff --git a/test_plans/cvl_dcf_acl_filter_test_plan.rst b/test_plans/ice_dcf_acl_filter_test_plan.rst
similarity index 99%
rename from test_plans/cvl_dcf_acl_filter_test_plan.rst
rename to test_plans/ice_dcf_acl_filter_test_plan.rst
index 27a0e332..1f92d659 100644
--- a/test_plans/cvl_dcf_acl_filter_test_plan.rst
+++ b/test_plans/ice_dcf_acl_filter_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ==================
-CVL DCF ACL filter
+ICE DCF ACL filter
 ==================
 
 Description
@@ -51,7 +51,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
    dpdk: http://dpdk.org/git/dpdk
diff --git a/test_plans/cvl_dcf_date_path_test_plan.rst b/test_plans/ice_dcf_date_path_test_plan.rst
old mode 100755
new mode 100644
similarity index 100%
rename from test_plans/cvl_dcf_date_path_test_plan.rst
rename to test_plans/ice_dcf_date_path_test_plan.rst
diff --git a/test_plans/cvl_dcf_flow_priority_test_plan.rst b/test_plans/ice_dcf_flow_priority_test_plan.rst
old mode 100755
new mode 100644
similarity index 99%
rename from test_plans/cvl_dcf_flow_priority_test_plan.rst
rename to test_plans/ice_dcf_flow_priority_test_plan.rst
index d4623194..522243b3
--- a/test_plans/cvl_dcf_flow_priority_test_plan.rst
+++ b/test_plans/ice_dcf_flow_priority_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================
-CVL Support Flow Priority in DCF
+ICE Support Flow Priority in DCF
 ================================
 
 Description
@@ -47,7 +47,7 @@ Description
 Prerequisites
 =============
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
    dpdk: http://dpdk.org/git/dpdk
diff --git a/test_plans/cvl_dcf_qos_test_plan.rst b/test_plans/ice_dcf_qos_test_plan.rst
similarity index 99%
rename from test_plans/cvl_dcf_qos_test_plan.rst
rename to test_plans/ice_dcf_qos_test_plan.rst
index 1ceaed0c..4498c717 100644
--- a/test_plans/cvl_dcf_qos_test_plan.rst
+++ b/test_plans/ice_dcf_qos_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===================================
-CVL configure QoS for vf/vsi in DCF
+ICE configure QoS for vf/vsi in DCF
 ===================================
 
 Description
@@ -81,7 +81,8 @@ Prerequisites
 =============
 
 1. Hardware:
-   1 port from columbiaville_100g(NIC-1), 2 ports from columbiaville_25g(NIC-2);
+   1 port from Intel® Ethernet Network Adapter E810-CQDA2(NIC-1),
+   2 ports from Intel® Ethernet Network Adapter E810-XXVDA4(NIC-2);
    one 100G cable, one 10G cable;
    The connection is as below table::
 
diff --git a/test_plans/cvl_dcf_switch_filter_gtpu_test_plan.rst b/test_plans/ice_dcf_switch_filter_gtpu_test_plan.rst
similarity index 99%
rename from test_plans/cvl_dcf_switch_filter_gtpu_test_plan.rst
rename to test_plans/ice_dcf_switch_filter_gtpu_test_plan.rst
index 5004b1e6..5ba28ec2 100644
--- a/test_plans/cvl_dcf_switch_filter_gtpu_test_plan.rst
+++ b/test_plans/ice_dcf_switch_filter_gtpu_test_plan.rst
@@ -31,13 +31,13 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================
-CVL DCF Switch Filter GTPU Tests
+ICE DCF Switch Filter GTPU Tests
 ================================
 
 Description
 ===========
 
-This document provides the plan for testing DCF switch filter gtpu of CVL, including:
+This document provides the plan for testing DCF switch filter gtpu of Intel® Ethernet 800 Series, including:
 
 * Enable DCF switch filter for GTPU, the Pattern and Input Set are shown in the below table
 
@@ -118,7 +118,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 810 Series: E810-XXVDA4/E810-CQ
 
 2. Software::
 
diff --git a/test_plans/cvl_dcf_switch_filter_pppoe_test_plan.rst b/test_plans/ice_dcf_switch_filter_pppoe_test_plan.rst
similarity index 99%
rename from test_plans/cvl_dcf_switch_filter_pppoe_test_plan.rst
rename to test_plans/ice_dcf_switch_filter_pppoe_test_plan.rst
index a00687c8..323f5e3e 100644
--- a/test_plans/cvl_dcf_switch_filter_pppoe_test_plan.rst
+++ b/test_plans/ice_dcf_switch_filter_pppoe_test_plan.rst
@@ -31,13 +31,13 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =================================
-CVL DCF Switch Filter PPPOE Tests
+ICE DCF Switch Filter PPPOE Tests
 =================================
 
 Description
 ===========
 
-This document provides the plan for testing DCF switch filter pppoe of CVL, including:
+This document provides the plan for testing DCF switch filter pppoe of Intel® Ethernet 800 Series, including:
 
 * Enable DCF switch filter for PPPOES (comm #1 package)
 
@@ -156,7 +156,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 810 Series: E810-XXVDA4/E810-CQ
    design the cases with 2 ports card.
 
 2. Software:
diff --git a/test_plans/cvl_dcf_switch_filter_test_plan.rst b/test_plans/ice_dcf_switch_filter_test_plan.rst
similarity index 99%
rename from test_plans/cvl_dcf_switch_filter_test_plan.rst
rename to test_plans/ice_dcf_switch_filter_test_plan.rst
index dda27740..08485fad 100644
--- a/test_plans/cvl_dcf_switch_filter_test_plan.rst
+++ b/test_plans/ice_dcf_switch_filter_test_plan.rst
@@ -31,13 +31,13 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===========================
-CVL DCF Switch Filter Tests
+ICE DCF Switch Filter Tests
 ===========================
 
 Description
 ===========
 
-This document provides the plan for testing DCF switch filter of CVL, including:
+This document provides the plan for testing DCF switch filter of Intel® Ethernet 800 Series, including:
 
 * Enable DCF switch filter for IPv4/IPv6 + TCP/UDP/IGMP (comm #1 package)
 * Enable DCF switch filter for tunnel: NVGRE (comm #1 package)
@@ -186,7 +186,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 810 Series: E810-XXVDA4/E810-CQ
    design the cases with 2 ports card.
 
 2. Software:
@@ -2661,7 +2661,7 @@ are dropped.
 Test case: Max vfs
 ==================
 
-Description: 256 VFs can be created on a CVL NIC, if 2*100G NIC, each PF
+Description: 256 VFs can be created on a Intel® Ethernet 800 Series NIC, if 2*100G NIC, each PF
 can create 128 VFs, else if 4*25G NIC, each PF can create 64 VFs. This
 case is used to test when all VFs on a PF are used, switch filter rules can work.
 This case is designed based on 4*25G NIC.
@@ -2741,7 +2741,7 @@ This case is designed based on 4*25G NIC.
 Test case: max field vectors
 ============================
 
-Description: 48 field vectors can be used on a CVL nic. This case is used
+Description: 48 field vectors can be used on a Intel® Ethernet 800 Series nic. This case is used
 to test when field vectors are run out of, then creating a rule, testpmd
 will not hang and provide a friendly output.
 
diff --git a/test_plans/cvl_ecpri_test_plan.rst b/test_plans/ice_ecpri_test_plan.rst
similarity index 99%
rename from test_plans/cvl_ecpri_test_plan.rst
rename to test_plans/ice_ecpri_test_plan.rst
index 101562cd..9bf88d4d 100644
--- a/test_plans/cvl_ecpri_test_plan.rst
+++ b/test_plans/ice_ecpri_test_plan.rst
@@ -31,15 +31,15 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ==========================
-CVL support eCPRI protocol
+ICE support eCPRI protocol
 ==========================
 eCPRI protocol is used for exchanging messages within ORAN 5G Front Haul.
 According to the ORAN FH specification the eCPRI packets are sent over Ethernet.
 They can be transmitted over standard Ethernet frames, or can use IP/UDP as the transport mechanism.
 In case of the IP/UDP transport mechanism the ORAN FH standard says that
-the UDP destination port used for eCPRI protocol is not fixed, thus, the user should be able to configure the port number dynamically.
-A change is required in DPDK APIs to allow it.
-And CVL rss and fdir rte_flow APIs are needed to support classfication of eCPRI protocol.
+the UDP destination port used for eCPRI protocol is not fixed, thus, the user should be able to configure
+the port number dynamically. A change is required in DPDK APIs to allow it.
+And Intel® Ethernet 800 Series rss and fdir rte_flow APIs are needed to support classfication of eCPRI protocol.
 Therefore, this test plan contain 3 parts:
 * UDP dst port dynamically config for eCPRI
 * rss supporting for eCPRI
@@ -49,7 +49,7 @@ Therefore, this test plan contain 3 parts:
 Prerequisites
 =============
 1. Hardware:
-    columbiaville_25g/columbiaville_100g
+    Intel® Ethernet 810 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
     dpdk: http://dpdk.org/git/dpdk
diff --git a/test_plans/cvl_fdir_test_plan.rst b/test_plans/ice_fdir_test_plan.rst
similarity index 99%
rename from test_plans/cvl_fdir_test_plan.rst
rename to test_plans/ice_fdir_test_plan.rst
index 55625bde..906b3527 100644
--- a/test_plans/cvl_fdir_test_plan.rst
+++ b/test_plans/ice_fdir_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================
-CVL:Classification:Flow Director
+ICE:Classification:Flow Director
 ================================
 
 Enable fdir filter for IPv4/IPv6 + TCP/UDP/SCTP  (OS default package)
@@ -129,7 +129,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 810 Series: E810-XXVDA4/E810-CQ
    design the cases with 2 ports card.
 
 2. Software:
diff --git a/test_plans/cvl_flow_priority_test_plan.rst b/test_plans/ice_flow_priority_test_plan.rst
similarity index 98%
rename from test_plans/cvl_flow_priority_test_plan.rst
rename to test_plans/ice_flow_priority_test_plan.rst
index a04e12dc..4bce5105 100644
--- a/test_plans/cvl_flow_priority_test_plan.rst
+++ b/test_plans/ice_flow_priority_test_plan.rst
@@ -31,16 +31,17 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===============================
-CVL Support Flow Priority in PF
+ICE Support Flow Priority in PF
 ===============================
 
 Description
 ===========
-In CVL PF rte_flow distribution mode(non-pipeline mode), a flow with priority = 1 will be programmed into switch filter,
-a flow with priority = 0 will be programmed into switch first then fdir. 
-Currently only support priority 0 and 1. 1 means low priority and 0 means high priority.
-When looking up rule table, matched pkt will hit the high priority rule firstly,
-it will hit the low priority rule only when there is no high priority rule exist.
+In Intel® Ethernet 800 Series PF rte_flow distribution mode(non-pipeline mode), a flow
+with priority = 1 will be programmed into switch filter, a flow with priority = 0 will
+be programmed into switch first then fdir. Currently only support priority 0 and 1. 1
+means low priority and 0 means high priority. When looking up rule table, matched pkt
+will hit the high priority rule firstly, it will hit the low priority rule only when
+there is no high priority rule exist.
 
 
 Prerequisites
@@ -53,7 +54,7 @@ Topology
 
 Hardware
 --------
-Supportted NICs: columbiaville_25g/columbiaville_100g
+Supportted NICs: Intel® Ethernet Network Adapter E810-XXVDA4/Intel® Ethernet Network Adapter E810-CQDA2
 
 Software
 --------
@@ -288,7 +289,7 @@ Support Pattern and Input Set
 
 ..note::
 
-    the basic switch function of supported pattern is covered by cvl_switch_filter_test_plan.rst and cvl_switch_filter_pppoe_test_plan.rst.
+    the basic switch function of supported pattern is covered by ice_switch_filter_test_plan.rst and ice_switch_filter_pppoe_test_plan.rst.
     this test plan is designed to check the flow priority in switch, so we only select some patterns not all matrix in test plan.
 
 
diff --git a/test_plans/iavf_fdir_gtpogre_test_plan.rst b/test_plans/ice_iavf_fdir_gtpogre_test_plan.rst
similarity index 99%
rename from test_plans/iavf_fdir_gtpogre_test_plan.rst
rename to test_plans/ice_iavf_fdir_gtpogre_test_plan.rst
index 8e9e187a..4fb5bc34 100644
--- a/test_plans/iavf_fdir_gtpogre_test_plan.rst
+++ b/test_plans/ice_iavf_fdir_gtpogre_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================
-CVL IAVF Support GTPoGRE in FDIR
+ICE IAVF Support GTPoGRE in FDIR
 ================================
 
 Description
@@ -47,7 +47,7 @@ As previous(dpdk-21.05) DDP limitation, the outer IP layer of an GTP over GRE pa
 while customers need the second IP layer.
 A new DDP package is required in dpdk-21.08, the new DDP's parser will be able to generate 3 layer's IP protocol header,
 so it will not allow a GTP over GRE packet to share the same profile with a normal GTP packet.
-And DPDK need to support both RSS and FDIR in CVL IAVF.
+And DPDK need to support both RSS and FDIR in Intel® Ethernet 800 Series IAVF.
 
 This test plan is designed to check the FDIR of GTPoGRE.
 Supported input set: inner most l3/l4 src/dst, outer l3 src/dst, gtpu teid, qfi
@@ -57,7 +57,7 @@ Supported action: queue index, rss queues, passthru, drop, mark rss
 Prerequisites
 =============
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet Network Adapter E810-XXVDA4/Intel® Ethernet Network Adapter E810-CQDA2
 
 2. Software:
    dpdk: http://dpdk.org/git/dpdk
diff --git a/test_plans/cvl_iavf_fdir_pppol2tpoudp_test_plan.rst b/test_plans/ice_iavf_fdir_pppol2tpoudp_test_plan.rst
similarity index 99%
rename from test_plans/cvl_iavf_fdir_pppol2tpoudp_test_plan.rst
rename to test_plans/ice_iavf_fdir_pppol2tpoudp_test_plan.rst
index da195ad2..fa3ac934 100644
--- a/test_plans/cvl_iavf_fdir_pppol2tpoudp_test_plan.rst
+++ b/test_plans/ice_iavf_fdir_pppol2tpoudp_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =================================
-CVL IAVF: FDIR For PPPoL2TPv2oUDP
+ICE IAVF: FDIR For PPPoL2TPv2oUDP
 =================================
 
 Description
@@ -50,7 +50,7 @@ Topology
 
 Hardware
 --------
-Supportted NICs: columbiaville_25g/columbiaville_100g
+Supportted NICs: Intel® Ethernet Network Adapter E810-XXVDA4/Intel® Ethernet Network Adapter E810-CQDA2
 
 Software
 --------
diff --git a/test_plans/iavf_fdir_test_plan.rst b/test_plans/ice_iavf_fdir_test_plan.rst
similarity index 99%
rename from test_plans/iavf_fdir_test_plan.rst
rename to test_plans/ice_iavf_fdir_test_plan.rst
index d371ca71..f5940e1c 100644
--- a/test_plans/iavf_fdir_test_plan.rst
+++ b/test_plans/ice_iavf_fdir_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ======================================
-CVL:advanced iavf with FDIR capability
+ICE:advanced iavf with FDIR capability
 ======================================
 
 Support flow director to steering packets to queue/queue group in iavf
@@ -206,7 +206,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet Network Adapter E810-XXVDA4/Intel® Ethernet Network Adapter E810-CQDA2
 
 2. Software:
    DPDK: http://dpdk.org/git/dpdk
diff --git a/test_plans/cvl_iavf_ip_fragment_rte_flow_test_plan.rst b/test_plans/ice_iavf_ip_fragment_rte_flow_test_plan.rst
similarity index 99%
rename from test_plans/cvl_iavf_ip_fragment_rte_flow_test_plan.rst
rename to test_plans/ice_iavf_ip_fragment_rte_flow_test_plan.rst
index 35e4c03c..d7e4e1b1 100644
--- a/test_plans/cvl_iavf_ip_fragment_rte_flow_test_plan.rst
+++ b/test_plans/ice_iavf_ip_fragment_rte_flow_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ==================================
-CVL IAVF IP FRAGMENT RTE FLOW TEST
+ICE IAVF IP FRAGMENT RTE FLOW TEST
 ==================================
 
 Description
@@ -63,7 +63,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
    dpdk: http://dpdk.org/git/dpdk
diff --git a/test_plans/cvl_iavf_rss_configure_test_plan.rst b/test_plans/ice_iavf_rss_configure_test_plan.rst
old mode 100755
new mode 100644
similarity index 99%
rename from test_plans/cvl_iavf_rss_configure_test_plan.rst
rename to test_plans/ice_iavf_rss_configure_test_plan.rst
index ecce0fe8..2473f28b
--- a/test_plans/cvl_iavf_rss_configure_test_plan.rst
+++ b/test_plans/ice_iavf_rss_configure_test_plan.rst
@@ -53,7 +53,7 @@ Prerequisites
 
 1. NIC requires:
 
-   - Intel E810 series ethernet cards: columbiaville_25g, columbiaville_100g, etc.
+   - Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ, etc.
 
 2. insmod ice.ko, and bind PF to ice.
 
diff --git a/test_plans/cvl_ip_fragment_rte_flow_test_plan.rst b/test_plans/ice_ip_fragment_rte_flow_test_plan.rst
similarity index 99%
rename from test_plans/cvl_ip_fragment_rte_flow_test_plan.rst
rename to test_plans/ice_ip_fragment_rte_flow_test_plan.rst
index 909692cc..18e0ad28 100644
--- a/test_plans/cvl_ip_fragment_rte_flow_test_plan.rst
+++ b/test_plans/ice_ip_fragment_rte_flow_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =============================
-CVL IP FRAGMENT RTE FLOW TEST
+ICE IP FRAGMENT RTE FLOW TEST
 =============================
 
 Description
@@ -63,7 +63,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
    dpdk: http://dpdk.org/git/dpdk
diff --git a/test_plans/cvl_limit_value_test_test_plan.rst b/test_plans/ice_limit_value_test_test_plan.rst
similarity index 97%
rename from test_plans/cvl_limit_value_test_test_plan.rst
rename to test_plans/ice_limit_value_test_test_plan.rst
index 84e650d5..30c98e77 100644
--- a/test_plans/cvl_limit_value_test_test_plan.rst
+++ b/test_plans/ice_limit_value_test_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ========================
-CVL Limit Value Test
+ICE Limit Value Test
 ========================
 
 Description
@@ -60,7 +60,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
    DPDK: http://dpdk.org/git/dpdk
@@ -419,7 +419,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
    design the cases with 2 ports card.
 
 2. Software:
@@ -488,7 +488,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
    design the cases with 2 ports card.
 
 2. Software:
@@ -552,11 +552,11 @@ Prerequisites
 Test case: max rule number
 ==========================
 
-Description: 32k switch filter rules can be created on a CVL card,
-and all PFs and VFs share the 32k rules. But the system will first create
-some MAC_VLAN rules in switch table, and as the number of rules increased,
-the hash conflicts in the switch filter table are increased, so we can
-create a total of 32500 switch filter rules on a DCF.
+Description: 32k switch filter rules can be created on a Intel® Ethernet
+800 Series card, and all PFs and VFs share the 32k rules. But the system
+will first create some MAC_VLAN rules in switch table, and as the number
+of rules increased, the hash conflicts in the switch filter table are
+increased, so we can create a total of 32500 switch filter rules on a DCF.
 
 1. create 32500 rules with the same pattern, but different input set::
 
diff --git a/test_plans/cvl_qinq_test_plan.rst b/test_plans/ice_qinq_test_plan.rst
similarity index 99%
rename from test_plans/cvl_qinq_test_plan.rst
rename to test_plans/ice_qinq_test_plan.rst
index 474d6209..2ad52f10 100644
--- a/test_plans/cvl_qinq_test_plan.rst
+++ b/test_plans/ice_qinq_test_plan.rst
@@ -31,9 +31,9 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =========================
-CVL support QinQ protocol
+ICE support QinQ protocol
 =========================
-DPDK support QinQ protocol in CVL as below requirements:
+DPDK support QinQ protocol in Intel® Ethernet 800 Series as below requirements:
 * DCF support QinQ by add steering rule and vlan strip disable.
 * DCF is able to set port vlan by port representor.
 * AVF is able to configure inner VLAN filter when port vlan is enabled base on negotiation.
@@ -47,7 +47,7 @@ this test plan contain 3 parts to cover above requirements:
 Prerequisites
 =============
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
    dpdk: http://dpdk.org/git/dpdk
@@ -1536,12 +1536,14 @@ Test case 14: AVF CRC strip and Vlan strip co-exists
      196.222.232.221 > 127.0.0.1:  ip-proto-0 480
 
 ====================================
-CVL DCF QINQ Switch Filter Test Plan
+ICE DCF QINQ Switch Filter Test Plan
 ====================================
 
 Description
 ===========
-CVL support l4 for QinQ switch filter in DCF driver is by dst MAC + outer VLAN id + inner VLAN id + dst IP + dst port, and port can support as eth / vlan / vlan / IP / tcp|udp.
+Intel® Ethernet 800 Series support l4 for QinQ switch filter in DCF driver is by
+dst MAC + outer VLAN id + inner VLAN id + dst IP + dst port, and port can support
+as eth / vlan / vlan / IP / tcp|udp.
 * Enable QINQ switch filter for IPv4/IPv6, IPv4 + TCP/UDP in non-pipeline mode. 
 * Enable QINQ switch filter for IPv6 + TCP/UDP in pipeline mode. 
 
@@ -1550,7 +1552,7 @@ Prerequisites
 
 Hardware
 --------
-Supportted NICs: columbiaville_25g/columbiaville_100g
+Supportted NICs: Intel® Ethernet Network Adapter E810-XXVDA4/Intel® Ethernet Network Adapter E810-CQDA2
 
 Software
 --------
diff --git a/test_plans/cvl_rss_configure_test_plan.rst b/test_plans/ice_rss_configure_test_plan.rst
similarity index 99%
rename from test_plans/cvl_rss_configure_test_plan.rst
rename to test_plans/ice_rss_configure_test_plan.rst
index 3e9fb96b..7f16398e 100644
--- a/test_plans/cvl_rss_configure_test_plan.rst
+++ b/test_plans/ice_rss_configure_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =============================
-CVL: RSS CONFIGURE AND UPDATE
+ICE: RSS CONFIGURE AND UPDATE
 =============================
 
 Description
@@ -64,14 +64,14 @@ Prerequisites
 
 1. Hardware:
 
-   - Intel E810 series ethernet cards: columbiaville
+   - Intel® Ethernet 800 Series
 
 2. Software:
 
    - dpdk: http://dpdk.org/git/dpdk
    - scapy: http://www.secdev.org/projects/scapy/
 
-3. bind the CVL port to dpdk driver in DUT::
+3. bind the Intel® Ethernet 800 Series port to dpdk driver in DUT::
 
     modprobe vfio-pci
     usertools/dpdk-devbind.py --force --bind=vfio-pci 0000:18:00.0
diff --git a/test_plans/cvl_switch_filter_pppoe_test_plan.rst b/test_plans/ice_switch_filter_pppoe_test_plan.rst
similarity index 99%
rename from test_plans/cvl_switch_filter_pppoe_test_plan.rst
rename to test_plans/ice_switch_filter_pppoe_test_plan.rst
index 7485c45d..3d6db445 100644
--- a/test_plans/cvl_switch_filter_pppoe_test_plan.rst
+++ b/test_plans/ice_switch_filter_pppoe_test_plan.rst
@@ -31,13 +31,13 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =======================
-CVL Switch Filter Tests
+ICE Switch Filter Tests
 =======================
 
 Description
 ===========
 
-This document provides the plan for testing switch filter feature of CVL, including:
+This document provides the plan for testing switch filter feature of Intel® Ethernet 800 Series, including:
 
 * Enable switch filter for PPPOE in non-pipeline/pipeline mode (comm #1 package)
 
@@ -179,7 +179,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
    design the cases with 2 ports card.
 
 2. software:
diff --git a/test_plans/cvl_switch_filter_test_plan.rst b/test_plans/ice_switch_filter_test_plan.rst
similarity index 99%
rename from test_plans/cvl_switch_filter_test_plan.rst
rename to test_plans/ice_switch_filter_test_plan.rst
index def9394d..b6d0d596 100644
--- a/test_plans/cvl_switch_filter_test_plan.rst
+++ b/test_plans/ice_switch_filter_test_plan.rst
@@ -31,13 +31,13 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =======================
-CVL Switch Filter Tests
+ICE Switch Filter Tests
 =======================
 
 Description
 ===========
 
-This document provides the plan for testing switch filter feature of CVL, including:
+This document provides the plan for testing switch filter feature of Intel® Ethernet 800 Series, including:
 
 * Enable switch filter for IPv4/IPv6 + TCP/UDP in non-pipeline/pipeline mode (comm #1 package)
 * Enable switch filter for tunnel : VXLAN / NVGRE in non-pipeline/pipeline mode (comm #1 package)
@@ -158,7 +158,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
    design the cases with 2 ports card.
 
 2. software:
@@ -5154,7 +5154,9 @@ flow create 0 ingress pattern eth / ipv6 / udp / gtpu / gtp_psc / ipv6 dst is CD
 
 Description
 ===========
-CVL support l4 for QinQ switch filter in PF driver is by dst MAC + outer VLAN id + inner VLAN id + dst IP + dst port, and port can support as eth / vlan / vlan / IP / tcp|udp.
+Intel® Ethernet 800 Series support l4 for QinQ switch filter in PF driver is by
+dst MAC + outer VLAN id + inner VLAN id + dst IP + dst port, and port can support
+as eth / vlan / vlan / IP / tcp|udp.
 * Enable QINQ switch filter for IPv4/IPv6, IPv4 + TCP/UDP in non-pipeline mode.
 * Enable QINQ switch filter for IPv6 + TCP/UDP in pipeline mode.
 
diff --git a/test_plans/cvl_vf_support_multicast_address_test_plan.rst b/test_plans/ice_vf_support_multicast_address_test_plan.rst
similarity index 99%
rename from test_plans/cvl_vf_support_multicast_address_test_plan.rst
rename to test_plans/ice_vf_support_multicast_address_test_plan.rst
index 24a3c600..71ae7f56 100644
--- a/test_plans/cvl_vf_support_multicast_address_test_plan.rst
+++ b/test_plans/ice_vf_support_multicast_address_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =================================
-CVL: VF support multicast address
+ICE: VF support multicast address
 =================================
 VF support adding and removing multicast address
 
@@ -40,7 +40,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet 800 Series: E810-XXVDA4/E810-CQ
 
 2. Software:
    DPDK: http://dpdk.org/git/dpdk
diff --git a/test_plans/index.rst b/test_plans/index.rst
index d0f73d23..db5237e4 100644
--- a/test_plans/index.rst
+++ b/test_plans/index.rst
@@ -43,37 +43,37 @@ The following are the test plans for the DPDK DTS automated test system.
     basic_4k_pages_cbdma_test_plan
     checksum_offload_test_plan
     coremask_test_plan
-    cvl_advanced_rss_test_plan
-    cvl_advanced_rss_gtpu_test_plan
-    cvl_advanced_rss_pppoe_test_plan
-    cvl_advanced_rss_gtpogre_test_plan
-    cvl_advanced_iavf_rss_test_plan
-    cvl_advanced_iavf_rss_gtpu_test_plan
-    cvl_advanced_iavf_rss_gtpogre_test_plan
-    cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan
-    cvl_advanced_iavf_rss_pppol2tpoudp_test_plan
-    cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan
-    cvl_dcf_acl_filter_test_plan
-    cvl_dcf_date_path_test_plan
-    cvl_dcf_switch_filter_test_plan
-    cvl_dcf_switch_filter_pppoe_test_plan
-    cvl_dcf_switch_filter_gtpu_test_plan
-    cvl_dcf_flow_priority_test_plan
-    cvl_flow_priority_test_plan
-    cvl_dcf_qos_test_plan
-    cvl_ecpri_test_plan
-    cvl_fdir_test_plan
-    cvl_ip_fragment_rte_flow_test_plan
-    cvl_iavf_ip_fragment_rte_flow_test_plan
-    cvl_iavf_rss_configure_test_plan
-    cvl_iavf_fdir_pppol2tpoudp_test_plan
-    cvl_limit_value_test_test_plan
-    cvl_qinq_test_plan
-    cvl_rss_configure_test_plan
-    cvl_switch_filter_test_plan
-    cvl_switch_filter_pppoe_test_plan
-    cvl_vf_support_multicast_address_test_plan
-    cvl_1pps_signal_test_plan
+    ice_advanced_rss_test_plan
+    ice_advanced_rss_gtpu_test_plan
+    ice_advanced_rss_pppoe_test_plan
+    ice_advanced_rss_gtpogre_test_plan
+    ice_advanced_iavf_rss_test_plan
+    ice_advanced_iavf_rss_gtpu_test_plan
+    ice_advanced_iavf_rss_gtpogre_test_plan
+    ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp_test_plan
+    ice_advanced_iavf_rss_pppol2tpoudp_test_plan
+    ice_advanced_rss_vlan_esp_ah_l2tp_pfcp_test_plan
+    ice_dcf_acl_filter_test_plan
+    ice_dcf_date_path_test_plan
+    ice_dcf_switch_filter_test_plan
+    ice_dcf_switch_filter_pppoe_test_plan
+    ice_dcf_switch_filter_gtpu_test_plan
+    ice_dcf_flow_priority_test_plan
+    ice_flow_priority_test_plan
+    ice_dcf_qos_test_plan
+    ice_ecpri_test_plan
+    ice_fdir_test_plan
+    ice_ip_fragment_rte_flow_test_plan
+    ice_iavf_ip_fragment_rte_flow_test_plan
+    ice_iavf_rss_configure_test_plan
+    ice_iavf_fdir_pppol2tpoudp_test_plan
+    ice_limit_value_test_test_plan
+    ice_qinq_test_plan
+    ice_rss_configure_test_plan
+    ice_switch_filter_test_plan
+    ice_switch_filter_pppoe_test_plan
+    ice_vf_support_multicast_address_test_plan
+    ice_1pps_signal_test_plan
     cloud_filter_with_l4_port_test_plan
     dcf_lifecycle_test_plan
     crypto_perf_cryptodev_perf_test_plan
@@ -92,12 +92,12 @@ The following are the test plans for the DPDK DTS automated test system.
     firmware_version_test_plan
     floating_veb_test_plan
     flow_classify_softnic_test_plan
-    fortville_rss_input_test_plan
+    i40e_rss_input_test_plan
     generic_flow_api_test_plan
     hotplug_mp_test_plan
     hotplug_test_plan
-    iavf_fdir_test_plan
-    iavf_fdir_gtpogre_test_plan
+    ice_iavf_fdir_test_plan
+    ice_iavf_fdir_gtpogre_test_plan
     iavf_flexible_descriptor_test_plan
     iavf_package_driver_error_handle_test_plan
     ieee1588_test_plan
diff --git a/test_plans/inline_ipsec_test_plan.rst b/test_plans/inline_ipsec_test_plan.rst
index 0b4e45a1..4ce841b3 100644
--- a/test_plans/inline_ipsec_test_plan.rst
+++ b/test_plans/inline_ipsec_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ==========================
-Niantic Inline IPsec Tests
+82599 Inline IPsec Tests
 ==========================
 
 This test plan describe the method of validation inline hardware acceleration
diff --git a/test_plans/ipfrag_test_plan.rst b/test_plans/ipfrag_test_plan.rst
index 68cf01ca..da8d52d4 100644
--- a/test_plans/ipfrag_test_plan.rst
+++ b/test_plans/ipfrag_test_plan.rst
@@ -45,7 +45,7 @@ Prerequisites
    - For each CPU socket, each memory channel should be populated with at least 1x DIMM
    - Board is populated with at least 2x 1GbE or 10GbE ports. Special PCIe restrictions may
      be required for performance. For example, the following requirements should be
-     met for Intel 82599 (Niantic) NICs:
+     met for Intel 82599 NICs:
 
        - NICs are plugged into PCIe Gen2 or Gen3 slots
        - For PCIe Gen2 slots, the number of lanes should be 8x or higher
diff --git a/test_plans/ipgre_test_plan.rst b/test_plans/ipgre_test_plan.rst
index 2c652273..6e1234c9 100644
--- a/test_plans/ipgre_test_plan.rst
+++ b/test_plans/ipgre_test_plan.rst
@@ -35,13 +35,19 @@
 Generic Routing Encapsulation (GRE) Tests
 =========================================
 
-Generic Routing Encapsulation (GRE) is a tunneling protocol developed by Cisco Systems that can encapsulate a wide variety of network layer protocols inside virtual point-to-point links over an Internet Protocol network.
-Fortville support GRE packet detecting, checksum computing and filtering.
+Generic Routing Encapsulation (GRE) is a tunneling protocol developed by
+Cisco Systems that can encapsulate a wide variety of network layer
+protocols inside virtual point-to-point links over an Internet Protocol
+network. Intel® Ethernet 700 Series support GRE packet detecting, checksum
+computing and filtering.
 
 Prerequisites
 =============
 
-Fortville/carlsville/columbiaville nic should be on the DUT.
+Intel® Ethernet 700 Series/
+Intel® Ethernet Network Adapter X710-T4L/
+Intel® Ethernet Network Adapter X710-T2L/
+Intel® Ethernet 800 Series nic should be on the DUT.
 
 Test Case 1: GRE ipv4 packet detect
 ===================================
diff --git a/test_plans/ipv4_reassembly_test_plan.rst b/test_plans/ipv4_reassembly_test_plan.rst
index 2f6de54e..e37d5af2 100644
--- a/test_plans/ipv4_reassembly_test_plan.rst
+++ b/test_plans/ipv4_reassembly_test_plan.rst
@@ -53,7 +53,7 @@ to the device under test::
    modprobe vfio-pci
    usertools/dpdk-devbind.py --bind=vfio-pci device_bus_id
 
-1x Intel® 82599 (Niantic) NICs (1x 10GbE full duplex optical ports per NIC)
+1x 82599 NICs (1x 10GbE full duplex optical ports per NIC)
 plugged into the available PCIe Gen2 8-lane slots.
 
 Build dpdk and examples=ip_reassembly:
diff --git a/test_plans/ixgbe_vf_get_extra_queue_information_test_plan.rst b/test_plans/ixgbe_vf_get_extra_queue_information_test_plan.rst
index 07c67e76..592e6fdd 100644
--- a/test_plans/ixgbe_vf_get_extra_queue_information_test_plan.rst
+++ b/test_plans/ixgbe_vf_get_extra_queue_information_test_plan.rst
@@ -31,7 +31,7 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ==========================================================
-Niantic ixgbe_get_vf_queue Include Extra Information Tests
+82599 ixgbe_get_vf_queue Include Extra Information Tests
 ==========================================================
 
 Description
diff --git a/test_plans/l2tp_esp_coverage_test_plan.rst b/test_plans/l2tp_esp_coverage_test_plan.rst
index f9edaee9..b3a2fa45 100644
--- a/test_plans/l2tp_esp_coverage_test_plan.rst
+++ b/test_plans/l2tp_esp_coverage_test_plan.rst
@@ -36,8 +36,9 @@ test coverage for L2TPv3 and ESP
 
 Description
 ===========
-For each protocol, below is a list of standard features supported by the Columbiaville hardware and the impact on the feature for each protocol.  
-Some features are supported in a limited manner as stated below.
+For each protocol, below is a list of standard features supported by the
+Intel® Ethernet 800 Series hardware and the impact on the feature for
+each protocol.Some features are supported in a limited manner as stated below.
  
 IPSec(ESP):
 L2 Tag offloads 
@@ -67,7 +68,8 @@ DCB
 ----Priority Flow Control - No
 
 this test plan is designed to check above offloads in L2TPv3 and ESP.
-and CVL can't support tx checksum in vector path now, so only test the rx checksum offload.
+and Intel® Ethernet 700 Series can't support tx checksum in vector path
+now, so only test the rx checksum offload.
 
 
 Prerequisites
diff --git a/test_plans/l3fwd_test_plan.rst b/test_plans/l3fwd_test_plan.rst
index f0b4c641..efd761dd 100644
--- a/test_plans/l3fwd_test_plan.rst
+++ b/test_plans/l3fwd_test_plan.rst
@@ -44,7 +44,7 @@ Prerequisites
     - For each CPU socket, each memory channel should be populated with at least 1x DIMM
     - Board is populated with 4x 1GbE or 10GbE ports. Special PCIe restrictions may
       be required for performance. For example, the following requirements should be
-      met for Intel 82599 (Niantic) NICs:
+      met for 82599 NICs:
 
         - NICs are plugged into PCIe Gen2 or Gen3 slots
         - For PCIe Gen2 slots, the number of lanes should be 8x or higher
diff --git a/test_plans/large_vf_test_plan.rst b/test_plans/large_vf_test_plan.rst
index 4e2d0555..1f690ad2 100644
--- a/test_plans/large_vf_test_plan.rst
+++ b/test_plans/large_vf_test_plan.rst
@@ -31,14 +31,14 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ============================
-CVL: Large VF for 256 queues
+ICE: Large VF for 256 queues
 ============================
 
 Prerequisites
 =============
 
 1. Hardware:
-   columbiaville_25g/columbiaville_100g
+   Intel® Ethernet Network Adapter E810-XXVDA4/Intel® Ethernet Network Adapter E810-CQDA2
 
 2. Software:
    DPDK: http://dpdk.org/git/dpdk
diff --git a/test_plans/macsec_for_ixgbe_test_plan.rst b/test_plans/macsec_for_ixgbe_test_plan.rst
index 68c2c2c8..fc21026b 100644
--- a/test_plans/macsec_for_ixgbe_test_plan.rst
+++ b/test_plans/macsec_for_ixgbe_test_plan.rst
@@ -31,13 +31,13 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================
-Niantic Media Access Control Security (MACsec) Tests
+82599 Media Access Control Security (MACsec) Tests
 ====================================================
 
 Description
 ===========
 
-This document provides test plan for testing the MACsec function of Niantic:
+This document provides test plan for testing the MACsec function of 82599:
 
 IEEE 802.1AE:  https://en.wikipedia.org/wiki/IEEE_802.1AE
 Media Access Control Security (MACsec) is a Layer 2 security technology
@@ -50,9 +50,9 @@ in the hardware.
 As a hop-to-hop Layer 2 security feature, MACsec can be combined with
 Layer 3 security technologies such as IPsec for end-to-end data security.
 
-MACsec was removed in Fortville since Data Center customers don’t require it.
-MACsec can be used for LAN / VLAN, Campus, Cloud and NFV environments
-(Guest and Overlay) to protect and encrypt data on the wire.
+MACsec was removed in Intel® Ethernet 700 Series since Data Center customers
+don’t require it. MACsec can be used for LAN / VLAN, Campus, Cloud and NFV
+environments (Guest and Overlay) to protect and encrypt data on the wire.
 One benefit of a SW approach to encryption in the cloud is that the payload
 is encrypted by the tenant, not by the tunnel provider, thus the tenant has
 full control over the keys.
@@ -72,7 +72,7 @@ Prerequisites
 
 1. Hardware:
 
-   * 1x Niantic NIC (2x 10G)
+   * 1x 82599 NIC (2x 10G)
      ::
 
        port0:
diff --git a/test_plans/malicious_driver_event_indication_test_plan.rst b/test_plans/malicious_driver_event_indication_test_plan.rst
index c97555ba..a1037e20 100644
--- a/test_plans/malicious_driver_event_indication_test_plan.rst
+++ b/test_plans/malicious_driver_event_indication_test_plan.rst
@@ -30,9 +30,9 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-==========================================================
-Malicious driver event indication process in FVL PF driver
-==========================================================
+=================================================================================
+Malicious driver event indication process in Intel® Ethernet 700 Series PF driver
+=================================================================================
 
 Need modify the testpmd APP to generate invalid packets in tx only mode
 
diff --git a/test_plans/metrics_test_plan.rst b/test_plans/metrics_test_plan.rst
index 2ba3617d..a2b8a3db 100644
--- a/test_plans/metrics_test_plan.rst
+++ b/test_plans/metrics_test_plan.rst
@@ -72,7 +72,7 @@ Calculates peak and average bit-rate statistics.
 Prerequisites
 =============
 
-2x Intel® 82599 (Niantic) NICs (2x 10GbE full duplex optical ports per NIC)
+2x 82599 NICs (2x 10GbE full duplex optical ports per NIC)
 plugged into the available PCIe Gen2 8-lane slots in two different configurations.
 
 port topology diagram::
diff --git a/test_plans/multicast_test_plan.rst b/test_plans/multicast_test_plan.rst
index 11d84347..b9dbfdaa 100644
--- a/test_plans/multicast_test_plan.rst
+++ b/test_plans/multicast_test_plan.rst
@@ -70,7 +70,7 @@ Prerequisites
 
 - Board is populated with 2x 10GbE ports. Special PCIe restrictions may
   be required for performance. For example, the following requirements should be
-  met for Intel 82599 (Niantic) NICs:
+  met for 82599 NICs:
 
 	- NICs are plugged into PCIe Gen2 or Gen3 slots
 	- For PCIe Gen2 slots, the number of lanes should be 8x or higher
diff --git a/test_plans/nic_single_core_perf_test_plan.rst b/test_plans/nic_single_core_perf_test_plan.rst
index 459ad87f..4290f8df 100644
--- a/test_plans/nic_single_core_perf_test_plan.rst
+++ b/test_plans/nic_single_core_perf_test_plan.rst
@@ -30,19 +30,20 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-======================================================================
-Benchmark the performance of single core forwarding with FVL25G/NNT10G
-======================================================================
+========================================================================================
+Benchmark the performance of single core forwarding with XXV710 and 82599/500 Series 10G
+========================================================================================
 
 Prerequisites
 =============
 
 1. Hardware:
 
-    1.1) nic_single_core_perf test for FVL25G: two dual port FVL25G nics,
-        all installed on the same socket, pick one port per nic
-    1.2) nic_single_core_perf test for NNT10G: four 82599 nics,
-        all installed on the same socket, pick one port per nic
+    1.1) nic_single_core_perf test for Intel® Ethernet Network Adapter XXV710-DA2 :
+        two dual port Intel® Ethernet Network Adapter XXV710-DA2 nics, all installed
+        on the same socket, pick one port per nic
+    1.2) nic_single_core_perf test for 82599/500 Series 10G: four 82599 nics, all
+        installed on the same socket, pick one port per nic
   
 2. Software::
 
@@ -60,16 +61,19 @@ Prerequisites
 3. Connect all the selected nic ports to traffic generator(IXIA,TREX,
    PKTGEN) ports(TG ports)::
 
-    2 TG 25g ports for FVL25G ports
-    4 TG 10g ports for 4 NNT10G ports
+    2 TG 25g ports for Intel® Ethernet Network Adapter XXV710-DA2 ports
+    4 TG 10g ports for 4 82599/500 Series 10G ports
 
 4. Case config::
 
-    For FVL40g, if test 16 Byte Descriptor, need to be configured with the
+    For Intel® Ethernet Converged Network Adapter XL710-QDA2, if test 16
+    Byte Descriptor, need to be configured with the
     "-Dc_args=-DRTE_LIBRTE_I40E_16BYTE_RX_DESC" option at compile time.
 
-    For CVL25G, if test 16 Byte Descriptor, need to be configured with the
+    For Intel® Ethernet Network Adapter E810-XXVDA4, if test 16 Byte Descriptor,
+    need to be configured with the
     "-Dc_args=-DRTE_LIBRTE_ICE_16BYTE_RX_DESC" option at compile time.
+    
 
 Test Case : Single Core Performance Measurement
 ===============================================
@@ -90,13 +94,13 @@ Test Case : Single Core Performance Measurement
         
 4)  check throughput and compare it with the expected value.
 
-5)  for NNT10G, repeat above step 1-4 for txd=rxd=512,2048 separately.
-    for FVL25G nic, just test txd=rxd=512,2048 following above steps 
-    1-4.
+5)  for 82599/500 Series 10G, repeat above step 1-4 for txd=rxd=512,2048 separately.
+    for Intel® Ethernet Network Adapter XXV710-DA2  nic, just test
+    txd=rxd=512,2048 following above steps 1-4.
 
 6) Result tables for different NICs:
 
-   FVL25G:
+   Intel® Ethernet Network Adapter XXV710-DA2:
 
    +------------+---------+-------------+---------+---------------------+
    | Frame Size | TXD/RXD |  Throughput |   Rate  | Expected Throughput |
@@ -106,7 +110,7 @@ Test Case : Single Core Performance Measurement
    |     64     |   2048  | xxxxxx Mpps |   xxx % |     xxx    Mpps     |
    +------------+---------+-------------+---------+---------------------+
 
-   NNT10G:
+   82599/500 Series 10G:
 
    +------------+---------+-------------+---------+---------------------+
    | Frame Size | TXD/RXD |  Throughput |   Rate  | Expected Throughput |
@@ -120,9 +124,9 @@ Test Case : Single Core Performance Measurement
 
 Note : The values for the expected throughput may vary due to different
        platform and OS, and traffic generator, please correct threshold
-       values accordingly. (the above expected values for FVL 25G and
-       NNT10G  were got from the combination of Purly,Ubuntu 16.04, and
-       traffic generator IXIA) 
+       values accordingly. (the above expected values for XXV710 and
+       82599/500 Series 10G were got from the combination of Purly,
+       Ubuntu 16.04, and traffic generator IXIA)
 
 Case will raise failure if actual throughputs have more than 1Mpps gap
 from expected ones. 
diff --git a/test_plans/nvgre_test_plan.rst b/test_plans/nvgre_test_plan.rst
index 71a406fd..801bd73b 100644
--- a/test_plans/nvgre_test_plan.rst
+++ b/test_plans/nvgre_test_plan.rst
@@ -30,32 +30,31 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-=====================
-Fortville NVGRE Tests
-=====================
+======================================
+Intel® Ethernet 700 Series NVGRE Tests
+======================================
 
 Cloud providers build virtual network overlays over existing network
 infrastructure that provide tenant isolation and scaling. Tunneling
 layers added to the packets carry the virtual networking frames over
 existing Layer 2 and IP networks. Conceptually, this is similar to
-creating virtual private networks over the Internet. Fortville will
-process these tunneling layers by the hardware.
+creating virtual private networks over the Internet. Intel® Ethernet
+700 Series will process these tunneling layers by the hardware.
 
-This document provides test plan for Fortville NVGRE packet detecting,
-checksum computing and filtering.
+This document provides test plan for Intel® Ethernet 700 Series NVGRE
+packet detecting, checksum computing and filtering.
 
 Prerequisites
 =============
 
-1x Intel X710 (Fortville) NICs (2x 40GbE full duplex optical ports per NIC)
+1x X710 NICs (2x 40GbE full duplex optical ports per NIC)
 plugged into the available PCIe Gen3 8-lane slot.
 
-1x Intel XL710-DA4 (Eagle Fountain) (1x 10GbE full duplex optical ports per NIC)
+1x XL710-DA4 (1x 10GbE full duplex optical ports per NIC)
 plugged into the available PCIe Gen3 8-lane slot.
 
 DUT board must be two sockets system and each cpu have more than 8 lcores.
 
-
 Test Case: NVGRE ipv4 packet detect
 ===================================
 
diff --git a/test_plans/pf_smoke_test_plan.rst b/test_plans/pf_smoke_test_plan.rst
index ffcd2105..259bc76c 100644
--- a/test_plans/pf_smoke_test_plan.rst
+++ b/test_plans/pf_smoke_test_plan.rst
@@ -46,7 +46,7 @@ Prerequisites
 
 1. Hardware:
 
-    niantic/fortville/columbiaville
+    82599/Intel® Ethernet 700 Series/Intel® Ethernet 800 Series
 
 2. Software:
 
diff --git a/test_plans/pmd_bonded_test_plan.rst b/test_plans/pmd_bonded_test_plan.rst
index 52ba55ad..e0cb24dd 100644
--- a/test_plans/pmd_bonded_test_plan.rst
+++ b/test_plans/pmd_bonded_test_plan.rst
@@ -80,8 +80,8 @@ Prerequisites for Bonding
 
 * NIC and IXIA ports requirements.
 
-  - Tester: have 4 10Gb (Niantic) ports and 4 1Gb ports.
-  - DUT: have 4 10Gb (Niantic) ports and 4 1Gb ports. All functional tests should be done on both 10G and 1G port.
+  - Tester: have 4 10Gb (82599) ports and 4 1Gb ports.
+  - DUT: have 4 10Gb (82599) ports and 4 1Gb ports. All functional tests should be done on both 10G and 1G port.
   - IXIA: have 4 10G ports and 4 1G ports. IXIA is used for performance test.
 
 * BIOS settings on DUT:
diff --git a/test_plans/pmd_test_plan.rst b/test_plans/pmd_test_plan.rst
index 88671419..3f94a72d 100644
--- a/test_plans/pmd_test_plan.rst
+++ b/test_plans/pmd_test_plan.rst
@@ -82,10 +82,12 @@ If using igb_uio::
 
 Case config::
 
-   For FVL40g, if test 16 Byte Descriptor, need to be configured with the
+   For Intel® Ethernet Converged Network Adapter XL710-QDA2, if test 16
+   Byte Descriptor, need to be configured with the
    "-Dc_args=-DRTE_LIBRTE_I40E_16BYTE_RX_DESC" option at compile time.
 
-   For CVL25G, if test 16 Byte Descriptor, need to be configured with the
+   For Intel® Ethernet Network Adapter E810-XXVDA4, if test 16 Byte
+   Descriptor, need to be configured with the
    "-Dc_args=-DRTE_LIBRTE_ICE_16BYTE_RX_DESC" option at compile time.
 
 Test Case: Packet Checking
diff --git a/test_plans/pmdpcap_test_plan.rst b/test_plans/pmdpcap_test_plan.rst
index 18b85e5e..ad3e4551 100644
--- a/test_plans/pmdpcap_test_plan.rst
+++ b/test_plans/pmdpcap_test_plan.rst
@@ -34,8 +34,8 @@
 TestPMD PCAP Tests
 ==================
 
-This document provides tests for the userland Intel(R)
-82599 Gigabit Ethernet Controller (Niantic) Poll Mode Driver (PMD) when using
+This document provides tests for the userland Intel(R) 82599
+Gigabit Ethernet Controller Poll Mode Driver (PMD) when using
 pcap files as input and output.
 
 The core configurations description is:
diff --git a/test_plans/pmdrss_hash_test_plan.rst b/test_plans/pmdrss_hash_test_plan.rst
index 544d2e51..f23a5a90 100644
--- a/test_plans/pmdrss_hash_test_plan.rst
+++ b/test_plans/pmdrss_hash_test_plan.rst
@@ -30,24 +30,24 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-===============================================
-Fortville RSS - Configuring Hash Function Tests
-===============================================
+================================================================
+Intel® Ethernet 700 Series RSS - Configuring Hash Function Tests
+================================================================
 
-This document provides test plan for testing the function of Fortville:
+This document provides test plan for testing the function of Intel® Ethernet 700 Series:
 Support configuring hash functions.
 
 
 Prerequisites
 =============
 
-* 2x Intel® 82599 (Niantic) NICs (2x 10GbE full duplex optical ports per NIC)
-* 1x Fortville_eagle NIC (4x 10G)
-* 1x Fortville_spirit NIC (2x 40G)
-* 2x Fortville_spirit_single NIC (1x 40G)
+* 2x 82599 NICs (2x 10GbE full duplex optical ports per NIC)
+* 1x X710 NIC (4x 10G)
+* 1x XL710 NIC (2x 40G)
+* 2x XL710 NIC (1x 40G)
 
-The four ports of the 82599 connect to the Fortville_eagle;
-The two ports of Fortville_spirit connect to Fortville_spirit_single.
+The four ports of the 82599 connect to the X710;
+The two ports of XL710 connect to XL710.
 The three kinds of NICs are the target NICs. the connected NICs can send packets
 to these three NICs using scapy.
 
@@ -61,7 +61,8 @@ handled by a different logical core.
 #. The receive packet is parsed into the header fields used by the hash
    operation (such as IP addresses, TCP port, etc.)
 
-#. A hash calculation is performed. The Fortville supports four hash function:
+#. A hash calculation is performed. The Intel® Ethernet 700 Series supports four
+   hash function:
    Toeplitz, simple XOR and their Symmetric RSS.
 
 #. The seven LSBs of the hash result are used as an index into a 128/512 entry
@@ -75,7 +76,7 @@ Test Case:  test_toeplitz
 Testpmd configuration - 16 RX/TX queues per port
 ------------------------------------------------
 
-#. set up testpmd with fortville NICs::
+#. set up testpmd with Intel® Ethernet 700 Series NICs::
 
       ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c fffff -n %d -- -i --coremask=0xffffe --rxq=16 --txq=16
 
diff --git a/test_plans/pmdrssreta_test_plan.rst b/test_plans/pmdrssreta_test_plan.rst
index dd9f1ca1..f165e4a7 100644
--- a/test_plans/pmdrssreta_test_plan.rst
+++ b/test_plans/pmdrssreta_test_plan.rst
@@ -31,12 +31,12 @@
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ======================================
-Niantic Reta (Redirection table) Tests
+82599 Reta (Redirection table) Tests
 ======================================
 
 This document provides test plan for benchmarking of Rss reta(Redirection
 table) updating for the Intel® 82599 10 Gigabit Ethernet Controller
-(Niantic) Poll Mode Driver (PMD) in userland runtime configurations.
+(82599) Poll Mode Driver (PMD) in userland runtime configurations.
 The content of Rss Redirection table are not defined following reset
 of the Memory Configuration registers. System software must initialize
 the table prior to enabling multiple receive queues .It can also update
@@ -46,7 +46,7 @@ not synchronized with the arrival time of received packets.
 Prerequisites
 =============
 
-2x Intel® 82599 (Niantic) NICs (2x 10GbE full duplex optical ports per NIC)
+2x Intel® 82599 (82599) NICs (2x 10GbE full duplex optical ports per NIC)
 plugged into the available PCIe Gen2 8-lane slots. To avoid PCIe bandwidth
 bottlenecks at high packet rates, a single optical port from each NIC is
 connected to the traffic  generator.
diff --git a/test_plans/port_control_test_plan.rst b/test_plans/port_control_test_plan.rst
index 532d363a..4577802d 100644
--- a/test_plans/port_control_test_plan.rst
+++ b/test_plans/port_control_test_plan.rst
@@ -40,9 +40,9 @@ Prerequisites
 
 1. Hardware:
 
-   * Fortville
-   * Niantic
-   * Columbiaville
+   * Intel® Ethernet 700 Series NIC
+   * 82599
+   * Intel® Ethernet 810 Series NIC
    * i350 NIC
    * e1000 emulated device
 
diff --git a/test_plans/ptpclient_test_plan.rst b/test_plans/ptpclient_test_plan.rst
index 3ae8b68b..2cdae4c3 100644
--- a/test_plans/ptpclient_test_plan.rst
+++ b/test_plans/ptpclient_test_plan.rst
@@ -48,7 +48,7 @@ Case Config::
 
     Meson: For support IEEE1588, build DPDK with '-Dc_args=-DRTE_LIBRTE_IEEE1588'
 
-The sample should be validated on Forville, Niantic and i350 Nics. 
+The sample should be validated on Intel® Ethernet 700 Series, 82599 and i350 Nics.
 
 Test case: ptp client
 ======================
@@ -61,7 +61,7 @@ Start ptp client on DUT and wait few seconds::
     ./<build_target>/examples/dpdk-ptpclient -c f -n 3 -- -T 0 -p 0x1
 
 Check that output message contained T1,T2,T3,T4 clock and time difference
-between master and slave time is about 10us in niantic, 20us in Fortville,
+between master and slave time is about 10us in 82599, 20us in Intel® Ethernet 700 Series,
 8us in i350.
    
 Test case: update system
@@ -84,5 +84,5 @@ Start ptp client on DUT and wait few seconds::
 
 Make sure DUT system time has been changed to same as tester.
 Check that output message contained T1,T2,T3,T4 clock and time difference
-between master and slave time is about 10us in niantic, 20us in Fortville,
+between master and slave time is about 10us in 82599, 20us in Intel® Ethernet 700 Series,
 8us in i350.
diff --git a/test_plans/ptype_mapping_test_plan.rst b/test_plans/ptype_mapping_test_plan.rst
index fdabd191..4f15d9cf 100644
--- a/test_plans/ptype_mapping_test_plan.rst
+++ b/test_plans/ptype_mapping_test_plan.rst
@@ -38,9 +38,9 @@ All PTYPEs (packet types) in DPDK PMDs before are statically defined
 using static constant map tables. It makes impossible to add a new
 packet type without first defining them statically and then recompiling
 DPDK. New NICs are flexible enough to be reconfigured depending on the
-network environment. In case of FVL new PTYPEs can be added
-dynamically at device initialization time using corresponding AQ
-commands.
+network environment. In case of Intel® Ethernet 700 Series new PTYPEs
+can be added dynamically at device initialization time using corresponding
+AQ commands.
 Note that the packet types of the same packet recognized by different
 hardware may be different, as different hardware may have different
 capabilities of packet type recognition.
diff --git a/test_plans/pvp_share_lib_test_plan.rst b/test_plans/pvp_share_lib_test_plan.rst
index c5a3c9b8..c3d49db2 100644
--- a/test_plans/pvp_share_lib_test_plan.rst
+++ b/test_plans/pvp_share_lib_test_plan.rst
@@ -39,8 +39,8 @@ Description
 
 The feature need compile dpdk as shared libraries, then application should use option ``-d`` to load the dynamic pmd that are built as shared libraries.
 
-Test Case1: Vhost/virtio-user pvp share lib test with niantic
-=============================================================
+Test Case1: Vhost/virtio-user pvp share lib test with 82599
+===========================================================
 
 1. Enable the shared lib in DPDK configure file::
 
@@ -54,7 +54,7 @@ Test Case1: Vhost/virtio-user pvp share lib test with niantic
 
     export LD_LIBRARY_PATH=/root/dpdk/x86_64-native-linuxapp-gcc/drivers:$LD_LIBRARY_PATH
 
-4. Bind niantic port with vfio-pci, use option ``-d`` to load the dynamic pmd when launch vhost::
+4. Bind 82599 port with vfio-pci, use option ``-d`` to load the dynamic pmd when launch vhost::
 
     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd  -c 0x03 -n 4 -d librte_net_vhost.so.21.0 -d librte_net_i40e.so.21.0 -d librte_mempool_ring.so.21.0 \
     --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net,queues=1' -- -i
@@ -70,12 +70,12 @@ Test Case1: Vhost/virtio-user pvp share lib test with niantic
 
     testpmd>show port stats all
 
-Test Case2: Vhost/virtio-user pvp share lib test with fortville
-===============================================================
+Test Case2: Vhost/virtio-user pvp share lib test with Intel® Ethernet 700 Series
+================================================================================
 
 Similar as Test Case1, all steps are similar except step 4:
 
-4. Bind fortville port with vfio-pci, use option ``-d`` to load the dynamic pmd when launch vhost::
+4. Bind Intel® Ethernet 700 Series port with vfio-pci, use option ``-d`` to load the dynamic pmd when launch vhost::
 
     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd  -c 0x03 -n 4 -d librte_net_vhost.so -d librte_net_i40e.so -d librte_mempool_ring.so \
     --file-prefix=vhost --vdev 'net_vhost0,iface=vhost-net,queues=1' -- -i
diff --git a/test_plans/qinq_filter_test_plan.rst b/test_plans/qinq_filter_test_plan.rst
index 6781c517..b1b2509b 100644
--- a/test_plans/qinq_filter_test_plan.rst
+++ b/test_plans/qinq_filter_test_plan.rst
@@ -30,18 +30,18 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-===============================================
-Fortville Cloud filters for QinQ steering Tests
-===============================================
-This document provides test plan for testing the function of Fortville:
+================================================================
+Intel® Ethernet 700 Series Cloud filters for QinQ steering Tests
+================================================================
+This document provides test plan for testing the function of Intel® Ethernet 700 Series:
 QinQ filter function
 
 Prerequisites
 =============
 1.Hardware:
-   Fortville
+   Intel® Ethernet 700 Series
    HarborChannel_DP_OEMGEN_8MB_J24798-001_0.65_80002DA4 
-   firmware-version: 5.70 0x80002da4 1.3908.0(fortville 25G) or 6.0.0+
+   firmware-version: 5.70 0x80002da4 1.3908.0(Intel® Ethernet Network Adapter XXV710-DA2) or 6.0.0+
    
 2.Software: 
   dpdk: http://dpdk.org/git/dpdk
@@ -53,7 +53,7 @@ Test Case 1: test qinq packet type
 
 Testpmd configuration - 4 RX/TX queues per port
 ------------------------------------------------
-#. set up testpmd with fortville NICs::
+#. set up testpmd with Intel® Ethernet 700 Series NICs::
 
       ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x1f -n 4 -- -i --rxq=4 --txq=4 --disable-rss
 
@@ -86,7 +86,7 @@ Test Case 2: qinq packet filter to PF queues
 Testpmd configuration - 4 RX/TX queues per port
 -----------------------------------------------
 
-#. set up testpmd with fortville NICs::
+#. set up testpmd with Intel® Ethernet 700 Series NICs::
 
     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x1f -n 4 -- -i --rxq=4 --txq=4 --disable-rss
 
@@ -129,7 +129,7 @@ Test Case 3: qinq packet filter to VF queues
 
     linux cmdline: ./usertools/dpdk-devbind.py -b igb_uio 81:02.0 81:02.1
  
-#. set up testpmd with fortville PF NICs::
+#. set up testpmd with Intel® Ethernet 700 Series PF NICs::
 
     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x1f -n 4 --socket-mem=1024,1024 --file-prefix=pf -a 81:00.0 -- -i --rxq=4 --txq=4
 
@@ -155,7 +155,7 @@ Test Case 3: qinq packet filter to VF queues
     testpmd command: flow create 0 ingress pattern eth / vlan tci is 2 / vlan tci is 4094 / end actions vf id 1 / queue index 3 / end
     testpmd command: flow create 0 ingress pattern eth / vlan tci is 3 / vlan tci is 4094 / end actions pf / queue index 1 / end
 
-#. set up testpmd with fortville VF0 NICs::
+#. set up testpmd with Intel® Ethernet 700 Series VF0 NICs::
 
     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x3e0 -n 4 --socket-mem=1024,1024 --file-prefix=vf0 -a 81:02.0 -- -i --rxq=4 --txq=4
 
@@ -171,7 +171,7 @@ Test Case 3: qinq packet filter to VF queues
 
     testpmd command: start
 
-#. set up testpmd with fortville VF1 NICs::
+#. set up testpmd with Intel® Ethernet 700 Series VF1 NICs::
 
     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x7c0 -n 4 --socket-mem=1024,1024 --file-prefix=vf1 -a 81:02.1 -- -i --rxq=4 --txq=4
 
@@ -206,7 +206,7 @@ Test Case 4: qinq packet filter with different tpid
 
     linux cmdline: ./usertools/dpdk-devbind.py -b igb_uio 81:02.0 81:02.1
  
-#. set up testpmd with fortville PF NICs::
+#. set up testpmd with Intel® Ethernet 700 Series PF NICs::
 
     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x1f -n 4 --socket-mem=1024,1024 --file-prefix=pf -a 81:00.0 -- -i --rxq=4 --txq=4
 
@@ -236,7 +236,7 @@ Test Case 4: qinq packet filter with different tpid
     testpmd command: flow create 0 ingress pattern eth / vlan tci is 2 / vlan tci is 4094 / end actions vf id 1 / queue index 3 / end
     testpmd command: flow create 0 ingress pattern eth / vlan tci is 3 / vlan tci is 4094 / end actions pf / queue index 1 / end
 
-#. set up testpmd with fortville VF0 NICs::
+#. set up testpmd with Intel® Ethernet 700 Series VF0 NICs::
 
     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x3e0 -n 4 --socket-mem=1024,1024 --file-prefix=vf0 -a 81:02.0 -- -i --rxq=4 --txq=4
 
@@ -252,7 +252,7 @@ Test Case 4: qinq packet filter with different tpid
 
     testpmd command: start
 
-#. set up testpmd with fortville VF1 NICs::
+#. set up testpmd with Intel® Ethernet 700 Series VF1 NICs::
 
     ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0x7c0 -n 4 --socket-mem=1024,1024 --file-prefix=vf1 -a 81:02.1 -- -i --rxq=4 --txq=4
 
diff --git a/test_plans/queue_region_test_plan.rst b/test_plans/queue_region_test_plan.rst
index 7e4c9ca6..41857646 100644
--- a/test_plans/queue_region_test_plan.rst
+++ b/test_plans/queue_region_test_plan.rst
@@ -30,18 +30,19 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-===========================================
-Fortville Configure RSS Queue Regions Tests
-===========================================
+============================================================
+Intel® Ethernet 700 Series Configure RSS Queue Regions Tests
+============================================================
 Description
 ===========
 
-FVL/FPK and future CVL/CPK NICs support queue regions configuration for
-RSS in PF/VF, so different traffic classes or different packet
-classification types can be separated to different queue regions which
-includes several queues, but traffic classes and packet classification
-cannot co-existing with the support of queue region functionality.
-Different PCtype packets take rss algorithm in different queue regions.
+Intel® Ethernet 700 Series/X722 series and future Intel® Ethernet 800
+Series/E822 NICs support queue regions configuration for RSS in PF/VF,
+so different traffic classes or different packet classification types
+can be separated to different queue regions which includes several
+queues, but traffic classes and packet classification cannot co-existing
+with the support of queue region functionality. Different PCtype packets
+take rss algorithm in different queue regions.
 
 Examples:
 
@@ -58,14 +59,14 @@ Examples:
 • different traffic classes defined in VLAN PCP bits distributed to
   different queue regions
 
-For FVL see chapter 7.1.7 of the latest datasheet.
-For FPK/CPK see corresponding EAS sections.
+For Intel® Ethernet 700 Series see chapter 7.1.7 of the latest datasheet.
+For X722 series/E822 see corresponding EAS sections.
 
 Prerequisites
 =============
 
 1. Hardware:
-   Fortville
+   Intel® Ethernet 700 Series
 
 2. software:
    dpdk: http://dpdk.org/git/dpdk
@@ -139,8 +140,8 @@ Test case 1: different pctype packet can enter the expected queue region
    Send the pkt1-pkt9, the packets can't enter the same queue which defined in queue region rule.
    They are distributed to queues according RSS rule.
 
-Notes: fortville can't parse the TCP SYN type packet, fortpark can parse it.
-So if fortville, pkt2 to queue 6 or queue 7.
+Notes: Intel® Ethernet 700 Series can't parse the TCP SYN type packet, X722 series can parse it.
+So if Intel® Ethernet 700 Series, pkt2 to queue 6 or queue 7.
 
 Test case 2: different user priority packet can enter the expected queue region
 ===============================================================================
diff --git a/test_plans/queue_start_stop_test_plan.rst b/test_plans/queue_start_stop_test_plan.rst
index 82e35280..963cdc9a 100644
--- a/test_plans/queue_start_stop_test_plan.rst
+++ b/test_plans/queue_start_stop_test_plan.rst
@@ -58,7 +58,7 @@ To run the testpmd application in linuxapp environment with 4 lcores,
 Test Case: queue start/stop
 ---------------------------
 
-This case support PF (fortville), VF (fortville,niantic)
+This case support PF (Intel® Ethernet 700 Series), VF (Intel® Ethernet 700 Series, 82599)
 
 #. Update testpmd source code. Add the following C code in ./app/test-pmd/fwdmac.c::
 
diff --git a/test_plans/rss_to_rte_flow_test_plan.rst b/test_plans/rss_to_rte_flow_test_plan.rst
index cb006d80..481cd032 100644
--- a/test_plans/rss_to_rte_flow_test_plan.rst
+++ b/test_plans/rss_to_rte_flow_test_plan.rst
@@ -713,8 +713,8 @@ Test case: Set queue region in rte_flow with invalid parameter (I40E)
 Test case: Queue region and RSS rule combination (I40E)
 =======================================================
 
-Notes: Queue region is only supported by fortville, so this case only can
-be implemented with fortville.
+Notes: Queue region is only supported by Intel® Ethernet 700 Series, so this case only can
+be implemented with Intel® Ethernet 700 Series.
 
 1. Start the testpmd::
 
diff --git a/test_plans/rteflow_priority_test_plan.rst b/test_plans/rteflow_priority_test_plan.rst
index 405a1bf1..ead54333 100644
--- a/test_plans/rteflow_priority_test_plan.rst
+++ b/test_plans/rteflow_priority_test_plan.rst
@@ -47,7 +47,8 @@ when priority is not active, flows are created on fdir then switch/ACL.
 when priority is active, flows are identified into 2 category: 
 High priority as permission stage that maps to switch/ACL,
 Low priority as distribution stage that maps to fdir,
-a no destination high priority rule is not acceptable, since it may be overwritten by a low priority rule due to cvl FXP behavior.
+a no destination high priority rule is not acceptable, since it may be overwritten
+by a low priority rule due to Intel® Ethernet 800 Series FXP behavior.
 
 Note: Since these tests are focus on priority, the patterns in tests are examples.
 
diff --git a/test_plans/runtime_vf_queue_number_kernel_test_plan.rst b/test_plans/runtime_vf_queue_number_kernel_test_plan.rst
index d4f01a3b..1e235966 100644
--- a/test_plans/runtime_vf_queue_number_kernel_test_plan.rst
+++ b/test_plans/runtime_vf_queue_number_kernel_test_plan.rst
@@ -49,7 +49,7 @@ Prerequisites
 
 1. Hardware:
 
-- Forville(X710/XL710/XXV710)
+- Intel® Ethernet 700 Series(X710/XL710/XXV710)
 
 2. Software:
 
diff --git a/test_plans/runtime_vf_queue_number_maxinum_test_plan.rst b/test_plans/runtime_vf_queue_number_maxinum_test_plan.rst
index 1a9ff77d..aeff1bb9 100644
--- a/test_plans/runtime_vf_queue_number_maxinum_test_plan.rst
+++ b/test_plans/runtime_vf_queue_number_maxinum_test_plan.rst
@@ -47,9 +47,9 @@ see runtime_vf_queue_number_test_plan.rst
     The datasheet xl710-10-40-controller-datasheet2017.pdf described in page 10:
     "The 710 series supports up to 1536 LQPs that can be assigned to PFs or VFs as needed".
 
-    For four ports Fortville NIC, each port has 384 queues,
+    For four ports Intel® Ethernet 700 Series NIC, each port has 384 queues,
     the total queues number is 384 * 4 = 1536.
-    For two ports Fortville NIC, each port has 768 queues,
+    For two ports Intel® Ethernet 700 Series NIC, each port has 768 queues,
     the total queues number is 768 * 2 = 1536.
 
 - Queues PF used
@@ -76,7 +76,7 @@ Prerequisites
 
 1. Hardware:
 
-- Fortville(X710/XXV710/XL710)
+- Intel® Ethernet 700 Series(X710/XXV710/XL710)
 
 2. Software:
 
@@ -90,11 +90,11 @@ Set up scenario
 ===============
 
 1. Set up max VFs from one PF with DPDK driver
-   Create 32 vfs on four ports fortville NIC::
+   Create 32 vfs on four ports Intel® Ethernet 700 Series NIC::
 
     echo 32 > /sys/bus/pci/devices/0000\:05\:00.0/max_vfs
 
-   Create 64 vfs on two ports fortville NIC::
+   Create 64 vfs on two ports Intel® Ethernet 700 Series NIC::
 
     echo 64 > /sys/bus/pci/devices/0000\:05\:00.0/max_vfs
 
@@ -152,7 +152,7 @@ Test case 2: set max queue number per vf on one pf port
 ================================================================
 1. Start the PF testpmd with VF max queue number 16::
    As the feature description describe, the max value of queue-num-per-vf is 8
-   for Both two and four ports Fortville NIC::
+   for Both two and four ports Intel® Ethernet 700 Series NIC::
 
     ./<build_target>/app/dpdk-testpmd -c f -n 4 -a 05:00.0,queue-num-per-vf=16 --file-prefix=test1 \
     --socket-mem 1024,1024 -- -i
diff --git a/test_plans/runtime_vf_queue_number_test_plan.rst b/test_plans/runtime_vf_queue_number_test_plan.rst
index c4aaaed0..1757271a 100644
--- a/test_plans/runtime_vf_queue_number_test_plan.rst
+++ b/test_plans/runtime_vf_queue_number_test_plan.rst
@@ -62,7 +62,7 @@ Prerequisites
 
 1. Hardware:
 
--  Fortville(X710/XXV710/XL710)
+-  Intel® Ethernet 700 Series(X710/XXV710/XL710)
 
 2. Software:
 
diff --git a/test_plans/rxtx_offload_test_plan.rst b/test_plans/rxtx_offload_test_plan.rst
index 172bb9cd..6739bcb0 100644
--- a/test_plans/rxtx_offload_test_plan.rst
+++ b/test_plans/rxtx_offload_test_plan.rst
@@ -65,7 +65,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   FVL/NNT
+   Intel® Ethernet 700 Series and 82599/500 Series
 
 2. Software:
    dpdk: http://dpdk.org/git/dpdk
@@ -168,8 +168,8 @@ Test case: Rx offload per-port and per_queue setting
 
    Check the configuration and the port can start normally.
 
-Test case: NNT Rx offload per-queue setting
-===========================================
+Test case: 82599/500 Series Rx offload per-queue setting
+========================================================
 
 1. Start testpmd::
 
@@ -514,8 +514,8 @@ Test case: Tx offload per-queue and per-port setting
 
    Check the configuration and the port can start normally.
 
-Test case: FVL Tx offload per-queue setting
-===========================================
+Test case: Intel® Ethernet 700 Series Tx offload per-queue setting
+==================================================================
 
 1. Start testpmd and get the tx_offload capability and configuration::
 
diff --git a/test_plans/stats_checks_test_plan.rst b/test_plans/stats_checks_test_plan.rst
index 5cc3ee7e..7eb120b3 100644
--- a/test_plans/stats_checks_test_plan.rst
+++ b/test_plans/stats_checks_test_plan.rst
@@ -128,7 +128,7 @@ The fields checked are RX-packets and TX-packets of each queue stats,
 RX-packets, RX-bytes, TX-packets and TX-bytes of each port stats,
 rx_good_packets and rx_good_bytes of each port xstats,
 tx_good_packets and tx_good_bytes of each port xstats,
-FVL does not support hardware per queue stats,
+Intel® Ethernet 700 Series does not support hardware per queue stats,
 so we won't check rx and tx per queue stats.
 
 Test Case: PF xstatus Checks
@@ -260,7 +260,7 @@ Test Case: PF xstatus Checks
 
 verify rx_good_packets, RX-packets of port 0 and tx_good_packets, TX-packets of port 1 are both 100.
 rx_good_bytes, RX-bytes of port 0 and tx_good_bytes, TX-bytes of port 1 are the same.
-FVL does not support hardware per queue stats,
+Intel® Ethernet 700 Series does not support hardware per queue stats,
 so rx_qx_packets and rx_qx_bytes are both 0.
 tx_qx_packets and tx_qx_bytes are both 0 too.
 
diff --git a/test_plans/tso_test_plan.rst b/test_plans/tso_test_plan.rst
index ee443d10..6b1367d0 100644
--- a/test_plans/tso_test_plan.rst
+++ b/test_plans/tso_test_plan.rst
@@ -40,7 +40,7 @@ Description
 This document provides the plan for testing the TSO (Transmit Segmentation
 Offload, also called Large Send offload - LSO) feature of
 Intel Ethernet Controller, including Intel 82599 10GbE Ethernet Controller and
-Fortville 40GbE Ethernet Controller. TSO enables the TCP/IP stack to
+Intel® Ethernet Converged Network Adapter XL710-QDA2. TSO enables the TCP/IP stack to
 pass to the network device a larger ULP datagram than the Maximum Transmit
 Unit Size (MTU). NIC divides the large ULP datagram to multiple segments
 according to the MTU size.
diff --git a/test_plans/tx_preparation_test_plan.rst b/test_plans/tx_preparation_test_plan.rst
index d61d772f..fce416ad 100644
--- a/test_plans/tx_preparation_test_plan.rst
+++ b/test_plans/tx_preparation_test_plan.rst
@@ -171,8 +171,8 @@ Captured packet::
 
 Note:
 Generally TSO only supports TCP packets but doesn't support UDP packets due to
-hardware segmentation limitation, for example packets are sent on niantic
-NIC, but not segmented.
+hardware segmentation limitation, for example packets are sent on 82599 NIC, but
+not segmented.
 
 
 Packet::
diff --git a/test_plans/uni_pkt_test_plan.rst b/test_plans/uni_pkt_test_plan.rst
index cfb9544a..3544af48 100644
--- a/test_plans/uni_pkt_test_plan.rst
+++ b/test_plans/uni_pkt_test_plan.rst
@@ -64,7 +64,7 @@ Test Case: L2 Packet detect
 ===========================
 
 This case checked that whether Timesync, ARP, LLDP detection supported by
-Fortville.
+Intel® Ethernet 700 Series.
 
 Send time sync packet from tester::
 
@@ -94,12 +94,12 @@ Test Case: IPv4&L4 packet type detect
 =====================================
 
 This case checked that whether L3 and L4 packet can be normally detected.
-Only Fortville can detect icmp packet.
-Only niantic and i350 can detect ipv4 extension packet.
-Fortville did not detect whether packet contain ipv4 header options, so L3
+Only Intel® Ethernet 700 Series can detect icmp packet.
+Only 82599 and i350 can detect ipv4 extension packet.
+Intel® Ethernet 700 Series did not detect whether packet contain ipv4 header options, so L3
 type will be shown as IPV4_EXT_UNKNOWN.
-Fortville will identify all unrecognized L4 packet as L4_NONFRAG.
-Only Fortville can identify L4 fragment packet.
+Intel® Ethernet 700 Series will identify all unrecognized L4 packet as L4_NONFRAG.
+Only Intel® Ethernet 700 Series can identify L4 fragment packet.
 
 Send IP only packet and verify L2/L3/L4 corrected::
 
@@ -127,13 +127,13 @@ Send IP+SCTP packet and verify L2/L3/L4 corrected::
 
     (outer) L4 type: SCTP
 
-Send IP+ICMP packet and verify L2/L3/L4 corrected(Fortville)::
+Send IP+ICMP packet and verify L2/L3/L4 corrected(Intel® Ethernet 700 Series)::
 
     sendp([Ether()/IP()/ICMP()/Raw('\0'*60)], iface=txItf)
 
     (outer) L4 type: ICMP
 
-Send IP fragment+TCP packet and verify L2/L3/L4 corrected(Fortville)::
+Send IP fragment+TCP packet and verify L2/L3/L4 corrected(Intel® Ethernet 700 Series)::
 
     sendp([Ether()/IP(frag=5)/TCP()/Raw('\0'*60)], iface=txItf)
 
@@ -141,14 +141,14 @@ Send IP fragment+TCP packet and verify L2/L3/L4 corrected(Fortville)::
     (outer) L3 type: IPV4_EXT_UNKNOWN
     (outer) L4 type: L4_FRAG
 
-Send IP extension packet and verify L2/L3 corrected(Niantic,i350)::
+Send IP extension packet and verify L2/L3 corrected(82599,i350)::
 
     sendp([Ether()/IP(ihl=10)/Raw('\0'*40)],iface=txItf)
 
     (outer) L3 type: IPV4_EXT
     (outer) L4 type: Unknown
 
-Send IP extension+SCTP packet and verify L2/L3/L4 corrected(Niantic,i350)::
+Send IP extension+SCTP packet and verify L2/L3/L4 corrected(82599,i350)::
 
     sendp([Ether()/IP(ihl=10)/SCTP()/Raw('\0'*40)],iface=txItf)
 
@@ -159,10 +159,10 @@ Test Case: IPv6&L4 packet type detect
 =====================================
 
 This case checked that whether IPv6 and L4 packet can be normally detected.
-Fortville did not detect whether packet contain ipv6 extension options, so L3
-type will be shown as IPV6_EXT_UNKNOWN.
-Fortville will identify all unrecognized L4 packet as L4_NONFRAG.
-Only Fortville can identify L4 fragment packet.
+Intel® Ethernet 700 Series did not detect whether packet contain ipv6 extension
+options, so L3 type will be shown as IPV6_EXT_UNKNOWN.
+Intel® Ethernet 700 Series will identify all unrecognized L4 packet as L4_NONFRAG.
+Only Intel® Ethernet 700 Series can identify L4 fragment packet.
 
 Send IPv6 only packet and verify L2/L3/L4 corrected::
 
@@ -184,14 +184,14 @@ Send IPv6+TCP packet and verify L2/L3/L4 corrected::
 
     (outer) L4 type: TCP
 
-Send IPv6 fragment packet and verify L2/L3/L4 corrected(Fortville)::
+Send IPv6 fragment packet and verify L2/L3/L4 corrected(Intel® Ethernet 700 Series)::
 
     sendp([Ether()/IPv6()/IPv6ExtHdrFragment()/Raw('\0'*60)],iface=txItf)
 
     (outer) L3 type: IPV6_EXT_UNKNOWN
     (outer) L4 type: L4_FRAG
 
-Send IPv6 fragment packet and verify L2/L3/L4 corrected(Niantic,i350)::
+Send IPv6 fragment packet and verify L2/L3/L4 corrected(82599,i350)::
 
     sendp([Ether()/IPv6()/IPv6ExtHdrFragment()/Raw('\0'*60)],iface=txItf)
 
@@ -202,7 +202,7 @@ Test Case: IP in IPv4 tunnel packet type detect
 ===============================================
 
 This case checked that whether IP in IPv4 tunnel packet can be normally
-detected by Fortville.
+detected by Intel® Ethernet 700 Series.
 
 Send IPv4+IPv4 fragment packet and verify inner and outer L2/L3/L4 corrected::
 
@@ -283,11 +283,11 @@ Send IPv4+IPv6+ICMP packet and verify inner and outer L2/L3/L4 corrected::
 
     Inner L4 type: ICMP
 
-Test Case: IPv6 in IPv4 tunnel packet type detect by niantic and i350
-=====================================================================
+Test Case: IPv6 in IPv4 tunnel packet type detect by 82599 and i350
+===================================================================
 
 This case checked that whether IPv4 in IPv6 tunnel packet can be normally
-detected by Niantic and i350.
+detected by 82599 and i350.
 
 Send IPv4+IPv6 packet and verify inner and outer L2/L3/L4 corrected::
 
@@ -340,7 +340,7 @@ Test Case: IP in IPv6 tunnel packet type detect
 ===============================================
 
 This case checked that whether IP in IPv6 tunnel packet can be normally
-detected by Fortville.
+detected by Intel® Ethernet 700 Series.
 
 Send IPv4+IPv4 fragment packet and verify inner and outer L2/L3/L4 corrected::
 
@@ -427,9 +427,9 @@ Test Case: NVGRE tunnel packet type detect
 ==========================================
 
 This case checked that whether NVGRE tunnel packet can be normally detected
-by Fortville.
-Fortville did not distinguish GRE/Teredo/Vxlan packets, all those types will
-be displayed as GRENAT.
+by Intel® Ethernet 700 Series.
+Intel® Ethernet 700 Series did not distinguish GRE/Teredo/Vxlan packets, all
+those types will be displayed as GRENAT.
 
 Send IPv4+NVGRE fragment packet and verify inner and outer L2/L3/L4
 corrected::
@@ -560,9 +560,9 @@ Test Case: NVGRE in IPv6 tunnel packet type detect
 ==================================================
 
 This case checked that whether NVGRE in IPv6 tunnel packet can be normally
-detected by Fortville.
-Fortville did not distinguish GRE/Teredo/Vxlan packets, all those types will
-be displayed as GRENAT.
+detected by Intel® Ethernet 700 Series.
+Intel® Ethernet 700 Series did not distinguish GRE/Teredo/Vxlan packets, all
+those types will be displayed as GRENAT.
 
 Send IPV6+NVGRE+MAC packet and verify inner and outer L2/L3/L4 corrected::
 
@@ -777,9 +777,9 @@ Test Case: GRE tunnel packet type detect
 ========================================
 
 This case checked that whether GRE tunnel packet can be normally detected by
-Fortville.
-Fortville did not distinguish GRE/Teredo/Vxlan packets, all those types will
-be displayed as GRENAT.
+Intel® Ethernet 700 Series.
+Intel® Ethernet 700 Series did not distinguish GRE/Teredo/Vxlan packets, all
+those types will be displayed as GRENAT.
 
 Send IPv4+GRE+IPv4 fragment packet and verify inner and outer L2/L3/L4
 corrected::
@@ -835,9 +835,9 @@ Test Case: Vxlan tunnel packet type detect
 ==========================================
 
 This case checked that whether Vxlan tunnel packet can be normally detected by
-Fortville.
-Fortville did not distinguish GRE/Teredo/Vxlan packets, all those types
-will be displayed as GRENAT.
+Intel® Ethernet 700 Series.
+Intel® Ethernet 700 Series did not distinguish GRE/Teredo/Vxlan packets, all
+those types will be displayed as GRENAT.
 
 Add vxlan tunnel port filter on receive port::
 
diff --git a/test_plans/userspace_ethtool_test_plan.rst b/test_plans/userspace_ethtool_test_plan.rst
index ab3fbc8f..1cc11cf4 100644
--- a/test_plans/userspace_ethtool_test_plan.rst
+++ b/test_plans/userspace_ethtool_test_plan.rst
@@ -43,15 +43,15 @@ is based upon a simple L2 frame reflector.
 Prerequisites
 =============
 
-notice: On FVL, test case "test_dump_driver_info" need a physical link disconnect,
-this case must do manually at this condition.
+notice: On Intel® Ethernet 700 Series, test case "test_dump_driver_info"
+need a physical link disconnect, this case must do manually at this condition.
 
 Assume port 0 and 1 are connected to the traffic generator, to run the test
 application in linux app environment with 4 lcores, 2 ports::
 
     ethtool -c f -n 4
 
-The sample should be validated on Fortville, Niantic and i350 Nics.
+The sample should be validated on Intel® Ethernet 700 Series, 82599 and i350 Nics.
 
 other requirements:
 
@@ -76,7 +76,7 @@ linux's ethtool, were exactly the same::
     firmware-version: 0x61bf0001
 
 Use "link" command to dump all ports link status.
-Notice:: On FVL, link detect need a physical link disconnect::
+Notice:: On Intel® Ethernet 700 Series, link detect need a physical link disconnect::
 
     EthApp> link
     Port 0: Up
@@ -226,7 +226,7 @@ Test Case: Pause tx/rx test(performance test)
 
 Enable port 0 Rx pause frame and then create two packets flows on IXIA port.
 One flow is 100000 normally packet and the second flow is pause frame.
-Check that dut's port 0 Rx speed dropped status. For example, niantic will drop
+Check that dut's port 0 Rx speed dropped status. For example, 82599 will drop
 from 14.8Mpps to 7.49Mpps::
 
     EthApp> pause 0 rx
diff --git a/test_plans/veb_switch_test_plan.rst b/test_plans/veb_switch_test_plan.rst
index bf2e1cd0..e27afdd4 100644
--- a/test_plans/veb_switch_test_plan.rst
+++ b/test_plans/veb_switch_test_plan.rst
@@ -41,24 +41,25 @@ IEEE EVB tutorial:
 http://www.ieee802.org/802_tutorials/2009-11/evb-tutorial-draft-20091116_v09.pdf
 
 Virtual Ethernet Bridge (VEB) - This is an IEEE EVB term. A VEB is a VLAN
-Bridge internal to Fortville that bridges the traffic of multiple VSIs over an
-internal virtual network.
+Bridge internal to Intel® Ethernet 700 Series that bridges the traffic of
+multiple VSIs over an internal virtual network.
 
 Virtual Ethernet Port Aggregator (VEPA) - This is an IEEE EVB term. A VEPA
-multiplexes the traffic of one or more VSIs onto a single Fortville Ethernet
-port. The biggest difference between a VEB and a VEPA is that a VEB can
-switch packets internally between VSIs, whereas a VEPA cannot.
+multiplexes the traffic of one or more VSIs onto a single Intel® Ethernet
+700 Series Ethernet port. The biggest difference between a VEB and a VEPA
+is that a VEB can switch packets internally between VSIs, whereas a VEPA
+cannot.
 
 Virtual Station Interface (VSI) - This is an IEEE EVB term that defines
 the properties of a virtual machine's (or a physical machine's) connection
-to the network. Each downstream v-port on a Fortville VEB or VEPA defines
-a VSI. A standards-based definition of VSI properties enables network
-management tools to perform virtual machine migration and associated network
-re-configuration in a vendor-neutral manner.
+to the network. Each downstream v-port on a Intel® Ethernet 700 Series VEB
+or VEPA defines a VSI. A standards-based definition of VSI properties enables
+network management tools to perform virtual machine migration and associated
+network re-configuration in a vendor-neutral manner.
 
 My understanding of VEB is that it's an in-NIC switch(MAC/VLAN), and it can
 support VF->VF, PF->VF, VF->PF packet forwarding according to the NIC internal
-switch. It's similar as Niantic's SRIOV switch.
+switch. It's similar as 82599's SRIOV switch.
 
 Prerequisites for VEB testing
 =============================
diff --git a/test_plans/vf_daemon_test_plan.rst b/test_plans/vf_daemon_test_plan.rst
index b75cb11b..26d9f9e7 100644
--- a/test_plans/vf_daemon_test_plan.rst
+++ b/test_plans/vf_daemon_test_plan.rst
@@ -71,7 +71,7 @@ Prerequisites
 =============
 
 1. Host PF in DPDK driver. Create 2 VFs from 1 PF with dpdk driver, take
-   Niantic for example::
+   82599 for example::
 
         ./usertools/dpdk-devbind.py -b igb_uio 81:00.0
         echo 2 >/sys/bus/pci/devices/0000:81:00.0/max_vfs
diff --git a/test_plans/vf_kernel_test_plan.rst b/test_plans/vf_kernel_test_plan.rst
index f711f54a..16e4fc47 100644
--- a/test_plans/vf_kernel_test_plan.rst
+++ b/test_plans/vf_kernel_test_plan.rst
@@ -48,7 +48,7 @@ below features.
 Test Case 1: Set up environment and load driver
 ===============================================
 1. Get the pci device id of DUT, load ixgbe driver to required version, 
-   take Niantic for example::
+   take 82599 for example::
 
     rmmod ixgbe
     insmod ixgbe.ko
@@ -305,7 +305,7 @@ Steps:
    can be received by DPDK PF
 
 Note: 
-Niantic NIC un-supports this case.
+82599 NIC un-supports this case.
 
 
 Test Case 10: RSS
@@ -330,7 +330,7 @@ Steps:
 4. Check kernel VF each queue can receive packets
 
 Note: 
-Niantic NIC un-supports this case.
+82599 NIC un-supports this case.
 
 
 Test Case 11: DPDK PF + kernel VF + DPDK VF
diff --git a/test_plans/vf_pf_reset_test_plan.rst b/test_plans/vf_pf_reset_test_plan.rst
index d3a9f505..ff3aa326 100644
--- a/test_plans/vf_pf_reset_test_plan.rst
+++ b/test_plans/vf_pf_reset_test_plan.rst
@@ -41,7 +41,7 @@ Prerequisites
 
 1. Hardware:
 
-   * Fortville 4*10G NIC (driver: i40e)
+   * Intel® Ethernet 700 Series 4*10G NIC (driver: i40e)
    * tester: ens3f0
    * dut: ens5f0(pf0), ens5f1(pf1)
    * ens3f0 connect with ens5f0 by cable
diff --git a/test_plans/vf_rss_test_plan.rst b/test_plans/vf_rss_test_plan.rst
index ce50072e..d6fdbcfc 100644
--- a/test_plans/vf_rss_test_plan.rst
+++ b/test_plans/vf_rss_test_plan.rst
@@ -34,7 +34,7 @@
 VF RSS - Configuring Hash Function Tests
 ========================================
 
-This document provides test plan for testing the function of Fortville:
+This document provides test plan for testing the function of Intel® Ethernet 700 Series:
 Support configuring hash functions.
 
 Prerequisites
@@ -53,15 +53,15 @@ handled by a different logical core.
 #. The receive packet is parsed into the header fields used by the hash
    operation (such as IP addresses, TCP port, etc.)
 
-#. A hash calculation is performed. The Fortville supports three hash function:
+#. A hash calculation is performed. The Intel® Ethernet 700 Series supports three hash function:
    Toeplitz, simple XOR and their Symmetric RSS.
 
 #. Hash results are used as an index into a 128/512 entry
    'redirection table'.
 
-#. Niantic VF only supports simple default hash algorithm(simple). Fortville NICs
+#. 82599 VF only supports simple default hash algorithm(simple). Intel® Ethernet 700 Series NICs
    support all hash algorithm only used dpdk driver on host. when used kernel driver on host,
-   fortville NICs only support default hash algorithm(simple).
+   Intel® Ethernet 700 Series NICs only support default hash algorithm(simple).
 
 The RSS RETA update feature is designed to make RSS more flexible by allowing
 users to define the correspondence between the seven LSBs of hash result and
diff --git a/test_plans/vf_single_core_perf_test_plan.rst b/test_plans/vf_single_core_perf_test_plan.rst
index 8c4ff727..6de790ea 100644
--- a/test_plans/vf_single_core_perf_test_plan.rst
+++ b/test_plans/vf_single_core_perf_test_plan.rst
@@ -39,12 +39,14 @@ Prerequisites
 
 1.  Nic single core performance test requirements:
 
-    1.1) FVL25G: two dual port FVL25G nics, all installed on the same socket,
-                 pick one port per nic.
-    1.2) NNT10G: four 82599 nics, all installed on the same socket,
-                 pick one port per nic.
-    1.3) CVL100G: one CVL100G nics, all installed on the same socket,
-                 pick one port per nic.
+    1.1) Intel® Ethernet Network Adapter XXV710-DA2:
+         two dual port Intel® Ethernet Network Adapter XXV710-DA2 nics,all
+         installed on the same socket, pick one port per nic.
+    1.2) 82599/500 Series 10G:
+         four 82599 nics, all installed on the same socket, pick one port per nic.
+    1.3) Intel® Ethernet Network Adapter E810-CQDA2:
+         one Intel® Ethernet Network Adapter E810-CQDA2 nics, all installed on the
+         same socket, pick one port per nic.
 
 2. Software::
 
@@ -62,9 +64,9 @@ Prerequisites
 3. Connect all the selected nic ports to traffic generator(IXIA,TREX,
    PKTGEN) ports(TG ports)::
 
-    2 TG 25g  ports for FVL25G ports
-    4 TG 10g  ports for 4 NNT10G ports
-    1 TG 100g ports for CVL100G port
+    2 TG 25g  ports for Intel® Ethernet Network Adapter XXV710-DA2 ports
+    4 TG 10g  ports for 4 82599/500 Series 10G ports
+    1 TG 100g ports for Intel® Ethernet Network Adapter E810-CQDA2 port
 
 Test Case : Vf Single Core Performance Measurement
 ==================================================
diff --git a/test_plans/vf_smoke_test_plan.rst b/test_plans/vf_smoke_test_plan.rst
index 43330c10..54cf4c42 100644
--- a/test_plans/vf_smoke_test_plan.rst
+++ b/test_plans/vf_smoke_test_plan.rst
@@ -46,7 +46,7 @@ Prerequisites
 
 1. Hardware:
 
-    niantic/fortville/columbiaville
+    82599/Intel® Ethernet 700 Series/Intel® Ethernet 800 Series
 
 2. Software:
 
diff --git a/test_plans/vlan_ethertype_config_test_plan.rst b/test_plans/vlan_ethertype_config_test_plan.rst
index 17657c7b..fb6b47ab 100644
--- a/test_plans/vlan_ethertype_config_test_plan.rst
+++ b/test_plans/vlan_ethertype_config_test_plan.rst
@@ -46,7 +46,7 @@ Prerequisites
 =============
 
 1. Hardware:
-   one Fortville NIC (4x 10G or 2x10G or 2x40G or 1x10G)
+   one Intel® Ethernet 700 Series NIC (4x 10G or 2x10G or 2x40G or 1x10G)
 
 2. Software:
 
diff --git a/test_plans/vm_power_manager_test_plan.rst b/test_plans/vm_power_manager_test_plan.rst
index f85d2ef9..ca66ba06 100644
--- a/test_plans/vm_power_manager_test_plan.rst
+++ b/test_plans/vm_power_manager_test_plan.rst
@@ -64,7 +64,7 @@ Prerequisites
 1. Hardware:
 
     - CPU: Haswell, IVB(CrownPass)
-    - NIC: Niantic 82599
+    - NIC: 82599
 
 2. BIOS:
 
diff --git a/test_plans/vmdq_dcb_test_plan.rst b/test_plans/vmdq_dcb_test_plan.rst
index 1d20a9bc..fa1bd7dd 100644
--- a/test_plans/vmdq_dcb_test_plan.rst
+++ b/test_plans/vmdq_dcb_test_plan.rst
@@ -30,9 +30,9 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-===================================================================
-Fortville: Support of RX Packet Filtering using VMDQ & DCB Features
-===================================================================
+====================================================================================
+Intel® Ethernet 700 Series: Support of RX Packet Filtering using VMDQ & DCB Features
+====================================================================================
 
 The Intel Network Interface Card(e.g. XL710), supports a number of
 packet filtering functions which can be used to distribute incoming packets
diff --git a/test_plans/vmdq_test_plan.rst b/test_plans/vmdq_test_plan.rst
index ef64823c..8f6fd3bc 100644
--- a/test_plans/vmdq_test_plan.rst
+++ b/test_plans/vmdq_test_plan.rst
@@ -34,9 +34,9 @@
 VMDQ Tests
 ==========
 
-The 1G, 10G 82599 and 40G FVL Network Interface Card (NIC), supports a number of packet
-filtering functions which can be used to distribute incoming packets into a
-number of reception (RX) queues. VMDQ is a  filtering
+The 1G, 10G 82599 and 40G Intel® Ethernet 700 Series Network Interface Card (NIC),
+supports a number of packet filtering functions which can be used to distribute
+incoming packets into a number of reception (RX) queues. VMDQ is a  filtering
 functions which operate on VLAN-tagged packets to distribute those packets
 among up to 512 RX queues.
 
@@ -63,14 +63,16 @@ Prerequisites
   reception, the other for transmission
 - The traffic generator being used is configured to send to the application RX
   port a stream of packets with VLAN tags, where the VLAN IDs increment from 0
-  to the pools numbers(e.g: for FVL spirit, it's 63, inclusive) as well as the MAC address from
-  52:54:00:12:[port_index]:00 to 52:54:00:12:[port_index]:3e and the VLAN user priority field increments from 0 to 7
+  to the pools numbers(e.g: for Intel® Ethernet Converged Network Adapter XL710-QDA2,
+  it's 63, inclusive) as well as the MAC address from 52:54:00:12:[port_index]:00 to
+  52:54:00:12:[port_index]:3e and the VLAN user priority field increments from 0 to 7
   (inclusive) for each VLAN ID. In our case port_index = 0 or 1.
 
 Test Case: Measure VMDQ pools queues
 ------------------------------------
 1. Put different number of pools: in the case of 10G 82599 Nic is 64, in the case
-   of FVL spirit is 63,in case of FVL eagle is 34.
+   of Intel® Ethernet Converged Network Adapter XL710-QDA2 is 63,in case of Intel®
+   Ethernet Converged Network Adapter X710-DA4 is 34.
 2. Start traffic transmission using approx 10% of line rate.
 3. After a number of seconds, e.g. 15, stop traffic, and ensure no traffic
    loss (<0.001%) has occurred.
diff --git a/test_plans/vswitch_pvp_multi_paths_performance_with_cbdma_test_plan.rst b/test_plans/vswitch_pvp_multi_paths_performance_with_cbdma_test_plan.rst
index 2083ad1b..9c53c19c 100644
--- a/test_plans/vswitch_pvp_multi_paths_performance_with_cbdma_test_plan.rst
+++ b/test_plans/vswitch_pvp_multi_paths_performance_with_cbdma_test_plan.rst
@@ -60,7 +60,7 @@ Test flow: TG-->nic-->vswitch-->virtio-user-->vswitch-->nic-->TG
 
 Hardware
 --------
-Supportted NICs: all except columbiaville that not support VMDQ
+Supportted NICs: all except Intel® Ethernet 800 Series that not support VMDQ
 
 Software
 --------
diff --git a/test_plans/vxlan_test_plan.rst b/test_plans/vxlan_test_plan.rst
index 12e35bee..63fe8713 100644
--- a/test_plans/vxlan_test_plan.rst
+++ b/test_plans/vxlan_test_plan.rst
@@ -30,23 +30,23 @@
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
    OF THE POSSIBILITY OF SUCH DAMAGE.
 
-=====================
-Fortville Vxlan Tests
-=====================
+======================================
+Intel® Ethernet 700 Series Vxlan Tests
+======================================
 Cloud providers build virtual network overlays over existing network
 infrastructure that provide tenant isolation and scaling. Tunneling
 layers added to the packets carry the virtual networking frames over
 existing Layer 2 and IP networks. Conceptually, this is similar to
-creating virtual private networks over the Internet. Fortville will
-process these tunneling layers by the hardware.
+creating virtual private networks over the Internet. Intel® Ethernet
+700 Series will process these tunneling layers by the hardware.
 
-This document provides test plan for Fortville vxlan packet detecting,
-checksum computing and filtering.
+This document provides test plan for Intel® Ethernet 700 Series vxlan
+packet detecting, checksum computing and filtering.
 
 Prerequisites
 =============
-1x Intel® X710 (Fortville) NICs (2x 40GbE full duplex optical ports per NIC)
-plugged into the available PCIe Gen3 8-lane slot.
+1x Intel® X710 (Intel® Ethernet 700 Series) NICs (2x 40GbE full duplex
+optical ports per NIC) plugged into the available PCIe Gen3 8-lane slot.
 
 1x Intel® XL710-DA4 (Eagle Fountain) (1x 10GbE full duplex optical ports per NIC)
 plugged into the available PCIe Gen3 8-lane slot.
-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [dts] [6/6] tests/*: replace codename in test suites
  2022-05-10  9:54 [dts] [0/6] modify about codename replacement Jun Dong
                   ` (4 preceding siblings ...)
  2022-05-10  9:54 ` [dts] [5/6] test_plans/*: replace codename in test plans Jun Dong
@ 2022-05-10  9:54 ` Jun Dong
  2022-05-12  5:05   ` lijuan.tu
  5 siblings, 1 reply; 8+ messages in thread
From: Jun Dong @ 2022-05-10  9:54 UTC (permalink / raw)
  To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong

Signed-off-by: Jun Dong <junx.dong@intel.com>
---
 tests/TestSuite_af_xdp_2.py                   |   2 +-
 tests/TestSuite_checksum_offload.py           |   8 +-
 tests/TestSuite_cloud_filter_with_l4_port.py  |  14 +-
 tests/TestSuite_ddp_gtp.py                    |   8 +-
 tests/TestSuite_ddp_gtp_qregion.py            |   6 +-
 tests/TestSuite_ddp_l2tpv3.py                 |   4 +-
 tests/TestSuite_ddp_mpls.py                   |  10 +-
 tests/TestSuite_ddp_ppp_l2tp.py               |   6 +-
 tests/TestSuite_dual_vlan.py                  | 126 ++--
 tests/TestSuite_dynamic_flowtype.py           |   8 +-
 tests/TestSuite_dynamic_queue.py              |   4 +-
 tests/TestSuite_eeprom_dump.py                |   6 +-
 ...e_enable_package_download_in_ice_driver.py |   7 +-
 tests/TestSuite_flexible_rxd.py               |   8 +-
 tests/TestSuite_floating_veb.py               |   8 +-
 tests/TestSuite_generic_flow_api.py           | 607 +++++++++---------
 tests/TestSuite_hotplug.py                    |   4 +-
 ...s_input.py => TestSuite_i40e_rss_input.py} |  24 +-
 tests/TestSuite_iavf_flexible_descriptor.py   |  12 +-
 ...tSuite_iavf_package_driver_error_handle.py |   2 +-
 ...signal.py => TestSuite_ice_1pps_signal.py} |   4 +-
 ....py => TestSuite_ice_advanced_iavf_rss.py} |   0
 ...estSuite_ice_advanced_iavf_rss_gtpogre.py} |   2 +-
 ...> TestSuite_ice_advanced_iavf_rss_gtpu.py} |   4 +-
 ...ite_ice_advanced_iavf_rss_pppol2tpoudp.py} |   2 +-
 ...dvanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py} |   2 +-
 ...d_rss.py => TestSuite_ice_advanced_rss.py} |   0
 ... => TestSuite_ice_advanced_rss_gtpogre.py} |   2 +-
 ....py => TestSuite_ice_advanced_rss_gtpu.py} |   4 +-
 ...py => TestSuite_ice_advanced_rss_pppoe.py} |   0
 ...ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py} |   0
 ...ter.py => TestSuite_ice_dcf_acl_filter.py} |  13 +-
 ...path.py => TestSuite_ice_dcf_date_path.py} |   0
 ....py => TestSuite_ice_dcf_flow_priority.py} |   4 +-
 ...vl_dcf_qos.py => TestSuite_ice_dcf_qos.py} |  10 +-
 ....py => TestSuite_ice_dcf_switch_filter.py} |   4 +-
 ...> TestSuite_ice_dcf_switch_filter_gtpu.py} |   4 +-
 ... TestSuite_ice_dcf_switch_filter_pppoe.py} |   4 +-
 ...te_cvl_ecpri.py => TestSuite_ice_ecpri.py} |   2 +-
 ...uite_cvl_fdir.py => TestSuite_ice_fdir.py} |   4 +-
 ...rity.py => TestSuite_ice_flow_priority.py} |   4 +-
 ...avf_fdir.py => TestSuite_ice_iavf_fdir.py} |  34 +-
 ....py => TestSuite_ice_iavf_fdir_gtpogre.py} |   2 +-
 ...> TestSuite_ice_iavf_fdir_pppol2tpoudp.py} |   4 +-
 ...estSuite_ice_iavf_ip_fragment_rte_flow.py} |   2 +-
 ...py => TestSuite_ice_iavf_rss_configure.py} |   0
 ... => TestSuite_ice_ip_fragment_rte_flow.py} |   2 +-
 ...t.py => TestSuite_ice_limit_value_test.py} |  57 +-
 ...uite_cvl_qinq.py => TestSuite_ice_qinq.py} |   4 +-
 ...gure.py => TestSuite_ice_rss_configure.py} |   2 +-
 ...lter.py => TestSuite_ice_switch_filter.py} |   6 +-
 ...y => TestSuite_ice_switch_filter_pppoe.py} |   6 +-
 ...Suite_ice_vf_support_multicast_address.py} |   2 +-
 tests/TestSuite_inline_ipsec.py               |   3 +-
 tests/TestSuite_ipgre.py                      |  21 +-
 ...te_ixgbe_vf_get_extra_queue_information.py |   6 +-
 tests/TestSuite_jumboframes.py                |   7 +-
 tests/TestSuite_kernelpf_iavf.py              |   6 +-
 tests/TestSuite_l2fwd_jobstats.py             |  12 +-
 tests/TestSuite_l2tp_esp_coverage.py          |   6 +-
 tests/TestSuite_large_vf.py                   |   2 +-
 tests/TestSuite_link_flowctrl.py              |  12 +-
 tests/TestSuite_link_status_interrupt.py      |  14 +-
 tests/TestSuite_mac_filter.py                 |   2 +-
 tests/TestSuite_macsec_for_ixgbe.py           |   4 +-
 tests/TestSuite_metering_and_policing.py      |   2 +-
 tests/TestSuite_mtu_update.py                 |   5 +-
 tests/TestSuite_nic_single_core_perf.py       |  34 +-
 tests/TestSuite_nvgre.py                      |  30 +-
 tests/TestSuite_pmdrss_hash.py                |  23 +-
 tests/TestSuite_pmdrssreta.py                 |  34 +-
 tests/TestSuite_port_control.py               |   4 +-
 tests/TestSuite_port_representor.py           |  14 +-
 tests/TestSuite_ptype_mapping.py              |  14 +-
 tests/TestSuite_pvp_share_lib.py              |   8 +-
 tests/TestSuite_pvp_vhost_user_reconnect.py   |   8 +-
 tests/TestSuite_qinq_filter.py                |  16 +-
 tests/TestSuite_queue_region.py               |  24 +-
 tests/TestSuite_rss_key_update.py             |  68 +-
 tests/TestSuite_rss_to_rte_flow.py            | 307 ++++-----
 ...estSuite_runtime_vf_queue_number_kernel.py |  20 +-
 ...stSuite_runtime_vf_queue_number_maxinum.py |  38 +-
 tests/TestSuite_rxtx_offload.py               | 113 ++--
 tests/TestSuite_scatter.py                    |  34 +-
 tests/TestSuite_shutdown_api.py               |  52 +-
 tests/TestSuite_softnic.py                    |   6 +-
 tests/TestSuite_sriov_kvm.py                  |  24 +-
 tests/TestSuite_testpmd_perf.py               |  10 +-
 tests/TestSuite_tso.py                        |  16 +-
 tests/TestSuite_uni_pkt.py                    | 229 ++++---
 tests/TestSuite_userspace_ethtool.py          |  33 +-
 tests/TestSuite_veb_switch.py                 |  14 +-
 tests/TestSuite_vf_interrupt_pmd.py           |  28 +-
 tests/TestSuite_vf_kernel.py                  |  15 +-
 tests/TestSuite_vf_l3fwd.py                   |  13 +-
 tests/TestSuite_vf_macfilter.py               |  13 +-
 tests/TestSuite_vf_packet_rxtx.py             |  14 +-
 tests/TestSuite_vf_rss.py                     |  40 +-
 tests/TestSuite_vf_single_core_perf.py        |  12 +-
 tests/TestSuite_vf_vlan.py                    |   8 +-
 tests/TestSuite_vlan_ethertype_config.py      |  10 +-
 tests/TestSuite_vmdq.py                       |   8 +-
 tests/TestSuite_vxlan.py                      |  30 +-
 tests/TestSuite_vxlan_gpe_support_in_i40e.py  |  12 +-
 tests/flexible_common.py                      |   2 +-
 tests/perf_test_base.py                       |  25 +-
 tests/rte_flow_common.py                      |  35 +-
 107 files changed, 1343 insertions(+), 1261 deletions(-)
 rename tests/{TestSuite_fortville_rss_input.py => TestSuite_i40e_rss_input.py} (99%)
 rename tests/{TestSuite_cvl_1pps_signal.py => TestSuite_ice_1pps_signal.py} (98%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_advanced_iavf_rss.py => TestSuite_ice_advanced_iavf_rss.py} (100%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_advanced_iavf_rss_gtpogre.py => TestSuite_ice_advanced_iavf_rss_gtpogre.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_advanced_iavf_rss_gtpu.py => TestSuite_ice_advanced_iavf_rss_gtpu.py} (99%)
 rename tests/{TestSuite_cvl_advanced_iavf_rss_pppol2tpoudp.py => TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py} (99%)
 rename tests/{TestSuite_cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py => TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py} (99%)
 rename tests/{TestSuite_cvl_advanced_rss.py => TestSuite_ice_advanced_rss.py} (100%)
 rename tests/{TestSuite_cvl_advanced_rss_gtpogre.py => TestSuite_ice_advanced_rss_gtpogre.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_advanced_rss_gtpu.py => TestSuite_ice_advanced_rss_gtpu.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_advanced_rss_pppoe.py => TestSuite_ice_advanced_rss_pppoe.py} (100%)
 rename tests/{TestSuite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py => TestSuite_ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py} (100%)
 rename tests/{TestSuite_cvl_dcf_acl_filter.py => TestSuite_ice_dcf_acl_filter.py} (99%)
 rename tests/{TestSuite_cvl_dcf_date_path.py => TestSuite_ice_dcf_date_path.py} (100%)
 rename tests/{TestSuite_cvl_dcf_flow_priority.py => TestSuite_ice_dcf_flow_priority.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_dcf_qos.py => TestSuite_ice_dcf_qos.py} (99%)
 rename tests/{TestSuite_cvl_dcf_switch_filter.py => TestSuite_ice_dcf_switch_filter.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_dcf_switch_filter_gtpu.py => TestSuite_ice_dcf_switch_filter_gtpu.py} (99%)
 rename tests/{TestSuite_cvl_dcf_switch_filter_pppoe.py => TestSuite_ice_dcf_switch_filter_pppoe.py} (99%)
 rename tests/{TestSuite_cvl_ecpri.py => TestSuite_ice_ecpri.py} (99%)
 rename tests/{TestSuite_cvl_fdir.py => TestSuite_ice_fdir.py} (99%)
 rename tests/{TestSuite_cvl_flow_priority.py => TestSuite_ice_flow_priority.py} (99%)
 rename tests/{TestSuite_iavf_fdir.py => TestSuite_ice_iavf_fdir.py} (99%)
 rename tests/{TestSuite_iavf_fdir_gtpogre.py => TestSuite_ice_iavf_fdir_gtpogre.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_iavf_fdir_pppol2tpoudp.py => TestSuite_ice_iavf_fdir_pppol2tpoudp.py} (99%)
 rename tests/{TestSuite_cvl_iavf_ip_fragment_rte_flow.py => TestSuite_ice_iavf_ip_fragment_rte_flow.py} (99%)
 rename tests/{TestSuite_cvl_iavf_rss_configure.py => TestSuite_ice_iavf_rss_configure.py} (100%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_ip_fragment_rte_flow.py => TestSuite_ice_ip_fragment_rte_flow.py} (99%)
 rename tests/{TestSuite_cvl_limit_value_test.py => TestSuite_ice_limit_value_test.py} (96%)
 rename tests/{TestSuite_cvl_qinq.py => TestSuite_ice_qinq.py} (99%)
 rename tests/{TestSuite_cvl_rss_configure.py => TestSuite_ice_rss_configure.py} (99%)
 rename tests/{TestSuite_cvl_switch_filter.py => TestSuite_ice_switch_filter.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_switch_filter_pppoe.py => TestSuite_ice_switch_filter_pppoe.py} (99%)
 mode change 100755 => 100644
 rename tests/{TestSuite_cvl_vf_support_multicast_address.py => TestSuite_ice_vf_support_multicast_address.py} (99%)

diff --git a/tests/TestSuite_af_xdp_2.py b/tests/TestSuite_af_xdp_2.py
index edc9b320..7d628145 100644
--- a/tests/TestSuite_af_xdp_2.py
+++ b/tests/TestSuite_af_xdp_2.py
@@ -44,7 +44,7 @@ class TestAfXdp(TestCase):
         """
         Run at the start of each test suite.
         """
-        # self.verify(self.nic in ("fortville_spirit"), "the port can not run this suite")
+        # self.verify(self.nic in ("I40E_40G-QSFP_A"), "the port can not run this suite")
 
         self.frame_sizes = [64, 128, 256, 512, 1024, 1518]
         self.dut_ports = self.dut.get_ports()
diff --git a/tests/TestSuite_checksum_offload.py b/tests/TestSuite_checksum_offload.py
index 142be171..b849a1d5 100644
--- a/tests/TestSuite_checksum_offload.py
+++ b/tests/TestSuite_checksum_offload.py
@@ -508,8 +508,8 @@ class TestChecksumOffload(TestCase):
                     packet[VXLAN][Ether], "VXLAN", inner_flag=True
                 ):
                     error_messages.append(vxlan_error_message % self.count)
-                # fortville not support outer udp checksum
-                if "fortville" in self.nic:
+                # Intel® Ethernet 700 Series not support outer udp checksum
+                if self.is_eth_series_nic(700):
                     continue
                 if self.validate_checksum(packet, "VXLAN"):
                     error_messages.append(vxlan_error_message % self.count)
@@ -962,8 +962,8 @@ class TestChecksumOffload(TestCase):
                             if flag == "RTE_MBUF_F_RX_L4_CKSUM_":
                                 should_pass = inner_arg == ""
                             else:  # flag == RTE_MBUF_F_RX_OUTER_L4_CKSUM_
-                                # fortville not support outer checksum
-                                if "fortville" in self.nic:
+                                # Intel® Ethernet 700 Series not support outer checksum
+                                if self.is_eth_series_nic(700):
                                     continue
                                 should_pass = outer_arg == ""
                             vf = self.send_pkt_expect_good_bad_from_flag_catch_failure(
diff --git a/tests/TestSuite_cloud_filter_with_l4_port.py b/tests/TestSuite_cloud_filter_with_l4_port.py
index 6c2b3453..1ab85d9f 100644
--- a/tests/TestSuite_cloud_filter_with_l4_port.py
+++ b/tests/TestSuite_cloud_filter_with_l4_port.py
@@ -78,13 +78,13 @@ class TestCloudFilterWithL4Port(TestCase):
         self.verify(
             self.nic
             in [
-                "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",
             ],
             "%s nic not support cloud filter" % self.nic,
         )
diff --git a/tests/TestSuite_ddp_gtp.py b/tests/TestSuite_ddp_gtp.py
index f6ceb5b4..50245c9a 100644
--- a/tests/TestSuite_ddp_gtp.py
+++ b/tests/TestSuite_ddp_gtp.py
@@ -49,7 +49,7 @@ class TestDdpGtp(TestCase):
 
     def set_up_all(self):
         self.verify(
-            "fortville" in self.nic, "ddp gtp can not support %s nic" % self.nic
+            self.is_eth_series_nic(700), "ddp gtp can not support %s nic" % self.nic
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
@@ -178,9 +178,9 @@ class TestDdpGtp(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file and need to be passed to AQ to program FVL
-        during initialization stage.
+        Load profile to update Intel® Ethernet 700 Series configuration tables,
+        profile will be stored in binary file and need to be passed to AQ to
+        program Intel® Ethernet 700 Series during initialization stage.
         """
         self.dut_testpmd.start_testpmd(
             "Default",
diff --git a/tests/TestSuite_ddp_gtp_qregion.py b/tests/TestSuite_ddp_gtp_qregion.py
index 5daa3c17..3600c7b4 100644
--- a/tests/TestSuite_ddp_gtp_qregion.py
+++ b/tests/TestSuite_ddp_gtp_qregion.py
@@ -77,9 +77,9 @@ class TestDdpGtpQregion(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file and need to be passed to AQ to program FVL
-        during initialization stage.
+        Load profile to update Intel® Ethernet 700 Series configuration tables,
+        profile will be stored in binary file and need to be passed to AQ to
+        program Intel® Ethernet 700 Series during initialization stage.
         """
         self.dut_testpmd.start_testpmd(
             "Default",
diff --git a/tests/TestSuite_ddp_l2tpv3.py b/tests/TestSuite_ddp_l2tpv3.py
index 1eece104..7c3d5ee4 100644
--- a/tests/TestSuite_ddp_l2tpv3.py
+++ b/tests/TestSuite_ddp_l2tpv3.py
@@ -75,8 +75,8 @@ class TestDdpL2tpv3(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file.
+        Load profile to update Intel® Ethernet 700 Series configuration
+        tables, profile will be stored in binary file.
         """
         self.dut_testpmd.start_testpmd(
             "Default",
diff --git a/tests/TestSuite_ddp_mpls.py b/tests/TestSuite_ddp_mpls.py
index 9b1179be..4108a62c 100644
--- a/tests/TestSuite_ddp_mpls.py
+++ b/tests/TestSuite_ddp_mpls.py
@@ -51,7 +51,7 @@ class Testddp_mpls(TestCase):
 
     def set_up_all(self):
         self.verify(
-            "fortville" in self.nic, "ddp mpls can not support %s nic" % self.nic
+            self.is_eth_series_nic(700), "ddp mpls can not support %s nic" % self.nic
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
@@ -137,9 +137,9 @@ class Testddp_mpls(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file and need to be passed to AQ to program FVL
-        during initialization stage.
+        Load profile to update Intel® Ethernet 700 Series configuration tables,
+        profile will be stored in binary file and need to be passed to AQ to
+        program Intel® Ethernet 700 Series during initialization stage.
         """
         self.dut_testpmd.execute_cmd("port stop all")
         time.sleep(1)
@@ -218,7 +218,7 @@ class Testddp_mpls(TestCase):
 
     def test_load_ddp(self):
         """
-        Load profile to update FVL configuration tables.
+        Load profile to update Intel® Ethernet 700 Series configuration tables.
         """
         self.load_profile()
 
diff --git a/tests/TestSuite_ddp_ppp_l2tp.py b/tests/TestSuite_ddp_ppp_l2tp.py
index 3fe8879b..15d29ef0 100644
--- a/tests/TestSuite_ddp_ppp_l2tp.py
+++ b/tests/TestSuite_ddp_ppp_l2tp.py
@@ -76,9 +76,9 @@ class TestDdpPppL2tp(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file and need to be passed to AQ to program FVL
-        during initialization stage.
+        Load profile to update Intel® Ethernet 700 Series configuration tables,
+        profile will be stored in binary file and need to be passed to AQ to
+        program Intel® Ethernet 700 Series during initialization stage.
         """
         self.dut_testpmd.start_testpmd(
             "Default",
diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py
index 63e273f1..0c0cae6d 100644
--- a/tests/TestSuite_dual_vlan.py
+++ b/tests/TestSuite_dual_vlan.py
@@ -133,13 +133,13 @@ class TestDualVlan(TestCase):
         )
 
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "fortpark_TLV",
-            "carlsville",
-            "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_BC",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             self.dut.send_expect("vlan set filter on all", "testpmd> ")
             self.dut.send_expect("set promisc all off", "testpmd> ")
@@ -191,15 +191,15 @@ class TestDualVlan(TestCase):
 
         for mode in modeName:
             if self.nic in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark_TLV",
-                "carlsville",
-                "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_BC",
+                "I40E_10G-10G_BASE_T_X722",
             ]:
-                # fortville NIC vlan filter can't close, if want close need remove rx_vlan
+                # Intel® Ethernet 700 Series NIC vlan filter can't close, if want close need remove rx_vlan
                 if mode == "filter":
                     if modeName[mode] == "off":
                         self.dut.send_expect(
@@ -226,15 +226,15 @@ class TestDualVlan(TestCase):
         out = self.dut.send_expect("show port info %s" % dutRxPortId, "testpmd> ")
         for mode in modeName:
             if self.nic in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "fortpark_TLV",
-                "carlsville",
-                "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_BC",
+                "I40E_10G-10G_BASE_T_X722",
             ]:
-                # fortville NIC vlan filter can't close, if want close need remove rx_vlan
+                # Intel® Ethernet 700 Series NIC vlan filter can't close, if want close need remove rx_vlan
                 if mode == "filter":
                     if modeName[mode] == "off":
                         self.dut.send_expect(
@@ -376,15 +376,15 @@ class TestDualVlan(TestCase):
         )
 
         if self.nic not in [
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "fortpark_TLV",
-            "carlsville",
-            "fortpark_BASE-T",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "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_BC",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             self.mode_config(filter="off")
             self.vlan_send_packet(outvlan)
@@ -434,15 +434,15 @@ class TestDualVlan(TestCase):
         self.mode_config(extend="off")
         self.mode_config(strip="on")
         if self.nic in [
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "fortpark_TLV",
-            "carlsville",
-            "fortpark_BASE-T",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "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_BC",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             self.dut.send_expect(
                 "rx_vlan add %s %s" % (outvlan, dutRxPortId), "testpmd> "
@@ -456,15 +456,15 @@ class TestDualVlan(TestCase):
         out = self.get_tcpdump_package()
         self.verify("vlan %s" % outvlan in out, "Vlan strip disable error: " + out)
         if self.nic in [
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
-            "fortpark_TLV",
-            "carlsville",
-            "fortpark_BASE-T",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "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_BC",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             self.dut.send_expect(
                 "rx_vlan rm %s %s" % (outvlan, dutRxPortId), "testpmd> "
@@ -483,7 +483,7 @@ class TestDualVlan(TestCase):
         self.verify(
             "vlan %s" % outvlan in out, "vlan strip queue disable error : " + out
         )
-        # if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]:
+        # if self.nic in ["I40E_10G-SFP_XL710", "I40E_40G-QSFP_A", "I40E_40G-QSFP_B"]:
         self.mode_config(strip="on")
         self.mode_config(stripq="on")
         self.vlan_send_packet(outvlan)
@@ -504,8 +504,8 @@ class TestDualVlan(TestCase):
         self.mode_config(filter="off")
         self.mode_config(extend="off")
 
-        # hartwell need to set CTRL.VME for vlan insert
-        if self.nic == "hartwell":
+        # IGB_1G-82574L need to set CTRL.VME for vlan insert
+        if self.nic == "IGB_1G-82574L":
             self.dut.send_expect("vlan set strip on %s" % dutTxPortId, "testpmd> ")
 
         self.dut.send_expect("stop", "testpmd> ")
@@ -535,19 +535,19 @@ class TestDualVlan(TestCase):
         self.verify(
             self.nic
             not in [
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "hartwell",
-                "carlsville",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGB_1G-82574L",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s NIC not support tcpid " % self.nic,
         )
 
         self.mode_config(filter="on", strip="on", extend="on")
-        # nic only support inner model, except fortville nic
+        # nic only support inner model, except Intel® Ethernet 700 Series nic
         self.dut.send_expect("vlan set inner tpid 1234 %s" % dutRxPortId, "testpmd> ")
         self.vlan_send_packet(outvlan, invlan)
 
@@ -568,7 +568,7 @@ class TestDualVlan(TestCase):
         VLAN synthetic test.
         """
         self.verify(
-            self.nic != "hartwell", "sorry, dual vlan cannot support this self.nic"
+            self.nic != "IGB_1G-82574L", "sorry, dual vlan cannot support this self.nic"
         )
         for i in range(len(vlanCase)):
             self.multimode_test(i)
@@ -578,7 +578,7 @@ class TestDualVlan(TestCase):
         VLAN random test.
         """
         self.verify(
-            self.nic != "hartwell", "sorry, dual vlan cannot support this self.nic"
+            self.nic != "IGB_1G-82574L", "sorry, dual vlan cannot support this self.nic"
         )
         for _ in range(30):
             rand = random.randint(0, 15)
diff --git a/tests/TestSuite_dynamic_flowtype.py b/tests/TestSuite_dynamic_flowtype.py
index fbf7d178..81c06976 100644
--- a/tests/TestSuite_dynamic_flowtype.py
+++ b/tests/TestSuite_dynamic_flowtype.py
@@ -43,7 +43,7 @@ VM_CORES_MASK = "all"
 class TestDynamicFlowtype(TestCase):
     def set_up_all(self):
         self.verify(
-            "fortville" in self.nic,
+            self.is_eth_series_nic(700),
             "dynamic flow type mapping can not support %s nic" % self.nic,
         )
         ports = self.dut.get_ports()
@@ -87,9 +87,9 @@ class TestDynamicFlowtype(TestCase):
 
     def load_profile(self):
         """
-        Load profile to update FVL configuration tables, profile will be
-        stored in binary file and need to be passed to AQ to program FVL
-        during initialization stage.
+        Load profile to update Intel® Ethernet 700 Series configuration tables,
+        profile will be stored in binary file and need to be passed to AQ to
+        program Intel® Ethernet 700 Series during initialization stage.
         """
         self.dut_testpmd.execute_cmd("port stop all")
         time.sleep(1)
diff --git a/tests/TestSuite_dynamic_queue.py b/tests/TestSuite_dynamic_queue.py
index 9c65efaf..59a3443c 100644
--- a/tests/TestSuite_dynamic_queue.py
+++ b/tests/TestSuite_dynamic_queue.py
@@ -56,8 +56,8 @@ class TestDynamicQueue(TestCase):
         self.dut_testpmd = PmdOutput(self.dut)
 
     def set_up(self):
-        # Fortville_spirit needs more cores to run properly
-        if self.nic in ["fortville_spirit"]:
+        # Intel® Ethernet Converged Network Adapter XL710-QDA1 needs more cores to run properly
+        if self.nic in ["I40E_40G-QSFP_A"]:
             self.verify(
                 "len(self.dut.cores)>=7", "Less than seven cores can't run testpmd"
             )
diff --git a/tests/TestSuite_eeprom_dump.py b/tests/TestSuite_eeprom_dump.py
index b220316b..c4a6173a 100644
--- a/tests/TestSuite_eeprom_dump.py
+++ b/tests/TestSuite_eeprom_dump.py
@@ -71,9 +71,9 @@ class TestEEPROMDump(TestCase):
         self.verify(not result, "Testpmd dumped is not same as linux dumped")
 
     def dump_to_file(self, regex, get, to, testname):
-        # if nic is columbiaville, eeprom_dump get testpmd output of the first 1000 lines,
-        # module_eeprom_dump get testpmd output of the first 16 lines.
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+        # if nic is Intel® Ethernet 800 Series, eeprom_dump get testpmd output of the
+        # first 1000 lines, module_eeprom_dump get testpmd output of the first 16 lines.
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
             if testname == "eeprom":
                 count = 1000
             elif testname == "module_eeprom":
diff --git a/tests/TestSuite_enable_package_download_in_ice_driver.py b/tests/TestSuite_enable_package_download_in_ice_driver.py
index 5e91ea6e..79fdf653 100644
--- a/tests/TestSuite_enable_package_download_in_ice_driver.py
+++ b/tests/TestSuite_enable_package_download_in_ice_driver.py
@@ -40,7 +40,7 @@ from framework.test_case import TestCase
 class TestEnable_Package_Download_In_Ice_Driver(TestCase):
     def set_up_all(self):
         self.verify(
-            self.nic in ["columbiaville_100g", "columbiaville_25g"],
+            self.nic in ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP"],
             "NIC Unsupported: " + str(self.nic),
         )
         self.dut_ports = self.dut.get_ports(self.nic)
@@ -413,13 +413,14 @@ class TestEnable_Package_Download_In_Ice_Driver(TestCase):
 
     def check_env(self):
         """
-        Check the DUT has two or more CVL NICs. If not, return "the ENV needs at least two CVL NICs"
+        Check the DUT has two or more Intel® Ethernet 800 Series NICs. If not, return
+        "the case needs >=2 Intel® Ethernet 800 Series NICs with different Serial Numbers"
         """
         self.nic_pci = [self.dut.ports_info[0]["pci"], self.dut.ports_info[-1]["pci"]]
         self.nic_sn = [self.get_sn(self.nic_pci[0]), self.get_sn(self.nic_pci[1])]
         self.verify(
             self.nic_sn[0] != self.nic_sn[1],
-            "the case needs >=2 CVL NICs with different Serial Numbers",
+            "the case needs >=2 Intel® Ethernet 800 Series NICs with different Serial Numbers",
         )
 
     def copy_specify_ice_pkg(self, pkg_ver):
diff --git a/tests/TestSuite_flexible_rxd.py b/tests/TestSuite_flexible_rxd.py
index ef800603..1fa04e39 100644
--- a/tests/TestSuite_flexible_rxd.py
+++ b/tests/TestSuite_flexible_rxd.py
@@ -41,10 +41,10 @@ from .flexible_common import FlexibleRxdBase
 
 class TestFlexibleRxd(TestCase, FlexibleRxdBase):
     supported_nic = [
-        "columbiaville_100g",
-        "columbiaville_25g",
-        "columbiaville_25gx2",
-        "foxville",
+        "ICE_100G-E810C_QSFP",
+        "ICE_25G-E810C_SFP",
+        "ICE_25G-E810_XXV_SFP",
+        "IGC-I225_LM",
     ]
 
     def preset_compilation(self):
diff --git a/tests/TestSuite_floating_veb.py b/tests/TestSuite_floating_veb.py
index c3c0f83c..ad95227a 100644
--- a/tests/TestSuite_floating_veb.py
+++ b/tests/TestSuite_floating_veb.py
@@ -139,10 +139,10 @@ class TestFloatingVEBSwitching(TestCase):
         self.verify(
             self.nic
             in [
-                "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",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
diff --git a/tests/TestSuite_generic_flow_api.py b/tests/TestSuite_generic_flow_api.py
index a87f3f8b..18380d20 100644
--- a/tests/TestSuite_generic_flow_api.py
+++ b/tests/TestSuite_generic_flow_api.py
@@ -76,9 +76,14 @@ class TestGeneric_flow_api(TestCase):
         Generic filter Prerequistites
         """
         global MAX_QUEUE
-        if self.nic in ["powerville", "bartonhills", "kawela", "kawela_4"]:
+        if self.nic in [
+            "IGB_1G-I350_COPPER",
+            "IGB_1G-82580_COPPER",
+            "IGB_1G-82576_QUAD_COPPER",
+            "IGB_1G-82576_QUAD_COPPER_ET2",
+        ]:
             MAX_QUEUE = 7
-        elif self.nic in ["foxville"]:
+        elif self.nic in ["IGC-I225_LM"]:
             MAX_QUEUE = 3
         # Based on h/w type, choose how many ports to use
         self.dut_ports = self.dut.get_ports(self.nic)
@@ -350,30 +355,29 @@ class TestGeneric_flow_api(TestCase):
                 or "index %s" % str(MAX_QUEUE + 1) in flow_cmd
             ):
                 if self.nic in [
-                    "fortville_eagle",
-                    "fortville_spirit",
-                    "fortville_spirit_single",
-                    "fortpark_TLV",
-                    "fortpark_BASE-T",
-                    "niantic",
-                    "kawela_4",
-                    "kawela",
-                    "bartonhills",
-                    "twinville",
-                    "sagepond",
-                    "sageville",
-                    "powerville",
-                    "carlsville",
+                    "I40E_10G-SFP_XL710",
+                    "I40E_40G-QSFP_A",
+                    "I40E_40G-QSFP_B",
+                    "I40E_10G-SFP_X722",
+                    "I40E_10G-10G_BASE_T_X722",
+                    "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-10G_BASE_T_BC",
                 ]:
                     self.dut.send_expect(flow_cmd, "error")
             elif "type is 0x8100" in flow_cmd:
                 if self.nic in [
-                    "fortville_eagle",
-                    "fortville_spirit",
-                    "fortville_spirit_single",
-                    "fortpark_TLV",
-                    "fortpark_BASE-T",
-                    "carlsville",
+                    "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",
                 ]:
                     self.dut.send_expect(flow_cmd, "error")
             # vf queue id exceeds max vf queue number.
@@ -394,30 +398,29 @@ class TestGeneric_flow_api(TestCase):
                 or "index %s" % str(MAX_QUEUE + 1) in flow_cmd
             ):
                 if self.nic in [
-                    "fortville_eagle",
-                    "fortville_spirit",
-                    "fortville_spirit_single",
-                    "fortpark_TLV",
-                    "fortpark_BASE-T",
-                    "niantic",
-                    "kawela_4",
-                    "kawela",
-                    "bartonhills",
-                    "twinville",
-                    "sagepond",
-                    "sageville",
-                    "powerville",
-                    "carlsville",
+                    "I40E_10G-SFP_XL710",
+                    "I40E_40G-QSFP_A",
+                    "I40E_40G-QSFP_B",
+                    "I40E_10G-SFP_X722",
+                    "I40E_10G-10G_BASE_T_X722",
+                    "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-10G_BASE_T_BC",
                 ]:
                     self.dut.send_expect(flow_cmd, "error")
             elif "type is 0x8100" in flow_cmd:
                 if self.nic in [
-                    "fortville_eagle",
-                    "fortville_spirit",
-                    "fortville_spirit_single",
-                    "fortpark_TLV",
-                    "fortpark_BASE-T",
-                    "carlsville",
+                    "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",
                 ]:
                     self.dut.send_expect(flow_cmd, "error")
             # vf queue id exceeds max vf queue number.
@@ -937,15 +940,14 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "kawela_4",
-                "kawela",
-                "bartonhills",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "powerville",
-                "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",
+                "IGC-I225_LM",
             ],
             "%s nic not support SYN filter" % self.nic,
         )
@@ -990,7 +992,7 @@ class TestGeneric_flow_api(TestCase):
         self.dut.send_expect("flow destroy 0 rule 0", "testpmd> ", 120)
 
         # validate and create the flow rules
-        q_idx = "2" if self.nic == "foxville" else "4"
+        q_idx = "2" if self.nic == "IGC-I225_LM" else "4"
         self.dut.send_expect(
             "flow validate 0 ingress pattern eth / ipv6 / tcp flags spec 0x02 flags mask 0x02 / end actions queue index %s / end"
             % (q_idx),
@@ -1026,7 +1028,13 @@ class TestGeneric_flow_api(TestCase):
         only supported by ixgbe and igb
         """
         self.verify(
-            self.nic in ["niantic", "kawela_4", "kawela", "twinville", "foxville"],
+            self.nic
+            in [
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82576_QUAD_COPPER",
+                "IGC-I225_LM",
+            ],
             "%s nic not support n-tuple filter" % self.nic,
         )
 
@@ -1127,14 +1135,14 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "bartonhills",
-                "powerville",
-                "foxville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "IGB_1G-82580_COPPER",
+                "IGB_1G-I350_COPPER",
+                "IGC-I225_LM",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support 2-tuple filter" % self.nic,
         )
@@ -1151,11 +1159,11 @@ class TestGeneric_flow_api(TestCase):
         # i350 and 82580 only support 2-tuple, and don't support SCTP
         # create the flow rules
         if self.nic in [
-            "fortville_eagle",
-            "fortville_25g",
-            "fortville_spirit",
-            "columbiaville_25g",
-            "columbiaville_100g",
+            "I40E_10G-SFP_XL710",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
         ]:
             basic_flow_actions = [
                 {
@@ -1229,26 +1237,25 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "kawela_4",
-                "kawela",
-                "bartonhills",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "powerville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "IXGBE_10G-82599_SFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "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_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support ethertype filter" % self.nic,
         )
@@ -1265,14 +1272,14 @@ class TestGeneric_flow_api(TestCase):
 
         # i40e,ixgbe and igb support different packet types.
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "carlsville",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "columbiaville_25g",
-            "columbiaville_100g",
+            "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",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
         ]:
 
             basic_flow_actions = [
@@ -1357,16 +1364,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir L2 payload filter" % self.nic,
         )
@@ -1425,16 +1432,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "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",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -1557,16 +1564,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "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",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -1691,16 +1698,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "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",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -1825,16 +1832,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "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",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -1969,16 +1976,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "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",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -2061,16 +2068,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir vlan filter" % self.nic,
         )
@@ -2390,35 +2397,34 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
+                "IXGBE_10G-82599_SFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
             ],
             "%s nic not support fdir ipv4 filter" % self.nic,
         )
         # i40e
         if self.nic in [
-            "fortville_eagle",
-            "fortville_25g",
-            "fortville_spirit",
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "foxville",
-            "carlsville",
+            "I40E_10G-SFP_XL710",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "IGC-I225_LM",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             self.setup_env()
             # start testpmd on pf
@@ -2692,7 +2698,7 @@ class TestGeneric_flow_api(TestCase):
             self.dut.send_expect("start", "testpmd> ", 120)
             time.sleep(2)
 
-            if self.nic in ["sagepond", "sageville"]:
+            if self.nic in ["IXGBE_10G-X550EM_X_10G_T", "IXGBE_10G-X550T"]:
                 # create the flow rules
                 basic_flow_actions = [
                     {
@@ -2815,34 +2821,33 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
             ],
             "%s nic not support fdir ipv6 filter" % self.nic,
         )
         # i40e
         if self.nic in [
-            "fortville_eagle",
-            "fortville_25g",
-            "fortville_spirit",
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "carlsville",
+            "I40E_10G-SFP_XL710",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             self.setup_env()
             self.pmdout.start_testpmd(
@@ -3128,7 +3133,7 @@ class TestGeneric_flow_api(TestCase):
             self.dut.send_expect("set verbose 1", "testpmd> ", 120)
             self.dut.send_expect("start", "testpmd> ", 120)
             time.sleep(2)
-            if self.nic in ["niantic", "twinville"]:
+            if self.nic in ["IXGBE_10G-82599_SFP"]:
                 # create the flow rules
                 basic_flow_actions = [
                     {
@@ -3283,7 +3288,7 @@ class TestGeneric_flow_api(TestCase):
                 )
                 rule_num = extrapkt_rulenum["rulenum"]
                 self.verify_rulenum(rule_num + 1)
-            elif self.nic in ["sagepond", "sageville"]:
+            elif self.nic in ["IXGBE_10G-X550EM_X_10G_T", "IXGBE_10G-X550T"]:
                 # create the flow rules
                 basic_flow_actions = [
                     {
@@ -3458,34 +3463,33 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "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_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir flexbytes filter" % self.nic,
         )
         # i40e
         if self.nic in [
-            "fortville_eagle",
-            "fortville_25g",
-            "fortville_spirit",
-            "carlsville",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "columbiaville_25g",
-            "columbiaville_100g",
+            "I40E_10G-SFP_XL710",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "I40E_10G-10G_BASE_T_BC",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
         ]:
             self.pmdout.start_testpmd(
                 "%s" % self.pf_cores,
@@ -3774,7 +3778,7 @@ class TestGeneric_flow_api(TestCase):
             time.sleep(2)
 
             # ipv4-sctp-flexbytes
-            if self.nic in ["sagepond", "sageville"]:
+            if self.nic in ["IXGBE_10G-X550EM_X_10G_T", "IXGBE_10G-X550T"]:
                 self.dut.send_expect(
                     "flow validate 0 ingress pattern fuzzy thresh is 6 / eth / ipv4 src is 192.168.0.1 dst is 192.168.0.2 / sctp src is 24 dst is 25 / raw relative is 0 search is 0 offset is 48 limit is 0 pattern is ab / end actions queue index 3 / end",
                     "validated",
@@ -3810,7 +3814,7 @@ class TestGeneric_flow_api(TestCase):
             )
 
             # ipv6-other-flexbytes
-            if self.nic in ["niantic", "twinville"]:
+            if self.nic in ["IXGBE_10G-82599_SFP"]:
                 self.dut.send_expect("quit", "# ")
                 time.sleep(2)
 
@@ -3852,7 +3856,7 @@ class TestGeneric_flow_api(TestCase):
         The filter structure is different between igb, ixgbe and i40e
         """
         self.verify(
-            self.nic in ["bartonhills", "powerville", "foxville"],
+            self.nic in ["IGB_1G-82580_COPPER", "IGB_1G-I350_COPPER", "IGC-I225_LM"],
             "%s nic not support flexbytes filter" % self.nic,
         )
 
@@ -4064,15 +4068,14 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "twinville",
-                "sagepond",
-                "sageville",
-                "foxville",
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "%s nic not support fdir mac vlan filter" % self.nic,
         )
@@ -4091,11 +4094,11 @@ class TestGeneric_flow_api(TestCase):
 
         # create the flow rules
         if self.nic in [
-            "fortville_eagle",
-            "fortville_25g",
-            "fortville_spirit",
-            "columbiaville_25g",
-            "columbiaville_100g",
+            "I40E_10G-SFP_XL710",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
         ]:
             basic_flow_actions = [
                 {"create": "validate", "flows": ["vlan"], "actions": ["queue"]},
@@ -4137,12 +4140,11 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "twinville",
-                "sagepond",
-                "sageville",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "foxville",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IGC-I225_LM",
             ],
             "%s nic not support fdir vxlan filter" % self.nic,
         )
@@ -4189,7 +4191,7 @@ class TestGeneric_flow_api(TestCase):
         only supported by ixgbe
         """
         self.verify(
-            self.nic in ["twinville", "sagepond", "sageville", "foxville"],
+            self.nic in ["IXGBE_10G-X550EM_X_10G_T", "IXGBE_10G-X550T", "IGC-I225_LM"],
             "%s nic not support fdir nvgre filter" % self.nic,
         )
 
@@ -4237,16 +4239,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s nic not support tunnel vxlan filter" % self.nic,
         )
@@ -4408,16 +4410,16 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_25g",
-                "fortville_spirit",
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "foxville",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "IGC-I225_LM",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s nic not support tunnel nvgre filter" % self.nic,
         )
@@ -4656,13 +4658,13 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville",
-                "fortpark_BASE-T",
-                "fortpark_TLV",
+                "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",
+                "I40E_10G-SFP_X722",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -4736,7 +4738,13 @@ class TestGeneric_flow_api(TestCase):
         only supported by ixgbe and igb
         """
         self.verify(
-            self.nic in ["niantic", "kawela_4", "kawela", "twinville", "foxville"],
+            self.nic
+            in [
+                "IXGBE_10G-82599_SFP",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IGB_1G-82576_QUAD_COPPER",
+                "IGC-I225_LM",
+            ],
             "%s nic not support n-tuple filter" % self.nic,
         )
         self.pmdout.start_testpmd(
@@ -4862,19 +4870,18 @@ class TestGeneric_flow_api(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "kawela_4",
-                "kawela",
-                "bartonhills",
-                "twinville",
-                "sagepond",
-                "sageville",
-                "powerville",
-                "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",
+                "IGC-I225_LM",
             ],
             "%s nic not support" % self.nic,
         )
-        if self.nic in ["cavium_a063", "cavium_a064", "foxville"]:
+        if self.nic in ["cavium_a063", "cavium_a064", "IGC-I225_LM"]:
             self.pmdout.start_testpmd(
                 "%s" % self.cores,
                 "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1 --mbcache=200 --mbuf-size=2048 --max-pkt-len=9200"
@@ -5016,7 +5023,7 @@ class TestGeneric_flow_api(TestCase):
         else:
             self.verify(False, "%s not support this test" % self.nic)
 
-    @check_supported_nic(["niantic"])
+    @check_supported_nic(["IXGBE_10G-82599_SFP"])
     def test_fdir_for_match_report(self):
         """
         Test case: IXGBE fdir for Control levels of FDir match reporting
diff --git a/tests/TestSuite_hotplug.py b/tests/TestSuite_hotplug.py
index 1e1b9266..a490233a 100644
--- a/tests/TestSuite_hotplug.py
+++ b/tests/TestSuite_hotplug.py
@@ -86,7 +86,7 @@ class TestPortHotPlug(TestCase):
         self.verify("is attached" in out, "Failed to attach")
         out = self.dut.send_expect("port start %s" % port, "testpmd>", 120)
         self.verify("Configuring Port" in out, "Failed to start port")
-        # sleep 10 seconds for fortville update link stats
+        # sleep 10 seconds for Intel® Ethernet 700 Series update link stats
         time.sleep(10)
         self.dut.send_expect("show port info %s" % port, "testpmd>", 60)
 
@@ -96,7 +96,7 @@ class TestPortHotPlug(TestCase):
         """
         out = self.dut.send_expect("port stop %s" % port, "testpmd>", 60)
         self.verify("Stopping ports" in out, "Failed to stop port")
-        # sleep 10 seconds for fortville update link stats
+        # sleep 10 seconds for Intel® Ethernet 700 Series update link stats
         time.sleep(10)
         out = self.dut.send_expect("port detach %s" % port, "testpmd>", 60)
         self.verify("is detached" in out, "Failed to detach port")
diff --git a/tests/TestSuite_fortville_rss_input.py b/tests/TestSuite_i40e_rss_input.py
similarity index 99%
rename from tests/TestSuite_fortville_rss_input.py
rename to tests/TestSuite_i40e_rss_input.py
index 4b009d02..eb60329d 100644
--- a/tests/TestSuite_fortville_rss_input.py
+++ b/tests/TestSuite_i40e_rss_input.py
@@ -33,14 +33,14 @@
 DPDK Test suite.
 
 Test DPDK2.3 feature:
-1.Fortville support granularity configuration of RSS.
-By default Fortville uses hash input set preloaded from NVM image which includes all fields
+1.Intel® Ethernet 700 Series support granularity configuration of RSS.
+By default Intel® Ethernet 700 Series uses hash input set preloaded from NVM image which includes all fields
 - IPv4/v6+TCP/UDP port. Potential problem for this is global configuration per device and can
 affect all ports. It is required that hash input set can be configurable,  such as using IPv4
 only or IPv6 only or IPv4/v6+TCP/UDP.
 
-2.Fortville support 32-bit GRE keys.
-By default Fortville extracts only 24 bits of GRE key to FieldVector (NVGRE use case) but
+2.Intel® Ethernet 700 Series support 32-bit GRE keys.
+By default Intel® Ethernet 700 Series extracts only 24 bits of GRE key to FieldVector (NVGRE use case) but
 for Telco use cases full 32-bit GRE key is needed. It is required that both 24-bit and 32-bit
 keys for GRE should be supported. the test plan is to test the API to switch between 24-bit and
 32-bit keys
@@ -69,7 +69,7 @@ from framework.test_case import TestCase
 #
 
 
-class TestFortvilleRssInput(TestCase):
+class TestI40ERssInput(TestCase):
     #
     #
     # Utility methods and other non-test code.
@@ -83,13 +83,13 @@ class TestFortvilleRssInput(TestCase):
         self.verify(
             self.nic
             in [
-                "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",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
diff --git a/tests/TestSuite_iavf_flexible_descriptor.py b/tests/TestSuite_iavf_flexible_descriptor.py
index 0268cf83..29d1e491 100644
--- a/tests/TestSuite_iavf_flexible_descriptor.py
+++ b/tests/TestSuite_iavf_flexible_descriptor.py
@@ -41,10 +41,10 @@ from .flexible_common import FlexibleRxdBase
 
 class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
     supported_nic = [
-        "columbiaville_100g",
-        "columbiaville_25g",
-        "columbiaville_25gx2",
-        "foxville",
+        "ICE_100G-E810C_QSFP",
+        "ICE_25G-E810C_SFP",
+        "ICE_25G-E810_XXV_SFP",
+        "IGC-I225_LM",
     ]
 
     def preset_compilation(self):
@@ -87,12 +87,12 @@ class TestIavfFlexibleDescriptor(TestCase, FlexibleRxdBase):
         vf_driver = "vfio-pci"
         self.pf0_intf = self.dut.ports_info[self.dut_ports[dut_index]]["intf"]
         # get priv-flags default stats
-        if self.nic.startswith("columbiaville"):
+        if self.is_eth_series_nic(800):
             self.flag = "vf-vlan-pruning"
         else:
             self.flag = "vf-vlan-prune-disable"
         self.default_stats = self.dut.get_priv_flags_state(self.pf0_intf, self.flag)
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s off" % (self.pf0_intf, self.flag), "# "
             )
diff --git a/tests/TestSuite_iavf_package_driver_error_handle.py b/tests/TestSuite_iavf_package_driver_error_handle.py
index be105f9c..e54b38a2 100644
--- a/tests/TestSuite_iavf_package_driver_error_handle.py
+++ b/tests/TestSuite_iavf_package_driver_error_handle.py
@@ -42,7 +42,7 @@ from framework.test_case import TestCase
 class Testiavf_package_and_driver_check(TestCase):
     def set_up_all(self):
         self.verify(
-            self.nic in ["columbiaville_100g", "columbiaville_25g"],
+            self.nic in ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP"],
             "NIC Unsupported: " + str(self.nic),
         )
         self.dut_ports = self.dut.get_ports(self.nic)
diff --git a/tests/TestSuite_cvl_1pps_signal.py b/tests/TestSuite_ice_1pps_signal.py
old mode 100755
new mode 100644
similarity index 98%
rename from tests/TestSuite_cvl_1pps_signal.py
rename to tests/TestSuite_ice_1pps_signal.py
index 890a1df8..060c08b7
--- a/tests/TestSuite_cvl_1pps_signal.py
+++ b/tests/TestSuite_ice_1pps_signal.py
@@ -36,8 +36,8 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase, check_supported_nic
 
 
-class TestCVL1PPS(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g"]
+class TestICE1PPS(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP"]
 
     @check_supported_nic(supported_nic)
     def set_up_all(self):
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss.py b/tests/TestSuite_ice_advanced_iavf_rss.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/TestSuite_cvl_advanced_iavf_rss.py
rename to tests/TestSuite_ice_advanced_iavf_rss.py
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py b/tests/TestSuite_ice_advanced_iavf_rss_gtpogre.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py
rename to tests/TestSuite_ice_advanced_iavf_rss_gtpogre.py
index 9c8e6122..2d884dc3
--- a/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_gtpogre.py
@@ -5713,7 +5713,7 @@ exclusive = [
 ]
 
 
-class TestCVLAdvancedIAVFRSSGTPoGRE(TestCase):
+class TestICEAdvancedIAVFRSSGTPoGRE(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py b/tests/TestSuite_ice_advanced_iavf_rss_gtpu.py
similarity index 99%
rename from tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py
rename to tests/TestSuite_ice_advanced_iavf_rss_gtpu.py
index 2bc79a66..d80ce759 100644
--- a/tests/TestSuite_cvl_advanced_iavf_rss_gtpu.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_gtpu.py
@@ -8484,8 +8484,8 @@ mac_ipv4_gtpc_symmetric_toeplitz = [mac_ipv4_gtpc_symmetric]
 mac_ipv6_gtpc_symmetric_toeplitz = [mac_ipv6_gtpc_symmetric]
 
 
-class TestCVLAdvancedIAVFRSSGTPU(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class TestICEAdvancedIAVFRSSGTPU(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     @check_supported_nic(supported_nic)
     @skip_unsupported_pkg("os default")
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_pppol2tpoudp.py b/tests/TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py
similarity index 99%
rename from tests/TestSuite_cvl_advanced_iavf_rss_pppol2tpoudp.py
rename to tests/TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py
index c6ee9699..651c0d9b 100644
--- a/tests/TestSuite_cvl_advanced_iavf_rss_pppol2tpoudp.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_pppol2tpoudp.py
@@ -3030,7 +3030,7 @@ vector_case_108 = [
 ]
 
 
-class TestCVLAdvancedIAVFRSSPPPoL2TPv2oUDP(TestCase):
+class TestICEAdvancedIAVFRSSPPPoL2TPv2oUDP(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py b/tests/TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
similarity index 99%
rename from tests/TestSuite_cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
rename to tests/TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
index 1b89d07e..ba56b024 100644
--- a/tests/TestSuite_cvl_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
+++ b/tests/TestSuite_ice_advanced_iavf_rss_vlan_esp_ah_l2tp_pfcp.py
@@ -996,7 +996,7 @@ mac_vlan_ipv6_sctp_pay = {
 }
 
 
-class Cvl_advance_iavf_rss_vlan_ah_l2tp_pfcp(TestCase):
+class ICE_advance_iavf_rss_vlan_ah_l2tp_pfcp(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_cvl_advanced_rss.py b/tests/TestSuite_ice_advanced_rss.py
similarity index 100%
rename from tests/TestSuite_cvl_advanced_rss.py
rename to tests/TestSuite_ice_advanced_rss.py
diff --git a/tests/TestSuite_cvl_advanced_rss_gtpogre.py b/tests/TestSuite_ice_advanced_rss_gtpogre.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_advanced_rss_gtpogre.py
rename to tests/TestSuite_ice_advanced_rss_gtpogre.py
index 68d8f26f..add2d23b
--- a/tests/TestSuite_cvl_advanced_rss_gtpogre.py
+++ b/tests/TestSuite_ice_advanced_rss_gtpogre.py
@@ -3821,7 +3821,7 @@ mac_ipv4_gtpu_eh_ipv6_tcp_without_ul_dl_symmetric = eval(
 )
 
 
-class TestCVLAdvancedRSSGTPoGRE(TestCase):
+class TestICEAdvancedRSSGTPoGRE(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_cvl_advanced_rss_gtpu.py b/tests/TestSuite_ice_advanced_rss_gtpu.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_advanced_rss_gtpu.py
rename to tests/TestSuite_ice_advanced_rss_gtpu.py
index 48bee0c2..b3e51b40
--- a/tests/TestSuite_cvl_advanced_rss_gtpu.py
+++ b/tests/TestSuite_ice_advanced_rss_gtpu.py
@@ -5086,8 +5086,8 @@ mac_ipv4_gtpu_eh_ipv6_tcp_without_ul_dl_symmetric = eval(
 )
 
 
-class TestCVLAdvancedRSSGTPU(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class TestICEAdvancedRSSGTPU(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     @check_supported_nic(supported_nic)
     @skip_unsupported_pkg("os default")
diff --git a/tests/TestSuite_cvl_advanced_rss_pppoe.py b/tests/TestSuite_ice_advanced_rss_pppoe.py
similarity index 100%
rename from tests/TestSuite_cvl_advanced_rss_pppoe.py
rename to tests/TestSuite_ice_advanced_rss_pppoe.py
diff --git a/tests/TestSuite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py b/tests/TestSuite_ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py
similarity index 100%
rename from tests/TestSuite_cvl_advanced_rss_vlan_esp_ah_l2tp_pfcp.py
rename to tests/TestSuite_ice_advanced_rss_vlan_esp_ah_l2tp_pfcp.py
diff --git a/tests/TestSuite_cvl_dcf_acl_filter.py b/tests/TestSuite_ice_dcf_acl_filter.py
similarity index 99%
rename from tests/TestSuite_cvl_dcf_acl_filter.py
rename to tests/TestSuite_ice_dcf_acl_filter.py
index 42eaaa5b..49fd23a0 100644
--- a/tests/TestSuite_cvl_dcf_acl_filter.py
+++ b/tests/TestSuite_ice_dcf_acl_filter.py
@@ -892,7 +892,7 @@ vectors_ipv4_sctp_2ports = [
 ]
 
 
-class CVLDCFACLFilterTest(TestCase):
+class ICEDCFACLFilterTest(TestCase):
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
         if driver == "vfio-pci":
@@ -923,7 +923,8 @@ class CVLDCFACLFilterTest(TestCase):
         Run at the start of each test suite.
         """
         self.verify(
-            self.nic in ["columbiaville_25g", "columbiaville_100g"], "nic is not CVL"
+            self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"],
+            "nic is not Intel® Ethernet 800 Series",
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         # Verify that enough ports are available
@@ -1210,25 +1211,25 @@ class CVLDCFACLFilterTest(TestCase):
         self.verify(all(test_results.values()), "{} failed.".format(failed_cases))
 
     def test_mac_ipv4(self):
-        if self.nic == "columbiaville_25g":
+        if self.nic == "ICE_25G-E810C_SFP":
             self.common_process(vectors_ipv4_pay_4ports)
         else:
             self.common_process(vectors_ipv4_pay_2ports)
 
     def test_mac_ipv4_tcp(self):
-        if self.nic == "columbiaville_25g":
+        if self.nic == "ICE_25G-E810C_SFP":
             self.common_process(vectors_ipv4_tcp_4ports)
         else:
             self.common_process(vectors_ipv4_tcp_2ports)
 
     def test_mac_ipv4_udp(self):
-        if self.nic == "columbiaville_25g":
+        if self.nic == "ICE_25G-E810C_SFP":
             self.common_process(vectors_ipv4_udp_4ports)
         else:
             self.common_process(vectors_ipv4_udp_2ports)
 
     def test_mac_ipv4_sctp(self):
-        if self.nic == "columbiaville_25g":
+        if self.nic == "ICE_25G-E810C_SFP":
             self.common_process(vectors_ipv4_sctp_4ports)
         else:
             self.common_process(vectors_ipv4_sctp_2ports)
diff --git a/tests/TestSuite_cvl_dcf_date_path.py b/tests/TestSuite_ice_dcf_date_path.py
similarity index 100%
rename from tests/TestSuite_cvl_dcf_date_path.py
rename to tests/TestSuite_ice_dcf_date_path.py
diff --git a/tests/TestSuite_cvl_dcf_flow_priority.py b/tests/TestSuite_ice_dcf_flow_priority.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_dcf_flow_priority.py
rename to tests/TestSuite_ice_dcf_flow_priority.py
index db2ba9cc..39b2dfcc
--- a/tests/TestSuite_cvl_dcf_flow_priority.py
+++ b/tests/TestSuite_ice_dcf_flow_priority.py
@@ -1856,8 +1856,8 @@ tv_mac_vlan_pppoe_ipcp_pay = {
 }
 
 
-class CVLDCFFlowPriorityTest(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class ICEDCFFlowPriorityTest(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
diff --git a/tests/TestSuite_cvl_dcf_qos.py b/tests/TestSuite_ice_dcf_qos.py
similarity index 99%
rename from tests/TestSuite_cvl_dcf_qos.py
rename to tests/TestSuite_ice_dcf_qos.py
index 4186e46d..4f632007 100644
--- a/tests/TestSuite_cvl_dcf_qos.py
+++ b/tests/TestSuite_ice_dcf_qos.py
@@ -29,8 +29,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
-DPDK Test suite cvl_dcf_qos
-CVL configure QoS for vf/vsi in DCF
+DPDK Test suite ICE_dcf_qos
+Intel® Ethernet 800 Series configure QoS for vf/vsi in DCF
 Support ETS-based QoS configuration, including Arbiters configuration (strict priority, WFQ)
 and BW Allocation and limitation.
 """
@@ -50,7 +50,7 @@ from framework.settings import HEADER_SIZE, NICS, get_nic_name
 from framework.test_case import TestCase
 
 
-class TestCvlDcfQos(TestCase):
+class TestICEDcfQos(TestCase):
     def d_con(self, cmd):
         _cmd = [cmd, "# ", 15] if isinstance(cmd, str) else cmd
         return self.dut.send_expect(*_cmd)
@@ -231,13 +231,13 @@ class TestCvlDcfQos(TestCase):
     def pf_preset(self, num=None):
         self.nic_100g, self.nic100G_intf, self.nic100g_pci = self.get_custom_nic_port(
             [
-                "columbiaville_100g",
+                "ICE_100G-E810C_QSFP",
             ],
             num=num,
         )
         self.nic_25g, self.nic25G_intf, self.nic25g_pci = self.get_custom_nic_port(
             [
-                "columbiaville_25gx2",
+                "ICE_25G-E810_XXV_SFP",
             ]
         )
         msg = "not enough nics for testing"
diff --git a/tests/TestSuite_cvl_dcf_switch_filter.py b/tests/TestSuite_ice_dcf_switch_filter.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_dcf_switch_filter.py
rename to tests/TestSuite_ice_dcf_switch_filter.py
index 7b473c92..4c9f7336
--- a/tests/TestSuite_cvl_dcf_switch_filter.py
+++ b/tests/TestSuite_ice_dcf_switch_filter.py
@@ -1672,8 +1672,8 @@ sv_mac_test_drop_action = [
 ]
 
 
-class CVLDCFSwitchFilterTest(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class ICEDCFSwitchFilterTest(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
diff --git a/tests/TestSuite_cvl_dcf_switch_filter_gtpu.py b/tests/TestSuite_ice_dcf_switch_filter_gtpu.py
similarity index 99%
rename from tests/TestSuite_cvl_dcf_switch_filter_gtpu.py
rename to tests/TestSuite_ice_dcf_switch_filter_gtpu.py
index 00d19af0..da815910 100644
--- a/tests/TestSuite_cvl_dcf_switch_filter_gtpu.py
+++ b/tests/TestSuite_ice_dcf_switch_filter_gtpu.py
@@ -3562,8 +3562,8 @@ sv_mac_ipv6_gtpu_ipv6_tcp_2 = [
 sv_mac_ipv6_gtpu_ipv6_tcp = [sv_mac_ipv6_gtpu_ipv6_tcp_1, sv_mac_ipv6_gtpu_ipv6_tcp_2]
 
 
-class CVLDCFSwitchFilterGTPUTest(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class ICEDCFSwitchFilterGTPUTest(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     @check_supported_nic(supported_nic)
     @skip_unsupported_pkg(["os default", "wireless"])
diff --git a/tests/TestSuite_cvl_dcf_switch_filter_pppoe.py b/tests/TestSuite_ice_dcf_switch_filter_pppoe.py
similarity index 99%
rename from tests/TestSuite_cvl_dcf_switch_filter_pppoe.py
rename to tests/TestSuite_ice_dcf_switch_filter_pppoe.py
index 76d9bb97..49d8ce94 100644
--- a/tests/TestSuite_cvl_dcf_switch_filter_pppoe.py
+++ b/tests/TestSuite_ice_dcf_switch_filter_pppoe.py
@@ -818,8 +818,8 @@ tv_mac_vlan_pppoe_ipcp_pay = {
 }
 
 
-class CVLDCFSwitchFilterPPPOETest(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class ICEDCFSwitchFilterPPPOETest(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
diff --git a/tests/TestSuite_cvl_ecpri.py b/tests/TestSuite_ice_ecpri.py
similarity index 99%
rename from tests/TestSuite_cvl_ecpri.py
rename to tests/TestSuite_ice_ecpri.py
index f0556dad..92d6aa4a 100644
--- a/tests/TestSuite_cvl_ecpri.py
+++ b/tests/TestSuite_ice_ecpri.py
@@ -180,7 +180,7 @@ tv_over_ip_udp = [
 ]
 
 
-class TestCVLEcpri(TestCase):
+class TestICEEcpri(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
diff --git a/tests/TestSuite_cvl_fdir.py b/tests/TestSuite_ice_fdir.py
similarity index 99%
rename from tests/TestSuite_cvl_fdir.py
rename to tests/TestSuite_ice_fdir.py
index f0fe6c4d..7b642f70 100644
--- a/tests/TestSuite_cvl_fdir.py
+++ b/tests/TestSuite_ice_fdir.py
@@ -2712,7 +2712,7 @@ vectors_mac_ipv6_nat_t_esp = [
 ]
 
 
-class TestCVLFdir(TestCase):
+class TestICEFdir(TestCase):
     def query_count(self, hits_set, hits, port_id=0, rule_id=0):
         out = self.dut.send_command(
             "flow query %s %s count" % (port_id, rule_id), timeout=1
@@ -2890,7 +2890,7 @@ class TestCVLFdir(TestCase):
         self.pmd_output.execute_cmd("port config 0 udp_tunnel_port add vxlan 4789")
         self.pmd_output.execute_cmd("port config 1 udp_tunnel_port add vxlan 4789")
         self.pmd_output.execute_cmd("port config all rss all")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.pmd_output.execute_cmd(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd"
         )
diff --git a/tests/TestSuite_cvl_flow_priority.py b/tests/TestSuite_ice_flow_priority.py
similarity index 99%
rename from tests/TestSuite_cvl_flow_priority.py
rename to tests/TestSuite_ice_flow_priority.py
index 48111d1b..ded9b405 100644
--- a/tests/TestSuite_cvl_flow_priority.py
+++ b/tests/TestSuite_ice_flow_priority.py
@@ -421,8 +421,8 @@ tv_mac_vlan_pppoe_ipcp_pay = {
 }
 
 
-class CVLPFFlowPriorityTest(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+class ICEPFFlowPriorityTest(TestCase):
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     @check_supported_nic(supported_nic)
     def set_up_all(self):
diff --git a/tests/TestSuite_iavf_fdir.py b/tests/TestSuite_ice_iavf_fdir.py
similarity index 99%
rename from tests/TestSuite_iavf_fdir.py
rename to tests/TestSuite_ice_iavf_fdir.py
index e0d16e7b..376275b7 100644
--- a/tests/TestSuite_iavf_fdir.py
+++ b/tests/TestSuite_ice_iavf_fdir.py
@@ -41,7 +41,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase, skip_unsupported_pkg
 from framework.utils import GREEN, RED
 
-from .rte_flow_common import CVL_TXQ_RXQ_NUMBER
+from .rte_flow_common import TXQ_RXQ_NUMBER
 
 MAC_IPV4_PAY = {
     "match": [
@@ -8283,7 +8283,7 @@ vectors_ipv6_gre_ipv6_udp = [
 ]
 
 
-class TestIAVFFdir(TestCase):
+class TestICEIAVFFdir(TestCase):
     def rte_flow_process(self, vectors):
         test_results = {}
         for tv in vectors:
@@ -8428,7 +8428,7 @@ class TestIAVFFdir(TestCase):
 
         self.src_file_dir = "dep/"
         self.dut_file_dir = "/tmp/"
-        self.cvlq_num = CVL_TXQ_RXQ_NUMBER
+        self.q_num = TXQ_RXQ_NUMBER
 
     def set_up(self):
         """
@@ -8532,7 +8532,7 @@ class TestIAVFFdir(TestCase):
         self.pmd_output.execute_cmd("set verbose 1")
         self.pmd_output.execute_cmd("vlan set filter on 0")
         self.pmd_output.execute_cmd("rx_vlan add 1 0")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.pmd_output.execute_cmd(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd"
         )
@@ -8546,7 +8546,7 @@ class TestIAVFFdir(TestCase):
     def launch_testpmd(self):
         self.pmd_output.start_testpmd(
             cores="1S/4C/1T",
-            param="--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num),
+            param="--rxq={} --txq={}".format(self.q_num, self.q_num),
             eal_param="-a %s -a %s"
             % (self.sriov_vfs_pf0[0].pci, self.sriov_vfs_pf0[1].pci),
             socket=self.ports_socket,
@@ -9445,7 +9445,7 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.dut.send_expect(command, "testpmd> ", 300)
         self.config_testpmd()
@@ -9457,13 +9457,13 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.session_secondary.send_expect(command, "testpmd> ", 300)
         # self.session_secondary.config_testpmd()
         self.session_secondary.send_expect("set fwd rxonly", "testpmd> ")
         self.session_secondary.send_expect("set verbose 1", "testpmd> ")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.session_secondary.send_expect(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd",
             "testpmd> ",
@@ -9687,7 +9687,7 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.dut.send_expect(command, "testpmd> ", 300)
         self.config_testpmd()
@@ -9699,13 +9699,13 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.session_secondary.send_expect(command, "testpmd> ", 300)
         # self.session_secondary.config_testpmd()
         self.session_secondary.send_expect("set fwd rxonly", "testpmd> ")
         self.session_secondary.send_expect("set verbose 1", "testpmd> ")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.session_secondary.send_expect(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd",
             "testpmd> ",
@@ -9950,7 +9950,7 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.dut.send_expect(command, "testpmd> ", 300)
         self.config_testpmd()
@@ -9962,13 +9962,13 @@ class TestIAVFFdir(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.session_secondary.send_expect(command, "testpmd> ", 300)
         # self.session_secondary.config_testpmd()
         self.session_secondary.send_expect("set fwd rxonly", "testpmd> ")
         self.session_secondary.send_expect("set verbose 1", "testpmd> ")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.session_secondary.send_expect(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd",
             "testpmd> ",
@@ -10916,7 +10916,7 @@ class TestIAVFFdir(TestCase):
         self.pmd_output.start_testpmd(
             cores="1S/4C/1T",
             param="--rxq={} --txq={} --enable-rx-cksum --port-topology=loop".format(
-                self.cvlq_num, self.cvlq_num
+                self.q_num, self.q_num
             ),
             eal_param="-a %s" % self.sriov_vfs_pf0[0].pci,
             socket=self.ports_socket,
@@ -11071,7 +11071,7 @@ class TestIAVFFdir(TestCase):
         self.pmd_output.start_testpmd(
             cores="1S/4C/1T",
             param="--rxq={} --txq={} --enable-rx-cksum --port-topology=loop".format(
-                self.cvlq_num, self.cvlq_num
+                self.q_num, self.q_num
             ),
             eal_param="-a %s" % self.sriov_vfs_pf0[0].pci,
             socket=self.ports_socket,
@@ -11219,7 +11219,7 @@ class TestIAVFFdir(TestCase):
         self.pmd_output.start_testpmd(
             cores="1S/4C/1T",
             param="--rxq={} --txq={} --enable-rx-cksum --port-topology=loop".format(
-                self.cvlq_num, self.cvlq_num
+                self.q_num, self.q_num
             ),
             eal_param="-a %s" % self.sriov_vfs_pf0[0].pci,
             socket=self.ports_socket,
diff --git a/tests/TestSuite_iavf_fdir_gtpogre.py b/tests/TestSuite_ice_iavf_fdir_gtpogre.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_iavf_fdir_gtpogre.py
rename to tests/TestSuite_ice_iavf_fdir_gtpogre.py
index d95739b1..f1c2390b
--- a/tests/TestSuite_iavf_fdir_gtpogre.py
+++ b/tests/TestSuite_ice_iavf_fdir_gtpogre.py
@@ -2255,7 +2255,7 @@ tvs_outer_mac_ipv6_gre_ipv6_gtpu_dl = [
 ]
 
 
-class TestCvlIavfGTPoGREFDIR(TestCase):
+class TestICEIavfGTPoGREFDIR(TestCase):
     def set_up_all(self):
         self.ports = self.dut.get_ports(self.nic)
 
diff --git a/tests/TestSuite_cvl_iavf_fdir_pppol2tpoudp.py b/tests/TestSuite_ice_iavf_fdir_pppol2tpoudp.py
similarity index 99%
rename from tests/TestSuite_cvl_iavf_fdir_pppol2tpoudp.py
rename to tests/TestSuite_ice_iavf_fdir_pppol2tpoudp.py
index 1d367aaf..6bcaba70 100644
--- a/tests/TestSuite_cvl_iavf_fdir_pppol2tpoudp.py
+++ b/tests/TestSuite_ice_iavf_fdir_pppol2tpoudp.py
@@ -42,7 +42,7 @@ from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 from framework.utils import GREEN, RED
 
-from .rte_flow_common import CVL_TXQ_RXQ_NUMBER
+from .rte_flow_common import TXQ_RXQ_NUMBER
 
 tv_l2tpv2_seession_id_mac_ipv4_l2tpv2_control = {
     "name": "l2tpv2_seession_id_mac_ipv4_l2tpv2_control",
@@ -1927,7 +1927,7 @@ vectors_mac_ipv6_pppol2tpv2_ipv6_tcp = [
 ]
 
 
-class TestCVLIAVFFDIRPPPoL2TPv2oUDP(TestCase):
+class TestICEIAVFFDIRPPPoL2TPv2oUDP(TestCase):
     def rte_flow_process(self, vectors):
         test_results = {}
         for tv in vectors:
diff --git a/tests/TestSuite_cvl_iavf_ip_fragment_rte_flow.py b/tests/TestSuite_ice_iavf_ip_fragment_rte_flow.py
similarity index 99%
rename from tests/TestSuite_cvl_iavf_ip_fragment_rte_flow.py
rename to tests/TestSuite_ice_iavf_ip_fragment_rte_flow.py
index 9c890b25..8c9cfd9d 100644
--- a/tests/TestSuite_cvl_iavf_ip_fragment_rte_flow.py
+++ b/tests/TestSuite_ice_iavf_ip_fragment_rte_flow.py
@@ -343,7 +343,7 @@ tv_mac_ipv6_fragment_rss = {
 }
 
 
-class TestCvlIavfIpFragmentRteFlow(TestCase):
+class TestICEIavfIpFragmentRteFlow(TestCase):
     def set_up_all(self):
         self.ports = self.dut.get_ports(self.nic)
 
diff --git a/tests/TestSuite_cvl_iavf_rss_configure.py b/tests/TestSuite_ice_iavf_rss_configure.py
old mode 100755
new mode 100644
similarity index 100%
rename from tests/TestSuite_cvl_iavf_rss_configure.py
rename to tests/TestSuite_ice_iavf_rss_configure.py
diff --git a/tests/TestSuite_cvl_ip_fragment_rte_flow.py b/tests/TestSuite_ice_ip_fragment_rte_flow.py
similarity index 99%
rename from tests/TestSuite_cvl_ip_fragment_rte_flow.py
rename to tests/TestSuite_ice_ip_fragment_rte_flow.py
index dc2c0290..3acf3250 100644
--- a/tests/TestSuite_cvl_ip_fragment_rte_flow.py
+++ b/tests/TestSuite_ice_ip_fragment_rte_flow.py
@@ -349,7 +349,7 @@ tv_mac_ipv6_fragment_rss = {
 }
 
 
-class TestCvlIpFragmentRteFlow(TestCase):
+class TestICEIpFragmentRteFlow(TestCase):
     def set_up_all(self):
         self.ports = self.dut.get_ports(self.nic)
 
diff --git a/tests/TestSuite_cvl_limit_value_test.py b/tests/TestSuite_ice_limit_value_test.py
similarity index 96%
rename from tests/TestSuite_cvl_limit_value_test.py
rename to tests/TestSuite_ice_limit_value_test.py
index cc609a38..057e2d55 100644
--- a/tests/TestSuite_cvl_limit_value_test.py
+++ b/tests/TestSuite_ice_limit_value_test.py
@@ -41,7 +41,7 @@ from framework.packet import Packet
 from framework.pmd_output import PmdOutput
 from framework.test_case import TestCase
 
-from .rte_flow_common import CVL_TXQ_RXQ_NUMBER
+from .rte_flow_common import TXQ_RXQ_NUMBER
 
 # max rule number case: rte_flow_pattern and matched packets will be generated by code, and rte_flow_pattern will be writed to file.
 tv_max_rule_number = {
@@ -68,7 +68,7 @@ tv_max_rule_number = {
 }
 
 
-class TestCvlLimitValue(TestCase):
+class TestICELimitValue(TestCase):
     def set_up_all(self):
         """
         Run at the start of each test suite.
@@ -98,7 +98,7 @@ class TestCvlLimitValue(TestCase):
         self.path = self.dut.apps_name["test-pmd"]
 
         self.src_file_dir = "dep/"
-        self.cvlq_num = CVL_TXQ_RXQ_NUMBER
+        self.q_num = TXQ_RXQ_NUMBER
 
         # max_rule number
         localPort = self.tester.get_local_port(self.dut_ports[0])
@@ -210,13 +210,13 @@ class TestCvlLimitValue(TestCase):
         self.verify(res is True, "there have port link is down")
         self.pmd_output.execute_cmd("start")
 
-    def config_testpmd_cvl_fidr(self):
+    def config_testpmd_with_rss_key(self):
         self.pmd_output.execute_cmd("set fwd rxonly")
         self.pmd_output.execute_cmd("set verbose 1")
         self.pmd_output.execute_cmd("port config 0 udp_tunnel_port add vxlan 4789")
         self.pmd_output.execute_cmd("port config 1 udp_tunnel_port add vxlan 4789")
         self.pmd_output.execute_cmd("port config all rss all")
-        # specify a fixed rss-hash-key for cvl ether
+        # specify a fixed rss-hash-key for Intel® Ethernet 800 Series ether
         self.pmd_output.execute_cmd(
             "port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd"
         )
@@ -229,7 +229,7 @@ class TestCvlLimitValue(TestCase):
     def launch_testpmd(self):
         self.pmd_output.start_testpmd(
             cores="1S/4C/1T",
-            param="--rxq={} --txq={}".format(self.cvlq_num, self.cvlq_num),
+            param="--rxq={} --txq={}".format(self.q_num, self.q_num),
             eal_param="-a %s -a %s"
             % (self.sriov_vfs_pf0[0].pci, self.sriov_vfs_pf0[1].pci),
             socket=self.ports_socket,
@@ -386,10 +386,10 @@ class TestCvlLimitValue(TestCase):
         """
         vfs share 14336 rules table
         maximum number of rules varies with NIC, it can be identified by product name as below:
-        product name   NIC type           rule maximum
-        E810-XXVDA4   cvl25g*4             14336
-        E810-CQDA2    cvl100g*2            14336
-        E810-2CQDA2   chapmanbeach100g*2   14336 (1 vf)
+        product name   NIC type                                     rule maximum
+        E810-XXVDA4   Intel® Ethernet 800 Series 25g*4              14336
+        E810-CQDA2    Intel® Ethernet 800 Series 100g*2             14336
+        E810-2CQDA2   chapmanbeach100g*2                            14336 (1 vf)
         """
         dut_file_dir = "/tmp/"
         self.set_up_for_iavf_dir()
@@ -415,7 +415,7 @@ class TestCvlLimitValue(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
             + " --cmdline-file=%s" % (dut_file_dir + src_file)
         )
         self.dut.send_expect(command, "testpmd> ", 300)
@@ -501,10 +501,11 @@ class TestCvlLimitValue(TestCase):
     def test_maxnum_rules_2vf(self):
         """
         maximum number of rules varies with NIC, it can be identified by product name as below:
-        product name   NIC type           rule maximum
-        E810-XXVDA4   cvl25g*4             14336
-        E810-CQDA2    cvl100g*2            14336
-        E810-2CQDA2   chapmanbeach100g*2   14336*2 (if vfs generated by 2 pf port, each can create 14336 rules at most)
+        product name   NIC type                        rule maximum
+        E810-XXVDA4   ICE_25G-E810C_SFP*4              14336
+        E810-CQDA2    ICE_100G-E810C_QSFP*2            14336
+        E810-2CQDA2   chapmanbeach100g*2               14336*2 (if vfs generated by 2 pf port,
+                                                               each can create 14336 rules at most)
         """
         dut_file_dir = "/tmp/"
         self.dut.kill_all()
@@ -535,7 +536,7 @@ class TestCvlLimitValue(TestCase):
                         file_handle.write(rule.format(k, i, j))
         self.dut.session.copy_file_to(src_file, dut_file_dir)
         param = "--rxq={} --txq={} --cmdline-file={}".format(
-            self.cvlq_num, self.cvlq_num, os.path.join(dut_file_dir, file_name)
+            self.q_num, self.q_num, os.path.join(dut_file_dir, file_name)
         )
         self.pmd_output.start_testpmd(param=param, ports=ports, timeout=1200)
         self.config_testpmd()
@@ -683,11 +684,11 @@ class TestCvlLimitValue(TestCase):
         self.session_secondary = self.dut.new_session()
         # create kernel rules on pf1
         rule = "ethtool -N {} flow-type tcp4 src-ip 192.168.{}.{} dst-ip 192.168.100.2 src-port 32 dst-port 33 action 8 \n"
-        if self.nic in ["columbiaville_100g"]:
+        if self.nic in ["ICE_100G-E810C_QSFP"]:
             num = 4
             if self.is_chapman:
                 num = 8
-        if self.nic in ["columbiaville_25g"]:
+        if self.nic in ["ICE_25G-E810C_SFP"]:
             num = 2
         for i in range(num):
             for j in range(256):
@@ -726,7 +727,7 @@ class TestCvlLimitValue(TestCase):
                         file_handle.write(rule.format(k, i, j))
         self.dut.session.copy_file_to(src_file, dut_file_dir)
         param = "--rxq={} --txq={} --cmdline-file={}".format(
-            self.cvlq_num, self.cvlq_num, os.path.join(dut_file_dir, file_name)
+            self.q_num, self.q_num, os.path.join(dut_file_dir, file_name)
         )
         self.pmd_output.start_testpmd(param=param, ports=ports, timeout=1200)
         self.config_testpmd()
@@ -869,7 +870,7 @@ class TestCvlLimitValue(TestCase):
         num = 60
         if self.is_chapman:
             num = 64
-        if self.nic in ["columbiaville_100g"]:
+        if self.nic in ["ICE_100G-E810C_QSFP"]:
             for i in range(num):
                 for j in range(256):
                     flows.write(
@@ -882,7 +883,7 @@ class TestCvlLimitValue(TestCase):
                 count == num * 256,
                 "failed to create %s fdir rules on pf." % (num * 256),
             )
-        elif self.nic in ["columbiaville_25g"]:
+        elif self.nic in ["ICE_25G-E810C_SFP"]:
             for i in range(58):
                 for j in range(256):
                     flows.write(
@@ -918,7 +919,7 @@ class TestCvlLimitValue(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
         )
         self.dut.send_expect(command, "testpmd> ", 20)
 
@@ -1014,7 +1015,7 @@ class TestCvlLimitValue(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
             + " --cmdline-file=%s" % (dut_file_dir + src_file)
         )
         self.dut.send_expect(command, "testpmd> ", 900)
@@ -1073,7 +1074,7 @@ class TestCvlLimitValue(TestCase):
         command = (
             self.path
             + eal_param
-            + " -- -i --rxq=%s --txq=%s" % (self.cvlq_num, self.cvlq_num)
+            + " -- -i --rxq=%s --txq=%s" % (self.q_num, self.q_num)
             + " --cmdline-file=%s" % (dut_file_dir + src_file)
         )
         self.dut.send_expect(command, "testpmd> ", 900)
@@ -1099,9 +1100,9 @@ class TestCvlLimitValue(TestCase):
             eal_param="-a %s -a %s --log-level=ice,7" % (self.pci0, self.pci1),
             socket=self.ports_socket,
         )
-        self.config_testpmd_cvl_fidr()
+        self.config_testpmd_with_rss_key()
 
-    # this case copy from cvl_fdir
+    # this case copy from ice_fdir
     def test_add_delete_rules(self):
         self.launch_testpmd_with_mark()
         self.pmd_output.execute_cmd("start")
@@ -1131,7 +1132,7 @@ class TestCvlLimitValue(TestCase):
             self.verify(
                 "Failed to create file" not in out, "create some rule failed: %s" % out
             )
-            self.config_testpmd_cvl_fidr()
+            self.config_testpmd_with_rss_key()
             self.pmd_output.execute_cmd("start")
             rules = [
                 "flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp src is 22 dst is 23 / end actions queue index 1 / mark / end",
@@ -1168,7 +1169,7 @@ class TestCvlLimitValue(TestCase):
         finally:
             self.dut.kill_all()
 
-    # this case copy from cvl_dcf_switch_filter
+    # this case copy from ice_dcf_switch_filter
     def test_max_rule_number(self):
         # bind pf to kernel
         self.bind_nics_driver(self.dut_ports, driver="ice")
diff --git a/tests/TestSuite_cvl_qinq.py b/tests/TestSuite_ice_qinq.py
similarity index 99%
rename from tests/TestSuite_cvl_qinq.py
rename to tests/TestSuite_ice_qinq.py
index c82a606c..b912b5c6 100644
--- a/tests/TestSuite_cvl_qinq.py
+++ b/tests/TestSuite_ice_qinq.py
@@ -431,9 +431,9 @@ tv_mac_qinq_ipv6_tcp = {
 tvs_mac_l4_qinq_dcf_pipeline_mode = [tv_mac_qinq_ipv6_udp, tv_mac_qinq_ipv6_tcp]
 
 
-class TestCvlQinq(TestCase):
+class TestICEQinq(TestCase):
     @check_supported_nic(
-        ["columbiaville_25g", "columbiaville_100g", "columbiaville_25gx2"]
+        ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP", "ICE_25G-E810_XXV_SFP"]
     )
     def set_up_all(self):
         """
diff --git a/tests/TestSuite_cvl_rss_configure.py b/tests/TestSuite_ice_rss_configure.py
similarity index 99%
rename from tests/TestSuite_cvl_rss_configure.py
rename to tests/TestSuite_ice_rss_configure.py
index 1b2b84c9..11130f1d 100644
--- a/tests/TestSuite_cvl_rss_configure.py
+++ b/tests/TestSuite_ice_rss_configure.py
@@ -327,7 +327,7 @@ class RSSConfigureTest(TestCase):
         self.pf_mac = self.dut.get_mac_address(0)
         self.pf_pci = self.dut.ports_info[self.dut_ports[0]]["pci"]
         self.verify(
-            self.nic in ["columbiaville_25g", "columbiaville_100g"],
+            self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"],
             "%s nic not support ethertype filter" % self.nic,
         )
         self.rsspro = RssProcessing(self, self.pmdout, [self.__tx_iface], rxq=16)
diff --git a/tests/TestSuite_cvl_switch_filter.py b/tests/TestSuite_ice_switch_filter.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_switch_filter.py
rename to tests/TestSuite_ice_switch_filter.py
index 6fca7998..2622a5cd
--- a/tests/TestSuite_cvl_switch_filter.py
+++ b/tests/TestSuite_ice_switch_filter.py
@@ -4243,7 +4243,7 @@ drop_any_pkt_list = [
 test_results = OrderedDict()
 
 
-class CVLSwitchFilterTest(TestCase):
+class ICESwitchFilterTest(TestCase):
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
         if driver == "vfio-pci":
@@ -4274,8 +4274,8 @@ class CVLSwitchFilterTest(TestCase):
         Run at the start of each test suite.
         """
         self.verify(
-            self.nic in ["columbiaville_25g", "columbiaville_100g"],
-            "%s nic not support CVL switch filter" % self.nic,
+            self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"],
+            "%s nic not support Intel® Ethernet 800 Series switch filter" % self.nic,
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         # Verify that enough ports are available
diff --git a/tests/TestSuite_cvl_switch_filter_pppoe.py b/tests/TestSuite_ice_switch_filter_pppoe.py
old mode 100755
new mode 100644
similarity index 99%
rename from tests/TestSuite_cvl_switch_filter_pppoe.py
rename to tests/TestSuite_ice_switch_filter_pppoe.py
index 64dea49e..5a50f487
--- a/tests/TestSuite_cvl_switch_filter_pppoe.py
+++ b/tests/TestSuite_ice_switch_filter_pppoe.py
@@ -2851,7 +2851,7 @@ tvs_mac_vlan_pppoe_ipcp_pay = [
 test_results = OrderedDict()
 
 
-class CVLSwitchFilterPPPOETest(TestCase):
+class ICESwitchFilterPPPOETest(TestCase):
     def bind_nics_driver(self, ports, driver=""):
         # modprobe vfio driver
         if driver == "vfio-pci":
@@ -2883,8 +2883,8 @@ class CVLSwitchFilterPPPOETest(TestCase):
         Run at the start of each test suite.
         """
         self.verify(
-            self.nic in ["columbiaville_25g", "columbiaville_100g"],
-            "%s nic not support CVL switch filter" % self.nic,
+            self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"],
+            "%s nic not support Intel® Ethernet 800 Series switch filter" % self.nic,
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         # Verify that enough ports are available
diff --git a/tests/TestSuite_cvl_vf_support_multicast_address.py b/tests/TestSuite_ice_vf_support_multicast_address.py
similarity index 99%
rename from tests/TestSuite_cvl_vf_support_multicast_address.py
rename to tests/TestSuite_ice_vf_support_multicast_address.py
index 1a58aa7f..765abdc2 100644
--- a/tests/TestSuite_cvl_vf_support_multicast_address.py
+++ b/tests/TestSuite_ice_vf_support_multicast_address.py
@@ -42,7 +42,7 @@ mul_mac_1 = "33:33:00:40:10:01"
 vf0_wrong_mac = "00:11:22:33:44:56"
 
 
-class TestCvlVfSupportMulticastAdress(TestCase):
+class TestICEVfSupportMulticastAdress(TestCase):
     def set_up_all(self):
         """
         Prerequisite steps for each test suite.
diff --git a/tests/TestSuite_inline_ipsec.py b/tests/TestSuite_inline_ipsec.py
index 9cc15301..c2ed0391 100644
--- a/tests/TestSuite_inline_ipsec.py
+++ b/tests/TestSuite_inline_ipsec.py
@@ -60,7 +60,8 @@ class TestInlineIpsec(TestCase):
         Run at the start of each test suite.
         """
         self.verify(
-            self.nic in ["niantic", "twinpond"], "%s NIC not support" % self.nic
+            self.nic in ["IXGBE_10G-82599_SFP", "IXGBE_10G-X540T"],
+            "%s NIC not support" % self.nic,
         )
         self.verify(
             self.drivername in ["vfio-pci"],
diff --git a/tests/TestSuite_ipgre.py b/tests/TestSuite_ipgre.py
index 4deaf315..37c7fe97 100644
--- a/tests/TestSuite_ipgre.py
+++ b/tests/TestSuite_ipgre.py
@@ -36,7 +36,8 @@ Generic Routing Encapsulation (GRE) is a tunneling protocol developed by
 Cisco Systems that can encapsulate a wide variety of network layer protocols 
 inside virtual point-to-point links over an Internet Protocol network.
 
-Fortville support GRE packet detecting, checksum computing and filtering.
+Intel® Ethernet 700 Series support GRE packet detecting, checksum computing
+and filtering.
 """
 
 import os
@@ -66,17 +67,19 @@ class TestIpgre(TestCase):
         self.verify(
             self.nic
             in [
-                "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",
                 "cavium_a063",
                 "cavium_a064",
             ],
-            "GRE tunnel packet type only support by fortville, carlsville and cavium",
+            "GRE tunnel packet type only support by Intel® Ethernet 700 Series, "
+            "Intel® Ethernet Network Adapter X710-T4L, Intel® Ethernet Network "
+            "Adapter X710-T2L and cavium",
         )
         self.verify(len(ports) >= 1, "Insufficient ports for testing")
         valports = [_ for _ in ports if self.tester.get_local_port(_) != -1]
diff --git a/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py b/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py
index 0e64a5d6..a6b08071 100644
--- a/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py
+++ b/tests/TestSuite_ixgbe_vf_get_extra_queue_information.py
@@ -31,7 +31,7 @@
 
 """
 DPDK Test suite.
-Test Niantic ixgbe_get_vf_queue Include Extra Information function.
+Test 82599 ixgbe_get_vf_queue Include Extra Information function.
 """
 import random
 import re
@@ -149,7 +149,9 @@ class TestIxgbeVfGetExtraInfo(TestCase):
         """
         Run at the start of each test suite.
         """
-        self.verify(self.nic in ["niantic"], "NIC Unsupported: " + str(self.nic))
+        self.verify(
+            self.nic in ["IXGBE_10G-82599_SFP"], "NIC Unsupported: " + str(self.nic)
+        )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
         self.cores = "1S/8C/1T"
diff --git a/tests/TestSuite_jumboframes.py b/tests/TestSuite_jumboframes.py
index bcdf6c62..af532a74 100644
--- a/tests/TestSuite_jumboframes.py
+++ b/tests/TestSuite_jumboframes.py
@@ -250,7 +250,12 @@ class TestJumboframes(TestCase):
         """
         On 1G NICs, when the jubmo frame MTU set as 9000, the software adjust it to 9004.
         """
-        if self.nic in ["powerville", "springville", "kawela_4", "foxville"]:
+        if self.nic in [
+            "IGB_1G-I350_COPPER",
+            "IGB_1G-I210_COPPER",
+            "IGB_1G-82576_QUAD_COPPER_ET2",
+            "IGC-I225_LM",
+        ]:
             self.jumboframes_send_packet(ETHER_JUMBO_FRAME_MTU + 4 + 1, False)
         else:
             self.jumboframes_send_packet(ETHER_JUMBO_FRAME_MTU + 1, False)
diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py
index 3c8e5929..a5aa1a4c 100644
--- a/tests/TestSuite_kernelpf_iavf.py
+++ b/tests/TestSuite_kernelpf_iavf.py
@@ -124,7 +124,7 @@ class TestKernelpfIavf(TestCase):
         # bind to default driver
         self.bind_nic_driver(self.dut_ports, driver="")
         self.used_dut_port = self.dut_ports[0]
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s on" % (self.host_intf, self.flag), "# "
             )
@@ -132,7 +132,7 @@ class TestKernelpfIavf(TestCase):
         self.sriov_vfs_port = self.dut.ports_info[self.used_dut_port]["vfs_port"]
         out = self.dut.send_expect("ethtool %s" % self.host_intf, "#")
         self.speed = int(re.findall("Speed: (\d*)", out)[0]) // 1000
-        if self.nic.startswith("columbiaville"):
+        if self.is_eth_series_nic(800):
             self.dut.send_expect(
                 "ip link set %s vf 0 spoofchk off" % (self.host_intf), "# "
             )
@@ -1162,7 +1162,7 @@ class TestKernelpfIavf(TestCase):
         if self.env_done:
             self.destroy_vm_env()
 
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s %s"
                 % (self.host_intf, self.flag, self.default_stats),
diff --git a/tests/TestSuite_l2fwd_jobstats.py b/tests/TestSuite_l2fwd_jobstats.py
index ad099d87..fd0dad11 100644
--- a/tests/TestSuite_l2fwd_jobstats.py
+++ b/tests/TestSuite_l2fwd_jobstats.py
@@ -51,12 +51,12 @@ class TestL2fwdJobstats(TestCase):
         self.verify(
             self.nic
             not in [
-                "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",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
diff --git a/tests/TestSuite_l2tp_esp_coverage.py b/tests/TestSuite_l2tp_esp_coverage.py
index 22813b9d..981b3730 100644
--- a/tests/TestSuite_l2tp_esp_coverage.py
+++ b/tests/TestSuite_l2tp_esp_coverage.py
@@ -136,7 +136,7 @@ tv_MAC_IPV6_NAT_T_ESP_vlan = {
 
 
 class L2tpEspCoverage(TestCase):
-    supported_nic = ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]
+    supported_nic = ["ICE_100G-E810C_QSFP", "ICE_25G-E810C_SFP", "ICE_25G-E810_XXV_SFP"]
 
     @check_supported_nic(supported_nic)
     def set_up_all(self):
@@ -181,7 +181,7 @@ class L2tpEspCoverage(TestCase):
         """
         self.dut.kill_all()
         self.destroy_iavf()
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s %s"
                 % (self.pf_interface, self.flag, self.default_stats),
@@ -197,7 +197,7 @@ class L2tpEspCoverage(TestCase):
             self.default_stats = self.dut.get_priv_flags_state(
                 self.pf_interface, self.flag
             )
-            if self.nic.startswith("columbiaville") and self.default_stats:
+            if self.is_eth_series_nic(800) and self.default_stats:
                 self.dut.send_expect(
                     "ethtool --set-priv-flags %s %s on"
                     % (self.pf_interface, self.flag),
diff --git a/tests/TestSuite_large_vf.py b/tests/TestSuite_large_vf.py
index 171e2a5b..c6797179 100644
--- a/tests/TestSuite_large_vf.py
+++ b/tests/TestSuite_large_vf.py
@@ -216,7 +216,7 @@ class TestLargeVf(TestCase):
         # Based on h/w type, choose how many ports to use
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(
-            self.nic in ["columbiaville_25g", "columbiaville_100g"],
+            self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"],
             "%s nic not support large vf" % self.nic,
         )
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
diff --git a/tests/TestSuite_link_flowctrl.py b/tests/TestSuite_link_flowctrl.py
index 5c4e7c6b..f24a63a1 100644
--- a/tests/TestSuite_link_flowctrl.py
+++ b/tests/TestSuite_link_flowctrl.py
@@ -192,7 +192,7 @@ class TestLinkFlowctrl(TestCase):
         self.tester.scapy_execute()
         # The following sleep is needed to allow all the packets to arrive.
         # 1s works for Crown Pass (FC18) DUT, Lizard Head Pass (FC14) tester
-        # using Niantic. Increase it in case of packet loosing.
+        # using 82599. Increase it in case of packet loosing.
         sleep(1)
 
         self.dut.send_expect("stop", "testpmd> ")
@@ -496,7 +496,7 @@ class TestLinkFlowctrl(TestCase):
         )
 
         self.logger.info("Packet loss: %.3f" % result)
-        if self.nic == "niantic":
+        if self.nic == "IXGBE_10G-82599_SFP":
             self.verify(
                 result >= 0.3,
                 "Link flow control fail, the loss percent is less than 30%",
@@ -517,7 +517,7 @@ class TestLinkFlowctrl(TestCase):
         )
 
         self.logger.info("Packet loss: %.3f" % result)
-        if self.nic == "niantic":
+        if self.nic == "IXGBE_10G-82599_SFP":
             self.verify(
                 result >= 0.3,
                 "Link flow control fail, the loss percent is less than 30%",
@@ -538,7 +538,7 @@ class TestLinkFlowctrl(TestCase):
         )
 
         self.logger.info("Packet loss: %.3f" % result)
-        if self.nic == "niantic":
+        if self.nic == "IXGBE_10G-82599_SFP":
             self.verify(
                 result >= 0.3,
                 "Link flow control fail, the loss percent is less than 30%",
@@ -599,7 +599,7 @@ class TestLinkFlowctrl(TestCase):
         )
         result = self.start_traffic(tgenInput)
         self.logger.info("Packet loss: %.3f" % result)
-        if self.nic == "niantic":
+        if self.nic == "IXGBE_10G-82599_SFP":
             self.verify(
                 result >= 0.3,
                 "Link flow control fail, the loss percent is less than 30%",
@@ -617,7 +617,7 @@ class TestLinkFlowctrl(TestCase):
         self.pmdout.wait_link_status_up(self.dutPorts[0])
         result = self.start_traffic(tgenInput)
         self.logger.info("Packet loss: %.3f" % result)
-        if self.nic == "niantic":
+        if self.nic == "IXGBE_10G-82599_SFP":
             self.verify(
                 result >= 0.3,
                 "Link flow control fail, the loss percent is less than 30%",
diff --git a/tests/TestSuite_link_status_interrupt.py b/tests/TestSuite_link_status_interrupt.py
index 663c957d..efcb8a0e 100755
--- a/tests/TestSuite_link_status_interrupt.py
+++ b/tests/TestSuite_link_status_interrupt.py
@@ -66,13 +66,13 @@ class TestLinkStatusInterrupt(TestCase):
         # from kernel 4.8+, kernel will not support legacy intr mode.
         # detailed info:https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/drivers/pci/quirks.c?id=8bcf4525c5d43306c5fd07e132bc8650e3491aec
         if self.nic in [
-            "columbiaville_25g",
-            "columbiaville_100g",
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirt_single",
-            "fortville_25g",
-            "carlsville",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             self.basic_intr_mode = ["msix"]
         else:
diff --git a/tests/TestSuite_mac_filter.py b/tests/TestSuite_mac_filter.py
index 77240b26..7ef2aad2 100644
--- a/tests/TestSuite_mac_filter.py
+++ b/tests/TestSuite_mac_filter.py
@@ -110,7 +110,7 @@ class TestMacFilter(TestCase):
         # send one packet with the portid MAC address
         self.allowlist_send_packet(portid, self.dest)
 
-        # Niantic and FVL have different packet statistics when using the
+        # 82599 and Intel® Ethernet 700 Series have different packet statistics when using the
         # "show port stats" command. Packets number is stripped from log.
         out = self.dut.get_session_output()
         cur_rxpkt = utils.regexp(out, "received ([0-9]+) packets")
diff --git a/tests/TestSuite_macsec_for_ixgbe.py b/tests/TestSuite_macsec_for_ixgbe.py
index 1048ae68..ee7163db 100644
--- a/tests/TestSuite_macsec_for_ixgbe.py
+++ b/tests/TestSuite_macsec_for_ixgbe.py
@@ -44,7 +44,9 @@ class TestMacsecForIxgbe(TestCase):
         """
         Prerequisite steps for each test suite.
         """
-        self.verify(self.nic in ["niantic"], "NIC Unsupported: " + str(self.nic))
+        self.verify(
+            self.nic in ["IXGBE_10G-82599_SFP"], "NIC Unsupported: " + str(self.nic)
+        )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 2, "Insufficient ports")
         self.core_list = self.dut.get_core_list("1S/4C/1T")
diff --git a/tests/TestSuite_metering_and_policing.py b/tests/TestSuite_metering_and_policing.py
index 092974f9..06234997 100644
--- a/tests/TestSuite_metering_and_policing.py
+++ b/tests/TestSuite_metering_and_policing.py
@@ -215,7 +215,7 @@ class TestMeteringAndPolicing(TestCase):
             eal_param="-s %s --vdev 'net_softnic0,firmware=%s'"
             % (Servicecorelist, filename),
         )
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
             self.dut.send_expect("set fwd mac", "testpmd>")
 
     def add_port_meter_profile(self, profile_id, cbs=400, pbs=500):
diff --git a/tests/TestSuite_mtu_update.py b/tests/TestSuite_mtu_update.py
index f10dfbb7..b6b48439 100644
--- a/tests/TestSuite_mtu_update.py
+++ b/tests/TestSuite_mtu_update.py
@@ -250,7 +250,10 @@ class TestMtuUpdate(TestCase):
         """
         On 1G NICs, when the jubmo frame MTU set > 1500, the software adjust it to MTU+4.
         """
-        if self.nic in ["powerville", "springville", "foxville"] and packet_size > 1500:
+        if (
+            self.nic in ["IGB_1G-I350_COPPER", "IGB_1G-I210_COPPER", "IGC-I225_LM"]
+            and packet_size > 1500
+        ):
             self.send_packet_of_size_to_tx_port(packet_size + 8 - 1, received=True)
             self.send_packet_of_size_to_tx_port(packet_size + 8, received=True)
             self.send_packet_of_size_to_tx_port(packet_size + 8 + 1, received=False)
diff --git a/tests/TestSuite_nic_single_core_perf.py b/tests/TestSuite_nic_single_core_perf.py
index bcb19eeb..1bdbf877 100644
--- a/tests/TestSuite_nic_single_core_perf.py
+++ b/tests/TestSuite_nic_single_core_perf.py
@@ -57,14 +57,14 @@ class TestNicSingleCorePerf(TestCase):
         self.verify(
             self.nic
             in [
-                "niantic",
-                "fortville_25g",
-                "fortville_spirit",
+                "IXGBE_10G-82599_SFP",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_A",
                 "ConnectX5_MT4121",
                 "ConnectX4_LX_MT4117",
-                "columbiaville_100g",
-                "columbiaville_25g",
-                "columbiaville_25gx2",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_25G-E810_XXV_SFP",
                 "brcm_57414",
                 "brcm_P2100G",
             ],
@@ -79,13 +79,13 @@ class TestNicSingleCorePerf(TestCase):
         self.verify(self.rx_desc_size == 16 or self.rx_desc_size == 32, err_msg)
         if self.rx_desc_size == 16:
             extra_options = ""
-            # rebuild to get best perf on fortville
-            if self.nic in ["fortville_25g", "fortville_spirit"]:
+            # rebuild to get best perf on Intel® Ethernet 700 Series
+            if self.nic in ["I40E_25G-25G_SFP28", "I40E_40G-QSFP_A"]:
                 extra_options = "-Dc_args=-DRTE_LIBRTE_I40E_16BYTE_RX_DESC"
             elif self.nic in [
-                "columbiaville_100g",
-                "columbiaville_25g",
-                "columbiaville_25gx2",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_25G-E810_XXV_SFP",
             ]:
                 extra_options = "-Dc_args=-DRTE_LIBRTE_ICE_16BYTE_RX_DESC"
             self.dut.build_install_dpdk(self.target, extra_options=extra_options)
@@ -292,14 +292,14 @@ class TestNicSingleCorePerf(TestCase):
 
             nb_cores = thread_num
 
-            # fortville has to use 2 queues at least to get the best performance
-            if self.nic in ["fortville_25g", "fortville_spirit"] or thread_num == 2:
+            # Intel® Ethernet 700 Series has to use 2 queues at least to get the best performance
+            if self.nic in ["I40E_25G-25G_SFP28", "I40E_40G-QSFP_A"] or thread_num == 2:
                 param += " --rxq=2 --txq=2"
-            # columbiaville use one queue per port for best performance.
+            # Intel® Ethernet 810 Series use one queue per port for best performance.
             elif self.nic in [
-                "columbiaville_100g",
-                "columbiaville_25g",
-                "columbiaville_25gx2",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_25G-E810_XXV_SFP",
             ]:
                 param += " --rxq=1 --txq=1"
                 # workaround for that testpmd can't forward packets in io forward mode
diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py
index a129c561..67165e01 100644
--- a/tests/TestSuite_nvgre.py
+++ b/tests/TestSuite_nvgre.py
@@ -398,23 +398,23 @@ class TestNvgre(TestCase):
         """
         nvgre Prerequisites
         """
-        # this feature only enable in FVL now
+        # this feature only enable in Intel® Ethernet 700 Series now
         if self.nic in [
-            "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",
             "cavium_a063",
             "cavium_a064",
-            "carlsville",
+            "I40E_10G-10G_BASE_T_BC",
         ]:
             self.compile_switch = "CONFIG_RTE_LIBRTE_I40E_INC_VECTOR"
-        elif self.nic in ["sageville", "sagepond"]:
+        elif self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]:
             self.compile_switch = "CONFIG_RTE_IXGBE_INC_VECTOR"
-        elif self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        elif self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 800 Series support default none VECTOR")
         else:
             self.verify(False, "%s not support NVGRE case" % self.nic)
         # Based on h/w type, choose how many ports to use
@@ -751,8 +751,8 @@ class TestNvgre(TestCase):
         verify nvgre packet with ipv6
         """
         # packet type detect must used without VECTOR pmd
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 800 Series support default none VECTOR")
             src_vec_model = "n"
 
         # check no nvgre packet
@@ -843,8 +843,8 @@ class TestNvgre(TestCase):
         verify nvgre packet with ipv4
         """
         # packet type detect must used without VECTOR pmd
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 800 Series support default none VECTOR")
             src_vec_model = "n"
 
         # check no nvgre packet
diff --git a/tests/TestSuite_pmdrss_hash.py b/tests/TestSuite_pmdrss_hash.py
index e167cc43..f4f40ff2 100644
--- a/tests/TestSuite_pmdrss_hash.py
+++ b/tests/TestSuite_pmdrss_hash.py
@@ -32,7 +32,7 @@
 """
 DPDK Test suite.
 
-Test DPDK1.8 feature: Fortville RSS full support - configuring hash functions.
+Test DPDK1.8 feature: Intel® Ethernet 700 Series RSS full support - configuring hash functions.
 It can select Toeplitz or simple XOR hash function and it can configure symmetric hash functions.
 Support 4*10G, 1*40G and 2*40G NICs.
 """
@@ -509,7 +509,12 @@ class TestPmdrssHash(TestCase):
         self.verify(sum(result) == 0, "the symmetric RSS hash function failed!")
 
     @skip_unsupported_nic(
-        ["columbiaville_25g", "columbiaville_100g", "niantic", "foxville"]
+        [
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
+            "IXGBE_10G-82599_SFP",
+            "IGC-I225_LM",
+        ]
     )
     def set_up_all(self):
         """
@@ -521,13 +526,13 @@ class TestPmdrssHash(TestCase):
         global queue
 
         if self.nic in [
-            "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",
         ]:
             reta_num = 512
         else:
diff --git a/tests/TestSuite_pmdrssreta.py b/tests/TestSuite_pmdrssreta.py
index 7bc8d484..9e7c0f5f 100644
--- a/tests/TestSuite_pmdrssreta.py
+++ b/tests/TestSuite_pmdrssreta.py
@@ -177,7 +177,7 @@ class TestPmdrssreta(TestCase):
                 hash_index = int(tmp_reta_line["RSS hash"], 16) % 64
             elif self.nic in ["hi1822"]:
                 hash_index = int(tmp_reta_line["RSS hash"], 16) % 256
-            elif self.nic in ["niantic", "foxville", "twinpond"]:
+            elif self.nic in ["IXGBE_10G-82599_SFP", "IGC-I225_LM", "IXGBE_10G-X540T"]:
                 # compute the hash result of five tuple into the 7 LSBs value.
                 hash_index = int(tmp_reta_line["RSS hash"], 16) % 128
             else:
@@ -239,7 +239,7 @@ class TestPmdrssreta(TestCase):
 
         self.dut.kill_all()
         global testQueues
-        if self.nic == "foxville":
+        if self.nic == "IGC-I225_LM":
             testQueues = [2]
         # test with different rss queues
         for queue in testQueues:
@@ -285,7 +285,7 @@ class TestPmdrssreta(TestCase):
                             "port config 0 rss reta (%d,%d)" % (i, reta_entries[i]),
                             "testpmd> ",
                         )
-                elif self.nic in ["niantic", "foxville"]:
+                elif self.nic in ["IXGBE_10G-82599_SFP", "IGC-I225_LM"]:
                     for i in range(128):
                         reta_entries.insert(i, random.randint(0, queue - 1))
                         self.dut.send_expect(
@@ -306,24 +306,24 @@ class TestPmdrssreta(TestCase):
 
     def test_rss_key_size(self):
         nic_rss_key_size = {
-            "columbiaville_25g": 52,
-            "columbiaville_100g": 52,
-            "fortville_eagle": 52,
-            "fortville_spirit": 52,
-            "fortville_spirit_single": 52,
-            "fortville_25g": 52,
-            "niantic": 40,
+            "ICE_25G-E810C_SFP": 52,
+            "ICE_100G-E810C_QSFP": 52,
+            "I40E_10G-SFP_XL710": 52,
+            "I40E_40G-QSFP_A": 52,
+            "I40E_40G-QSFP_B": 52,
+            "I40E_25G-25G_SFP28": 52,
+            "IXGBE_10G-82599_SFP": 40,
             "e1000": 40,
-            "fortpark_TLV": 52,
-            "fortpark_BASE-T": 52,
+            "I40E_10G-SFP_X722": 52,
+            "I40E_10G-10G_BASE_T_X722": 52,
             "hi1822": 40,
             "cavium_a063": 48,
             "cavium_a064": 48,
-            "carlsville": 52,
-            "sagepond": 40,
-            "sageville": 40,
-            "foxville": 40,
-            "twinpond": 40,
+            "I40E_10G-10G_BASE_T_BC": 52,
+            "IXGBE_10G-X550EM_X_10G_T": 40,
+            "IXGBE_10G-X550T": 40,
+            "IGC-I225_LM": 40,
+            "IXGBE_10G-X540T": 40,
         }
         self.verify(
             self.nic in list(nic_rss_key_size.keys()),
diff --git a/tests/TestSuite_port_control.py b/tests/TestSuite_port_control.py
index 8055b776..c3fea5d9 100755
--- a/tests/TestSuite_port_control.py
+++ b/tests/TestSuite_port_control.py
@@ -160,7 +160,7 @@ class TestPortControl(TestCase):
         terminal.execute_cmd("stop")
         terminal.execute_cmd("port stop all")
         ret = terminal.get_port_link_status(self.port_id_0)
-        if self.nic.startswith("columbiaville") or (
+        if self.is_eth_series_nic(800) or (
             getattr(self, "vm_testpmd", None) and terminal is self.vm_testpmd
         ):
             self.verify(ret != "", "port status error!")
@@ -170,7 +170,7 @@ class TestPortControl(TestCase):
     def reset_pmd_port(self, terminal):
         terminal.execute_cmd("port reset all")
         ret = terminal.get_port_link_status(self.port_id_0)
-        if self.nic.startswith("columbiaville") or (
+        if self.is_eth_series_nic(800) or (
             getattr(self, "vm_testpmd", None) and terminal is self.vm_testpmd
         ):
             self.verify(ret != "", "port status error!")
diff --git a/tests/TestSuite_port_representor.py b/tests/TestSuite_port_representor.py
index 03a8d1c9..15f03ce8 100644
--- a/tests/TestSuite_port_representor.py
+++ b/tests/TestSuite_port_representor.py
@@ -53,13 +53,13 @@ class TestPortRepresentor(TestCase):
         self.verify(
             self.nic
             in [
-                "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",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
diff --git a/tests/TestSuite_ptype_mapping.py b/tests/TestSuite_ptype_mapping.py
index 9b458073..6bf02052 100644
--- a/tests/TestSuite_ptype_mapping.py
+++ b/tests/TestSuite_ptype_mapping.py
@@ -48,13 +48,13 @@ class TestPtype_Mapping(TestCase):
         self.verify(
             self.nic
             in [
-                "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",
                 "cavium_a063",
                 "cavium_a064",
             ],
diff --git a/tests/TestSuite_pvp_share_lib.py b/tests/TestSuite_pvp_share_lib.py
index f9c1f5da..0990d0d4 100644
--- a/tests/TestSuite_pvp_share_lib.py
+++ b/tests/TestSuite_pvp_share_lib.py
@@ -195,10 +195,10 @@ class TestPVPShareLib(TestCase):
 
     def test_perf_pvp_share_lib_of_niantic(self):
         """
-        Vhost/virtio-user pvp share lib test with niantic
+        Vhost/virtio-user pvp share lib test with 82599
         """
         self.verify(
-            self.nic in ["niantic"],
+            self.nic in ["IXGBE_10G-82599_SFP"],
             "the nic not support this case: %s" % self.running_case,
         )
         self.start_testpmd_as_vhost(driver="ixgbe")
@@ -209,10 +209,10 @@ class TestPVPShareLib(TestCase):
 
     def test_perf_pvp_share_lib_of_fortville(self):
         """
-        Vhost/virtio-user pvp share lib test with fortville
+        Vhost/virtio-user pvp share lib test with Intel® Ethernet 700 Series
         """
         self.verify(
-            self.nic in ["fortville_eagle", "fortville_spirit", "fortville_25g"],
+            self.nic in ["I40E_10G-SFP_XL710", "I40E_40G-QSFP_A", "I40E_25G-25G_SFP28"],
             "the nic not support this case: %s" % self.running_case,
         )
         self.start_testpmd_as_vhost(driver="i40e")
diff --git a/tests/TestSuite_pvp_vhost_user_reconnect.py b/tests/TestSuite_pvp_vhost_user_reconnect.py
index 327444fb..61b56bd0 100644
--- a/tests/TestSuite_pvp_vhost_user_reconnect.py
+++ b/tests/TestSuite_pvp_vhost_user_reconnect.py
@@ -283,7 +283,7 @@ class TestPVPVhostUserReconnect(TestCase):
             cinfo = tinfo
         self.result_table_add(["vm2vm iperf", iperfdata[-1], cinfo])
         data_li = iperfdata[-1].strip().split()
-        if self.nic in ["fortville_spirit"]:
+        if self.nic in ["I40E_40G-QSFP_A"]:
             self.verify(data_li[1] == "Gbits/sec", "data unit not correct")
         return float(data_li[0])
 
@@ -453,7 +453,8 @@ class TestPVPVhostUserReconnect(TestCase):
         self.config_vm_intf()
         self.start_iperf()
         self.before_data = self.iperf_result_verify(vm_cycle, "before reconnet")
-        # Because of repeat iperf test on FVL-40g nic, the result is unstable, so use 15Gb/s as check value.
+        # Because of repeat iperf test on Intel® Ethernet Converged Network Adapter XL710-QDA2 nic,
+        # the result is unstable, so use 15Gb/s as check value.
         self.check_data = 15.000
 
         vm_cycle = 1
@@ -582,7 +583,8 @@ class TestPVPVhostUserReconnect(TestCase):
         self.config_vm_intf()
         self.start_iperf()
         self.before_data = self.iperf_result_verify(vm_cycle, "before reconnet")
-        # Because of repeat iperf test on FVL-40g nic, the result is unstable, so use 15Gb/s as check value.
+        # Because of repeat iperf test on Intel® Ethernet Converged Network Adapter XL710-QDA2 nic,
+        # the result is unstable, so use 15Gb/s as check value.
         self.check_data = 15.000
 
         vm_cycle = 1
diff --git a/tests/TestSuite_qinq_filter.py b/tests/TestSuite_qinq_filter.py
index 955a0dc0..f3d076df 100644
--- a/tests/TestSuite_qinq_filter.py
+++ b/tests/TestSuite_qinq_filter.py
@@ -56,16 +56,18 @@ class TestQinqFilter(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "foxville",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "IGC-I225_LM",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "NIC %s not support this test" % self.nic,
         )
-        print("this case only supports fortville with 6.0.0+ firmware and dpdk17.05+")
+        print(
+            "this case only supports Intel® Ethernet 700 Series with 6.0.0+ firmware and dpdk17.05+"
+        )
         ports = self.dut.get_ports()
         # Verify that enough ports are available
         self.verify(len(ports) >= 1, "Insufficient ports")
diff --git a/tests/TestSuite_queue_region.py b/tests/TestSuite_queue_region.py
index 3ff02075..faf2ecac 100644
--- a/tests/TestSuite_queue_region.py
+++ b/tests/TestSuite_queue_region.py
@@ -57,13 +57,13 @@ class TestQueue_region(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -281,7 +281,7 @@ class TestQueue_region(TestCase):
         self.dut.send_expect(
             "set port 0 queue-region region_id 6 flowtype 36", "testpmd> "
         )
-        if self.nic in ["fortpark_TLV", "fortpark_BASE-T"]:
+        if self.nic in ["I40E_10G-SFP_X722", "I40E_10G-10G_BASE_T_X722"]:
             self.dut.send_expect(
                 "set port 0 queue-region region_id 2 flowtype 39", "testpmd> "
             )
@@ -317,8 +317,8 @@ class TestQueue_region(TestCase):
         queue_region = ["1"]
         queue_udp = self.send_and_check(queue_region, mac=self.pf_mac, pkt_type="udp")
 
-        # fortville can't parse the TCP SYN type packet, fortpark can parse it.
-        if self.nic in ["fortpark_TLV", "fortpark_BASE-T"]:
+        # Intel® Ethernet 700 Series can't parse the TCP SYN type packet, X722 can parse it.
+        if self.nic in ["I40E_10G-SFP_X722", "I40E_10G-10G_BASE_T_X722"]:
             queue_region = ["3", "4"]
             self.send_and_check(
                 queue_region, mac=self.pf_mac, pkt_type="tcp", flags="S"
@@ -344,10 +344,10 @@ class TestQueue_region(TestCase):
         queue_region = ["5"]
         self.send_and_check(queue_region, mac=self.pf_mac, pkt_type="ipv4", frag=1)
 
-        # fortville can't parse the TCP SYN type packet, fortpark can parse it.
+        # Intel® Ethernet 700 Series can't parse the TCP SYN type packet, X722 can parse it.
         # default is SYN mode.
         # not assign ipv4-tcp SYN packet to any queue region, the packet to queue region 0.
-        if self.nic in ["fortpark_TLV", "fortpark_BASE-T"]:
+        if self.nic in ["I40E_10G-SFP_X722", "I40E_10G-10G_BASE_T_X722"]:
             queue_region = ["1"]
             queue_ipv6tcp = self.send_and_check(
                 queue_region, mac=self.pf_mac, pkt_type="ipv6_tcp", flags="S"
diff --git a/tests/TestSuite_rss_key_update.py b/tests/TestSuite_rss_key_update.py
index 09a6564d..6d5a2fe6 100644
--- a/tests/TestSuite_rss_key_update.py
+++ b/tests/TestSuite_rss_key_update.py
@@ -191,37 +191,37 @@ class TestRssKeyUpdate(TestCase):
         self.verify(
             self.nic
             in [
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "niantic",
-                "carlsville",
-                "foxville",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "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",
+                "IXGBE_10G-82599_SFP",
+                "I40E_10G-10G_BASE_T_BC",
+                "IGC-I225_LM",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
         global reta_num
         global iptypes
         global queue
-        if self.nic in ["foxville"]:
+        if self.nic in ["IGC-I225_LM"]:
             queue = 4
 
         if self.nic in [
-            "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",
         ]:
             reta_num = 512
-        elif self.nic in ["niantic", "foxville"]:
+        elif self.nic in ["IXGBE_10G-82599_SFP", "IGC-I225_LM"]:
             reta_num = 128
             iptypes = {
                 "ipv4-other": "ip",
@@ -361,24 +361,24 @@ class TestRssKeyUpdate(TestCase):
     def test_set_hash_key_short_long(self):
 
         nic_rss_key_size = {
-            "columbiaville_25g": 52,
-            "columbiaville_100g": 52,
-            "fortville_eagle": 52,
-            "fortville_spirit": 52,
-            "fortville_spirit_single": 52,
-            "fortville_25g": 52,
-            "niantic": 40,
+            "ICE_25G-E810C_SFP": 52,
+            "ICE_100G-E810C_QSFP": 52,
+            "I40E_10G-SFP_XL710": 52,
+            "I40E_40G-QSFP_A": 52,
+            "I40E_40G-QSFP_B": 52,
+            "I40E_25G-25G_SFP28": 52,
+            "IXGBE_10G-82599_SFP": 40,
             "e1000": 40,
-            "fortpark_TLV": 52,
-            "fortpark_BASE-T": 52,
+            "I40E_10G-SFP_X722": 52,
+            "I40E_10G-10G_BASE_T_X722": 52,
             "hi1822": 40,
             "cavium_a063": 48,
             "cavium_a064": 48,
-            "carlsville": 52,
-            "sagepond": 40,
-            "sageville": 40,
-            "foxville": 40,
-            "twinpond": 40,
+            "I40E_10G-10G_BASE_T_BC": 52,
+            "IXGBE_10G-X550EM_X_10G_T": 40,
+            "IXGBE_10G-X550T": 40,
+            "IGC-I225_LM": 40,
+            "IXGBE_10G-X540T": 40,
         }
 
         self.verify(
diff --git a/tests/TestSuite_rss_to_rte_flow.py b/tests/TestSuite_rss_to_rte_flow.py
index a18808bb..de952ac3 100644
--- a/tests/TestSuite_rss_to_rte_flow.py
+++ b/tests/TestSuite_rss_to_rte_flow.py
@@ -400,15 +400,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -616,15 +616,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -727,15 +727,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -842,15 +842,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -987,15 +987,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1188,15 +1188,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1241,15 +1241,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1316,15 +1316,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1373,15 +1373,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1433,15 +1433,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1495,15 +1495,15 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -1545,19 +1545,19 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.pmdout.start_testpmd(
                 "%s" % self.cores, "--rxq=4 --txq=4 --port-topology=chained"
             )
@@ -1571,7 +1571,7 @@ class TestRSS_to_Rteflow(TestCase):
         time.sleep(2)
 
         # Create a rss queue rule
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss queues 1 2 end / end",
                 "created",
@@ -1594,7 +1594,7 @@ class TestRSS_to_Rteflow(TestCase):
             "ipv6-tcp",
             "ipv6-sctp",
         ]
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.send_check_100_packet_queue(ptype_list1, ["1", "2"], port_id=0)
         else:
             self.send_check_100_packet_queue(ptype_list1, ["1", "4", "7"], port_id=0)
@@ -1635,7 +1635,7 @@ class TestRSS_to_Rteflow(TestCase):
             "flow create 0 ingress pattern end actions rss queues 8 end / end", "error"
         )
         # Set all the queues to the rule
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss queues 0 1 2 3 end / end",
                 "created",
@@ -1654,19 +1654,19 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.pmdout.start_testpmd(
                 "%s" % self.cores, "--rxq=4 --txq=4 --port-topology=chained"
             )
@@ -1680,7 +1680,7 @@ class TestRSS_to_Rteflow(TestCase):
         time.sleep(2)
 
         # Create a rss queue rule
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss types udp ipv4-tcp ipv6-sctp ipv4-other end queues 1 2 3 end / end",
                 "created",
@@ -1707,7 +1707,7 @@ class TestRSS_to_Rteflow(TestCase):
         # send the packets and verify the results
         if self.nic in ["cavium_a063", "cavium_a064"]:
             self.send_check_100_packet_queue(ptype_list1, ["1", "4", "7"], port_id=0)
-        elif self.nic in ["foxville", "springville"]:
+        elif self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.send_check_100_packet_queue(ptype_list1, ["1", "2", "3"], port_id=0)
             self.send_check_100_packet_queue(ptype_list2, "0", port_id=0)
         else:
@@ -1717,7 +1717,7 @@ class TestRSS_to_Rteflow(TestCase):
         # Create different ptype rss rule.
         self.dut.send_expect("flow flush 0", "testpmd> ")
 
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss types ipv4 ipv6 end queues 1 3 end / end",
                 "created",
@@ -1740,7 +1740,7 @@ class TestRSS_to_Rteflow(TestCase):
             "ipv6-tcp",
             "ipv6-sctp",
         ]
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.send_check_100_packet_queue(ptype_list3, ["1", "3"], port_id=0)
         else:
             self.send_check_100_packet_queue(ptype_list3, ["3", "7"], port_id=0)
@@ -1752,19 +1752,19 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.pmdout.start_testpmd(
                 "%s" % self.cores,
                 "--rxq=4 --txq=4 --disable-rss --port-topology=chained",
@@ -1805,7 +1805,7 @@ class TestRSS_to_Rteflow(TestCase):
         self.send_check_100_packet_queue(ptype_list1, "0", port_id=0)
 
         # Create a rss queue rule
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss types ipv6-tcp ipv4-udp end queues 1 2 3 end / end",
                 "created",
@@ -1829,7 +1829,7 @@ class TestRSS_to_Rteflow(TestCase):
             "ipv6-udp",
             "ipv6-sctp",
         ]
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.send_check_100_packet_queue(ptype_list2, ["1", "2", "3"], port_id=0)
         else:
             self.send_check_100_packet_queue(ptype_list2, ["5", "6", "7"], port_id=0)
@@ -1842,19 +1842,19 @@ class TestRSS_to_Rteflow(TestCase):
         self.verify(
             self.nic
             not in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortville_25g",
-                "fortpark_BASE-T",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.pmdout.start_testpmd(
                 "%s" % self.cores,
                 "--rxq=4 --txq=4 --disable-rss --port-topology=chained",
@@ -1869,7 +1869,7 @@ class TestRSS_to_Rteflow(TestCase):
         time.sleep(2)
 
         # Create a rss queue rule
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern end actions rss types ipv4-udp end queues 2 3 end / end",
                 "created",
@@ -1883,7 +1883,12 @@ class TestRSS_to_Rteflow(TestCase):
             self.send_and_check(self.pkt2, ["3", "4", "5"], port_id=0)
 
         # Create a flow director rule
-        if self.nic in ["bartonhills", "powerville", "springville", "foxville"]:
+        if self.nic in [
+            "IGB_1G-82580_COPPER",
+            "IGB_1G-I350_COPPER",
+            "IGB_1G-I210_COPPER",
+            "IGC-I225_LM",
+        ]:
             self.dut.send_expect(
                 "flow create 0 ingress pattern eth / ipv4 proto is 17 / udp dst is 50 / end actions queue index 1 / end",
                 "created",
@@ -1897,7 +1902,7 @@ class TestRSS_to_Rteflow(TestCase):
             self.send_and_check(self.pkt2, ["1"], port_id=0)
         # Delete the fdir rule
         self.dut.send_expect("flow destroy 0 rule 1", "testpmd> ")
-        if self.nic in ["foxville", "springville"]:
+        if self.nic in ["IGC-I225_LM", "IGB_1G-I210_COPPER"]:
             self.send_and_check(self.pkt2, ["2", "3"], port_id=0)
         else:
             self.send_and_check(self.pkt2, ["3", "4", "5"], port_id=0)
diff --git a/tests/TestSuite_runtime_vf_queue_number_kernel.py b/tests/TestSuite_runtime_vf_queue_number_kernel.py
index e8f9f5c9..eabf829d 100755
--- a/tests/TestSuite_runtime_vf_queue_number_kernel.py
+++ b/tests/TestSuite_runtime_vf_queue_number_kernel.py
@@ -54,17 +54,17 @@ class TestRuntimeVfQueueNumberKernel(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "fortpark_BASE-T",
-                "fortpark_TLV",
-                "carlsville",
-                "columbiaville_100g",
-                "columbiaville_25g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
             ],
-            "Only supported by Fortville and columbiaville",
+            "Only supported by Intel® Ethernet 700 Series and Intel® Ethernet 800 Series",
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) > 1, "Insufficient ports")
diff --git a/tests/TestSuite_runtime_vf_queue_number_maxinum.py b/tests/TestSuite_runtime_vf_queue_number_maxinum.py
index 94f57cc1..5dbc52ba 100644
--- a/tests/TestSuite_runtime_vf_queue_number_maxinum.py
+++ b/tests/TestSuite_runtime_vf_queue_number_maxinum.py
@@ -51,13 +51,13 @@ class TestRuntimeVfQnMaxinum(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
             ],
-            "Only supported by Fortville",
+            "Only supported by Intel® Ethernet 700 Series",
         )
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
@@ -77,16 +77,16 @@ class TestRuntimeVfQnMaxinum(TestCase):
 
     def setup_test_env(self, driver="default"):
         """
-        Bind fortville nic to DPDK PF, and create 32/64 vfs on it.
+        Bind Intel® Ethernet 700 Series nic to DPDK PF, and create 32/64 vfs on it.
         Start testpmd based on the created vfs.
         """
-        if self.nic in ["fortville_eagle"]:
+        if self.nic in ["I40E_10G-SFP_XL710"]:
             self.dut.generate_sriov_vfs_by_port(self.used_dut_port, 32, driver=driver)
         elif self.nic in [
-            "fortville_25g",
-            "fortville_spirit",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             self.dut.generate_sriov_vfs_by_port(self.used_dut_port, 64, driver=driver)
 
@@ -158,8 +158,8 @@ class TestRuntimeVfQnMaxinum(TestCase):
     def test_vf_consume_max_queues_on_one_pf(self):
         """
         Test case 1: VF consume max queue number on one PF port.
-        For four port fortville nic, each port has 384 queues,
-        and for two port fortville nic, each port has 768 queues.
+        For four port Intel® Ethernet 700 Series nic, each port has 384 queues,
+        and for two port Intel® Ethernet 700 Series nic, each port has 768 queues.
         PF will use 65 queues on each port, the firmware will reserve 4 queues
         for each vf, when requested queues exceed 4 queues, it need to realloc queues
         in the left queues, the reserved queues generally can't be reused.
@@ -175,15 +175,15 @@ class TestRuntimeVfQnMaxinum(TestCase):
         vf2_queue_number = 0
         vf3_allow_index = 0
         vf3_allow_list = ""
-        if self.nic in ["fortville_eagle"]:
+        if self.nic in ["I40E_10G-SFP_XL710"]:
             left_queues = 384 - 65 - 32 * 4
             vf1_allow_index = left_queues / 16
             vf2_queue_number = left_queues % 16
         elif self.nic in [
-            "fortville_25g",
-            "fortville_spirit",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
         ]:
             left_queues = 768 - 65 - 64 * 4
             vf1_allow_index = left_queues / 16
diff --git a/tests/TestSuite_rxtx_offload.py b/tests/TestSuite_rxtx_offload.py
index a1c7a262..f108c3d9 100644
--- a/tests/TestSuite_rxtx_offload.py
+++ b/tests/TestSuite_rxtx_offload.py
@@ -88,22 +88,22 @@ class TestRxTx_Offload(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "niantic",
-                "twinpond",
-                "sagepond",
-                "sageville",
-                "foxville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM",
                 "cavium_a063",
                 "cavium_a064",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -520,7 +520,7 @@ class TestRxTx_Offload(TestCase):
         capabilities = self.check_port_capability("rx")
         for capability in capabilities:
             if (
-                self.nic in ["foxville", "cavium_a063", "cavium_a064"]
+                self.nic in ["IGC-I225_LM", "cavium_a063", "cavium_a064"]
                 and capability == "sctp_cksum"
             ):
                 continue
@@ -543,7 +543,14 @@ class TestRxTx_Offload(TestCase):
         """
         # Only support ixgbe NICs
         self.verify(
-            self.nic in ["niantic", "twinpond", "sagepond", "sageville", "foxville"],
+            self.nic
+            in [
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X540T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "IXGBE_10G-X550T",
+                "IGC-I225_LM",
+            ],
             "%s nic not support rx offload setting by queue." % self.nic,
         )
         # Define the vlan packets
@@ -611,17 +618,17 @@ class TestRxTx_Offload(TestCase):
         self.dut.send_expect("set fwd txonly", "testpmd> ")
         self.dut.send_expect("set verbose 1", "testpmd> ")
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_25g",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "carlsville",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_10G-10G_BASE_T_BC",
             "cavium_a063",
             "cavium_a064",
-            "columbiaville_100g",
-            "columbiaville_25g",
+            "ICE_100G-E810C_QSFP",
+            "ICE_25G-E810C_SFP",
         ]:
             self.dut.send_expect("port stop 0", "testpmd> ")
             self.dut.send_expect(
@@ -667,15 +674,15 @@ class TestRxTx_Offload(TestCase):
         self.dut.send_expect("set fwd txonly", "testpmd> ")
         self.dut.send_expect("set verbose 1", "testpmd> ")
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_25g",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "carlsville",
-            "columbiaville_100g",
-            "columbiaville_25g",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_10G-10G_BASE_T_BC",
+            "ICE_100G-E810C_QSFP",
+            "ICE_25G-E810C_SFP",
         ]:
             self.dut.send_expect("port stop 0", "testpmd> ")
             self.dut.send_expect(
@@ -803,17 +810,17 @@ class TestRxTx_Offload(TestCase):
         """
         self.pmdout.start_testpmd("%s" % self.cores, "--rxq=4 --txq=4")
         capabilities = self.check_port_capability("tx")
-        # Disable per queue capability first, if it is FVL/Fortpark.
+        # Disable per queue capability first, if it is Intel® Ethernet 700 Series/X722.
         if self.nic in [
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_25g",
-            "fortville_spirit_single",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "carlsville",
-            "columbiaville_100g",
-            "columbiaville_25g",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_B",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "I40E_10G-10G_BASE_T_BC",
+            "ICE_100G-E810C_QSFP",
+            "ICE_25G-E810C_SFP",
         ]:
             self.dut.send_expect("port stop 0", "testpmd> ")
             self.dut.send_expect(
@@ -841,15 +848,15 @@ class TestRxTx_Offload(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "carlsville",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "columbiaville_100g",
-                "columbiaville_25g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
             ],
             "%s nic not support rx offload setting by queue." % self.nic,
         )
diff --git a/tests/TestSuite_scatter.py b/tests/TestSuite_scatter.py
index 30f883bf..7a1f22ce 100644
--- a/tests/TestSuite_scatter.py
+++ b/tests/TestSuite_scatter.py
@@ -66,24 +66,24 @@ class TestScatter(TestCase):
 
         self.pmdout = PmdOutput(self.dut)
         if self.nic in [
-            "magnolia_park",
-            "niantic",
-            "sageville",
-            "fortpark",
-            "fortville_eagle",
-            "fortville_spirit",
-            "fortville_spirit_single",
-            "fortville_25g",
+            "IXGBE_10G-X550EM_A_SFP",
+            "IXGBE_10G-82599_SFP",
+            "IXGBE_10G-X550T",
+            "I40E_10G-X722_A0",
+            "I40E_10G-SFP_XL710",
+            "I40E_40G-QSFP_A",
+            "I40E_40G-QSFP_B",
+            "I40E_25G-25G_SFP28",
             "x722_37d2",
-            "ironpond",
-            "twinpond",
-            "springfountain",
-            "fortpark_TLV",
-            "fortpark_BASE-T",
-            "sagepond",
-            "carlsville",
-            "columbiaville_25g",
-            "columbiaville_100g",
+            "IXGBE_10G-82599_T3_LOM",
+            "IXGBE_10G-X540T",
+            "IXGBE_10G-82599_SFP_SF_QP",
+            "I40E_10G-SFP_X722",
+            "I40E_10G-10G_BASE_T_X722",
+            "IXGBE_10G-X550EM_X_10G_T",
+            "I40E_10G-10G_BASE_T_BC",
+            "ICE_25G-E810C_SFP",
+            "ICE_100G-E810C_QSFP",
         ]:
             self.mbsize = 2048
         else:
diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py
index a109932a..327f7bd5 100644
--- a/tests/TestSuite_shutdown_api.py
+++ b/tests/TestSuite_shutdown_api.py
@@ -222,7 +222,7 @@ class TestShutdownApi(TestCase):
             # vlan strip default is off
             tx_bytes_exp -= 16
 
-        # fortville nic enable send lldp packet function when port setup
+        # Intel® Ethernet 700 Series nic enable send lldp packet function when port setup
         # now the tx-packets size is lldp_size(110) * n + forward packe size
         # so use (tx-packets - forward packet size) % lldp_size, if it is 0, it means forward packet size right
 
@@ -375,7 +375,7 @@ class TestShutdownApi(TestCase):
         self.dut.send_expect("stop", "testpmd> ")
         self.check_forwarding(received=False)
         self.dut.send_expect("port stop all", "testpmd> ", 100)
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
             self.check_ports(status=True)
         else:
             self.check_ports(status=False)
@@ -561,10 +561,10 @@ class TestShutdownApi(TestCase):
 
         for config in configs:
             print(config)
-            if self.nic in ["ironpond"]:
+            if self.nic in ["IXGBE_10G-82599_T3_LOM"]:
                 if config[0] != "1000" or "10000":
                     continue
-            elif self.nic in ["sagepond"]:
+            elif self.nic in ["IXGBE_10G-X550EM_X_10G_T"]:
                 if config[0] not in ["1000", "10000"]:
                     continue
             self.dut.send_expect("port stop all", "testpmd> ", 100)
@@ -726,14 +726,14 @@ class TestShutdownApi(TestCase):
             self.dut.send_expect("start", "testpmd> ")
 
             if self.nic in [
-                "magnolia_park",
-                "niantic",
-                "twinpond",
-                "kawela_4",
-                "ironpond",
-                "springfountain",
-                "sageville",
-                "sagepond",
+                "IXGBE_10G-X550EM_A_SFP",
+                "IXGBE_10G-82599_SFP",
+                "IXGBE_10G-X540T",
+                "IGB_1G-82576_QUAD_COPPER_ET2",
+                "IXGBE_10G-82599_T3_LOM",
+                "IXGBE_10G-82599_SFP_SF_QP",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
             ]:
                 # nantic vlan length will not be calculated
                 vlan_jumbo_size = jumbo_size + 4
@@ -768,7 +768,7 @@ class TestShutdownApi(TestCase):
         """
         On 1G NICs, when the jubmo frame MTU set as X, the software adjust it to (X + 4).
         """
-        if self.nic in ["kawela_4"]:
+        if self.nic in ["IGB_1G-82576_QUAD_COPPER_ET2"]:
             jumbo_size += 4
         self.check_forwarding(pktSize=jumbo_size - 1)
         self.check_forwarding(pktSize=jumbo_size)
@@ -848,9 +848,9 @@ class TestShutdownApi(TestCase):
     def test_change_thresholds(self):
         """
         Change RX/TX thresholds
-        DPDK-24129:1.CVL and FVL not support tx and rx
+        DPDK-24129:1.Intel® Ethernet 700/800 Series not support tx and rx
                    2.Ixgbe not support rx, only support tx.
-                   3.foxville, powerville and springville not support txfree and txrs
+                   3.IGC-I225_LM, IGB_1G-I350_COPPER and IGB_1G-I210_COPPER not support txfree and txrs
         """
         self.pmdout.start_testpmd(
             "Default",
@@ -860,13 +860,18 @@ class TestShutdownApi(TestCase):
         self.dut.send_expect("set promisc all off", "testpmd>")
 
         self.dut.send_expect("port stop all", "testpmd> ", 100)
-        if self.nic in ["sagepond", "sageville", "twinpond", "niantic"]:
+        if self.nic in [
+            "IXGBE_10G-X550EM_X_10G_T",
+            "IXGBE_10G-X550T",
+            "IXGBE_10G-X540T",
+            "IXGBE_10G-82599_SFP",
+        ]:
             self.dut.send_expect("port config all txfreet 32", "testpmd> ")
             self.dut.send_expect("port config all txrst 32", "testpmd> ")
         self.dut.send_expect("port config all rxfreet 32", "testpmd> ")
         self.dut.send_expect("port config all txpt 64", "testpmd> ")
         self.dut.send_expect("port config all txht 64", "testpmd> ")
-        if self.nic in ["foxville"]:
+        if self.nic in ["IGC-I225_LM"]:
             self.dut.send_expect("port config all txwt 16", "testpmd> ")
         else:
             self.dut.send_expect("port config all txwt 0", "testpmd> ")
@@ -876,7 +881,12 @@ class TestShutdownApi(TestCase):
         self.verify(
             "RX free threshold=32" in out, "RX descriptor not reconfigured properly"
         )
-        if self.nic in ["sagepond", "sageville", "twinpond", "niantic"]:
+        if self.nic in [
+            "IXGBE_10G-X550EM_X_10G_T",
+            "IXGBE_10G-X550T",
+            "IXGBE_10G-X540T",
+            "IXGBE_10G-82599_SFP",
+        ]:
             self.verify(
                 "TX free threshold=32" in out, "TX descriptor not reconfigured properly"
             )
@@ -886,7 +896,7 @@ class TestShutdownApi(TestCase):
             )
         self.verify("pthresh=64" in out, "TX descriptor not reconfigured properly")
         self.verify("hthresh=64" in out, "TX descriptor not reconfigured properly")
-        if self.nic in ["foxville"]:
+        if self.nic in ["IGC-I225_LM"]:
             self.verify("wthresh=16" in out, "TX descriptor not reconfigured properly")
         else:
             self.verify("wthresh=0" in out, "TX descriptor not reconfigured properly")
@@ -964,9 +974,9 @@ class TestShutdownApi(TestCase):
         When tx_descriptor_status is used, status can be “FULL”, “DONE” or “UNAVAILABLE.”
         """
         queue_num = 16
-        if self.nic in ["springville", "foxville"]:
+        if self.nic in ["IGB_1G-I210_COPPER", "IGC-I225_LM"]:
             queue_num = 4
-        if self.nic in ["powerville"]:
+        if self.nic in ["IGB_1G-I350_COPPER"]:
             queue_num = 8
         self.pmdout.start_testpmd(
             "Default",
diff --git a/tests/TestSuite_softnic.py b/tests/TestSuite_softnic.py
index 2015b703..a001397d 100644
--- a/tests/TestSuite_softnic.py
+++ b/tests/TestSuite_softnic.py
@@ -218,9 +218,9 @@ class TestSoftnic(TestCase):
                     % (self.eal_param, "nat_firmware.cli"),
                 )
                 if self.nic in [
-                    "columbiaville_100g",
-                    "columbiaville_25g",
-                    "columbiaville_25gx2",
+                    "ICE_100G-E810C_QSFP",
+                    "ICE_25G-E810C_SFP",
+                    "ICE_25G-E810_XXV_SFP",
                 ]:
                     self.dut.send_expect("set fwd mac", "testpmd>")
                 self.dut.send_expect("start", "testpmd>")
diff --git a/tests/TestSuite_sriov_kvm.py b/tests/TestSuite_sriov_kvm.py
index c2ce2259..48d25d9f 100644
--- a/tests/TestSuite_sriov_kvm.py
+++ b/tests/TestSuite_sriov_kvm.py
@@ -558,10 +558,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_enalbe_or_disable_one_uta_mac_on_vf(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            self.is_eth_series_nic(700) == False,
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
@@ -617,10 +617,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_add_multi_uta_mac_on_vf(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            not self.is_eth_series_nic(700),
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
@@ -657,10 +657,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_add_or_remove_uta_mac_on_vf(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            not self.is_eth_series_nic(700),
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
@@ -715,10 +715,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_pause_rx_queues(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            not self.is_eth_series_nic(700),
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
@@ -765,10 +765,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_pause_tx_queuse(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            not self.is_eth_series_nic(700),
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
@@ -810,10 +810,10 @@ class TestSriovKvm(TestCase):
 
     def test_two_vms_prevent_rx_broadcast_on_vf(self):
         self.verify(
-            self.nic.startswith("fortville") == False,
+            not self.is_eth_series_nic(700),
             "NIC is [%s], skip this case" % self.nic,
         )
-        if self.nic.startswith("fortville"):
+        if self.is_eth_series_nic(700):
             self.dut.logger.warning("NIC is [%s], skip this case" % self.nic)
             return
 
diff --git a/tests/TestSuite_testpmd_perf.py b/tests/TestSuite_testpmd_perf.py
index 6a30fd9e..684a0ba1 100644
--- a/tests/TestSuite_testpmd_perf.py
+++ b/tests/TestSuite_testpmd_perf.py
@@ -47,11 +47,11 @@ class TestPmdPerf(TestCase, PerfTestBase):
     @property
     def supported_nics(self):
         return [
-            "niantic",
-            "fortville_25g",
-            "fortville_spirit",
-            "columbiaville_100g",
-            "columbiaville_25g",
+            "IXGBE_10G-82599_SFP",
+            "I40E_25G-25G_SFP28",
+            "I40E_40G-QSFP_A",
+            "ICE_100G-E810C_QSFP",
+            "ICE_25G-E810C_SFP",
             "ConnectX5_MT4121",
             "ConnectX4_LX_MT4117",
         ]
diff --git a/tests/TestSuite_tso.py b/tests/TestSuite_tso.py
index 47a2df59..2f492741 100644
--- a/tests/TestSuite_tso.py
+++ b/tests/TestSuite_tso.py
@@ -359,10 +359,10 @@ class TestTSO(TestCase):
         )
 
         Nic_list = [
-            "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",
         ]
         save_file = "/tmp/save.pcap"
         dump_pcap = "/tmp/tcpdump_%s.pcap" % rx_interface
@@ -397,7 +397,9 @@ class TestTSO(TestCase):
             "csum set outer-ip hw %d" % self.dut_ports[0], "testpmd> ", 120
         )
         if self.nic in Nic_list:
-            self.logger.warning("Warning: fvl serise not support outer udp.")
+            self.logger.warning(
+                "Warning: Intel® Ethernet 700 Series not support outer udp."
+            )
         else:
             self.dut.send_expect(
                 "csum set outer-udp hw %d" % self.dut_ports[0], "testpmd> ", 120
@@ -416,7 +418,9 @@ class TestTSO(TestCase):
             "csum set outer-ip hw %d" % self.dut_ports[1], "testpmd> ", 120
         )
         if self.nic in Nic_list:
-            self.logger.warning("Warning: fvl serise not support outer udp.")
+            self.logger.warning(
+                "Warning: Intel® Ethernet 700 Series not support outer udp."
+            )
         else:
             self.dut.send_expect(
                 "csum set outer-udp hw %d" % self.dut_ports[1], "testpmd> ", 120
diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py
index 275b8cac..9274fe7d 100644
--- a/tests/TestSuite_uni_pkt.py
+++ b/tests/TestSuite_uni_pkt.py
@@ -98,16 +98,16 @@ class TestUniPacket(TestCase):
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "L2 packet detect only support by Fortville",
+            "L2 packet detect only support by Intel® Ethernet 700 Series",
         )
         # Change this code start for DPDK-15109, the share code doest not support TIMESYNC, once /supported then will enable
-        if "columbiaville" in self.nic:
+        if self.is_eth_series_nic(800):
             self.L2_types = {
                 "ARP": "L2_ETHER_ARP",
                 "LLDP": "L2_ETHER_LLDP",
@@ -134,25 +134,24 @@ class TestUniPacket(TestCase):
         checked that whether L3 and L4 packet can be normally detected.
         """
         if (
-            "fortville" in self.nic
-            or "fortpark_TLV" in self.nic
-            or "carlsville" in self.nic
-            or "columbiaville" in self.nic
+            self.is_eth_series_nic(700)
+            or "I40E_10G-SFP_X722" in self.nic
+            or "I40E_10G-10G_BASE_T_BC" in self.nic
+            or self.is_eth_series_nic(800)
             or "x722" in self.nic
-            or "fortpark_BASE-T" in self.nic
+            or "I40E_10G-10G_BASE_T_X722" in self.nic
         ):
             outerL4Type = "L4_NONFRAG"
             ipv4_default_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN"]
         elif (
-            "niantic" in self.nic.lower()
-            or "powerville" in self.nic.lower()
-            or "cavium" in self.nic.lower()
-            or "twinpond" in self.nic.lower()
-            or "twinville" in self.nic.lower()
-            or "sageville" in self.nic.lower()
-            or "sagepond" in self.nic.lower()
-            or "springville" in self.nic.lower()
-            or "foxville" in self.nic.lower()
+            "IXGBE_10G-82599_SFP" in self.nic
+            or "IGB_1G-I350_COPPER" in self.nic
+            or "cavium" in self.nic
+            or "IXGBE_10G-X540T" in self.nic
+            or "IXGBE_10G-X550T" in self.nic
+            or "IXGBE_10G-X550EM_X_10G_T" in self.nic
+            or "IGB_1G-I210_COPPER" in self.nic
+            or "IGC-I225_LM" in self.nic
         ):
             outerL4Type = ""
             ipv4_default_packet_type = ["L2_ETHER", "L3_IPV4"]
@@ -169,24 +168,23 @@ class TestUniPacket(TestCase):
 
         # delete the unsupported packet based on nic type
         if (
-            "fortville" in self.nic
-            or "fortpark_TLV" in self.nic
-            or "carlsville" in self.nic
-            or "columbiaville" in self.nic
+            self.is_eth_series_nic(700)
+            or "I40E_10G-SFP_X722" in self.nic
+            or "I40E_10G-10G_BASE_T_BC" in self.nic
+            or self.is_eth_series_nic(800)
             or "x722" in self.nic
-            or "fortpark_BASE-T" in self.nic
+            or "I40E_10G-10G_BASE_T_X722" in self.nic
         ):
             pktType.pop("MAC_IPihl_PKT")
             pktType.pop("MAC_IPihl_SCTP_PKT")
         elif (
-            "niantic" in self.nic.lower()
-            or "powerville" in self.nic.lower()
-            or "cavium" in self.nic.lower()
-            or "twinpond" in self.nic.lower()
-            or "twinville" in self.nic.lower()
-            or "sageville" in self.nic.lower()
-            or "sagepond" in self.nic.lower()
-            or "springville" in self.nic.lower()
+            "IXGBE_10G-82599_SFP" in self.nic
+            or "IGB_1G-I350_COPPER" in self.nic
+            or "cavium" in self.nic
+            or "IXGBE_10G-X540T" in self.nic
+            or "IXGBE_10G-X550T" in self.nic
+            or "IXGBE_10G-X550EM_X_10G_T" in self.nic
+            or "IGB_1G-I210_COPPER" in self.nic
         ):
             pktType.pop("MAC_IP_ICMP_PKT")
             pktType.pop("MAC_IPFRAG_TCP_PKT")
@@ -198,25 +196,24 @@ class TestUniPacket(TestCase):
         checked that whether IPv6 and L4 packet can be normally detected.
         """
         if (
-            "fortville" in self.nic
-            or "fortpark_TLV" in self.nic
-            or "carlsville" in self.nic
-            or "columbiaville" in self.nic
+            self.is_eth_series_nic(700)
+            or "I40E_10G-SFP_X722" in self.nic
+            or "I40E_10G-10G_BASE_T_BC" in self.nic
+            or self.is_eth_series_nic(800)
             or "x722" in self.nic
-            or "fortpark_BASE-T" in self.nic
+            or "I40E_10G-10G_BASE_T_X722" in self.nic
         ):
             outerL4Type = "L4_NONFRAG"
             ipv6_default_packet_type = ["L2_ETHER", "L3_IPV6_EXT_UNKNOWN"]
         elif (
-            "niantic" in self.nic.lower()
-            or "powerville" in self.nic.lower()
-            or "cavium" in self.nic.lower()
-            or "twinpond" in self.nic.lower()
-            or "twinville" in self.nic.lower()
-            or "sageville" in self.nic.lower()
-            or "sagepond" in self.nic.lower()
-            or "springville" in self.nic.lower()
-            or "foxville" in self.nic.lower()
+            "IXGBE_10G-82599_SFP" in self.nic
+            or "IGB_1G-I350_COPPER" in self.nic
+            or "cavium" in self.nic
+            or "IXGBE_10G-X540T" in self.nic
+            or "IXGBE_10G-X550T" in self.nic
+            or "IXGBE_10G-X550EM_X_10G_T" in self.nic
+            or "IGB_1G-I210_COPPER" in self.nic
+            or "IGC-I225_LM" in self.nic
         ):
             outerL4Type = ""
             ipv6_default_packet_type = ["L2_ETHER", "L3_IPV6"]
@@ -231,23 +228,22 @@ class TestUniPacket(TestCase):
 
         # delete the unsupported packet based on nic type
         if (
-            "fortville" in self.nic
-            or "fortpark_TLV" in self.nic
-            or "carlsville" in self.nic
-            or "columbiaville" in self.nic
+            self.is_eth_series_nic(700)
+            or "I40E_10G-SFP_X722" in self.nic
+            or "I40E_10G-10G_BASE_T_BC" in self.nic
+            or self.is_eth_series_nic(800)
             or "x722" in self.nic
-            or "fortpark_BASE-T" in self.nic
+            or "I40E_10G-10G_BASE_T_X722" in self.nic
         ):
             pktType.pop("MAC_IPv6FRAG_PKT_N")
         elif (
-            "niantic" in self.nic.lower()
-            or "powerville" in self.nic.lower()
-            or "cavium" in self.nic.lower()
-            or "twinpond" in self.nic.lower()
-            or "twinville" in self.nic.lower()
-            or "sageville" in self.nic.lower()
-            or "sagepond" in self.nic.lower()
-            or "springville" in self.nic.lower()
+            "IXGBE_10G-82599_SFP" in self.nic
+            or "IGB_1G-I350_COPPER" in self.nic
+            or "cavium" in self.nic
+            or "IXGBE_10G-X540T" in self.nic
+            or "IXGBE_10G-X550T" in self.nic
+            or "IXGBE_10G-X550EM_X_10G_T" in self.nic
+            or "IGB_1G-I210_COPPER" in self.nic
         ):
             pktType.pop("MAC_IPv6FRAG_PKT_F")
 
@@ -256,17 +252,17 @@ class TestUniPacket(TestCase):
     def test_IP_in_IPv4_tunnel(self):
         """
         checked that whether IP in IPv4 tunnel packet can be normally
-        detected by Fortville.
+        detected by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "IP in IPv4 tunnel packet type detect only support by Fortville",
+            "IP in IPv4 tunnel packet type detect only support by Intel® Ethernet 700 Series",
         )
         ipv4_in_ipv4_packet_type = [
             "L2_ETHER",
@@ -306,18 +302,18 @@ class TestUniPacket(TestCase):
         self.verify(
             self.nic
             in [
-                "columbiaville_25g",
-                "columbiaville_100g",
-                "niantic",
-                "fortville_eagle",
-                "fortville_spirit",
-                "powerville",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "carlsville",
-                "foxville",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
+                "IXGBE_10G-82599_SFP",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "IGB_1G-I350_COPPER",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-10G_BASE_T_BC",
+                "IGC-I225_LM",
             ],
             "not support %s" % self.nic,
         )
@@ -363,17 +359,17 @@ class TestUniPacket(TestCase):
     def test_IP_in_IPv6_tunnel(self):
         """
         checked that whether IP in IPv6 tunnel packet can be normally
-        detected by Fortville.
+        detected by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "IP in IPv6 tunnel packet type detect only support by Fortville",
+            "IP in IPv6 tunnel packet type detect only support by Intel® Ethernet 700 Series",
         )
         ipv4_in_ipv6_packet_type = [
             "L2_ETHER",
@@ -407,17 +403,17 @@ class TestUniPacket(TestCase):
     def test_NVGRE_tunnel(self):
         """
         checked that whether NVGRE tunnel packet can be normally detected
-        by Fortville.
+        by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "NVGRE tunnel packet type detect only support by Fortville",
+            "NVGRE tunnel packet type detect only support by Intel® Ethernet 700 Series",
         )
         nvgre_base_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_GRENAT"]
         # INNER IPV4 not with vlan
@@ -477,17 +473,17 @@ class TestUniPacket(TestCase):
     def test_NVGRE_in_IPv6_tunnel(self):
         """
         checked that whether NVGRE in IPv6 tunnel packet can be normally
-        detected by Fortville.
+        detected by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "NVGRE in IPv6 detect only support by Fortville",
+            "NVGRE in IPv6 detect only support by Intel® Ethernet 700 Series",
         )
         nvgre_base_packet_type = ["L2_ETHER", "L3_IPV6_EXT_UNKNOWN", "TUNNEL_GRENAT"]
         # INNER IPV4 not with vlan
@@ -634,17 +630,17 @@ class TestUniPacket(TestCase):
 
     def test_GRE_tunnel(self):
         """
-        checked that whether GRE tunnel packet can be normally detected by Fortville.
+        checked that whether GRE tunnel packet can be normally detected by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "GRE tunnel packet type detect only support by Fortville",
+            "GRE tunnel packet type detect only support by Intel® Ethernet 700 Series",
         )
         base_packet_type = [" L2_ETHER", " L3_IPV4_EXT_UNKNOWN", "TUNNEL_GRENAT"]
         pktType = {
@@ -666,18 +662,17 @@ class TestUniPacket(TestCase):
 
     def test_Vxlan_tunnel(self):
         """
-        checked that whether Vxlan tunnel packet can be normally detected by
-        Fortville.
+        checked that whether Vxlan tunnel packet can be normally detected by Intel® Ethernet 700 Series.
         """
         self.verify(
             (
-                "fortville" in self.nic
-                or "fortpark_TLV" in self.nic
-                or "carlsville" in self.nic
-                or "columbiaville" in self.nic
-                or "fortpark_BASE-T" in self.nic
+                self.is_eth_series_nic(700)
+                or "I40E_10G-SFP_X722" in self.nic
+                or "I40E_10G-10G_BASE_T_BC" in self.nic
+                or self.is_eth_series_nic(800)
+                or "I40E_10G-10G_BASE_T_X722" in self.nic
             ),
-            "Vxlan tunnel packet type detect only support by Fortville",
+            "Vxlan tunnel packet type detect only support by Intel® Ethernet 700 Series",
         )
 
         self.dut.send_expect("rx_vxlan_port add 4789 0", "testpmd>", 10)
@@ -735,7 +730,7 @@ class TestUniPacket(TestCase):
 
     def test_nsh(self):
         """
-        check if NSH packets can be normally detected by Fortpark and Fortville
+        check if NSH packets can be normally detected by X722 and Intel® Ethernet 700 Series
         """
         self.verify(
             self.kdriver == "i40e",
diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py
index c1818722..8a056ea2 100755
--- a/tests/TestSuite_userspace_ethtool.py
+++ b/tests/TestSuite_userspace_ethtool.py
@@ -294,10 +294,7 @@ class TestUserspaceEthtool(TestCase):
         # only detect physical link disconnect status
         verify_pass = True
         verify_msg = ""
-        if (
-            self.nic.startswith("fortville") == False
-            and self.nic.startswith("columbiaville") == False
-        ):
+        if not (self.is_eth_series_nic(700) or self.is_eth_series_nic(800)):
             # check link status dump function
             for port in self.ports:
                 tester_port = self.tester.get_local_port(port)
@@ -542,14 +539,18 @@ class TestUserspaceEthtool(TestCase):
         for index in range(len(self.ports)):
             port = self.ports[index]
             ori_rx_pkts, _ = self.strip_portstats(index)
-            # add sleep time for update link status with fortville nic
+            # add sleep time for update link status with Intel® Ethernet 700 Series nic
             time.sleep(10)
             # stop port
             self.dut.send_expect("stop %d" % index, "EthApp>")
-            # about columbiaville_25g(8086:1593),there have a kernel driver link status issue
-            # about Sageville(8086:1563),driver do not write register to set link-down
+            # about ICE_25G-E810C_SFP(8086:1593),there have a kernel driver link status issue
+            # about IXGBE_10G-X550T(8086:1563),driver do not write register to set link-down
             # so skip this step of verify status
-            if self.nic not in ["columbiaville_25g", "sageville", "columbiaville_100g"]:
+            if self.nic not in [
+                "ICE_25G-E810C_SFP",
+                "IXGBE_10G-X550T",
+                "ICE_100G-E810C_QSFP",
+            ]:
                 self.verify(
                     self.ethapp_check_link_status(index, "Down") == True,
                     "Fail to stop port{}".format(index),
@@ -584,11 +585,11 @@ class TestUserspaceEthtool(TestCase):
         mtus = [1519, 2048]
         mtu_threshold = 2022
         offset = 0
-        if self.nic in ["powerville", "springville", "foxville"]:
+        if self.nic in ["IGB_1G-I350_COPPER", "IGB_1G-I210_COPPER", "IGC-I225_LM"]:
             mtu_threshold = 2026
             offset = 4
         # RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + ICE_VLAN_TAG_SIZE * 2
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
             offset = 8
         for index in range(len(self.ports)):
             port = self.ports[index]
@@ -598,20 +599,24 @@ class TestUserspaceEthtool(TestCase):
             ori_mtu = self.strip_mtu(intf)
             self.tester.send_expect("ifconfig %s mtu 9000" % (intf), "# ")
             for mtu in mtus:
-                # cvl should stop port before set mtu
-                if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+                # Intel® Ethernet 800 Series should stop port before set mtu
+                if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
                     self.dut.send_expect("stop %s" % index, "EthApp>")
 
                 # The mtu threshold is 2022,When it is greater than 2022, the open/stop port is required.
                 if mtu > mtu_threshold:
-                    if self.nic in ["powerville", "springville", "foxville"]:
+                    if self.nic in [
+                        "IGB_1G-I350_COPPER",
+                        "IGB_1G-I210_COPPER",
+                        "IGC-I225_LM",
+                    ]:
                         mtu = mtu_threshold
                     self.dut.send_expect("stop %s" % index, "EthApp>")
                     self.dut.send_expect("mtu %d %d" % (index, mtu), "EthApp>")
                     self.dut.send_expect("open %s" % index, "EthApp>")
                 self.dut.send_expect("mtu %d %d" % (index, mtu), "EthApp>")
 
-                if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
+                if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
                     self.dut.send_expect("open %s" % index, "EthApp>")
 
                 time.sleep(5)
diff --git a/tests/TestSuite_veb_switch.py b/tests/TestSuite_veb_switch.py
index 7b91fee3..51f9b53c 100644
--- a/tests/TestSuite_veb_switch.py
+++ b/tests/TestSuite_veb_switch.py
@@ -164,13 +164,13 @@ class TestVEBSwitching(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "carlsville",
-                "columbiaville_100g",
-                "columbiaville_25g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
diff --git a/tests/TestSuite_vf_interrupt_pmd.py b/tests/TestSuite_vf_interrupt_pmd.py
index d0b02b12..2877911d 100644
--- a/tests/TestSuite_vf_interrupt_pmd.py
+++ b/tests/TestSuite_vf_interrupt_pmd.py
@@ -347,13 +347,13 @@ class TestVfInterruptPmd(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s nic port not support vf multi-queues interrupt" % str(self.nic),
         )
@@ -392,13 +392,13 @@ class TestVfInterruptPmd(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_25g",
-                "fortville_spirit_single",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_25G-25G_SFP28",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s nic port not support vf multi-queues interrupt" % str(self.nic),
         )
diff --git a/tests/TestSuite_vf_kernel.py b/tests/TestSuite_vf_kernel.py
index b30b60b2..1a1cb24f 100755
--- a/tests/TestSuite_vf_kernel.py
+++ b/tests/TestSuite_vf_kernel.py
@@ -163,7 +163,7 @@ class TestVfKernel(TestCase):
             if self.vm1_dut is None:
                 raise Exception("Set up VM1 ENV failed!")
             else:
-                # fortville: PF not up ,vf will not get interface
+                # Intel® Ethernet 700 Series: PF not up ,vf will not get interface
                 self.verify(
                     self.vm1_dut.ports_info[0]["intf"] != "N/A", "Not interface"
                 )
@@ -484,7 +484,7 @@ class TestVfKernel(TestCase):
 
         # Send packet from tester to VF MAC with not-matching vlan id, check
         # the packet can't be received at the vlan device
-        # fortville nic need add -p parameter to disable promisc mode
+        # Intel® Ethernet 700 Series nic need add -p parameter to disable promisc mode
         wrong_vlan = vlan_ids % 4095 + 1
         self.verify(
             self.verify_vm_tcpdump(
@@ -512,7 +512,7 @@ class TestVfKernel(TestCase):
         self.vm0_dut.send_expect("vconfig rem %s.%s" % (self.vm0_intf1, vlan_ids), "#")
         out = self.vm0_dut.send_expect("ls /proc/net/vlan/ ", "#")
         self.verify("%s.%s" % (self.vm0_intf1, vlan_ids) not in out, "vlan error")
-        # behavior is different between niantic and fortville ,because of kernel
+        # behavior is different between 82599 and 700 Series ,because of kernel
         # driver
         self.verify(
             self.verify_vm_tcpdump(
@@ -665,7 +665,9 @@ class TestVfKernel(TestCase):
         """
         verify Enable/disable promisc mode
         """
-        self.verify(self.nic not in ["niantic"], "%s NIC not support" % self.nic)
+        self.verify(
+            self.nic not in ["IXGBE_10G-82599_SFP"], "%s NIC not support" % self.nic
+        )
         wrong_mac = "01:02:03:04:05:06"
         # Set up kernel VF tcpdump with -p parameter, which means disable promisc
         # Start DPDK PF, enable promisc mode, set rxonly forwarding
@@ -755,7 +757,10 @@ class TestVfKernel(TestCase):
         """
         verify kernel VF each queue can receive packets
         """
-        self.verify(self.nic not in ["niantic"], "%s NIC not support tcpid " % self.nic)
+        self.verify(
+            self.nic not in ["IXGBE_10G-82599_SFP"],
+            "%s NIC not support tcpid " % self.nic,
+        )
 
         # Verify kernel VF RSS using ethtool -"l" (lower case L) <devx> that the
         # default RSS setting is equal to the number of CPUs in the system and
diff --git a/tests/TestSuite_vf_l3fwd.py b/tests/TestSuite_vf_l3fwd.py
index 492349df..a0487cb3 100644
--- a/tests/TestSuite_vf_l3fwd.py
+++ b/tests/TestSuite_vf_l3fwd.py
@@ -282,8 +282,8 @@ class TestVfL3fwd(TestCase):
             eal_param += " -a " + self.sriov_vfs_port[i][0].pci
         port_mask = utils.create_mask(self.dut_ports)
 
-        # for fvl40g, fvl25g, use 2c/2q per VF port for performance test ,
-        # for fvl10g, nnt, use 1c/1q per VF port for performance test
+        # for IIntel® Ethernet 700 Series: XL710, XXV710, use 2c/2q per VF port for performance test ,
+        # for IIntel® Ethernet 700 Series: X710, 82599/500 Series, use 1c/1q per VF port for performance test
         core_list = self.cores[-len(valports) * self.queue :]
         core_mask = utils.create_mask(core_list)
         self.logger.info("Executing Test Using cores: %s" % core_list)
@@ -321,7 +321,7 @@ class TestVfL3fwd(TestCase):
         for idx in self.dut_ports:
             self.verify(
                 self.dut.ports_info[idx]["port"].default_driver != "ice",
-                "Columbiaville do not support generate vfs from igb_uio",
+                "Intel® Ethernet 800 Series do not support generate vfs from igb_uio",
             )
 
         self.set_rxtx_descriptor_2048_and_rebuild_l3fwd()
@@ -335,13 +335,14 @@ class TestVfL3fwd(TestCase):
 
     def test_perf_kernel_pf_dpdk_iavf_perf_host_only(self):
         """
-        Need to change dpdk code to test FVL iavf.
-        CVL iavf testing is same as FVL VF, so use dpdk_pf_dpdk_vf_perf_host_only to test CVL iavf
+        Need to change dpdk code to test Intel® Ethernet 700 Series iavf.
+        Intel® Ethernet 800 Series iavf testing is same as Intel® Ethernet 700 Series VF,
+        so use dpdk_pf_dpdk_vf_perf_host_only to test Intel® Ethernet 800 Series iavf
         """
         for idx in self.dut_ports:
             self.verify(
                 self.dut.ports_info[idx]["port"].default_driver == "i40e",
-                "The case is only designed for Fortville",
+                "The case is only designed for Intel® Ethernet 700 Series",
             )
 
         self.set_rxtx_descriptor_2048_and_rebuild_l3fwd()
diff --git a/tests/TestSuite_vf_macfilter.py b/tests/TestSuite_vf_macfilter.py
index 5351cb68..02cd81db 100644
--- a/tests/TestSuite_vf_macfilter.py
+++ b/tests/TestSuite_vf_macfilter.py
@@ -97,7 +97,12 @@ class TestVfMacFilter(TestCase):
             if driver == "igb_uio":
                 # start testpmd without the two VFs on the host
                 self.host_testpmd = PmdOutput(self.dut)
-                if self.nic in ["niantic", "sageville", "sagepond", "twinpond"]:
+                if self.nic in [
+                    "IXGBE_10G-82599_SFP",
+                    "IXGBE_10G-X550T",
+                    "IXGBE_10G-X550EM_X_10G_T",
+                    "IXGBE_10G-X540T",
+                ]:
                     self.host_testpmd.start_testpmd("1S/9C/1T", "--txq=4 --rxq=4 ")
                 else:
                     self.host_testpmd.start_testpmd("1S/2C/2T")
@@ -236,14 +241,14 @@ class TestVfMacFilter(TestCase):
         What's more, send packets with a wrong MAC address to the VF, check
         the VF will not RX packets.
         """
-        if "niantic" == self.nic:
+        if "IXGBE_10G-82599_SFP" == self.nic:
             self.verify(
-                self.nic.startswith("niantic") == True,
+                self.nic.startswith("IXGBE_10G-82599_SFP") == True,
                 "NIC is [%s], skip this case" % self.nic,
             )
         else:
             self.verify(
-                self.nic.startswith("fortville") == True,
+                self.is_eth_series_nic(700),
                 "NIC is [%s], skip this case" % self.nic,
             )
         self.setup_2pf_2vf_1vm_env(False, driver="igb_uio")
diff --git a/tests/TestSuite_vf_packet_rxtx.py b/tests/TestSuite_vf_packet_rxtx.py
index ea000c83..ab5d5d65 100644
--- a/tests/TestSuite_vf_packet_rxtx.py
+++ b/tests/TestSuite_vf_packet_rxtx.py
@@ -92,7 +92,12 @@ class TestVfPacketRxtx(TestCase):
             if driver == "igb_uio":
                 # start testpmd without the two VFs on the host
                 self.host_testpmd = PmdOutput(self.dut)
-                if self.nic in ["niantic", "sageville", "sagepond", "twinpond"]:
+                if self.nic in [
+                    "IXGBE_10G-82599_SFP",
+                    "IXGBE_10G-X550T",
+                    "IXGBE_10G-X550EM_X_10G_T",
+                    "IXGBE_10G-X540T",
+                ]:
                     self.host_testpmd.start_testpmd("1S/9C/1T", "--txq=4 --rxq=4 ")
                 else:
                     self.host_testpmd.start_testpmd("1S/5C/1T")
@@ -215,7 +220,12 @@ class TestVfPacketRxtx(TestCase):
 
             if driver == "igb_uio":
                 self.host_testpmd = PmdOutput(self.dut)
-                if self.nic in ["niantic", "sageville", "sagepond", "twinpond"]:
+                if self.nic in [
+                    "IXGBE_10G-82599_SFP",
+                    "IXGBE_10G-X550T",
+                    "IXGBE_10G-X550EM_X_10G_T",
+                    "IXGBE_10G-X540T",
+                ]:
                     self.host_testpmd.start_testpmd("1S/9C/1T", "--txq=4 --rxq=4 ")
                 else:
                     self.host_testpmd.start_testpmd("1S/2C/2T")
diff --git a/tests/TestSuite_vf_rss.py b/tests/TestSuite_vf_rss.py
index b8bf65a5..65995df1 100644
--- a/tests/TestSuite_vf_rss.py
+++ b/tests/TestSuite_vf_rss.py
@@ -248,7 +248,7 @@ class TestVfRss(TestCase):
             if (
                 self.kdriver == "i40e"
                 or self.kdriver == "ice"
-                or self.nic in ["sageville", "sagepond"]
+                or self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]
             ):
                 # compute the hash result of five tuple into the 7 LSBs value.
                 hash_index = int(tmp_reta_line["RSS hash"], 16) % 64
@@ -285,17 +285,17 @@ class TestVfRss(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "fortville_25g",
-                "sageville",
-                "sagepond",
-                "fortpark_TLV",
-                "fortpark_BASE-T",
-                "carlsville",
-                "columbiaville_25g",
-                "columbiaville_100g",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_25G-25G_SFP28",
+                "IXGBE_10G-X550T",
+                "IXGBE_10G-X550EM_X_10G_T",
+                "I40E_10G-SFP_X722",
+                "I40E_10G-10G_BASE_T_X722",
+                "I40E_10G-10G_BASE_T_BC",
+                "ICE_25G-E810C_SFP",
+                "ICE_100G-E810C_QSFP",
             ],
             "NIC Unsupported: " + str(self.nic),
         )
@@ -425,11 +425,14 @@ class TestVfRss(TestCase):
                 if (
                     self.kdriver == "i40e"
                     or self.kdriver == "ice"
-                    or self.nic in ["sageville", "sagepond"]
+                    or self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]
                 ):
-                    if self.nic in ["sageville", "sagepond"] and rss_type == "sctp":
+                    if (
+                        self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]
+                        and rss_type == "sctp"
+                    ):
                         self.logger.info(
-                            "sageville and sagepond do not support rsstype sctp"
+                            "IXGBE_10G-X550T and IXGBE_10G-X550EM_X_10G_T do not support rsstype sctp"
                         )
                         continue
                     for i in range(64):
@@ -488,9 +491,12 @@ class TestVfRss(TestCase):
             for iptype, rsstype in list(iptypes.items()):
                 self.vm_dut_0.send_expect("set verbose 8", "testpmd> ")
                 self.vm_dut_0.send_expect("set fwd rxonly", "testpmd> ")
-                if self.nic in ["sageville", "sagepond"] and rsstype == "sctp":
+                if (
+                    self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]
+                    and rsstype == "sctp"
+                ):
                     self.logger.info(
-                        "sageville and sagepond do not support rsstype sctp"
+                        "IXGBE_10G-X550T and IXGBE_10G-X550EM_X_10G_T do not support rsstype sctp"
                     )
                     continue
                 out = self.vm_dut_0.send_expect(
diff --git a/tests/TestSuite_vf_single_core_perf.py b/tests/TestSuite_vf_single_core_perf.py
index ef4c54ae..7f611ae7 100644
--- a/tests/TestSuite_vf_single_core_perf.py
+++ b/tests/TestSuite_vf_single_core_perf.py
@@ -274,14 +274,14 @@ class TestVfSingleCorePerf(TestCase):
 
             nb_cores = thread_num
 
-            # fortville has to use 2 queues at least to get the best performance
-            if self.nic in ["fortville_25g", "fortville_spirit"] or thread_num == 2:
+            # Intel® Ethernet 700 Series has to use 2 queues at least to get the best performance
+            if self.nic in ["I40E_25G-25G_SFP28", "I40E_40G-QSFP_A"] or thread_num == 2:
                 param += " --rxq=2 --txq=2"
-            # columbiaville use one queue per port for best performance.
+            # Intel® Ethernet 800 Series use one queue per port for best performance.
             elif self.nic in [
-                "columbiaville_100g",
-                "columbiaville_25g",
-                "columbiaville_25gx2",
+                "ICE_100G-E810C_QSFP",
+                "ICE_25G-E810C_SFP",
+                "ICE_25G-E810_XXV_SFP",
             ]:
                 param += " --rxq=1 --txq=1"
                 # workaround for that testpmd can't forward packets in io forward mode
diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py
index d4cf29b3..91f065bc 100644
--- a/tests/TestSuite_vf_vlan.py
+++ b/tests/TestSuite_vf_vlan.py
@@ -89,7 +89,7 @@ class TestVfVlan(TestCase):
         self.host_intf0 = self.dut.ports_info[self.used_dut_port_0]["intf"]
         tester_port = self.tester.get_local_port(self.used_dut_port_0)
         self.tester_intf0 = self.tester.get_interface(tester_port)
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s on" % (self.host_intf0, self.flag), "# "
             )
@@ -106,7 +106,7 @@ class TestVfVlan(TestCase):
 
         self.used_dut_port_1 = self.dut_ports[1]
         self.host_intf1 = self.dut.ports_info[self.used_dut_port_1]["intf"]
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s on" % (self.host_intf1, self.flag), "# "
             )
@@ -305,7 +305,7 @@ class TestVfVlan(TestCase):
         self.vm0_testpmd.execute_cmd("set verbose 1")
 
         for tx_vlan in tx_vlans:
-            # for fortville ,
+            # for Intel® Ethernet 700 Series ,
             # if you want insert tx_vlan,
             # please enable rx_vlan at the same time
             if self.kdriver == "i40e" or self.kdriver == "ice":
@@ -442,7 +442,7 @@ class TestVfVlan(TestCase):
 
     def tear_down_all(self):
         self.destroy_vm_env()
-        if self.nic.startswith("columbiaville") and self.default_stats:
+        if self.is_eth_series_nic(800) and self.default_stats:
             self.dut.send_expect(
                 "ethtool --set-priv-flags %s %s %s"
                 % (self.host_intf0, self.flag, self.default_stats),
diff --git a/tests/TestSuite_vlan_ethertype_config.py b/tests/TestSuite_vlan_ethertype_config.py
index f0f24182..ce7f1c7b 100644
--- a/tests/TestSuite_vlan_ethertype_config.py
+++ b/tests/TestSuite_vlan_ethertype_config.py
@@ -305,7 +305,7 @@ class TestVlanEthertypeConfig(TestCase):
         self.dut.send_expect("start", "testpmd> ")
 
         # caium_a063 card support only default '0x8100' tpid in rx mode
-        if self.nic in ["cavium_a063", "cavium_a064", "foxville"]:
+        if self.nic in ["cavium_a063", "cavium_a064", "IGC-I225_LM"]:
             tpids = [0x8100]
         else:
             tpids = [0x8100, 0xA100]
@@ -347,10 +347,10 @@ class TestVlanEthertypeConfig(TestCase):
         self.verify(
             self.nic
             in [
-                "fortville_eagle",
-                "fortville_spirit",
-                "fortville_spirit_single",
-                "carlsville",
+                "I40E_10G-SFP_XL710",
+                "I40E_40G-QSFP_A",
+                "I40E_40G-QSFP_B",
+                "I40E_10G-10G_BASE_T_BC",
             ],
             "%s NIC not support QinQ " % self.nic,
         )
diff --git a/tests/TestSuite_vmdq.py b/tests/TestSuite_vmdq.py
index aa02bbcf..ab8869ff 100644
--- a/tests/TestSuite_vmdq.py
+++ b/tests/TestSuite_vmdq.py
@@ -71,12 +71,12 @@ class TestVmdq(TestCase):
         self.core_configs.append({"cores": "1S/4C/1T", "mpps": {}})
 
         # Put different number of pools: in the case of 10G 82599 Nic is 64, in the case
-        # of FVL spirit is 63,in case of FVL eagle is 34.
-        if self.nic in ("niantic", "springfountain"):
+        # of XL710 is 63,in case of X710 is 34.
+        if self.nic in ("IXGBE_10G-82599_SFP", "IXGBE_10G-82599_SFP_SF_QP"):
             self.pools = 64
-        elif self.nic in ("fortville_spirit", "fortville_spirit_single"):
+        elif self.nic in ("I40E_40G-QSFP_A", "I40E_40G-QSFP_B"):
             self.pools = 63
-        elif self.nic in ("fortville_eagle"):
+        elif self.nic in ("I40E_10G-SFP_XL710"):
             self.pools = 34
         else:
             self.pools = 8
diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py
index 9b547a99..9bf8b739 100644
--- a/tests/TestSuite_vxlan.py
+++ b/tests/TestSuite_vxlan.py
@@ -290,21 +290,21 @@ class TestVxlan(TestCase):
         """
         vxlan Prerequisites
         """
-        # this feature only enable in FVL now
+        # this feature only enable in Intel® Ethernet 700 Series now
         if self.nic in [
-            "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",
         ]:
             self.compile_switch = "CONFIG_RTE_LIBRTE_I40E_INC_VECTOR"
-        elif self.nic in ["sageville", "sagepond"]:
+        elif self.nic in ["IXGBE_10G-X550T", "IXGBE_10G-X550EM_X_10G_T"]:
             self.compile_switch = "CONFIG_RTE_IXGBE_INC_VECTOR"
-        elif self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        elif self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 700 Series support default none VECTOR")
         else:
             self.verify(False, "%s not support this vxlan" % self.nic)
         # Based on h/w type, choose how many ports to use
@@ -705,8 +705,8 @@ class TestVxlan(TestCase):
         """
         verify vxlan packet detection
         """
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 700 Series support default none VECTOR")
             src_vec_model = "n"
         self.eal_para = self.dut.create_eal_parameters(
             cores="1S/5C/1T", socket=self.ports_socket
@@ -744,8 +744,8 @@ class TestVxlan(TestCase):
         """
         verify vxlan packet detection with ipv6 header
         """
-        if self.nic in ["columbiaville_25g", "columbiaville_100g"]:
-            print("CVL support default none VECTOR")
+        if self.nic in ["ICE_25G-E810C_SFP", "ICE_100G-E810C_QSFP"]:
+            print("Intel® Ethernet 700 Series support default none VECTOR")
             src_vec_model = "n"
 
         self.eal_para = self.dut.create_eal_parameters(
diff --git a/tests/TestSuite_vxlan_gpe_support_in_i40e.py b/tests/TestSuite_vxlan_gpe_support_in_i40e.py
index b5b129a8..e9753c86 100644
--- a/tests/TestSuite_vxlan_gpe_support_in_i40e.py
+++ b/tests/TestSuite_vxlan_gpe_support_in_i40e.py
@@ -132,13 +132,13 @@ class TestVxlanGpeSupportInI40e(TestCase):
         """
         vxlan Prerequisites
         """
-        # this feature only enable in FVL now
+        # this feature only enable in Intel® Ethernet 700 Series now
         if self.nic not in [
-            "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",
         ]:
             self.verify(False, "%s not support this vxlan-gpe" % self.nic)
         # Based on h/w type, choose how many ports to use
diff --git a/tests/flexible_common.py b/tests/flexible_common.py
index 9d032c8e..35d4d38f 100644
--- a/tests/flexible_common.py
+++ b/tests/flexible_common.py
@@ -60,7 +60,7 @@ class FlexibleRxdBase(object):
 
     def __get_port_option(self, flex_opt="", queue_num=None):
         nb_core = 2
-        num = 4 if self.nic == "foxville" or self.__is_iavf else 32
+        num = 4 if self.nic == "IGC-I225_LM" or self.__is_iavf else 32
         queue_num = queue_num if queue_num else num
         # port option
         port_option = ("{queue} " "--portmask=0x1 " "--nb-cores={nb_core}").format(
diff --git a/tests/perf_test_base.py b/tests/perf_test_base.py
index 5f80a9d8..fb4f123a 100644
--- a/tests/perf_test_base.py
+++ b/tests/perf_test_base.py
@@ -58,13 +58,13 @@ from framework.utils import convert_int2ip, convert_ip2int
 
 VF_L3FWD_NIC_SUPPORT = frozenset(
     (
-        "niantic",
-        "fortville_spirit",
-        "fortville_25g",
-        "fortville_eagle",
-        "columbiaville_100g",
-        "columbiaville_25g",
-        "columbiaville_25gx2",
+        "IXGBE_10G-82599_SFP",
+        "I40E_40G-QSFP_A",
+        "I40E_25G-25G_SFP28",
+        "I40E_10G-SFP_XL710",
+        "ICE_100G-E810C_QSFP",
+        "ICE_25G-E810C_SFP",
+        "ICE_25G-E810_XXV_SFP",
     )
 )
 
@@ -367,7 +367,8 @@ class PerfTestBase(object):
             }
         else:
             if self.__bin_type is BIN_TYPE.PMD and self.kdriver == "ice":
-                # testpmd can't use port real mac address to create traffic packet when use CVL nics.
+                # testpmd can't use port real mac address to create traffic
+                # packet when use Intel® Ethernet 800 Series nics.
                 dmacs = [
                     "52:00:00:00:00:00",
                     "52:00:00:00:00:01",
@@ -874,10 +875,10 @@ class PerfTestBase(object):
             }
         )
         suppored_nics = [
-            "niantic",
-            "columbiaville_100g",
-            "columbiaville_25g",
-            "columbiaville_25gx2",
+            "IXGBE_10G-82599_SFP",
+            "ICE_100G-E810C_QSFP",
+            "ICE_25G-E810C_SFP",
+            "ICE_25G-E810_XXV_SFP",
         ]
         if self.__rxtx_queue_size:
             command_line += " --rx-queue-size {rxtx} --tx-queue-size {rxtx}".format(
diff --git a/tests/rte_flow_common.py b/tests/rte_flow_common.py
index 98b07905..45446521 100644
--- a/tests/rte_flow_common.py
+++ b/tests/rte_flow_common.py
@@ -36,7 +36,7 @@ import time
 from framework.packet import Packet
 from framework.utils import GREEN, RED
 
-CVL_TXQ_RXQ_NUMBER = 16
+TXQ_RXQ_NUMBER = 16
 
 # switch filter common functions
 def get_suite_config(test_case):
@@ -502,7 +502,7 @@ def check_mark(out, pkt_num, check_param, stats=True):
                 raise Exception("got wrong output, not match pattern %s" % p.pattern)
             if mark_id is not None:
                 mark_list = set(
-                    int(i, CVL_TXQ_RXQ_NUMBER) for i in fdir_scanner.findall(out)
+                    int(i, TXQ_RXQ_NUMBER) for i in fdir_scanner.findall(out)
                 )
                 verify(
                     all([i == check_param["mark_id"] for i in mark_list]) and mark_list,
@@ -529,12 +529,12 @@ def check_mark(out, pkt_num, check_param, stats=True):
 def verify_directed_by_rss(out, rxq=64, stats=True):
     p = re.compile("RSS\shash=(\w+)\s-\sRSS\squeue=(\w+)")
     pkt_info = p.findall(out)
-    pkt_queue = set([int(i[1], CVL_TXQ_RXQ_NUMBER) for i in pkt_info])
+    pkt_queue = set([int(i[1], TXQ_RXQ_NUMBER) for i in pkt_info])
     if stats:
         verify(
             all(
                 [
-                    int(i[0], CVL_TXQ_RXQ_NUMBER) % rxq == int(i[1], CVL_TXQ_RXQ_NUMBER)
+                    int(i[0], TXQ_RXQ_NUMBER) % rxq == int(i[1], TXQ_RXQ_NUMBER)
                     for i in pkt_info
                 ]
             ),
@@ -544,7 +544,7 @@ def verify_directed_by_rss(out, rxq=64, stats=True):
         verify(
             not any(
                 [
-                    int(i[0], CVL_TXQ_RXQ_NUMBER) % rxq == int(i[1], CVL_TXQ_RXQ_NUMBER)
+                    int(i[0], TXQ_RXQ_NUMBER) % rxq == int(i[1], TXQ_RXQ_NUMBER)
                     for i in pkt_info
                 ]
             ),
@@ -590,14 +590,10 @@ def check_iavf_fdir_queue(out, pkt_num, check_param, stats=True):
                 raise Exception("wrong queue value, expect int or list")
         else:
             if isinstance(queue, int):
-                verify_iavf_fdir_directed_by_rss(
-                    out, rxq=CVL_TXQ_RXQ_NUMBER, stats=True
-                )
+                verify_iavf_fdir_directed_by_rss(out, rxq=TXQ_RXQ_NUMBER, stats=True)
                 print((GREEN("pass: queue id %s not matched" % res_queue)))
             elif isinstance(queue, list):
-                verify_iavf_fdir_directed_by_rss(
-                    out, rxq=CVL_TXQ_RXQ_NUMBER, stats=True
-                )
+                verify_iavf_fdir_directed_by_rss(out, rxq=TXQ_RXQ_NUMBER, stats=True)
                 print((GREEN("pass: queue id %s not matched" % res_queue)))
             else:
                 raise Exception("wrong action value, expect queue_index or queue_group")
@@ -605,13 +601,13 @@ def check_iavf_fdir_queue(out, pkt_num, check_param, stats=True):
         raise Exception("got wrong output, not match pattern %s" % p.pattern)
 
 
-def verify_iavf_fdir_directed_by_rss(out, rxq=CVL_TXQ_RXQ_NUMBER, stats=True):
+def verify_iavf_fdir_directed_by_rss(out, rxq=TXQ_RXQ_NUMBER, stats=True):
     p = re.compile("RSS hash=(0x\w+) - RSS queue=(0x\w+)")
     pkt_info = p.findall(out)
     if stats:
         for i in pkt_info:
             verify(
-                (int(i[0], CVL_TXQ_RXQ_NUMBER) % rxq == int(i[1], CVL_TXQ_RXQ_NUMBER)),
+                (int(i[0], TXQ_RXQ_NUMBER) % rxq == int(i[1], TXQ_RXQ_NUMBER)),
                 "some packets are not directed by RSS",
             )
             print(
@@ -623,7 +619,7 @@ def verify_iavf_fdir_directed_by_rss(out, rxq=CVL_TXQ_RXQ_NUMBER, stats=True):
     else:
         for i in pkt_info:
             verify(
-                (int(i[0], CVL_TXQ_RXQ_NUMBER) % rxq != int(i[1], CVL_TXQ_RXQ_NUMBER)),
+                (int(i[0], TXQ_RXQ_NUMBER) % rxq != int(i[1], TXQ_RXQ_NUMBER)),
                 "some packets are not directed by RSS",
             )
 
@@ -645,7 +641,7 @@ def check_iavf_fdir_passthru(out, pkt_num, check_param, stats=True):
         "fail: got wrong number of passthru packets, expect passthru packet number %s, got %s."
         % (pkt_num, len(pkt_hash)),
     )
-    verify_iavf_fdir_directed_by_rss(out, rxq=CVL_TXQ_RXQ_NUMBER, stats=True)
+    verify_iavf_fdir_directed_by_rss(out, rxq=TXQ_RXQ_NUMBER, stats=True)
 
 
 def check_iavf_fdir_mark(out, pkt_num, check_param, stats=True):
@@ -662,7 +658,7 @@ def check_iavf_fdir_mark(out, pkt_num, check_param, stats=True):
             verify(len(res) == pkt_num, "get wrong number of packet with mark_id")
             if isinstance(check_param.get("mark_id"), list):
                 result = [
-                    int(m, CVL_TXQ_RXQ_NUMBER) in check_param.get("mark_id")
+                    int(m, TXQ_RXQ_NUMBER) in check_param.get("mark_id")
                     for m in mark_list
                 ]
                 verify(
@@ -672,10 +668,7 @@ def check_iavf_fdir_mark(out, pkt_num, check_param, stats=True):
             elif isinstance(check_param.get("mark_id"), int):
                 verify(
                     all(
-                        [
-                            int(i, CVL_TXQ_RXQ_NUMBER) == check_param["mark_id"]
-                            for i in res
-                        ]
+                        [int(i, TXQ_RXQ_NUMBER) == check_param["mark_id"] for i in res]
                     ),
                     "failed: some packet mark id of %s not match" % mark_list,
                 )
@@ -818,7 +811,7 @@ def check_iavf_packets_rss_queue(out, count, rss_match=True):
                 packet_sumnum = packet_sumnum + int(packet_num)
 
     if rss_match:
-        if queue_flag == CVL_TXQ_RXQ_NUMBER and packet_sumnum == count:
+        if queue_flag == TXQ_RXQ_NUMBER and packet_sumnum == count:
             log_msg = "Packets has send to %s queues" % queue_flag
             return True, log_msg
         else:
-- 
2.25.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [dts] [6/6] tests/*: replace codename in test suites
  2022-05-10  9:54 ` [dts] [6/6] tests/*: replace codename in test suites Jun Dong
@ 2022-05-12  5:05   ` lijuan.tu
  0 siblings, 0 replies; 8+ messages in thread
From: lijuan.tu @ 2022-05-12  5:05 UTC (permalink / raw)
  To: dts, Jun Dong; +Cc: lijuan.tu, qingx.sun, junx.dong

On Tue, 10 May 2022 17:54:31 +0800, Jun Dong <junx.dong@intel.com> wrote:
> Signed-off-by: Jun Dong <junx.dong@intel.com>

Reviewed-by: Lijuan Tu <lijuan.tu@intel.com>
Series applied, thanks

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-05-12  5:05 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-10  9:54 [dts] [0/6] modify about codename replacement Jun Dong
2022-05-10  9:54 ` [dts] [1/6] conf/*: replace codename in configuration in conf directory Jun Dong
2022-05-10  9:54 ` [dts] [2/6] doc/*: replace codename in doc Jun Dong
2022-05-10  9:54 ` [dts] [3/6] executions/*: replace codename in executeion configurations Jun Dong
2022-05-10  9:54 ` [dts] [4/6] framework/*: replace codename in framework Jun Dong
2022-05-10  9:54 ` [dts] [5/6] test_plans/*: replace codename in test plans Jun Dong
2022-05-10  9:54 ` [dts] [6/6] tests/*: replace codename in test suites Jun Dong
2022-05-12  5:05   ` lijuan.tu

test suite reviews and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.dpdk.org/dts/0 dts/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dts dts/ http://inbox.dpdk.org/dts \
		dts@dpdk.org
	public-inbox-index dts

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dts


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git