Skip to content

Commit 07e5bf4

Browse files
twtseng-timchenkelly
authored andcommitted
Fix VLAN member not removed from VLAN TABLE after executing the CLI
1 parent 02586f1 commit 07e5bf4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

show/vlan.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -147,28 +147,28 @@ def config(db):
147147
member_data = db.cfgdb.get_table('VLAN_MEMBER')
148148
interface_naming_mode = clicommon.get_interface_naming_mode()
149149
iface_alias_converter = clicommon.InterfaceAliasConverter(db)
150-
150+
151151
def get_iface_name_for_display(member):
152152
name_for_display = member
153153
if interface_naming_mode == "alias" and member:
154154
name_for_display = iface_alias_converter.name_to_alias(member)
155155
return name_for_display
156-
156+
157157
def get_tagging_mode(vlan, member):
158158
if not member:
159159
return ''
160160
tagging_mode = db.cfgdb.get_entry('VLAN_MEMBER', (vlan, member)).get('tagging_mode')
161161
return '?' if tagging_mode is None else tagging_mode
162-
162+
163163
def tablelize(keys, data):
164164
table = []
165165

166166
for k in natsorted(keys):
167-
members = set([(vlan, member) for vlan, member in member_data if vlan == k] + [(k, member) for member in set(data[k].get('members', []))])
167+
members = set([(vlan, member) for vlan, member in member_data if vlan == k])
168168
# vlan with no members
169169
if not members:
170170
members = [(k, '')]
171-
171+
172172
for vlan, member in natsorted(members):
173173
r = [vlan, data[vlan]['vlanid'], get_iface_name_for_display(member), get_tagging_mode(vlan, member)]
174174
table.append(r)

0 commit comments

Comments
 (0)