Skip to content

Commit

Permalink
Fix LGTM errors.
Browse files Browse the repository at this point in the history
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
  • Loading branch information
SuvarnaMeenakshi committed May 27, 2020
1 parent 961fc20 commit 3ffba0e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 21 deletions.
26 changes: 10 additions & 16 deletions src/sonic_ax_impl/mibs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -570,26 +570,20 @@ def init_namespace_sync_d_queue_tables(dbs):
return port_queues_map, queue_stat_map, port_queue_list_map

@staticmethod
def get_bridge_port_map_from_namespace_dbs(all_ns_db, db_name):
def get_bridge_port_map_from_namespace_dbs(dbs, db_name):
"""
get_bridge_port_map from all namespace DBs
"""
if_br_oid_map = {}
if len(all_ns_db) == 1:
if_br_oid_map = port_util.get_bridge_port_map(all_ns_db[0])
else:
for db_conn in all_ns_db[1:]:
if_br_oid_map_ns = port_util.get_bridge_port_map(db_conn)
if_br_oid_map.update(if_br_oid_map_ns)
for db_conn in Namespace.get_non_host_dbs(dbs):
if_br_oid_map_ns = port_util.get_bridge_port_map(db_conn)
if_br_oid_map.update(if_br_oid_map_ns)
return if_br_oid_map

@staticmethod
def get_vlan_id_from_bvid_from_namespace_dbs(all_ns_db, bvid):
if len(all_ns_db) == 1:
return port_util.get_vlan_id_from_bvid(all_ns_db[0], bvid)
else:
for db_conn in all_ns_db[1:]:
db_conn.connect('ASIC_DB')
vlan_obj = db.keys('ASIC_DB', "ASIC_STATE:SAI_OBJECT_TYPE_VLAN:" + bvid)
if vlan_obj is not None:
return port_util.get_vlan_id_from_bvid(db_conn, bvid)
def get_vlan_id_from_bvid_from_namespace_dbs(dbs, bvid):
for db_conn in Namespace.get_non_host_dbs(dbs):
db_conn.connect('ASIC_DB')
vlan_obj = db.keys('ASIC_DB', "ASIC_STATE:SAI_OBJECT_TYPE_VLAN:" + bvid)
if vlan_obj is not None:
return port_util.get_vlan_id_from_bvid(db_conn, bvid)
2 changes: 0 additions & 2 deletions src/sonic_ax_impl/mibs/ietf/rfc2737.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
from sonic_ax_impl import mibs
from sonic_ax_impl.mibs import Namespace

import threading

@unique
class PhysicalClass(int, Enum):
"""
Expand Down
2 changes: 1 addition & 1 deletion src/sonic_ax_impl/mibs/ietf/rfc3433.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from enum import Enum, unique
from bisect import bisect_right

from swsssdk import SonicV2Connector, port_util
from swsssdk import port_util
from ax_interface import MIBMeta, MIBUpdater, ValueType, SubtreeMIBEntry
from sonic_ax_impl import mibs
from sonic_ax_impl.mibs import Namespace
Expand Down
2 changes: 0 additions & 2 deletions src/sonic_ax_impl/mibs/ietf/rfc4363.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import json
from enum import unique, Enum

from sonic_ax_impl import mibs
from sonic_ax_impl.mibs import Namespace
from swsssdk import port_util
from ax_interface import MIBMeta, ValueType, MIBUpdater, SubtreeMIBEntry
from ax_interface.util import mac_decimals
from bisect import bisect_right
Expand Down

0 comments on commit 3ffba0e

Please sign in to comment.