[Celestica] Ladakh800bcls: Agent Test: Fix AgentQueuePerHostL2Tests* AgentQueuePerHostRouteTests* init conf…#1301
Closed
cel-gl wants to merge 1 commit into
Closed
[Celestica] Ladakh800bcls: Agent Test: Fix AgentQueuePerHostL2Tests* AgentQueuePerHostRouteTests* init conf…#1301cel-gl wants to merge 1 commit into
cel-gl wants to merge 1 commit into
Conversation
Contributor
Author
Contributor
|
@mikechoifb has imported this pull request. If you are a Meta employee, you can view this in D109721421. |
Contributor
|
@jrallapalli merged this pull request in ec14e17. |
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.
Pre-submission checklist
pip install -r requirements-dev.txt && pre-commit installpre-commit runclang-format.............................................................Passed
shellcheck...........................................(no files to check)Skipped
shfmt................................................(no files to check)Skipped
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check json...........................................(no files to check)Skipped
check for merge conflicts................................................Passed
ruff check...........................................(no files to check)Skipped
ruff format..........................................(no files to check)Skipped
Prevent sai_impl in fboss manifest.......................................Passed
Summary
when run AgentQueuePerHostL2Tests* AgentQueuePerHostRouteTests* test cases, error info , agent can't create unit 1, because error config generated, need change initconfig
Replaced the legacy, multi-NPU-unaware configuration helper calls in AgentNeighborTest::initialConfig() with the multi-NPU-aware overloads:
Updated oneL3IntfTwoPortConfig branches to take explicit hardware arguments:
ensemble.getPlatformMapping()
asic
ensemble.supportsAddRemovePort()
asic->desiredLoopbackModes()
ensemble.getSw()->getPlatformType() (Crucially provides the specific platform type)
By explicitly passing PlatformType::PLATFORM_LEH800BCLS, the configuration generator (genPortVlanCfg()) detects the dual-NPU hardware layout and generates a complete, valid switch configuration covering both SwitchID(0) and SwitchID(1).
This ensures all SDK resources and units are correctly mapped and initialized
Test Plan
run test cases AgentQueuePerHostL2Tests* AgentQueuePerHostRouteTests* on unit 0 and 1 all passed
=== Cold boot: AgentQueuePerHostL2Test.VerifyHostToQueueMappingClassID (switch_id=1) ===
Waiting for config files...
Config files ready after 1s
Starting hw_agent processes...
=== Warm boot: AgentQueuePerHostL2Test.VerifyHostToQueueMappingClassID (switch_id=1) ===
=== Test Results ===
Cold boot: PASSED (exit code 0)
Warm boot: PASSED (exit code 0)
=== Cold boot: AgentQueuePerHostL2Test.VerifyHostToQueueMappingClassID (switch_id=1) ===
Waiting for config files...
Config files ready after 1s
Starting hw_agent processes...
=== Warm boot: AgentQueuePerHostL2Test.VerifyHostToQueueMappingClassID (switch_id=1) ===
=== Test Results ===
Cold boot: PASSED (exit code 0)
Warm boot: PASSED (exit code 0)
passed === Cold boot: AgentQueuePerHostRouteTest/0.VerifyHostToQueueMappingClassID (switch_id=0) ===
Waiting for config files...
Config files ready after 1s
Starting hw_agent processes...
=== Warm boot: AgentQueuePerHostRouteTest/0.VerifyHostToQueueMappingClassID (switch_id=0) ===
=== Test Results ===
Cold boot: PASSED (exit code 0)
Warm boot: PASSED (exit code 0)
=== Cold boot: AgentQueuePerHostRouteTest/1.VerifyHostToQueueMappingClassIDBlock (switch_id=1) ===
Waiting for config files...
Config files ready after 1s
Starting hw_agent processes...
=== Warm boot: AgentQueuePerHostRouteTest/1.VerifyHostToQueueMappingClassIDBlock (switch_id=1) ===
=== Test Results ===
Cold boot: PASSED (exit code 0)
Warm boot: PASSED (exit code 0)