From ee9ee1450b160bb7686a45478e7f75fbba0db910 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Tue, 7 Apr 2020 17:59:18 -0700 Subject: [PATCH] Revert "Revert "read portchannel name from LAG_NAME_MAP_TABLE in COUNTERS_DB (#51)" (#57)" (#64) This reverts commit 022d8fb514db6a89f61fe95b67c9de8c6c061892. Add #51 back in by reverting #57, in because issues should be addressed by the merge of Azure/sonic-swss#1124 --- src/swsssdk/port_util.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/swsssdk/port_util.py b/src/swsssdk/port_util.py index 9ff2fb2680f8..0ed0c6ea3b7e 100644 --- a/src/swsssdk/port_util.py +++ b/src/swsssdk/port_util.py @@ -49,6 +49,9 @@ def get_interface_oid_map(db): """ db.connect('COUNTERS_DB') if_name_map = db.get_all('COUNTERS_DB', 'COUNTERS_PORT_NAME_MAP', blocking=True) + if_lag_name_map = db.get_all('COUNTERS_DB', 'COUNTERS_LAG_NAME_MAP', blocking=True) + if_name_map.update(if_lag_name_map) + oid_pfx = len("oid:0x") if_name_map = {if_name: sai_oid[oid_pfx:] for if_name, sai_oid in if_name_map.items()}