Skip to content
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

Jump to bottom

Vlanmember #1042

Closed
wants to merge 4 commits into from
Closed

Vlanmember #1042

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd04f5e
Merge pull request #1 from Azure/master
ouxlwhu Jan 2, 2020
fea3067
Merge pull request #2 from Azure/master
ouxlwhu Aug 10, 2020
86b3dd6
[config vlan member]: fix the logic of VLAN member existence check
ouxlwhu Aug 10, 2020
6f03db5
Delete main_back.py
ouxlwhu Aug 10, 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
40 changes: 16 additions & 24 deletions config/main.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,22 +1812,17 @@ def add_vlan_member(ctx, vid, interface_name, untagged):
if interface_is_mirror_dst_port(db, interface_name):
ctx.fail("{} is configured as mirror destination port".format(interface_name))

members = vlan.get('members', [])
if interface_name in members:
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 already a member of {}".format(interface_name,
vlan_name))
else:
ctx.fail("{} is already a member of {}".format(interface_name,
vlan_name))
vlanmember = db.get_entry('VLAN_MEMBER', (vlan_name, interface_name))
if len(vlanmember) > 0:
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)
members = vlan.get('members', [])
if interface_name not in members:
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 @@ -1851,20 +1846,17 @@ def del_vlan_member(ctx, vid, interface_name):

if len(vlan) == 0:
ctx.fail("{} doesn't exist".format(vlan_name))
vlanmember = db.get_entry('VLAN_MEMBER', (vlan_name, interface_name))
if len(vlanmember) == 0:
ctx.fail("{} is not a member of {}".format(interface_name, vlan_name))

members = vlan.get('members', [])
if interface_name not in members:
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))
if interface_name in members:
members.remove(interface_name)
if len(members) == 0:
del vlan['members']
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
vlan['members'] = members
db.set_entry('VLAN', vlan_name, vlan)
db.set_entry('VLAN_MEMBER', (vlan_name, interface_name), None)

Expand Down