Repository navigation
[LLDP]: Update init_db to load global database config - #166
Merged
SuvarnaMeenakshi merged 5 commits intoOct 15, 2020
Merged
Conversation
before initializing SonicV2Connector class. Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
OID string. Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
qiluo-msft
reviewed
Oct 13, 2020
| SonicDBConfig.load_sonic_global_db_config() | ||
| # SyncD database connector. THIS MUST BE INITIALIZED ON A PER-THREAD BASIS. | ||
| # Redis PubSub objects (such as those within swsssdk) are NOT thread-safe. | ||
| db_conn = SonicV2Connector(**redis_kwargs) |
Contributor
There was a problem hiding this comment.
redis_kwargs [](start = 33, length = 12)
Why remove existing feature? #Closed
Contributor
Author
There was a problem hiding this comment.
Previously redis_kwargs had unix socket path, with the changes done in SonicV2Connector class, unix socket path should be read from database config file. Fixed this to use unix_socket_path from database config file.
Contributor
There was a problem hiding this comment.
This change is still arguable and irrelevant to the LLDP test fix. Could you minimize the changes in this PR, and submit another PR if you really want to change this part?
In reply to: 503657219 [](ancestors = 503657219)
Contributor
Author
There was a problem hiding this comment.
reverted back as suggested, only to provide fix for unit-test.
qiluo-msft
reviewed
Oct 13, 2020
| Connects to DB | ||
| :return: db_conn | ||
| """ | ||
| SonicDBConfig.load_sonic_global_db_config() |
Contributor
There was a problem hiding this comment.
load_sonic_global_db_config [](start = 18, length = 27)
Is it working for single ASIC use case? #Closed
Contributor
Author
There was a problem hiding this comment.
Yes, this works for single asic as well.
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
With the changes done in SonicV2Connector class, unix socket path should be read from database config file and flag to use unix socket path should be set to true. Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
Signed-off-by: SuvarnaMeenakshi <sumeenak@microsoft.com>
qiluo-msft
approved these changes
Oct 15, 2020
abdosi
pushed a commit
that referenced
this pull request
Dec 31, 2020
[LLDP]: Update init_db to load global database config before initializing SonicV2Connector class. LLDPLocManAddrUpdater requires information from host database hence uses init_db() to initialize the host db. For unit-testing multi-asic code path, there are mock db files provided for global_db and namespace specific dbs. As init_db did not load global database config, unit-test mock db was not loading global_db database files for LLDPLocManAddrUpdater unit-testing. Fixed this by loading global database config in init_db function. Fixed by: Loading global database config in init_db() unit-test: Loading mock db files from "global_db" director for multi-asic platform if namespace is empty or None.
ssithaia-ebay
pushed a commit
to ssithaia-ebay/sonic-snmpagent
that referenced
this pull request
May 23, 2025
[LLDP]: Update init_db to load global database config before initializing SonicV2Connector class. LLDPLocManAddrUpdater requires information from host database hence uses init_db() to initialize the host db. For unit-testing multi-asic code path, there are mock db files provided for global_db and namespace specific dbs. As init_db did not load global database config, unit-test mock db was not loading global_db database files for LLDPLocManAddrUpdater unit-testing. Fixed this by loading global database config in init_db function. Fixed by: Loading global database config in init_db() unit-test: Loading mock db files from "global_db" director for multi-asic platform if namespace is empty or None.
This file contains hidden or 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
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.
[LLDP]: Update init_db to load global database config
before initializing SonicV2Connector class.
LLDPLocManAddrUpdater requires information from host database hence uses init_db() to initialize the host db.
For unit-testing multi-asic code path, there are mock db files provided for global_db and namespace specific dbs.
As init_db did not load global database config, unit-test mock db was not loading global_db database files for LLDPLocManAddrUpdater unit-testing. Fixed this by loading global database config in init_db function.
- What I did
As init_db did not load global database config, unit-test mock db was not loading global_db database files for LLDPLocManAddrUpdater unit-testing. Fixed this by loading global database config in init_db function.
- How I did it
- How to verify it
Run unit-test test_subtype_lldp_loc_man_addr_table and make sure that for multi-asic platform, mock_tables/global_db/appl_db.json file is loaded and mock_tables/appl_db.json file is loaded for single-asic platform unit-test.
- Description for the changelog