[202503][#21073] chore: enable iface_namingmode and gnmi

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

@@ -214,7 +214,7 @@ bgp/test_bgpmon.py:
   skip:
     reason: "Not supported on T2 topology or topology backend"
     conditions:
-      - "'backend' in topo_name or 't2' in topo_name"
+      - "'backend' in topo_name or topo_type in ['t2']"
 
 bgp/test_bgpmon_v6.py::test_bgpmon_no_ipv6_resolve_via_default:
   skip:
@@ -1126,7 +1126,7 @@ gnmi/test_gnmi_configdb.py:
     reason: "This feature is not supported for multi asic. Skipping these test for T2 and multi asic."
     conditions_logical_operator: or
     conditions:
-      - "'t2' in topo_name"
+      - "topo_type in ['t2']"
       - "is_multi_asic==True"
 
 gnmi/test_gnoi_killprocess.py::test_gnoi_killprocess_then_restart:

tests/gnmi/helper.py

@@ -244,6 +244,11 @@ def gnmi_set(duthost, ptfhost, delete_list, update_list, replace_list, cert=None
     cmd += '--xpath ' + xpath
     cmd += ' '
     cmd += '--value ' + xvalue
+    health_check_cmd = f"sudo ss -ltnp | grep {env.gnmi_port} | grep ${env.gnmi_program}"
+
+    wait_until(120, 1, 5,
+               lambda: len(duthost.shell(health_check_cmd, module_ignore_errors=True)['stdout_lines']) > 0)
+
     output = ptfhost.shell(cmd, module_ignore_errors=True)
     error = "GRPC error\n"
     if error in output['stdout']:

tests/iface_namingmode/test_iface_namingmode.py

@@ -726,7 +726,7 @@ class TestConfigInterface():
 
     @pytest.fixture(scope="class", autouse=True)
     def setup_check_topo(self, tbinfo):
-        if tbinfo['topo']['type'] not in ['t2', 't1']:
+        if tbinfo['topo']['type'] not in ['t2', 't1', 'lt2', 'ft2']:
             pytest.skip('Unsupported topology')
 
     @pytest.fixture(scope='class', autouse=True)
@@ -908,7 +908,7 @@ def test_show_acl_table(setup, setup_config_mode, tbinfo):
     Checks whether 'show acl table DATAACL' lists the interface names
     as per the configured naming mode
     """
-    if tbinfo['topo']['type'] not in ['t1', 't2']:
+    if tbinfo['topo']['type'] not in ['t1', 't2', 'lt2', 'ft2']:
         pytest.skip('Unsupported topology')
 
     if not setup['physical_interfaces']:
@@ -937,7 +937,7 @@ def test_show_interfaces_neighbor_expected(setup, setup_config_mode, tbinfo, dut
     Checks whether 'show interfaces neighbor expected' lists the
     interface names as per the configured naming mode
     """
-    if tbinfo['topo']['type'] not in ['t1', 't2']:
+    if tbinfo['topo']['type'] not in ['t1', 't2', 'lt2', 'ft2']:
         pytest.skip('Unsupported topology')
 
     skip_test_for_multi_asic(duthosts, enum_rand_one_per_hwsku_frontend_hostname)
@@ -962,7 +962,7 @@ class TestNeighbors():
 
     @pytest.fixture(scope="class", autouse=True)
     def setup_check_topo(self, setup, tbinfo, duthosts, enum_rand_one_per_hwsku_frontend_hostname):
-        if tbinfo['topo']['type'] not in ['t2', 't1']:
+        if tbinfo['topo']['type'] not in ['t2', 't1', 'lt2', 'ft2']:
             pytest.skip('Unsupported topology')
         duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
         if duthost.is_multi_asic:
@@ -1027,7 +1027,7 @@ class TestShowIP():
 
     @pytest.fixture(scope="class", autouse=True)
     def setup_check_topo(self, setup, tbinfo):
-        if tbinfo['topo']['type'] not in ['t2', 't1']:
+        if tbinfo['topo']['type'] not in ['t2', 't1', 'lt2', 'ft2']:
             pytest.skip('Unsupported topology')
 
         if not setup['physical_interfaces']: