Skip to content

Fixing test failures in test_ecn_config_update.py#1188

Merged
mramezani95 merged 2 commits into
Azure:202412from
mramezani95:mramezani/test_ecn_config_update_fix_202412
May 19, 2026
Merged

Fixing test failures in test_ecn_config_update.py#1188
mramezani95 merged 2 commits into
Azure:202412from
mramezani95:mramezani/test_ecn_config_update_fix_202412

Conversation

@mramezani95
Copy link
Copy Markdown

What is the motivation for this PR?

Fixing test failures in test_ecn_config_update.py.

How did you do it?

WRED profiles that are not changed by the test (e.g., because wred_green_enable is false for them) still appear in ASIC DB. So we should add these profiles to the new_values dictionary. I removed the continue statement so that these profiles are added to new_values for comparison with ASIC DB profiles.

How did you verify/test it?

Ran the tests on a Broadcom TH5 switch:

generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates[replace-green_min_threshold] PASSED                                            [ 25%]
generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates[replace-green_max_threshold] PASSED                                            [ 50%]
generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates[replace-green_drop_probability] PASSED                                         [ 75%]
generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates[replace-green_min_threshold,green_max_threshold,green_drop_probability] PASSED [100%]

…with ASIC DB profiles.

Signed-off-by: Mahdi Ramezani <mramezani@microsoft.com>
@mramezani95 mramezani95 requested review from r12f and sdszhang May 12, 2026 00:10
@mramezani95
Copy link
Copy Markdown
Author

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Mahdi Ramezani <mramezani@microsoft.com>
@mramezani95
Copy link
Copy Markdown
Author

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

mramezani95 added a commit to sonic-net/sonic-mgmt that referenced this pull request May 12, 2026
<!--
Please make sure you've read and understood our contributing guidelines;
https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md

Please provide following information to help code review process a bit
easier:
-->
### Description of PR
<!--
- Please include a summary of the change and which issue is fixed.
- Please also include relevant motivation and context. Where should
reviewer start? background context?
- List any dependencies that are required for this change.
-->
This PR ports the following two PRs from 202412 to master:
Azure/sonic-mgmt.msft#1024
Azure/sonic-mgmt.msft#1188

Summary:
Skip updating WRED profiles for which `wred_green_enabled` is false.

### Type of change

<!--
- Fill x for your type of change.
- e.g.
- [x] Bug fix
-->

- [ ] Bug fix
- [ ] Testbed and Framework(new/improvement)
- [ ] New Test case
    - [ ] Skipped for non-supported platforms
- [x] Test case improvement


### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [x] 202511

### Approach
#### What is the motivation for this PR?
Ensuring that tests don't fail when for some WRED profiles,
`wred_green_enabled=false`.

#### How did you do it?
We set all delta values to 0 if `wred_green_enabled=false` for a WRED
profile and do not create a JSON patch for that profile.

#### How did you verify/test it?
Ran the tests:
```
generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates[None-replace-green_min_threshold] PASSED                                    [ 25%]
generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates[None-replace-green_max_threshold] PASSED                                    [ 50%]
generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates[None-replace-green_drop_probability] PASSED                                 [ 75%]
generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates[None-replace-green_min_threshold,green_max_threshold,green_drop_probability] PASSED [100%]
```

#### Any platform specific information?
N/A

#### Supported testbed topology if it's a new test case?
N/A

### Documentation
<!--
(If it's a new feature, new test case)
Did you update documentation/Wiki relevant to your implementation?
Link to the wiki page?
-->
N/A

Signed-off-by: Mahdi Ramezani <mramezani@microsoft.com>
@mramezani95
Copy link
Copy Markdown
Author

Merging this PR since test failures are unrelated to the changes (test_container_hardening and prepare_testbed) and the same changes have already been merged to the master branch.

@mramezani95 mramezani95 merged commit c65e6ae into Azure:202412 May 19, 2026
10 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants