[rfc1213] Interface MIB add l3 vlan interfaces & aggregate rif counters #133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 9 commits
May 15, 2020 12:32
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
|
Could you resolve the conflicts? |
qiluo-msft
reviewed
Jun 3, 2020
| @@ -264,6 +298,29 @@ def _get_counter(self, oid, table_name): | |||
| mibs.logger.warning("SyncD 'COUNTERS_DB' missing attribute '{}'.".format(e)) | |||
| return None | |||
|
|
|||
| def aggregate_counters(self): | |||
There was a problem hiding this comment.
aggregate_counters [](start = 8, length = 18)
Is it only for Mellanox SKUs? #Closed
There was a problem hiding this comment.
This will only be executed if COUNTERS DB contains the rif counters. If RIF counters is not supported/disabled we will have unchanged behavior.
qiluo-msft
reviewed
Jun 3, 2020
| @@ -283,7 +340,14 @@ def get_counter(self, sub_id, table_name): | |||
| counter_value = 0 | |||
| for lag_member in self.lag_name_if_name_map[self.oid_lag_name_map[oid]]: | |||
| counter_value += self._get_counter(mibs.get_index(lag_member), table_name) | |||
|
|
|||
| # import pdb; pdb.set_trace() | |||
There was a problem hiding this comment.
remove dead code #Closed
qiluo-msft
reviewed
Jun 3, 2020
| sai_lag_id = self.lag_sai_map[self.oid_lag_name_map[oid]] | ||
| sai_lag_rif_id = self.port_rif_map[sai_lag_id] | ||
| if sai_lag_rif_id in self.rif_port_map: | ||
| _table_name = bytes(getattr(table_name, 'name', table_name), 'utf-8') |
There was a problem hiding this comment.
_table_name [](start = 16, length = 11)
leading underscore is for private class member. Could you use other name convention? #Closed
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
3 tasks
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
qiluo-msft
approved these changes
Jun 22, 2020
|
Retest this please |
|
Test can not pass until sonic-net/sonic-py-swsssdk#78 is merged. |
volodymyrsamotiy
approved these changes
Jun 23, 2020
|
Retest this please |
|
Test did not pass even after sonic-net/sonic-py-swsssdk#78 merged. |
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
|
Hi @qiluo-msft, I added the mock data for the test to pass. Can we go forward and merge this? |
SuvarnaMeenakshi
added a commit
to SuvarnaMeenakshi/sonic-snmpagent
that referenced
this pull request
Jul 16, 2020
…f counters (sonic-net#133)" This reverts commit 253f58e. Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
qiluo-msft
pushed a commit
that referenced
this pull request
Dec 8, 2020
…rs (#169) **- What I did** Rework based on #133 and feedback #148. **- How I did it** - merge #133 with upstream master. - Fix UnavailableDataError when RIF counters are not enabled. - Make RIF keys in maps unique in multi asic env. **- How to verify it** - Disable rif counters - restart swss - snmpwalk - Verify no UnavailableDataError in logs - Verify port counters are returned - Enable rif counters - snmpwalk - Verify no error in logs - Verify error in/out counters are aggregated for rif ports and portchannels - Verify VLAN RIF counters are present in the MIB. **- Description for the changelog** Added support for aggregated router interface counters and L3 VLAN counters to RFC1213 MIB.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
- How I did it
- How to verify it
- Description for the changelog
According to HLD
Implies #4655
Relies on #78