Skip to content

[sonic-utilities] fix config/show vlan members #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dawnbeauty wants to merge 2 commits into from
Closed

[sonic-utilities] fix config/show vlan members #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f98dd7
[sonic-utilities] fix config/show vlan members
Dec 17, 2019
6e0c258
Merge branch 'master' into master
dawnbeauty Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,8 @@ def add_vlan_member(ctx, vid, interface_name, untagged):
if len(vlan) == 0:
ctx.fail("{} doesn't exist".format(vlan_name))
members = vlan.get('members', [])
if interface_name in members:
vlan_member_data = db.get_entry('VLAN_MEMBER', (vlan_name, interface_name))
if interface_name in members or len(vlan_member_data) !=0:
if get_interface_naming_mode() == "alias":
interface_name = interface_name_to_alias(interface_name)
if interface_name is None:
Expand All @@ -1092,13 +1093,11 @@ def add_vlan_member(ctx, vid, interface_name, untagged):
else:
ctx.fail("{} is already a member of {}".format(interface_name,
vlan_name))

for entry in interface_table:
if (interface_name == entry[0]):
ctx.fail("{} is a L3 interface!".format(interface_name))

members.append(interface_name)
vlan['members'] = members
db.set_entry('VLAN', vlan_name, vlan)

db.set_entry('VLAN_MEMBER', (vlan_name, interface_name), {'tagging_mode': "untagged" if untagged else "tagged" })


Expand All @@ -1119,19 +1118,21 @@ def del_vlan_member(ctx, vid, interface_name):
if len(vlan) == 0:
ctx.fail("{} doesn't exist".format(vlan_name))
members = vlan.get('members', [])
if interface_name not in members:
vlan_member_data = db.get_entry('VLAN_MEMBER', (vlan_name, interface_name))
if interface_name not in members and len(vlan_member_data) == 0:
if get_interface_naming_mode() == "alias":
interface_name = interface_name_to_alias(interface_name)
if interface_name is None:
ctx.fail("'interface_name' is None!")
ctx.fail("{} is not a member of {}".format(interface_name, vlan_name))
else:
ctx.fail("{} is not a member of {}".format(interface_name, vlan_name))
members.remove(interface_name)
if len(members) == 0:
del vlan['members']
else:
vlan['members'] = members
if interface_name in members:
members.remove(interface_name)
if len(members) == 0:
del vlan['members']
else:
vlan['members'] = members
db.set_entry('VLAN', vlan_name, vlan)
db.set_entry('VLAN_MEMBER', (vlan_name, interface_name), None)

Expand Down
14 changes: 6 additions & 8 deletions show/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2245,19 +2245,17 @@ def config(redis_unix_socket_path):
config_db.connect(wait_for_init=False)
data = config_db.get_table('VLAN')
keys = data.keys()
member_data = config_db.get_table('VLAN_MEMBER')

def tablelize(keys, data):
table = []

for k in natsorted(keys):
if 'members' not in data[k] :
r = []
r.append(k)
r.append(data[k]['vlanid'])
table.append(r)
continue

for m in data[k].get('members', []):
members = set(data[k].get('members', []))
for (vlan, interface_name) in member_data:
if vlan == k:
members.add(interface_name)
for m in members:
r = []
r.append(k)
r.append(data[k]['vlanid'])
Expand Down