[202412] Code sync sonic-net/sonic-mgmt:202411 => 202412 (sonic-net#522)

Code sync sonic-net/sonic-mgmt:202411 => 202412

```
*   3124d52 (HEAD -> code-sync-202412, origin/code-sync-202412) r12f 250710:1626 - Merge remote-tracking branch 'base/202411' into code-sync-202412
|\
| * b1b95dc (base/202411) zitingguo-ms 250513:1848 - Fix PortChannel name matching in verify_attr_change to handle leading spaces (sonic-net#18301)
| * 7461bf3 wrideout-arista 250604:1542 - Determine if the eos switch is running in multiagent mode, and stop/start the (sonic-net#18748)
| * 4346afd Dashuai Zhang 250411:0103 - update d18u8s4 PT0 ASN to 4 bytes (sonic-net#17888)
| * de1b1b4 Ryangwaite 250709:1028 - Skip multi-hop upgrade tests on non-T0 testbeds (sonic-net#19078) (sonic-net#19326)
| * 573d42d Cong Hou 250709:0232 - Update the skip for test test_qos_dscp_mapping.py (sonic-net#19381)
| * 3eb65b9 Yawen 250708:1743 - Unskip test_qos_sai for dualtor-aa-64-breakout (sonic-net#19363)
| * f0c9705 Cong Hou 250707:2351 - xfail generic hash test on dualtor (sonic-net#19383)
| * d378110 eyakubch 250707:0546 - Reduce flakiness of test_l2_configure.py. (sonic-net#18831)
| * 043dba8 ShiyanWangMS 250703:0935 - Fix the ignore pattern - leapsecond file expired warning (sonic-net#19332)
| * 92af38f zitingguo-ms 250703:1958 - Unskip testQosSaiHeadroomPoolWatermark on t0-d18u8s4 (sonic-net#19287) (sonic-net#19342)
| * 0b7e4de Chuan Wu 250704:0334 - Add background traffic for test_pfc_pause_extra_lossless test (sonic-net#19218)
```

Author: r12f

ansible/roles/test/files/tools/loganalyzer/loganalyzer_common_ignore.txt

@@ -306,7 +306,7 @@ r, ".* ERR swss#orchagent:.*doAppSwitchTableTask.*Unsupported Attribute lag_hash
 r, ".* ERR syncd\d*#syncd.*SAI_API_BUFFER.*Unsupported buffer pool.*"
 
 # ignore leap second file NTP daemon (ntpd) is using has passed its expiration date
-r, ".* ERR ntpd\[\d*\]:.*leapsecond file ('/usr/share/zoneinfo/leap-seconds.list'): expired.*"
+r, ".* ERR ntpd\[\d*\]:.*leapsecond file \('/usr/share/zoneinfo/leap-seconds\.list'\): expired.*"
 
 # ignore NTP nss_tacplus error, which will happen when reload config, because NTPD will invoke getpwnap API but nss_tacplus will re-render during reload config
 r, ".* ERR ntpd\[\d*\]: nss_tacplus: .*"

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

@@ -41,6 +41,7 @@
 from tests.common.helpers.dut_ports import encode_dut_port_name
 from tests.common.helpers.dut_utils import encode_dut_and_container_name
 from tests.common.helpers.parallel_utils import InitialCheckState, InitialCheckStatus
+from tests.common.helpers.pfcwd_helper import TrafficPorts, select_test_ports, set_pfc_timers
 from tests.common.system_utils import docker
 from tests.common.testbed import TestbedInfo
 from tests.common.utilities import get_inventory_files, wait_until
@@ -2827,3 +2828,112 @@ def start_platform_api_service(duthosts, enum_rand_one_per_hwsku_hostname, local
 
         res = localhost.wait_for(host=dut_ip, port=SERVER_PORT, state='started', delay=1, timeout=10)
         assert res['failed'] is False
+
+
+def update_t1_test_ports(duthost, mg_facts, test_ports, tbinfo):
+    """
+    Find out active IP interfaces and use the list to
+    remove inactive ports from test_ports
+    """
+    ip_ifaces = duthost.get_active_ip_interfaces(tbinfo, asic_index=0)
+    port_list = []
+    for iface in list(ip_ifaces.keys()):
+        if iface.startswith("PortChannel"):
+            port_list.extend(
+                mg_facts["minigraph_portchannels"][iface]["members"]
+            )
+        else:
+            port_list.append(iface)
+    port_list_set = set(port_list)
+    for port in list(test_ports.keys()):
+        if port not in port_list_set:
+            del test_ports[port]
+    return test_ports
+
+
+@pytest.fixture(scope="module")
+def setup_pfc_test(
+    duthosts, enum_rand_one_per_hwsku_frontend_hostname, ptfhost, conn_graph_facts, tbinfo,     # noqa F811
+):
+    """
+    Sets up all the parameters needed for the PFC Watchdog tests
+    Args:
+        duthost: AnsibleHost instance for DUT
+        ptfhost: AnsibleHost instance for PTF
+        conn_graph_facts: fixture that contains the parsed topology info
+    Yields:
+        setup_info: dictionary containing pfc timers, generated test ports and selected test ports
+    """
+    SUPPORTED_T1_TOPOS = {"t1-lag", "t1-64-lag", "t1-56-lag", "t1-28-lag", "t1-32-lag"}
+    duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
+    mg_facts = duthost.get_extended_minigraph_facts(tbinfo)
+    port_list = list(mg_facts['minigraph_ports'].keys())
+    neighbors = conn_graph_facts['device_conn'].get(duthost.hostname, {})
+    dut_eth0_ip = duthost.mgmt_ip
+    vlan_nw = None
+
+    if mg_facts['minigraph_vlans']:
+        # Filter VLANs with one interface inside only(PortChannel interface in case of t0-56-po2vlan topo)
+        unexpected_vlans = []
+        for vlan, vlan_data in list(mg_facts['minigraph_vlans'].items()):
+            if len(vlan_data['members']) < 2:
+                unexpected_vlans.append(vlan)
+
+        # Update minigraph_vlan_interfaces with only expected VLAN interfaces
+        expected_vlan_ifaces = []
+        for vlan in unexpected_vlans:
+            for mg_vl_iface in mg_facts['minigraph_vlan_interfaces']:
+                if vlan != mg_vl_iface['attachto']:
+                    expected_vlan_ifaces.append(mg_vl_iface)
+        if expected_vlan_ifaces:
+            mg_facts['minigraph_vlan_interfaces'] = expected_vlan_ifaces
+
+        # gather all vlan specific info
+        vlan_addr = mg_facts['minigraph_vlan_interfaces'][0]['addr']
+        vlan_prefix = mg_facts['minigraph_vlan_interfaces'][0]['prefixlen']
+        vlan_dev = mg_facts['minigraph_vlan_interfaces'][0]['attachto']
+        vlan_ips = duthost.get_ip_in_range(
+            num=1, prefix="{}/{}".format(vlan_addr, vlan_prefix),
+            exclude_ips=[vlan_addr])['ansible_facts']['generated_ips']
+        vlan_nw = vlan_ips[0].split('/')[0]
+
+    topo = tbinfo["topo"]["name"]
+
+    # build the port list for the test
+    config_facts = duthost.config_facts(host=duthost.hostname, source="running")['ansible_facts']
+    tp_handle = TrafficPorts(mg_facts, neighbors, vlan_nw, topo, config_facts)
+    test_ports = tp_handle.build_port_list()
+
+    # In T1 topology update test ports by removing inactive ports
+    if topo in SUPPORTED_T1_TOPOS:
+        test_ports = update_t1_test_ports(
+            duthost, mg_facts, test_ports, tbinfo
+        )
+    # select a subset of ports from the generated port list
+    selected_ports = select_test_ports(test_ports)
+
+    setup_info = {'test_ports': test_ports,
+                  'port_list': port_list,
+                  'selected_test_ports': selected_ports,
+                  'pfc_timers': set_pfc_timers(),
+                  'neighbors': neighbors,
+                  'eth0_ip': dut_eth0_ip
+                  }
+
+    if mg_facts['minigraph_vlans']:
+        setup_info['vlan'] = {'addr': vlan_addr,
+                              'prefix': vlan_prefix,
+                              'dev': vlan_dev
+                              }
+    else:
+        setup_info['vlan'] = None
+
+    # stop pfcwd
+    logger.info("--- Stopping Pfcwd ---")
+    duthost.command("pfcwd stop")
+
+    # set poll interval
+    duthost.command("pfcwd interval {}".format(setup_info['pfc_timers']['pfc_wd_poll_time']))
+
+    logger.info("setup_info : {}".format(setup_info))
+    yield setup_info

tests/conftest.py

@@ -247,7 +247,12 @@ def verify_attr_change(duthost, po_name, attr, value):
             ...
     """
     if attr == "mtu":
-        output = duthost.shell("show interfaces status | grep -w '^{}' | awk '{{print $4}}'".format(po_name))
+        cmd = (
+            "show interfaces status | "
+            "grep -w '^[[:space:]]*{}' | "
+            "awk '{{print $4}}'"
+        ).format(po_name)
+        output = duthost.shell(cmd)
 
         pytest_assert(output['stdout'] == value, "{} attribute {} failed to change to {}".format(po_name, attr, value))
     elif attr == "min_links":

tests/generic_config_updater/test_portchannel_interface.py

@@ -6,6 +6,8 @@
 import pytest
 import tempfile
 
+from pytest_ansible.errors import AnsibleConnectionFailure
+
 from tests.common import config_reload
 from tests.common.platform.processes_utils import wait_critical_processes
 from tests.common.helpers.assertions import pytest_assert
@@ -175,7 +177,12 @@ def test_no_hardcoded_tables(duthosts, rand_one_dut_hostname, tbinfo):
 
     # Remove minigraph to avoid config coming from minigraph.
     duthost.shell("sudo rm {}".format(MINIGRAPH))
-    config_reload(duthost)
+    try:
+        config_reload(duthost)
+    except AnsibleConnectionFailure as e:
+        # In latest SONiC, config reload command will exit after mgmt interface restart
+        # Then 'duthost' will lost IPV4 connection and throw exception
+        logger.warning(f'Exception after config reload: {e}')
     wait_critical_processes(duthost)
     db_version_after = get_db_version(duthost)
     logger.info(

tests/l2/test_l2_configure.py

@@ -10,7 +10,6 @@
 from tests.common.fixtures.ptfhost_utils import pause_garp_service          # noqa F401
 from tests.common.mellanox_data import is_mellanox_device as isMellanoxDevice
 from tests.common.cisco_data import is_cisco_device
-from tests.common.helpers.pfcwd_helper import TrafficPorts, set_pfc_timers, select_test_ports
 from tests.common.utilities import str2bool
 
 logger = logging.getLogger(__name__)
@@ -80,117 +79,6 @@ def fake_storm(request, duthosts, enum_rand_one_per_hwsku_frontend_hostname):
         else request.config.getoption('--fake-storm')
 
 
-def update_t1_test_ports(duthost, mg_facts, test_ports, tbinfo):
-    """
-    Find out active IP interfaces and use the list to
-    remove inactive ports from test_ports
-    """
-    ip_ifaces = duthost.get_active_ip_interfaces(tbinfo, asic_index=0)
-    port_list = []
-    for iface in list(ip_ifaces.keys()):
-        if iface.startswith("PortChannel"):
-            port_list.extend(
-                mg_facts["minigraph_portchannels"][iface]["members"]
-            )
-        else:
-            port_list.append(iface)
-    port_list_set = set(port_list)
-    for port in list(test_ports.keys()):
-        if port not in port_list_set:
-            del test_ports[port]
-    return test_ports
-
-
-@pytest.fixture(scope="module")
-def setup_pfc_test(
-    duthosts, enum_rand_one_per_hwsku_frontend_hostname, ptfhost, conn_graph_facts, tbinfo,     # noqa F811
-):
-    """
-    Sets up all the parameters needed for the PFC Watchdog tests
-
-    Args:
-        duthost: AnsibleHost instance for DUT
-        ptfhost: AnsibleHost instance for PTF
-        conn_graph_facts: fixture that contains the parsed topology info
-
-    Yields:
-        setup_info: dictionary containing pfc timers, generated test ports and selected test ports
-    """
-    SUPPORTED_T1_TOPOS = {"t1-lag", "t1-64-lag", "t1-56-lag", "t1-28-lag", "t1-32-lag"}
-    duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
-    mg_facts = duthost.get_extended_minigraph_facts(tbinfo)
-    port_list = list(mg_facts['minigraph_ports'].keys())
-    neighbors = conn_graph_facts['device_conn'].get(duthost.hostname, {})
-    dut_eth0_ip = duthost.mgmt_ip
-    vlan_nw = None
-
-    if mg_facts['minigraph_vlans']:
-        # Filter VLANs with one interface inside only(PortChannel interface in case of t0-56-po2vlan topo)
-        unexpected_vlans = []
-        for vlan, vlan_data in list(mg_facts['minigraph_vlans'].items()):
-            if len(vlan_data['members']) < 2:
-                unexpected_vlans.append(vlan)
-
-        # Update minigraph_vlan_interfaces with only expected VLAN interfaces
-        expected_vlan_ifaces = []
-        for vlan in unexpected_vlans:
-            for mg_vl_iface in mg_facts['minigraph_vlan_interfaces']:
-                if vlan != mg_vl_iface['attachto']:
-                    expected_vlan_ifaces.append(mg_vl_iface)
-        if expected_vlan_ifaces:
-            mg_facts['minigraph_vlan_interfaces'] = expected_vlan_ifaces
-
-        # gather all vlan specific info
-        vlan_addr = mg_facts['minigraph_vlan_interfaces'][0]['addr']
-        vlan_prefix = mg_facts['minigraph_vlan_interfaces'][0]['prefixlen']
-        vlan_dev = mg_facts['minigraph_vlan_interfaces'][0]['attachto']
-        vlan_ips = duthost.get_ip_in_range(
-            num=1, prefix="{}/{}".format(vlan_addr, vlan_prefix),
-            exclude_ips=[vlan_addr])['ansible_facts']['generated_ips']
-        vlan_nw = vlan_ips[0].split('/')[0]
-
-    topo = tbinfo["topo"]["name"]
-
-    # build the port list for the test
-    config_facts = duthost.config_facts(host=duthost.hostname, source="running")['ansible_facts']
-    tp_handle = TrafficPorts(mg_facts, neighbors, vlan_nw, topo, config_facts)
-    test_ports = tp_handle.build_port_list()
-
-    # In T1 topology update test ports by removing inactive ports
-    if topo in SUPPORTED_T1_TOPOS:
-        test_ports = update_t1_test_ports(
-            duthost, mg_facts, test_ports, tbinfo
-        )
-    # select a subset of ports from the generated port list
-    selected_ports = select_test_ports(test_ports)
-
-    setup_info = {'test_ports': test_ports,
-                  'port_list': port_list,
-                  'selected_test_ports': selected_ports,
-                  'pfc_timers': set_pfc_timers(),
-                  'neighbors': neighbors,
-                  'eth0_ip': dut_eth0_ip
-                  }
-
-    if mg_facts['minigraph_vlans']:
-        setup_info['vlan'] = {'addr': vlan_addr,
-                              'prefix': vlan_prefix,
-                              'dev': vlan_dev
-                              }
-    else:
-        setup_info['vlan'] = None
-
-    # stop pfcwd
-    logger.info("--- Stopping Pfcwd ---")
-    duthost.command("pfcwd stop")
-
-    # set poll interval
-    duthost.command("pfcwd interval {}".format(setup_info['pfc_timers']['pfc_wd_poll_time']))
-
-    logger.info("setup_info : {}".format(setup_info))
-    yield setup_info
-
-
 @pytest.fixture(scope="module")
 def setup_dut_test_params(
     duthosts, enum_rand_one_per_hwsku_frontend_hostname, ptfhost, conn_graph_facts, tbinfo,     # noqa F811