Skip to content

Get Vlan Id from SAI Vlan Object if bvid present #196

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

Merged
prsunny merged 2 commits into from
Jan 30, 2018
Merged

Get Vlan Id from SAI Vlan Object if bvid present #196

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b6c18
Get Vlan Id from ASIC_STATE Vlan Object if bvid present
prsunny Jan 29, 2018
7e0c024
Address review comments
prsunny Jan 30, 2018
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
7 changes: 5 additions & 2 deletions scripts/fdbshow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,11 @@ class FdbShow(object):
continue
port_id = self.if_br_oid_map[br_port_id]
if_name = self.if_oid_map[port_id]

self.bridge_mac_list.append((int(fdb["vlan"]),) + (fdb["mac"],) + (if_name,))
if 'vlan' in fdb:
vlan_id = fdb["vlan"]
elif 'bvid' in fdb:
vlan_id = port_util.get_vlan_id_from_bvid(self.db, fdb["bvid"])
Copy link
Copy Markdown
Contributor

@qiluo-msft qiluo-msft Apr 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vlan_id [](start = 16, length = 7)

If neither exists, vlan_id will be not defined, do you need protection?

Copy link
Copy Markdown
Contributor

@gitsabari gitsabari Apr 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no actually for lag interfaces there are no if_oid_map in this map, self.if_oid_map[port_id]. that cause it bails out

self.bridge_mac_list.append((int(vlan_id),) + (fdb["mac"],) + (if_name,))

self.bridge_mac_list.sort(key = lambda x: x[0])
return
Expand Down