Skip to content
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.

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

[code sync] Merge code from sonic-net/sonic-utilities.msft:202205 to 202205 #44

Merged
merged 6 commits into from
Feb 19, 2024

Conversation

mssonicbld
Copy link
Collaborator

* 241f9cc0 - (head/202205) [202205] Add teamd retry count script to 202205 image (#3116) (2024-01-23) [Saikrishna Arcot]
* 7a7305e9 - Fix issue: out of range sflow polling interval is accepted and stored in config_db (#2847) (#3123) (2024-01-22) [Stephen Sun]
* 06d11339 - [config] config reload should generate sysinfo if missing  (#3031) (#3126) (2024-01-21) [jingwenxie]
* bef96a1d - [202205] Allow using latest sonic-swss-common build even if tests failed (#3127) (2024-01-18) [Saikrishna Arcot]
* f5f9a858 - [DPB] Remove the optimization logic for delete/add ports. (#2463) (2024-01-04) [Aravind Mani]<br>```

aravindmani-1 and others added 6 commits January 4, 2024 16:34
* Fix port breakout issue

* Address comments

* fix LGTM alerts
…led (#3127)

The current 202205 branch build of sonic-swss-common has failing test
cases. This is blocking sonic-utilities, since this is the only build
available in that branch.

Allow using that build even though tests are failing, to unblock PRs in
this repo.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
…126)

What I did
Missing platform and mac in CONFIG_DB will result in container failure. We should make the config reload generate those info if missing.

How I did it
Add missing sys info if config_db.json doesn't contain it.

How to verify it
Unit test
… in config_db (#2847) (#3123)

Fixed issue: out of range sflow polling interval is accepted and stored in config_db.

Reproduce step:
```
1. Enable sflow feature:   config feature state sflow enabled
2. Enable sflow itself:   config sflow enable
3. Configure out of range polling interval:  config sflow polling-interval 1. Error message is shown as expected
4. Save config:    config save -y
5. Check "SFLOW" section inside config_db
```

As the interval is invalid, the expected behavior is that the interval is not saved to redis. But we see the invalid value was written to redis.

Change `click.echo` to `ctx.fail`

1. Manual test
2. Add a check in existing unit test case to cover the change

Co-authored-by: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
* Add teamd retry count script to 202205 image

This backports a part of #3069 to allow upgrading from 202205 to 202305
with the teamd retry count feature.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@mssonicbld mssonicbld merged commit 6535704 into Azure:202205 Feb 19, 2024
3 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.

5 participants