Fix test_bgp_suppress_fib.py for t1-f2-d10u8 topo

Update packet verification and port handling to support portchannels with
multiple ethernet interfaces on T0 VMs in t1-f2-d10u8 topology

Signed-off-by: markxiao <[email protected]>

Author: markx-arista

tests/bgp/bgp_helpers.py

@@ -597,9 +597,10 @@ def get_ptf_recv_port(duthost, vm_name, tbinfo):
     """
     Get ptf receive port
     """
-    port = duthost.shell("show lldp table | grep -w {} | awk '{{print $1}}'".format(vm_name))['stdout']
+    ports_output = duthost.shell("show lldp table | grep -w {} | awk '{{print $1}}'".format(vm_name))['stdout']
+    ports = [line.strip() for line in ports_output.split('\n') if line.strip()]
     mg_facts = duthost.get_extended_minigraph_facts(tbinfo)
-    return mg_facts['minigraph_ptf_indices'][port]
+    return [mg_facts['minigraph_ptf_indices'][port] for port in ports]
 
 
 def get_eth_port(duthost, tbinfo):

tests/bgp/test_bgp_suppress_fib.py

@@ -447,9 +447,9 @@ def send_and_verify_packet(ptfadapter, pkt_list, exp_pkt_list, tx_port, rx_ports
         rx_port = rx_ports[ip_ver] if ip_ver else rx_ports
         testutils.send(ptfadapter, pkt=pkt, port_id=tx_port)
         if exp_action == FORWARD:
-            testutils.verify_packet(ptfadapter, pkt=exp_pkt, port_id=rx_port, timeout=TRAFFIC_WAIT_TIME)
+            testutils.verify_packet_any_port(ptfadapter, pkt=exp_pkt, ports=rx_port, timeout=TRAFFIC_WAIT_TIME)
         else:
-            testutils.verify_no_packet(ptfadapter, pkt=exp_pkt, port_id=rx_port, timeout=TRAFFIC_WAIT_TIME)
+            testutils.verify_no_packet_any(ptfadapter, pkt=exp_pkt, ports=rx_port, timeout=TRAFFIC_WAIT_TIME)
 
 
 def send_and_verify_loopback_packets(ptfadapter, pkt_list, exp_pkt_list, tx_port, rx_ports, exp_action_list):
@@ -469,7 +469,8 @@ def send_and_verify_bulk_traffic(tcpdump_helper, ptfadapter, ip_ver_list, pkt_li
     """
     Send packet with ptfadapter and verify if packet is forwarded or dropped as expected
     """
-    tcpdump_helper.in_direct_ifaces = rx_ports if isinstance(rx_ports, list) else rx_ports.values()
+    tcpdump_helper.in_direct_ifaces = rx_ports if isinstance(rx_ports, list) else \
+        [port for port_list in rx_ports.values() for port in port_list]
     tcpdump_helper.start_sniffer()
     logger.info("Start sending traffic")
     ptfadapter.dataplane.flush()
@@ -816,7 +817,8 @@ def bgp_route_flap_with_stress(duthost, tbinfo, nbrhosts, ptf_ip, ipv4_route_lis
 
 def perf_sniffer_prepare(tcpdump_sniffer, duthost, nbrhosts, mg_facts, recv_port):
     eths_to_t2_vm = get_port_connected_with_vm(duthost, nbrhosts, vm_type='T2')
-    eths_to_t0_vm = get_eth_name_from_ptf_port(mg_facts, [port for port in recv_port.values()])
+    eths_to_t0_vm = get_eth_name_from_ptf_port(mg_facts, [port for port_list in recv_port.values()
+                                                          for port in port_list])
     tcpdump_sniffer.out_direct_ifaces = [random.choice(eths_to_t2_vm)]
     tcpdump_sniffer.in_direct_ifaces = eths_to_t0_vm
     tcpdump_sniffer.tcpdump_filter = BGP_FILTER