[rfc1213] Interface MIB add l3 vlan interfaces & aggregate rif counters by mykolaf · Pull Request #133 · sonic-net/sonic-snmpagent

mykolaf · 2020-06-01T18:13:21Z

- What I did

- How I did it

- How to verify it

- Description for the changelog

Add vlan interface to Interface MIB
Aggregate rif counters with l2 counters if rif counters are available.

According to HLD

Implies #4655
Relies on #78

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

qiluo-msft · 2020-06-02T23:31:01Z

Could you resolve the conflicts?

qiluo-msft · 2020-06-03T00:27:45Z

src/sonic_ax_impl/mibs/ietf/rfc1213.py

            mibs.logger.warning("SyncD 'COUNTERS_DB' missing attribute '{}'.".format(e))
            return None

+    def aggregate_counters(self):


aggregate_counters [](start = 8, length = 18)

Is it only for Mellanox SKUs? #Closed

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 · 2020-06-03T00:28:01Z

src/sonic_ax_impl/mibs/ietf/rfc1213.py

            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()


remove dead code #Closed

qiluo-msft · 2020-06-03T00:29:01Z

src/sonic_ax_impl/mibs/ietf/rfc1213.py

+            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')


_table_name [](start = 16, length = 11)

leading underscore is for private class member. Could you use other name convention? #Closed

qiluo-msft

As comments

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

qiluo-msft · 2020-06-22T19:58:50Z

Retest this please

mykolaf · 2020-06-23T07:48:55Z

Test can not pass until sonic-net/sonic-py-swsssdk#78 is merged.

qiluo-msft · 2020-06-23T23:59:50Z

Retest this please

qiluo-msft · 2020-06-24T00:11:39Z

Test did not pass even after sonic-net/sonic-py-swsssdk#78 merged.

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

mykolaf · 2020-07-06T07:43:13Z

Hi @qiluo-msft, I added the mock data for the test to pass. Can we go forward and merge this?

…f counters (sonic-net#133)" This reverts commit 253f58e. Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

…f counters (#133)" (#151) This reverts commit 253f58e. Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

…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.

…rs (sonic-net#133) * [rfc1213] Interface MIB add l3 vlan interfaces * [rfc1213] aggregate rifcounters on top of l2 counters * fix issues * add unittests * add mock data * cleanup * lag rif fixes * add more unittests * update test_mibs.py * fix comments * update namespace/test_mibs.py unittest * [rfc1213] add vlan interface admin_status * only aggregate errors * add vlan subinterface unitttests * fix init_sync_d_lag * update namespace mib test * add namespace mock table data

…f counters (sonic-net#133)" (sonic-net#151) This reverts commit 253f58e. Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

…rs (sonic-net#169) **- What I did** Rework based on sonic-net#133 and feedback sonic-net#148. **- How I did it** - merge sonic-net#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.

Mykola Faryma added 9 commits May 15, 2020 12:32

[rfc1213] Interface MIB add l3 vlan interfaces

f1b5ec1

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

[rfc1213] aggregate rifcounters on top of l2 counters

029a992

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

fix issues

5d3421f

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

add unittests

f0e4048

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

add mock data

2a35053

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

cleanup

0999b4b

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

lag rif fixes

cbf06e3

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

add more unittests

7c969b7

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

update test_mibs.py

b5c4632

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

mykolaf mentioned this pull request Jun 1, 2020

[port_util] add get_rif_port_map, get_vlan_interface_oid_map sonic-net/sonic-py-swsssdk#78

Merged

qiluo-msft self-requested a review June 2, 2020 23:31

qiluo-msft reviewed Jun 3, 2020

View reviewed changes

qiluo-msft requested changes Jun 3, 2020

View reviewed changes

mykolaf and others added 6 commits June 6, 2020 17:41

Merge branch 'master' into drops

20afa18

fix comments

167ece7

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

update namespace/test_mibs.py unittest

9124833

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

[rfc1213] add vlan interface admin_status

ed9409f

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

only aggregate errors

b141e51

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

add vlan subinterface unitttests

80935af

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

mykolaf marked this pull request as draft June 16, 2020 14:15

mykolaf mentioned this pull request Jun 19, 2020

[snmp_interfaces] add snmp interface counters check sonic-net/sonic-mgmt#1796

Merged

3 tasks

fix init_sync_d_lag

89616da

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

qiluo-msft approved these changes Jun 22, 2020

View reviewed changes

mykolaf marked this pull request as ready for review June 23, 2020 07:56

volodymyrsamotiy approved these changes Jun 23, 2020

View reviewed changes

update namespace mib test

0116f85

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

mykolaf force-pushed the drops branch from b26df4a to 0116f85 Compare June 24, 2020 16:07

add namespace mock table data

5d2110d

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

qiluo-msft merged commit 253f58e into sonic-net:master Jul 6, 2020

SuvarnaMeenakshi mentioned this pull request Jul 15, 2020

RIF SAI ID key unavailable error in COUNTERS_DB #148

Open

SuvarnaMeenakshi mentioned this pull request Jul 16, 2020

Revert "[rfc1213] Interface MIB add l3 vlan interfaces & aggregate rif counters (#133)" #151

Merged

jleveque pushed a commit that referenced this pull request Jul 16, 2020

Revert "[rfc1213] Interface MIB add l3 vlan interfaces & aggregate ri…

c702a57

…f counters (#133)" (#151) This reverts commit 253f58e. Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

stepanblyschak mentioned this pull request Oct 9, 2020

[rfc1213] Interface MIB add l3 vlan interfaces & aggregate rif counters stepanblyschak/sonic-snmpagent#1

Closed

stepanblyschak mentioned this pull request Oct 16, 2020

[rfc1213] Interface MIB add l3 vlan interfaces & aggregate rif counters #169

Merged

Conversation

mykolaf commented Jun 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

qiluo-msft commented Jun 2, 2020

Uh oh!

qiluo-msft Jun 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mykolaf Jun 6, 2020

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Jun 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mykolaf Jun 6, 2020

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Jun 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mykolaf Jun 6, 2020

Choose a reason for hiding this comment

Uh oh!

qiluo-msft left a comment

Choose a reason for hiding this comment

Uh oh!

qiluo-msft commented Jun 22, 2020

Uh oh!

mykolaf commented Jun 23, 2020

Uh oh!

qiluo-msft commented Jun 23, 2020

Uh oh!

qiluo-msft commented Jun 24, 2020

Uh oh!

mykolaf commented Jul 6, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mykolaf commented Jun 1, 2020 •

edited

Loading

qiluo-msft Jun 3, 2020 •

edited

Loading

qiluo-msft Jun 3, 2020 •

edited

Loading

qiluo-msft Jun 3, 2020 •

edited

Loading