[Draft] Revert "[sonic-bgpcfgd] Add ability to wait on rehydration for additional Loopback IPs during reloads"#26773
[Draft] Revert "[sonic-bgpcfgd] Add ability to wait on rehydration for additional Loopback IPs during reloads"#26773xwjiang-ms wants to merge 1 commit into
Conversation
…onal Loo…" This reverts commit b4ddef0.
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Pull request overview
This PR reverts the earlier change that added support for waiting on rehydration of additional loopback IPs (beyond the existing loopback requirements) during BGP reload handling in sonic-bgpcfgd.
Changes:
- Removes the “additional loopbacks” discovery/init logic from the BGP peer manager and restores explicit Loopback0/Loopback4096 gating behavior.
- Updates unit tests to stop asserting the removed informational log messages.
- Deletes the internal
additional_loopbacks.conf.j2template that supported the reverted behavior.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
src/sonic-bgpcfgd/tests/test_bgp.py |
Removes mocks/assertions tied to the reverted “additional loopbacks acquired” logging. |
src/sonic-bgpcfgd/bgpcfgd/managers_bgp.py |
Reverts additional-loopback initialization and restores direct Loopback0/Loopback4096 checks in add_peer. |
dockers/docker-fpm-frr/frr/bgpd/templates/internal/additional_loopbacks.conf.j2 |
Removes the template used for additional loopback enumeration (now unused after revert). |
| def get_lo_ipv4(self, loopback_str): | ||
| """ | ||
| Extract LoopbackX ipv4 address from the Directory | ||
| :return: ipv4 address for LoopbackX, None if nothing found | ||
| Extract Loopback0 ipv4 address from the Directory | ||
| :return: ipv4 address for Loopback0, None if nothing found | ||
| """ | ||
| loopback0_ipv4 = None |
There was a problem hiding this comment.
The get_lo_ipv4() docstring now states it only extracts Loopback0 IPv4, but the function is used for other loopbacks as well (e.g., Loopback4096| in add_peer). Please update the docstring (and ideally the local variable name loopback0_ipv4) to reflect that this is a generic helper for any loopback prefix passed via loopback_str.
|
/azpw ms_conflict |
|
/azpw ms_conflict |
3 similar comments
|
/azpw ms_conflict |
|
/azpw ms_conflict |
|
/azpw ms_conflict |
Reverts #26349