From 06bf76b5bc01e88b80715e6f88f7385dcd3b4e4d Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Thu, 18 Nov 2021 18:03:11 -0800 Subject: [PATCH] =?UTF-8?q?[minigraph]=20No=20longer=20generate=20the=20?= =?UTF-8?q?=E2=80=9Cmembers=E2=80=9D=20field=20on=20the=20VLAN=20table=20i?= =?UTF-8?q?n=20ConfigDB=20(#9237)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### Why I did it This field is deprecated. Fixes https://github.com/Azure/sonic-buildimage/issues/8306 Fixes https://github.com/Azure/sonic-buildimage/issues/9121 --- src/sonic-config-engine/minigraph.py | 6 ++++-- src/sonic-config-engine/tests/test_cfggen.py | 8 ++++---- src/sonic-config-engine/tests/test_minigraph_case.py | 2 -- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py index 7965ed9358..8d7f9551ae 100644 --- a/src/sonic-config-engine/minigraph.py +++ b/src/sonic-config-engine/minigraph.py @@ -531,6 +531,7 @@ def parse_dpg(dpg, hname): vlanintfs = child.find(str(QName(ns, "VlanInterfaces"))) vlans = {} vlan_members = {} + vlan_member_list = {} dhcp_relay_table = {} vlantype_name = "" intf_vlan_mbr = defaultdict(list) @@ -558,7 +559,7 @@ def parse_dpg(dpg, hname): else: vlan_members[(sonic_vlan_member_name, vmbr_list[i])] = {'tagging_mode': 'untagged'} - vlan_attributes = {'vlanid': vlanid, 'members': vmbr_list } + vlan_attributes = {'vlanid': vlanid} dhcp_attributes = {} # If this VLAN requires a DHCP relay agent, it will contain a element @@ -586,6 +587,7 @@ def parse_dpg(dpg, hname): if sonic_vlan_name != vintfname: vlan_attributes['alias'] = vintfname vlans[sonic_vlan_name] = vlan_attributes + vlan_member_list[sonic_vlan_name] = vmbr_list acls = {} for aclintf in aclintfs.findall(str(QName(ns, "AclInterface"))): @@ -616,7 +618,7 @@ def parse_dpg(dpg, hname): elif member in vlans: # For egress ACL attaching to vlan, we break them into vlan members if stage == "egress": - acl_intfs.extend(vlans[member]['members']) + acl_intfs.extend(vlan_member_list[member]) else: acl_intfs.append(member) elif member in port_alias_map: diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py index 36c496b6e3..77cce84ae3 100644 --- a/src/sonic-config-engine/tests/test_cfggen.py +++ b/src/sonic-config-engine/tests/test_cfggen.py @@ -245,10 +245,10 @@ class TestCfgGen(TestCase): self.assertEqual( utils.to_dict(output.strip()), utils.to_dict( - "{'Vlan1000': {'alias': 'ab1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1000', 'members': ['Ethernet8']}, " - "'Vlan2001': {'alias': 'ab3', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2001', 'members': ['Ethernet12']}," - "'Vlan2000': {'alias': 'ab2', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2000', 'members': ['Ethernet12']}," - "'Vlan2020': {'alias': 'kk1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2020', 'members': ['Ethernet12']}}" + "{'Vlan1000': {'alias': 'ab1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1000'}, " + "'Vlan2001': {'alias': 'ab3', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2001'}," + "'Vlan2000': {'alias': 'ab2', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2000'}," + "'Vlan2020': {'alias': 'kk1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '2020'}}" ) ) diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py index 4ebff7f78c..051f33c918 100644 --- a/src/sonic-config-engine/tests/test_minigraph_case.py +++ b/src/sonic-config-engine/tests/test_minigraph_case.py @@ -105,13 +105,11 @@ class TestCfgGenCaseInsensitive(TestCase): 'dhcpv6_servers': ['fc02:2000::1', 'fc02:2000::2'], 'vlanid': '1000', 'mac': '00:aa:bb:cc:dd:ee', - 'members': ['Ethernet8'] }, 'Vlan2000': { 'alias': 'ab2', 'dhcp_servers': ['192.0.0.1'], 'dhcpv6_servers': ['fc02:2000::3', 'fc02:2000::4'], - 'members': ['Ethernet4'], 'vlanid': '2000' } }