Skip to content

Get Vlan Id from ASIC_STATE Vlan Object if bvid present #62

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 ASIC_STATE Vlan Object if bvid present #62

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31755ce
Get Vlan Id from ASIC_STATE Vlan Object if bvid present
prsunny Jan 29, 2018
d2df995
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
10 changes: 7 additions & 3 deletions src/sonic_ax_impl/mibs/ietf/rfc4363.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@
from ax_interface.util import mac_decimals
from bisect import bisect_right

def fdb_vlanmac(fdb):
return (int(fdb["vlan"]),) + mac_decimals(fdb["mac"])
def fdb_vlanmac(db_conn, fdb):
if 'vlan' in fdb:
return (int(fdb["vlan"]),) + mac_decimals(fdb["mac"])
elif 'bvid' in fdb:
vlan_id = port_util.get_vlan_id_from_bvid(db_conn, fdb["bvid"])
return (int(vlan_id),) + mac_decimals(fdb["mac"])
Copy link
Copy Markdown
Contributor

@yxieca yxieca Jan 30, 2018

Choose a reason for hiding this comment

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

I don't feel this is a must-change;

I would assign vlan_id in both if and elif branches and return the vlanmac from a same statement, for the sake of consistency.


class FdbUpdater(MIBUpdater):
def __init__(self):
Expand Down Expand Up @@ -65,7 +69,7 @@ def update_data(self):
continue
port_id = self.if_bpid_map[bridge_port_id]

vlanmac = fdb_vlanmac(fdb)
vlanmac = fdb_vlanmac(self.db_conn, fdb)
self.vlanmac_ifindex_map[vlanmac] = mibs.get_index(self.if_id_map[port_id])
self.vlanmac_ifindex_list.append(vlanmac)
self.vlanmac_ifindex_list.sort()
Expand Down