[portchannel] Fix test_snmp_fdb/test_fib/test_tagged_arp failed due to config_db change (#7650)

What is the motivation for this PR?
test_snmp_fdb/test_fib/test_tagged_arp failed due to "members" field removed by this PR: sonic-net/sonic-buildimage#13660

How did you do it?
Add support for this change.

How did you verify/test it?
Run test

Signed-off-by: Yaqiang Zhu <[email protected]>

Author: yaqiangz

tests/common/fixtures/duthost_utils.py

@@ -170,8 +170,8 @@ def ports_list(duthosts, rand_one_dut_hostname, rand_selected_dut, tbinfo):
     ptf_ports_available_in_topo = {
         port_index: 'eth{}'.format(port_index) for port_index in config_port_indices.values()
     }
-    config_portchannels = cfg_facts.get('PORTCHANNEL', {})
-    config_port_channel_members = [port_channel['members'] for port_channel in config_portchannels.values()]
+    config_portchannels = cfg_facts.get('PORTCHANNEL_MEMBER', {})
+    config_port_channel_members = [port_channel.keys() for port_channel in config_portchannels.values()]
     config_port_channel_member_ports = list(itertools.chain.from_iterable(config_port_channel_members))
     ports = [port for port in config_ports if config_port_indices[port] in ptf_ports_available_in_topo and
              config_ports[port].get('admin_status', 'down') == 'up' and port not in config_port_channel_member_ports]
@@ -266,7 +266,7 @@ def utils_vlan_ports_list(duthosts, rand_one_dut_hostname, rand_selected_dut, tb
     mg_facts = rand_selected_dut.get_extended_minigraph_facts(tbinfo)
     vlan_ports_list = []
     config_ports = {k: v for k, v in cfg_facts['PORT'].items() if v.get('admin_status', 'down') == 'up'}
-    config_portchannels = cfg_facts.get('PORTCHANNEL', {})
+    config_portchannels = cfg_facts.get('PORTCHANNEL_MEMBER', {})
     config_port_indices = {k: v for k, v in mg_facts['minigraph_ptf_indices'].items() if k in config_ports}
     config_ports_vlan = collections.defaultdict(list)
     vlan_members = cfg_facts.get('VLAN_MEMBER', {})
@@ -292,7 +292,7 @@ def utils_vlan_ports_list(duthosts, rand_one_dut_hostname, rand_selected_dut, tb
         for po in config_portchannels:
             vlan_port = {
                 'dev': po,
-                'port_index': [config_port_indices[member] for member in config_portchannels[po]['members']],
+                'port_index': [config_port_indices[member] for member in config_portchannels[po].keys()],
                 'permit_vlanid': []
             }
             if po in config_ports_vlan:

tests/common/fixtures/fib_utils.py

@@ -189,7 +189,7 @@ def get_fib_info(duthost, dut_cfg_facts, duts_mg_facts):
         asic.shell("{} redis-dump -d 0 -k 'ROUTE*' -y > /tmp/fib.{}.txt".format(asic.ns_arg, timestamp))
         duthost.fetch(src="/tmp/fib.{}.txt".format(timestamp), dest="/tmp/fib")
 
-        po = asic_cfg_facts.get('PORTCHANNEL', {})
+        po = asic_cfg_facts.get('PORTCHANNEL_MEMBER', {})
         ports = asic_cfg_facts.get('PORT', {})
         sub_interfaces = asic_cfg_facts.get('VLAN_SUB_INTERFACE', {})
 
@@ -206,14 +206,14 @@ def get_fib_info(duthost, dut_cfg_facts, duts_mg_facts):
                 for ifname in ifnames:
                     if ifname in po:
                         # ignore the prefix, if the prefix nexthop is not a frontend port
-                        if 'members' in po[ifname]:
-                            if 'role' in ports[po[ifname]['members'][0]] and \
-                                    ports[po[ifname]['members'][0]]['role'] == 'Int':
+                        if len(po[ifname].keys()) > 0:
+                            if 'role' in ports[po[ifname].keys()[0]] and \
+                                    ports[po[ifname].keys()[0]]['role'] == 'Int':
                                 skip = True
                             else:
                                 oports.append(
                                     [str(duts_mg_facts[list_index][1]['minigraph_ptf_indices'][x])
-                                     for x in po[ifname]['members']]
+                                     for x in po[ifname].keys()]
                                 )
                     else:
                         if ifname in sub_interfaces: