Skip to content

Commit

Permalink
Support port speed for PortChannels
Browse files Browse the repository at this point in the history
Iteration over member interfaces is based on _get_counter.
  • Loading branch information
lukasstockner committed Jun 15, 2022
1 parent 1477c36 commit 4a676e5
Showing 1 changed file with 19 additions and 7 deletions.
26 changes: 19 additions & 7 deletions src/sonic_ax_impl/mibs/ietf/rfc2863.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,11 @@ def interface_alias(self, sub_id):
:param sub_id: The 1-based sub-identifier query.
:return: The SONiC interface description, empty string if not defined.
"""
entry = self._get_if_entry(sub_id)
oid = self.get_oid(sub_id)
if not oid:
return

entry = self._get_if_entry(oid)
if not entry:
return

Expand Down Expand Up @@ -259,15 +263,11 @@ def _get_counter(self, oid, table_name, mask):
mibs.logger.warning("SyncD 'COUNTERS_DB' missing attribute '{}'.".format(e))
return None

def _get_if_entry(self, sub_id):
def _get_if_entry(self, oid):
"""
:param oid: The 1-based sub-identifier query.
:return: the DB entry for the respective sub_id.
"""
oid = self.get_oid(sub_id)
if not oid:
return

if_table = ""
# Once PORT_TABLE will be moved to CONFIG DB
# we will get entry from CONFIG_DB for all cases
Expand All @@ -291,7 +291,19 @@ def get_high_speed(self, sub_id):
:param sub_id: The 1-based sub-identifier query.
:return: speed value for the respective sub_id or 40000 if not defined.
"""
entry = self._get_if_entry(sub_id)
oid = self.get_oid(sub_id)
if not oid:
return

if oid in self.oid_lag_name_map:
speed = 0
for lag_member in self.lag_name_if_name_map[self.oid_lag_name_map[oid]]:
entry = self._get_if_entry(mibs.get_index_from_str(lag_member))
if entry:
speed += int(entry.get("speed", 0))
return speed

entry = self._get_if_entry(oid)
if not entry:
return

Expand Down

0 comments on commit 4a676e5

Please sign in to comment.