Restore IPv6 support for GNMI tests except test_gnmi_auth

This partially reverts the revert commit 16c3a2f, restoring IPv6 support
for most GNMI tests while keeping test_gnmi_auth without IPv6 support to
avoid authentication issues.

Changes:
- Make duthost_mgmt_ip parameter optional in gnmi_capabilities() for backward compatibility
- Restore IPv6 support in test_gnmi.py and test_mimic_hwproxy_cert_rotation.py
- Keep test_gnmi_auth.py without IPv6 support to avoid breaking authentication

Author: hdwhdw

tests/common/helpers/gnmi_utils.py

@@ -319,12 +319,17 @@ def verify_tcp_port(localhost, ip, port):
     logger.info("TCP: " + res['stdout'] + res['stderr'])
 
 
-def gnmi_capabilities(duthost, localhost):
+def gnmi_capabilities(duthost, localhost, duthost_mgmt_ip=None):
     env = GNMIEnvironment(duthost, GNMIEnvironment.GNMI_MODE)
-    ip = duthost.mgmt_ip
+    if duthost_mgmt_ip:
+        ip = duthost_mgmt_ip['mgmt_ip']
+        addr = f"[{ip}]" if duthost_mgmt_ip['version'] == 'v6' else f"{ip}"
+    else:
+        ip = duthost.mgmt_ip
+        addr = ip
     port = env.gnmi_port
     # Run gnmi_cli in gnmi container as workaround
-    cmd = "docker exec %s gnmi_cli -client_types=gnmi -a %s:%s " % (env.gnmi_container, ip, port)
+    cmd = "docker exec %s gnmi_cli -client_types=gnmi -a %s:%s " % (env.gnmi_container, addr, port)
     cmd += "-client_crt /etc/sonic/telemetry/gnmiclient.crt "
     cmd += "-client_key /etc/sonic/telemetry/gnmiclient.key "
     cmd += "-ca_crt /etc/sonic/telemetry/gnmiCA.pem "

tests/gnmi/test_gnmi.py

@@ -6,6 +6,8 @@
 from .helper import gnmi_set, dump_gnmi_log
 from tests.common.utilities import wait_until
 from tests.common.plugins.allure_wrapper import allure_step_wrapper as allure
+from tests.common.fixtures.duthost_utils import duthost_mgmt_ip       # noqa: F401
+
 
 logger = logging.getLogger(__name__)
 allure.logger = logger
@@ -16,12 +18,12 @@
 ]
 
 
-def test_gnmi_capabilities(duthosts, rand_one_dut_hostname, localhost):
+def test_gnmi_capabilities(duthosts, rand_one_dut_hostname, localhost, duthost_mgmt_ip):  # noqa: F811
     '''
     Verify GNMI capabilities
     '''
     duthost = duthosts[rand_one_dut_hostname]
-    ret, msg = gnmi_capabilities(duthost, localhost)
+    ret, msg = gnmi_capabilities(duthost, localhost, duthost_mgmt_ip)
     assert ret == 0, (
         "GNMI capabilities command failed (non-zero return code).\n"
         "- Error message: {}"
@@ -38,7 +40,7 @@ def test_gnmi_capabilities(duthosts, rand_one_dut_hostname, localhost):
     ).format(msg)
 
 
-def test_gnmi_capabilities_authenticate(duthosts, rand_one_dut_hostname, localhost):
+def test_gnmi_capabilities_authenticate(duthosts, rand_one_dut_hostname, localhost, duthost_mgmt_ip):  # noqa: F811
     '''
     Verify GNMI capabilities with different roles
     '''
@@ -47,7 +49,7 @@ def test_gnmi_capabilities_authenticate(duthosts, rand_one_dut_hostname, localho
     with allure.step("Verify GNMI capabilities with noaccess role"):
         role = "gnmi_noaccess"
         add_gnmi_client_common_name(duthost, "test.client.gnmi.sonic", role)
-        ret, msg = gnmi_capabilities(duthost, localhost)
+        ret, msg = gnmi_capabilities(duthost, localhost, duthost_mgmt_ip)
         assert ret != 0, (
             "GNMI capabilities authenticate with noaccess role command unexpectedly succeeded "
             "(zero return code) for a client with noaccess role.\n"
@@ -61,7 +63,7 @@ def test_gnmi_capabilities_authenticate(duthosts, rand_one_dut_hostname, localho
     with allure.step("Verify GNMI capabilities with readonly role"):
         role = "gnmi_readonly"
         add_gnmi_client_common_name(duthost, "test.client.gnmi.sonic", role)
-        ret, msg = gnmi_capabilities(duthost, localhost)
+        ret, msg = gnmi_capabilities(duthost, localhost, duthost_mgmt_ip)
         assert ret == 0, (
             "GNMI capabilities authenticate readonly command failed (non-zero return code).\n"
             "- Error message: {}"
@@ -78,7 +80,7 @@ def test_gnmi_capabilities_authenticate(duthosts, rand_one_dut_hostname, localho
     with allure.step("Verify GNMI capabilities with readwrite role"):
         role = "gnmi_readwrite"
         add_gnmi_client_common_name(duthost, "test.client.gnmi.sonic", role)
-        ret, msg = gnmi_capabilities(duthost, localhost)
+        ret, msg = gnmi_capabilities(duthost, localhost, duthost_mgmt_ip)
         assert ret == 0, (
             "GNMI capabilities authenticate readwrite role command failed (non-zero return code).\n"
             "- Error message: {}"
@@ -95,7 +97,7 @@ def test_gnmi_capabilities_authenticate(duthosts, rand_one_dut_hostname, localho
     with allure.step("Verify GNMI capabilities with empty role"):
         role = ""
         add_gnmi_client_common_name(duthost, "test.client.gnmi.sonic", role)
-        ret, msg = gnmi_capabilities(duthost, localhost)
+        ret, msg = gnmi_capabilities(duthost, localhost, duthost_mgmt_ip)
         assert ret == 0, (
             "GNMI capabilities authenticate with empty role command failed (non-zero return code).\n"
             "- Error message: {}"

tests/gnmi/test_mimic_hwproxy_cert_rotation.py

@@ -6,6 +6,7 @@
 from tests.common.utilities import wait_until
 from tests.common.helpers.gnmi_utils import GNMIEnvironment, gnmi_capabilities
 from tests.common.utilities import get_image_type
+from tests.common.fixtures.duthost_utils import duthost_mgmt_ip      # noqa: F401
 
 
 logger = logging.getLogger(__name__)
@@ -29,7 +30,8 @@ def check_telemetry_status(duthost):
     return "RUNNING" in output['stdout']
 
 
-def test_mimic_hwproxy_cert_rotation(duthosts, rand_one_dut_hostname, localhost, ptfhost):
+def test_mimic_hwproxy_cert_rotation(duthosts, rand_one_dut_hostname, localhost, ptfhost,
+                                     duthost_mgmt_ip):  # noqa: F811
     duthost = duthosts[rand_one_dut_hostname]
 
     # Use bash -c to run the pipeline properly
@@ -87,7 +89,7 @@ def test_mimic_hwproxy_cert_rotation(duthosts, rand_one_dut_hostname, localhost,
             enable_feature = 'sudo config feature state gnmi enabled'
             duthost.command(enable_feature, module_ignore_errors=True)
             assert wait_until(60, 3, 0, check_gnmi_status, duthost), "GNMI service failed to start"
-            ret, msg = gnmi_capabilities(duthost, localhost)
+            ret, msg = gnmi_capabilities(duthost, localhost, duthost_mgmt_ip)
             assert ret == 0, msg
             assert "sonic-db" in msg, msg
             assert "JSON_IETF" in msg, msg