Revert "Orchagent changes needed to support single ASIC VOQ Fixed-System"#4035
Revert "Orchagent changes needed to support single ASIC VOQ Fixed-System"#4035
Conversation
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Pull request overview
This PR reverts PR #3847, which added support for single ASIC VOQ (Virtual Output Queue) Fixed-System. The revert removes the conditional logic that allowed VOQ switches to operate in a standalone mode without chassis database connectivity, reverting back to requiring CHASSIS_APP_DB connection for all VOQ switch types.
Key changes:
- Removed
gMultiAsicVoqglobal flag andisChassisDbInUse()helper function, reverting to directgMySwitchType == "voq"checks - Eliminated test infrastructure for single ASIC VOQ fixed-system mode, including test configurations and command-line options
- Removed conditional CHASSIS_APP_DB connection logic that enabled standalone VOQ operation
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
tests/virtual_chassis/database_config.json |
Deleted database configuration file used for testing virtual chassis setup with single ASIC VOQ |
tests/single_asic_voq_fs/default_config.json |
Deleted default configuration for single ASIC VOQ fixed-system test mode |
tests/conftest.py |
Removed --switch-mode parameter, SINGLE_ASIC_VOQ_FS constant, and related conditional logic for handling single ASIC VOQ test mode |
tests/mock_tests/mock_orchagent_main.cpp |
Removed mock implementations of gMultiAsicVoq and isChassisDbInUse() |
orchagent/p4orch/tests/test_main.cpp |
Removed mock implementations of gMultiAsicVoq and isChassisDbInUse() |
orchagent/main.cpp |
Removed gMultiAsicVoq flag, isChassisDbInUse() function, and isChassisAppDbPresent() function; restored unconditional CHASSIS_APP_DB connection for VOQ switches |
orchagent/portsorch.cpp |
Reverted VOQ detection from isChassisDbInUse() to gMySwitchType == "voq" for LAG operations and port status updates |
orchagent/neighorch.cpp |
Reverted VOQ detection from isChassisDbInUse() to gMySwitchType == "voq" for neighbor synchronization |
orchagent/intfsorch.cpp |
Reverted VOQ detection from isChassisDbInUse() to gMySwitchType == "voq" for interface operations |
.azure-pipelines/test-docker-sonic-vs-template.yml |
Removed single ASIC VOQ test execution from CI pipeline |
.azure-pipelines/docker-sonic-vs/start.sh |
Removed conditional VOQ configuration file handling during container startup |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
sonic-net/sonic-buildimage@71f390d |
|
@tjchadaga , would you check on this? need the t2 kvm fix before we can re-merge this. |
|
Orchagent crash backtrace seen on T2 KVM: Trigger of segfault: |
…tem (sonic-net#3847)" (sonic-net#4035) This reverts commit 5671e08. Signed-off-by: Kalash Nainwal <kalash@nexthop.ai>
What I did Orchagent changes needed to support single ASIC VOQ Fixed-System (#3847) was reverted via (#4035) because vms-kvm-t2 tests were failing. That was because the isChassisAppDbPresent() was using an incorrect path to database_config.json This PR brings back the original #3847 and fixes the isChassisAppDbPresent() to use the correct path. Why I did it Single-asic VOQ systems do need #3847
<!-- Please make sure you have read and understood the contribution guildlines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md 1. Make sure your commit includes a signature generted with `git commit -s` 2. Make sure your commit title follows the correct format: [component]: description 3. Make sure your commit message contains enough details about the change and related tests 4. Make sure your pull request adds related reviewers, asignees, labels Please also provide the following information in this pull request: --> **What I did** Orchagent changes needed to support single ASIC VOQ Fixed-System (sonic-net#3847) was reverted via (sonic-net#4035) because vms-kvm-t2 tests were failing. That was because the `isChassisAppDbPresent()` was using an incorrect path to `database_config.json` This PR brings back the original sonic-net#3847 and fixes the `isChassisAppDbPresent()` to use the correct path. **Why I did it** Single-asic VOQ systems do need sonic-net#3847 **How I verified it** Tests on vms-kvm-t2 and also single-asic voq systems Verified on vms-kvm-t2 the test_bgp_fact is passing ``` bgp/test_bgp_fact.py::test_bgp_facts[vlab-t2-1-1-0] PASSED [ 25%] bgp/test_bgp_fact.py::test_bgp_facts[vlab-t2-1-1-1] PASSED [ 50%] bgp/test_bgp_fact.py::test_bgp_facts[lvlab-t2-1-2-0] PASSED [ 75%] bgp/test_bgp_fact.py::test_bgp_facts[vlab-t2-1-2-1] PASSED [100%] ``` **Details if related**
<!-- Please make sure you have read and understood the contribution guildlines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md 1. Make sure your commit includes a signature generted with `git commit -s` 2. Make sure your commit title follows the correct format: [component]: description 3. Make sure your commit message contains enough details about the change and related tests 4. Make sure your pull request adds related reviewers, asignees, labels Please also provide the following information in this pull request: --> **What I did** Orchagent changes needed to support single ASIC VOQ Fixed-System (#3847) was reverted via (#4035) because vms-kvm-t2 tests were failing. That was because the `isChassisAppDbPresent()` was using an incorrect path to `database_config.json` This PR brings back the original #3847 and fixes the `isChassisAppDbPresent()` to use the correct path. **Why I did it** Single-asic VOQ systems do need #3847 **How I verified it** Tests on vms-kvm-t2 and also single-asic voq systems Verified on vms-kvm-t2 the test_bgp_fact is passing ``` bgp/test_bgp_fact.py::test_bgp_facts[vlab-t2-1-1-0] PASSED [ 25%] bgp/test_bgp_fact.py::test_bgp_facts[vlab-t2-1-1-1] PASSED [ 50%] bgp/test_bgp_fact.py::test_bgp_facts[lvlab-t2-1-2-0] PASSED [ 75%] bgp/test_bgp_fact.py::test_bgp_facts[vlab-t2-1-2-1] PASSED [100%] ``` **Details if related**
…tem (sonic-net#3847)" (sonic-net#4035) This reverts commit 5671e08.
…tem (sonic-net#3847)" (sonic-net#4035) This reverts commit 5671e08.
What I did Orchagent changes needed to support single ASIC VOQ Fixed-System (sonic-net#3847) was reverted via (sonic-net#4035) because vms-kvm-t2 tests were failing. That was because the isChassisAppDbPresent() was using an incorrect path to database_config.json This PR brings back the original sonic-net#3847 and fixes the isChassisAppDbPresent() to use the correct path. Why I did it Single-asic VOQ systems do need sonic-net#3847
What I did Orchagent changes needed to support single ASIC VOQ Fixed-System (sonic-net#3847) was reverted via (sonic-net#4035) because vms-kvm-t2 tests were failing. That was because the isChassisAppDbPresent() was using an incorrect path to database_config.json This PR brings back the original sonic-net#3847 and fixes the isChassisAppDbPresent() to use the correct path. Why I did it Single-asic VOQ systems do need sonic-net#3847 Signed-off-by: ganglyu <glv@nvidia.com>
…tem (sonic-net#3847)" (sonic-net#4035) This reverts commit 5671e08. Signed-off-by: Baorong Liu <96146196+baorliu@users.noreply.github.com>
What I did Orchagent changes needed to support single ASIC VOQ Fixed-System (sonic-net#3847) was reverted via (sonic-net#4035) because vms-kvm-t2 tests were failing. That was because the isChassisAppDbPresent() was using an incorrect path to database_config.json This PR brings back the original sonic-net#3847 and fixes the isChassisAppDbPresent() to use the correct path. Why I did it Single-asic VOQ systems do need sonic-net#3847 Signed-off-by: Baorong Liu <96146196+baorliu@users.noreply.github.com>
Reverts #3847