Skip to content

[port_util] Fix issue: port_util.get_vlan_interface_oid_map should not raise exception when DB has not RIF data #117

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
qiluo-msft merged 5 commits into from
Mar 21, 2022
Merged

[port_util] Fix issue: port_util.get_vlan_interface_oid_map should not raise exception when DB has not RIF data #117

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9beb381
[port_util] Fix issue: port_util.get_vlan_interface_oid_map should no…
Junchao-Mellanox Feb 24, 2022
049d4cc
Fix review comment
Junchao-Mellanox Mar 18, 2022
e796528
Merge branch 'master' into fix-get-vlan-oid
qiluo-msft Mar 18, 2022
7768312
Add unit test case
Junchao-Mellanox Mar 21, 2022
196aa77
Merge branch 'fix-get-vlan-oid' of github.com:Junchao-Mellanox/sonic-…
Junchao-Mellanox Mar 21, 2022
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: 4 additions & 3 deletions src/swsssdk/port_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,14 @@ def get_rif_port_map(db):

return rif_port_oid_map

def get_vlan_interface_oid_map(db):
def get_vlan_interface_oid_map(db, blocking=True):
"""
Get Vlan Interface names and sai oids
"""
db.connect('COUNTERS_DB')
rif_name_map = db.get_all('COUNTERS_DB', 'COUNTERS_RIF_NAME_MAP', blocking=True)
rif_type_name_map = db.get_all('COUNTERS_DB', 'COUNTERS_RIF_TYPE_MAP', blocking=True)

rif_name_map = db.get_all('COUNTERS_DB', 'COUNTERS_RIF_NAME_MAP', blocking=blocking)
rif_type_name_map = db.get_all('COUNTERS_DB', 'COUNTERS_RIF_TYPE_MAP', blocking=blocking)

if not rif_name_map or not rif_type_name_map:
return {}
Expand Down