Skip to content

[Celestica] Leh800bcls: Fix bcmcfg_parse_error in AgentTrafficPfc*Test tests case due to fragile hardcoded YAML indentation #1316

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.

Sign up for GitHub

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

Open
gang-tao wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

[Celestica] Leh800bcls: Fix bcmcfg_parse_error in AgentTrafficPfc*Test tests case due to fragile hardcoded YAML indentation #1316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion fboss/agent/test/utils/NetworkAITestUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,10 +379,27 @@ void applyBackendAsicConfig(
std::string toReplace("LOSSY");
if (std::size_t pos = yamlCfg.find(toReplace);
pos != std::string::npos) {
// Dynamically determine the line indentation before replacing "LOSSY"
// to ensure that the newly inserted "SKIP_BUFFER_RESERVATION: 1"
// matches the parent's YAML indentation style (e.g., 6 spaces before
// vs 12 spaces now). This prevents Broadcom SDKLT config parser
// (bcmcfg) block mapping syntax errors (bcmcfg_parse_error) during
// boot.
std::size_t lineStart = yamlCfg.rfind('\n', pos);
if (lineStart == std::string::npos) {
lineStart = 0;
} else {
lineStart += 1;
}
std::string indent = "";
while (lineStart < pos && std::isspace(yamlCfg[lineStart])) {
indent += yamlCfg[lineStart];
lineStart++;
}
yamlCfg.replace(
pos,
toReplace.length(),
"LOSSY_AND_LOSSLESS\n SKIP_BUFFER_RESERVATION: 1");
"LOSSY_AND_LOSSLESS\n" + indent + "SKIP_BUFFER_RESERVATION: 1");
}

// Do not force qgroups on in backend tests.
Expand Down
Loading