[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#81
Merged
mssonicbld merged 11 commits intoAzure:202205from Aug 12, 2023
Merged
Conversation
Collaborator
mssonicbld
commented
Aug 12, 2023
mssonicbld
commented
…mboot (#15685) (#16098) * Fix CONFIG_DB_INITIALIZED flag check logic and set/reset flag for warm-reboot * Fix db-cli usage * Handle same image warm-reboot and generalize handling of INIT flag * Cover boot from ONIE case: set config init flag when minigraph, config_db are missing * Handle case: first boot of SONiC * Check for config init flag * Simplify logic, and do not call db_migrator for same image reboot Co-authored-by: Vaibhav Hemant Dixit <[email protected]>
… (#15734) (#16099) Fixes #15667 and #13293 Work item tracking Microsoft ADO 24472854: How I did it On chassis supervisor bgp feature is disabled in hostcfgd. The dependency between swss and bgp causes the bgp containers to start even though the feature is disabled. How to verify it Tests on chassis supervisor and LC Co-authored-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>
… (#15993) (#16101) Signed-off-by: Kebo Liu <[email protected]> Co-authored-by: Kebo Liu <[email protected]>
… (#16013) (#16102)
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
** Make sure all your commits include a signature generated with `git commit -s` **
If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx" or "resolves #xxxx"
Please provide the following information:
-->
#### Why I did it
fixes: sonic-net/sonic-buildimage#16001
Caused by: sonic-net/sonic-buildimage#15487
The above PR introduced change to use Management and Loopback Ipv4 and ipv6 addresses as snmpagent address in snmpd.conf file.
With this change, if Link local IP address is configured as management or Loopback IPv6 address, then snmpd tries to open socket on that ipv6 address and fails with the below error:
```
Error opening specified endpoint "udp6:[fe80::5054:ff:fe6f:16f0]:161"
Server Exiting with code 1
```
From RFC4007, if we need to specify non-global ipv6 address without ambiguity, we need to use zone id along with the ipv6 address: <address>%<zone_id>
Reference: https://datatracker.ietf.org/doc/html/rfc4007
##### Work item tracking
- Microsoft ADO **(number only)**:
#### How I did it
Modify snmpd.conf file to use the %zone_id representation for ipv6 address.
#### How to verify it
In VS testbed, modify config_db to use link local ipv6 address as management address:
"MGMT_INTERFACE": {
"eth0|10.250.0.101/24": {
"forced_mgmt_routes": [
"172.17.0.1/24"
],
"gwaddr": "10.250.0.1"
},
"eth0|fe80::5054:ff:fe6f:16f0/64": {
"gwaddr": "fe80::1"
}
},
Execute config_reload after the above change.
snmpd comes up and check if snmpd is listening on ipv4 and ipv6 addresses:
```
admin@vlab-01:~$ sudo netstat -tulnp | grep 161
tcp 0 0 127.0.0.1:3161 0.0.0.0:* LISTEN 274060/snmpd
udp 0 0 10.1.0.32:161 0.0.0.0:* 274060/snmpd
udp 0 0 10.250.0.101:161 0.0.0.0:* 274060/snmpd
udp6 0 0 fc00:1::32:161 :::* 274060/snmpd
udp6 0 0 fe80::5054:ff:fe6f::161 :::* 274060/snmpd -- Link local
admin@vlab-01:~$ sudo ifconfig eth0
eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500
inet 10.250.0.101 netmask 255.255.255.0 broadcast 10.250.0.255
inet6 fe80::5054:ff:fe6f:16f0 prefixlen 64 scopeid 0x20<link>
ether 52:54:00:6f:16:f0 txqueuelen 1000 (Ethernet)
RX packets 36384 bytes 22878123 (21.8 MiB)
RX errors 0 dropped 0 overruns 0 frame 0
TX packets 261265 bytes 46585948 (44.4 MiB)
TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
admin@vlab-01:~$ docker exec -it snmp snmpget -v2c -c public fe80::5054:ff:fe6f:16f0 1.3.6.1.2.1.1.1.0
iso.3.6.1.2.1.1.1.0 = STRING: "SONiC Software Version: SONiC.master.327516-04a6031b2 - HwSku: Force10-S6000 - Distribution: Debian 11.7 - Kernel: 5.10.0-18-2-amd64"
```
Logs from snmpd:
```
Turning on AgentX master support.
NET-SNMP version 5.9
Connection from UDP/IPv6: [fe80::5054:ff:fe6f:16f0%eth0]:44308
```
Ran test_snmp_loopback test to check if loopback ipv4 and ipv6 works:
```
./run_tests.sh -n vms-kvm-t0 -d vlab-01 -c snmp/test_snmp_loopback.py -f vtestbed.yaml -i ../ansible/veos_vtb -e "--skip_sanity --disable_loganalyzer" -u
=== Running tests in groups ===
Running: pytest snmp/test_snmp_loopback.py --inventory ../ansible/veos_vtb --host-pattern vlab-01 --testbed vms-kvm-t0 --testbed_file vtestbed.yaml --log-cli-level warning --log-file-level debug --kube_master unset --showlocals --assert plain --show-capture no -rav --allow_recover --ignore=ptftests --ignore=acstests --ignore=saitests --ignore=scripts --ignore=k8s --ignore=sai_qualify --junit-xml=logs/tr.xml --log-file=logs/test.log --skip_sanity --disable_loganalyzer
..
snmp/test_snmp_loopback.py::test_snmp_loopback[vlab-01] PASSED
```
<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->
#### Which release branch to backport (provide reason below if selected)
<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->
- [ ] 201811
- [ ] 201911
- [ ] 202006
- [x] 202012
- [x] 202106
- [x] 202111
- [x] 202205
- [x] 202211
- [x] 202305
#### Tested branch (Please provide the tested image version)
<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->
- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->
#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
#### A picture of a cute animal (not mandatory but encouraged)
Co-authored-by: SuvarnaMeenakshi <[email protected]>
…y (#16105) src/linkmgrd * 6ce71ba - (HEAD -> 202205, origin/202205) Add ADO to the PR template (Azure#215) (4 hours ago) [Longxiang Lyu] * 1010d93 - [active-standby] Write `unhealthy` is default route `N/A` (Azure#214) (4 hours ago) [Longxiang Lyu] * 15e9ca2 - [link prober] Increase pause/restart probe log verbosity (Azure#213) (4 hours ago) [Longxiang Lyu]
… automatically (#16107) src/sonic-platform-common * 3b993c5 - (HEAD -> 202205, origin/202205) [Credo][Ycable] enhancement and error exception for some APIs (Azure#303) (7 hours ago) [Xinyu Lin] * ab91fde - [ycable] add definitions of some new API's for Y-Cable infrastructure (Azure#301) (7 hours ago) [vdahiya12] * 2b551f2 - [Credo][Ycable] fix incorrect uart statistics (Azure#296) (7 hours ago) [Xinyu Lin]
…lly (#16109) src/sonic-swss * 3e2974df - (HEAD -> 202205, origin/202205) [muxorch] set mux state to init upon warm reboot (#2834) (4 hours ago) [Nikola Dancejic]
…atically (#16110) src/sonic-utilities * 0f001c56 - (HEAD -> 202205, origin/202205) UT change: for db_migrator test do not check for RESTAPI cert values (#2919) (4 hours ago) [Vaibhav Hemant Dixit] * 69d348d1 - [CLI][Show][BGP] Show BGP Change for no neighbor scenario (#2885) (6 hours ago) [Dev Ojha] * 4c6af3c3 - [multi-asic] Refine [override config table] for corner cases (#2918) (6 hours ago) [wenyiz2021] * bef3ffeb - [db_migrator] Set docker_routing_config_mode to the value obtained from minigraph parser (#2890) (#2922) (7 hours ago) [Vaibhav Hemant Dixit]
Why I did it Updating the iSMART_64 tool for supporting latest debian releases. How I did it On branch new_ismart Changes to be committed: (use "git restore --staged ..." to unstage) modified: platform/broadcom/sonic-platform-modules-dell/s6100/scripts/iSMART_64 How to verify it In s6100, run the iSMART_64 tool. md5sum - 24725730d7649769c7ba50971c1f2955 Co-authored-by: Santhosh Kumar T <[email protected]>
…D automatically (#16108) src/sonic-platform-daemons * f5a0ffc - (HEAD -> 202205, origin/202205) Update active application selected code in transceiver_info table aft… (Azure#381) (4 hours ago) [Michael Wang - TW]
jon-nokia
pushed a commit
to jon-nokia/sonic-buildimage-msft
that referenced
this pull request
May 3, 2024
…e latest HEAD automatically (#18374) #### Why I did it src/wpasupplicant/sonic-wpa-supplicant ``` * 13e6f1100 - (HEAD -> master, origin/master, origin/HEAD) Fix a memory leak introduced by last commit for high level EVP API Azure#82 (64 minutes ago) [xumia] |\ | failure_prs.log 225157a01 - Merge branch 'master' into master (3 days ago) [wumiao_nokia] | |\ | |/ |/| * | 413704a6c - Provide CMAC high level API replacement Azure#81 (4 days ago) [xumia] | failure_prs.log c7eafc778 - Fix a memory leak introduced by last commit for high level EVP API for CMAC (3 days ago) [wumiao_nokia] |/ * 8521d4abb - Fix a port issue (6 days ago) [wumiao_nokia] * 01a39044a - Provide CMAC high level API replacement (6 days ago) [wumiao_nokia] ``` #### How I did it #### How to verify it #### Description for the changelog
r12f
pushed a commit
that referenced
this pull request
May 17, 2025
…tomatically (#1134) #### Why I did it src/sonic-swss ``` * a999b4d - (HEAD -> 202412, origin/202412) Merge pull request #81 from r12f/code-sync-202412 (4 minutes ago) [Dashuai Zhang] * fd87e1f - Merge remote-tracking branch 'base/202411' into code-sync-202412 (7 hours ago) [r12f] * 623b018 - [202411] Setting default nexthop weight to 1 in fpmsyncd (30 hours ago) [Kumaresh Perumal] * a99088e - Removed logging code. (34 hours ago) [Mahdi Ramezani] * 5cdc78e - Fixed a compile error. (2 days ago) [Mahdi Ramezani] * a79b7e0 - Set default nexthop weight to 1. Added unit tests for 'getNextHopWt'. (2 days ago) [Mahdi Ramezani] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
May 27, 2025
…tomatically (#1168) #### Why I did it src/sonic-swss ``` * d8c3d8c - (HEAD -> 202503, origin/202503) Merge pull request #85 from mssonicbld/sonicbld/202503-merge (15 hours ago) [mssonicbld] * 32da647 - Merge branch '202412' of https://github.com/Azure/sonic-swss.msft into 202503 (17 hours ago) [Sonic Automation] * 06b16c3 - (origin/202412) [fpmsyncd]Fixing blackhole route to publish protocol field to APPL_DB (#83) (3 days ago) [Sudharsan Dhamal Gopalarathnam] * b801f2d - [202412] [SRv6] add MySID counters support (#82) (7 days ago) [Yakiv Huryk] * a999b4d - Merge pull request #81 from r12f/code-sync-202412 (10 days ago) [Dashuai Zhang] |\ | failure_prs.log skip_prs.log fd87e1f - Merge remote-tracking branch 'base/202411' into code-sync-202412 (10 days ago) [r12f] |/| | failure_prs.log skip_prs.log 623b018 - [202411] Setting default nexthop weight to 1 in fpmsyncd (11 days ago) [Kumaresh Perumal] | |\ | | failure_prs.log skip_prs.log a99088e - Removed logging code. (11 days ago) [Mahdi Ramezani] | | failure_prs.log skip_prs.log 5cdc78e - Fixed a compile error. (12 days ago) [Mahdi Ramezani] | | failure_prs.log skip_prs.log a79b7e0 - Set default nexthop weight to 1. Added unit tests for 'getNextHopWt'. (12 days ago) [Mahdi Ramezani] | |/ * | 2a0856b - Merge pull request #78 from nazariig/202412-trim-azure (12 days ago) [Nazarii Hnydyn] * | 2daf207 - Enable FDB learning event after all ports removed from default 1Q bridge (#79) (3 weeks ago) [mssonicbld] * | 3b70292 - Move timestamps out of counter table to avoid update too frequently (#75) (4 weeks ago) [mssonicbld] * | 3fa0d72 - Merge pull request #74 from mssonicbld/sonicbld/202412-merge (5 weeks ago) [mssonicbld] * | be436da - Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (5 weeks ago) [Sonic Automation] |/ * 79f04e3 - Initialize the last fec ber computed values if not found (#3621) (5 weeks ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
added a commit
that referenced
this pull request
Aug 17, 2025
…D automatically (#1524) #### Why I did it src/sonic-sairedis ``` * 95ae43cf - (HEAD -> 202503, origin/202503) Merge pull request #82 from mssonicbld/sonicbld/202503-merge (16 hours ago) [mssonicbld] * 7a3919d8 - Merge branch '202412' of https://github.com/Azure/sonic-sairedis.msft into 202503 (16 hours ago) [Sonic Automation] * 2b3cbce9 - (origin/HEAD, origin/202412, 202412) Revert "Enhance counter polling implementation (#73)" (#81) (2 days ago) [Riff] ``` #### How I did it #### How to verify it #### Description for the changelog
liushilongbuaa
pushed a commit
that referenced
this pull request
Mar 25, 2026
…ly (#24622) #### Why I did it src/dhcprelay ``` * 39e28c4 - (HEAD -> master, origin/master, origin/HEAD) [dhcp4relay]: Fix swss-common references (#81) (25 hours ago) [Shivashankar C R] ``` #### How I did it #### How to verify it #### Description for the changelog
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
1 participant
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.