[submodule] Advance sonic-ztp to pick up the port config re-assert fix (202311.X) - #746
Merged
Merged
Conversation
sonic-ztp 274909a re-asserts the front panel port configuration after the ZTP profile is removed. Without it, the ports that ifupdown2 had adopted for ZTP in-band DHCP are torn down by the ifdown/ifup that interfaces-config performs during teardown and are never brought back, leaving the netdev administratively down with its MTU reset while CONFIG_DB, APPL_DB and the ASIC all still report the port as up. LLDP and DHCP stop working on those ports and only a manual "config interface shutdown/startup" recovers them. Advance the src/sonic-ztp submodule from c488842 to 274909a. The .gitmodules branch field for src/sonic-ztp already tracks 202311.X, so no other change is needed.
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
1 participant
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.
Advances the
src/sonic-ztpsubmodule on202311.Xso the branch picks up the port configuration re-assert fix (edge-core/sonic-ztp#7).c488842->274909a, which brings in exactly one commit:274909a[ZTP] Re-assert front panel port config after ZTP profile removalWhy
ztp-profile.sh removedeletesZTP|modefrom CONFIG_DB and then restartsinterfaces-config, which regenerates/etc/network/interfacesfrominterfaces.j2. The ZTP in-band block of that template is gated onZTP['mode'], so once the table is gone the regenerated file contains no Ethernet stanza at all. The subsequentsystemctl restart networkingrunsifdown -afollowed byifup -a: ifupdown2 tears down every front panel port it had adopted for ZTP in-band DHCP and does not bring them back.The netdev is left administratively down with its MTU reset to the kernel default, while CONFIG_DB, APPL_DB and the ASIC all still report the port as up. Because
show interfaces statusreads APPL_DB the CLI shows up/up, so the problem is invisible from there while LLDP and DHCP silently stop working. portmgrd only acts on CONFIG_DB events and keeps no desired state, so it neither notices nor corrects the drift. Recovery requires a manualconfig interface shutdown/startupon each affected port.Scope
Submodule pointer only.
.gitmodulesalready hasbranch = 202311.Xforsrc/sonic-ztp, so nothing else changes. The same bump has already been applied on202311.X_4630_10g_prodin #738.Verification
Validated on an AS4630-54PE running in-band ZTP with an official build. After ZTP removes its profile the teardown is confirmed to have happened -
/etc/network/interfacesholds no Ethernet stanza andZTP|modeis cleared - and all 48 cabled front panel ports stay up with MTU 9100, with the peer capturing LLDP frames at the expected 30 second interval. Without the fix the same environment leaves all 48 ports netdev DOWN with MTU 1500 while the CLI reports them as up/up and no LLDP is transmitted.