Issue 20758: Changes to run telemetry/test_events.py on v6 topos

* extend bgp idle check to check ipv6 routes as well as ipv4
* use ipv6 mgmt addr in test_events.py when running on ipv6 topo
* remove conditional skip for test_events.py on ipv6 topo

Author: anders-nexthop

tests/common/devices/sonic.py

@@ -2200,23 +2200,26 @@ def is_bgp_state_idle(self):
         Returns:
             True or False
         """
-        bgp_summary = self.command("show ip bgp summary")["stdout_lines"]
+        for af in ["ip", "ipv6"]:
+            bgp_summary = self.command(f"show {af} bgp summary")["stdout_lines"]
 
-        idle_count = 0
-        expected_idle_count = 0
-        bgp_monitor_count = 0
-        for line in bgp_summary:
-            if "Idle (Admin)" in line:
-                idle_count += 1
+            idle_count = 0
+            expected_idle_count = 0
+            bgp_monitor_count = 0
+            for line in bgp_summary:
+                if "Idle (Admin)" in line:
+                    idle_count += 1
 
-            if "Total number of neighbors" in line:
-                tokens = line.split()
-                expected_idle_count = int(tokens[-1])
+                if "Total number of neighbors" in line:
+                    tokens = line.split()
+                    expected_idle_count = int(tokens[-1])
 
-            if "BGPMonitor" in line:
-                bgp_monitor_count += 1
+                if "BGPMonitor" in line:
+                    bgp_monitor_count += 1
 
-        return idle_count == (expected_idle_count - bgp_monitor_count)
+            if idle_count != (expected_idle_count - bgp_monitor_count):
+                return False
+        return True
 
     def is_service_running(self, service_name, docker_name):
         """

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

@@ -4818,14 +4818,6 @@ telemetry/test_events.py:
       - "asic_type in ['vs']"
       - https://github.com/sonic-net/sonic-buildimage/issues/19943
 
-telemetry/test_events.py::test_events:
-  skip:
-    reason: "dut ipv6 mgmt ip not supported"
-    conditions_logical_operator: and
-    conditions:
-      - "is_mgmt_ipv6_only==True"
-      - "https://github.com/sonic-net/sonic-mgmt/issues/20395"
-
 telemetry/test_telemetry.py:
   skip:
     reason: "Skip telemetry test for 201911 and older branches"

tests/telemetry/telemetry_utils.py

@@ -125,7 +125,12 @@ def generate_client_cli(duthost, gnxi_path, method=METHOD_GET, xpath="COUNTERS/E
     # 3. Executes the py_gnmicli.py script.
     cmdFormat = '. /root/env-python3/bin/activate && cd {7}gnmi_cli_py' \
                 ' && python py_gnmicli.py -g -t {0} -p {1} -m {2} -x {3} -xt {4}{5} -o {6}'
-    cmd = cmdFormat.format(duthost.mgmt_ip, env.gnmi_port,
+
+    dut_facts = duthost.dut_basic_facts()['ansible_facts']['dut_basic_facts']
+    is_mgmt_ipv6_only = dut_facts.get('is_mgmt_ipv6_only', False)
+    mgmt_ip = duthost.mgmt_ipv6 if is_mgmt_ipv6_only else duthost.mgmt_ip
+
+    cmd = cmdFormat.format(mgmt_ip, env.gnmi_port,
                            method, xpath, target, ns,
                            "ndastreamingservertest", gnxi_path)