Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[201911]Cherry-pick Master PR's to 201911 #143

Closed
wants to merge 3 commits into from

Conversation

abdosi
Copy link
Contributor

@abdosi abdosi commented Jul 11, 2020

Not able to push to branch directly so creating PR for cherry-pick

Following PR's are picked:
1 . Fix LGTM reported alert of PR#141 (#142)
2. [Namespace] Fix interfaces counters in InterfacesMIB RFC 2863 (#141)
3. [Namespace]: Fix SNMP AgentX socket connection timeout when using Namespace.get_all() (#140)

SuvarnaMeenakshi and others added 3 commits July 11, 2020 10:35
…espace.get_all() (#140)

* [Namespace]: Remove key exists check in dbs_get_all
to reduce time taken.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Fix as per review comment.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Minor fix.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Connect to all required namespace dbs during init and periodic
sync_d functions to reduce time taken in dbs_get_all.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Change test_mibs to use generic wrapper function added.
The Namespace functions will be used for both single
and multi-asic platforms.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Fix review comment.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Fix as per review comment.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Remove whitespace.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Fix review comment. Avoid modifying mutable object kwargs,
do a shallow copy instead.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
* [InterfacesMIB]: Fix counters in InterfacesMIB for
multi-asic platforms. In multi-asic platforms SAI oid
is not unique across namespace/asic. Use interface index
as the key instead of using SAI oid.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* [Namespace]: Remove key exists check in dbs_get_all
to reduce time taken.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
(cherry picked from commit 16f36d8)

* Change the key used in if_id_map to support multi-asic
platform.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Fix interface counters only for rfc2863.
Do not run namespace unit-test for MIBs using SAI id as key.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Fix getting interface index in InterfacesMIB

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Remove debug print.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Remove db connect that is not required.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Modify as per review comments.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Fix as per review comment.
Add a new dict of namespace:db connector for easier access.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Fix as per review comment.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

* Modify based on review comment.

Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>

Co-authored-by: abdosi <58047199+abdosi@users.noreply.github.com>
@abdosi abdosi changed the title Cherry-pick Pr's from master to 201911 [201911]Cherry-pick Master PR's to 201911 Jul 11, 2020
@qiluo-msft
Copy link
Contributor

I change the branch policy, and direct cherry-pick is preferred. Please check again.

@qiluo-msft qiluo-msft closed this Jul 11, 2020
@abdosi abdosi deleted the cherry-pick-from_master branch July 11, 2020 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants