This repository was archived by the owner on Mar 1, 2023. It is now read-only.
test backmerge#36
Open
PrabhuSreenivasan wants to merge 9026 commits intoproject-arlo:test_backmergefrom
Open
Conversation
lguohan
force-pushed
the
master
branch
2 times, most recently
from
3690c1a to
512eb6b
Compare
…atically (#24956) #### Why I did it src/sonic-utilities ``` * 1ae65e3 - (HEAD -> master, origin/master, origin/HEAD) Adding cleanup for BGP_PEER_CONFIGURED_TABLE when config reload is done (#4034) (3 days ago) [sudarshankumar4893] ``` #### How I did it #### How to verify it #### Description for the changelog
…es (#24856) Why I did it This PR splits the monolithic Broadcom SAI build configuration (sai.mk) into two modular makefiles: platform/broadcom/sai-xgs.mk — XGS SAI package definitions platform/broadcom/sai-dnx.mk — DNX SAI package definitions The intent of this refactor is to improve build maintainability and reduce unintended coupling between the two ASIC families. Work item tracking Microsoft ADO (number only): 36193520 How I did it Created sai-xgs.mk with all XGS SAI variables, package URLs, and build registration Created sai-dnx.mk with all DNX SAI variables, package URLs, and build registration Updated dependency files (rules.mk, sai.dep, and docker dependency files) to reference the two new makefiles instead of the removed sai.mk (e.g. BRCM XGS uses sai-xgs.mk, DNX uses sai-dnx.mk) Signed-off-by: zitingguo <zitingguo@microsoft.com>
Why I did it Work item tracking Microsoft ADO (number only): 34848755 How I did it Wait for mgmtd initial config load to avoid "Lock already taken on DS" error How to verify it 2025 Dec 2 00:56:56.302357 bjw-can-7060-1 NOTICE bgp#bgpcfgd: Checking mgmtd datastore readiness... 2025 Dec 2 00:56:56.390985 bjw-can-7060-1 NOTICE bgp#bgpcfgd: mgmtd datastores are ready (attempt 1)
…VE_DOCKERD_FOR_BUILD is enabled (#24604) [build] Fix rsync failure in Docker builds when SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD is enabled
Why I did it Needed update to the latest release version of VPP 2510 How I did it Modified the vpp.mk rules file How to verify it Built and executed sonic-mgmt tests. Description for the changelog Updated the version from 2506 to 2510
Transceiver DOM update is currently too slow to update values in the database. Especially when it comes to temperature data which is needed to make cooling decisions. Because this case is rather specific a new thread was added to xcvrd which only polls temperature. It doesn't do anything else in an effort to reduce the amount of resources taken for every iteration. This feature was implemented as part of sonic-net/sonic-platform-daemons#685 How I did it Add the --dom_temperature_poll_interval to xcvrd startup command. Add this option in pmon_daemon_control.json to enable the new xcvrd thread for all Arista devices. How to verify it Verify that the TRANSCEIVER_DOM_TEMPERATURE table is populated in STATE_DB when xcvrd is running and cables support temperature reporting. Signed-off-by: Samuel Angebault <staphylo@arista.com>
Signed-off-by: arista-hpandya <hpandya@arista.com>
Why I did it To address regression issues, we need to have a way to quickly build a vs image. Work item tracking Microsoft ADO (number only): How I did it Add a yml to only build vs image. How to verify it Verified with pipeline.
…#24967) Why I did it Refine dependency files in device folder. During build device folder will generate git ignore files, which makes config-engine/device-data rebuild. Refine test logic for telemetry-sidecar, which makes that docker rebuild. Split test part and build part for eventd, debian-helper will run them in different step. Signed-off-by: Shilong Liu <shilongliu@microsoft.com> Co-authored-by: Jianquan Ye <jianquanye@microsoft.com>
…tically (#24978) #### Why I did it src/sonic-sairedis ``` * 88222b4b - (HEAD -> master, origin/master, origin/HEAD) [vslib] MACsec interface creation command fails on VM/VS with send_sci=false and SCI combination. (#1668) (2 hours ago) [vikram-nexthop] ``` #### How I did it #### How to verify it #### Description for the changelog
Why I did it If local code under src/sonic-frr/frr is outdated, the local branch origin/$(FRR_BRANCH) may not exist. Makefile need to fetch remote branch first, before switch local branch.
…er) (#24469) * SOC prop changes * Revert some SOC prop changes that will be done in a separate PR --------- Signed-off-by: venu-nexthop <venu@nexthop.ai> Co-authored-by: saravanan sellappa <saravanan@nexthop.ai>
Signed-off-by: Roy Wen <roy@nexthop.ai>
This commit resolves a permission denied issue during the mv command in bookworm by adding escalated sudo privileges. For more details, see the related PR and discussion: #18789 Why I did it make configure for broadcom reports Permission denied issue make configure PLATFORM=broadcom .... "LEGACY_SONIC_MGMT_DOCKER" : "y" "INCLUDE_EXTERNAL_PATCHES" : "n" "PTF_ENV_PY_VER" : "mixed" mv: cannot move '/etc/apt/sources.list.d/debian.sources' to '/etc/apt/sources.list.d/debian.sources.back': Permission denied "SONIC_DPKG_CACHE_METHOD" : "none" make[1]: Leaving directory '/home/ubuntu/sonic-buildimage' How I did it I resolved it by adding escalated sudo privileges. For more details, see the related PR and discussion: #18789 How to verify it make configure PLATFORM=broadcom should pass without permission issues Signed-off-by: Matej Feder <matej.feder@dnation.cloud>
Signed-off-by: Roy Wen <roy@nexthop.ai> Co-authored-by: saravanan sellappa <saravanan@nexthop.ai>
The additional thermal sensors are required to provide more comprehensive temperature monitoring for the Arista-7280R4-series platforms. Signed-off-by: arista-hpandya <hpandya@arista.com>
Signed-off-by: Stepan Blyschak <stepanb@nvidia.com> Co-authored-by: Stepan Blyschak <stepanb@nvidia.com> Co-authored-by: Sudharsan Dhamal Gopalarathnam <sudharsand@nvidia.com>
Why I did it
Fixed healthd stuck on service(s) process state polling during config reload operation
Work item tracking
N/A
How I did it
Added stuck process cleanup flow
How to verify it
Set minimal polling interval
root@sonic:/usr/share/sonic/device/x86_64-mlnx_msn4600c-r0# cat system_health_monitoring_config.json
{
"services_to_ignore": [],
"devices_to_ignore": ["psu.voltage"],
"user_defined_checkers": [],
"polling_interval": 1,
"led_color": {
"fault": "orange",
"normal": "green",
"booting": "orange_blink"
}
}
Run the script
root@sonic:/home/admin# cat repro.sh
#!/bin/bash
declare -i idx=0
while true; do
echo "=> Reset: ${idx}"
systemctl reset-failed gnmi
systemctl restart gnmi
((idx++))
done
) Why I did it Fix restapi.service_202505 with DPU env vars. Fix User setting in restapi.service_BRANCH files, the change is required to operate k8s rollout containers. Work item tracking Microsoft ADO (number only): How I did it How to verify it Manually tested on 202505 DUT, checked /usr/lib/systemd/system/restapi.service is expected to be override with changes.
…D automatically (#25574) #### Why I did it src/sonic-platform-daemons ``` * 12b64bb - (HEAD -> master, origin/master, origin/HEAD) psud: Handle all exceptions in try_get() to prevent crashes (#744) (32 minutes ago) [Vasundhara Volam] ``` #### How I did it #### How to verify it #### Description for the changelog
…ically (#25551) #### Why I did it src/sonic-dash-ha ``` * a6cf697 - (HEAD -> master, origin/master, origin/HEAD) update dash-api submodule (3 hours ago) [Jing Zhang] * 64022eb - Change convert_pb_to_json to parse proto encoded value from binary input (#142) (9 hours ago) [yue-fred-gao] * 53fb250 - [ci] fix build error and save binaries (#144) (28 hours ago) [Jing Zhang] ``` #### How I did it #### How to verify it #### Description for the changelog
…lly (#25546) #### Why I did it src/sonic-swss ``` * 4495a5d5 - (HEAD -> master, origin/master, origin/HEAD) [ssw][ha] vnetorch supporting DPU live re-pairing (#4042) What I did Support route update from vnet tunnel route config change for custom_bfd monitoring. In DPU repairing scenario (to form HA sets), VNetOrch needs to support live update of endpoints, monitoring endpoints, primary and secondary groups. (29 hours ago) [Jing Zhang] ``` #### How I did it #### How to verify it #### Description for the changelog
…tically (#25545) #### Why I did it src/sonic-dash-api ``` * 459cad6 - (HEAD -> master, origin/master, origin/HEAD) Add two extra HA states (#59) (3 hours ago) [Changrong Wu] * b3dfda7 - Add list of trusted VNIs (#56) (29 hours ago) [Lawrence Lee] ``` #### How I did it #### How to verify it #### Description for the changelog
…25305) - Why I did it This is to add the DEVICE_METADATA.localhost.sub_role field generation by sonic-cfg (when not using minigraph). The 'sub_role' field is required on a multi-asic system. A lot of utilities assume its presence. However, generating the config w/o minigraph does not add this field. Before this PR: $ sonic-cfggen -H -n asic1 -v DEVICE_METADATA.localhost.sub_role // nothing With this PR: $ sonic-cfggen -H -n asic1 -v DEVICE_METADATA.localhost.sub_role FrontEnd The value is specified in the asic.conf as a SUB_ROLE_ASIC_%asic_idx%=%role%. For example: $ cat asic.conf NUM_ASIC=2 DEV_ID_ASIC_0=01:00.0 DEV_ID_ASIC_1=02:00.0 SUB_ROLE_ASIC_0=FrontEnd SUB_ROLE_ASIC_1=BackEnd - How I did it Added a new utility to sonic_py_common to read the role from asic.conf. Extended sonic-cfggen to set the DEVICE_METADATA.localhost.sub_role - How to verify it new unit test manual tests Signed-off-by: Yakiv Huryk <yhuryk@nvidia.com>
…SIC_PWR_OFF (#25421) Why: On NH-5010, ASIC_PWR_OFF feature is missing from the DPM configuration, so ASIC is not power cycled during asic_init.sh. This causes asic_init failure when the system recovers from kernel panic. How: Swapped FPGA register writes to use DP_PWR_ON_DRV (reg 0x90, bit 4) instead of ASIC_PWR_OFF, and switched from full-register fpga_write to bit-level fpga write32 --bits for safer manipulation. Tested: Verified on generic DUTs and humm109 (the reproducer DUT) with reboot, config reload, and kernel panic recovery scenarios. Signed-off-by: YiFan Wang <yifan@nexthop.ai>
Why: Buffer and QoS settings for NH5010 HWSKUs needed adjustment per requirements. Custom QoS macros were unnecessary overrides of standard defaults. How: Updated buffers_defaults_t2.j2, pg_profile_lookup.ini, and qos.json.j2 for both base and BALANCED variants: - Renamed ingress_pool to ingress_lossless_pool with updated size/xoff - Added cable-length-differentiated PG lossless profiles - Enabled AZURE_LOSSLESS WRED profile - Removed custom per-SKU QoS macros in favor of standard qos_config.j2 - Added ports2cable mapping to base SKU Tested: Verified on sonic-mgmt QOS/PFCWD tests on NH5010 HWSKU. Signed-off-by: Venky Solaiyappan <venky@nexthop.ai>
Why: PORT PHY attributes (e.g., FEC stats, signal quality) are useful counters that should be collected by default. How: Added PORT_PHY_ATTR flex counter group with FLEX_COUNTER_STATUS enable to init_cfg.json.j2. Tested: Verified on 202505 branch. Signed-off-by: dhanasekar-arista <dhanasekar@arista.com>
Update EZB files to version 1.13 to support SAI 1.17.1-1 for 7215 IXS-T1 Update EZB files to version 1.13 to support SAI 1.17.1-1 for 7215 IXS-A1 Signed-off-by: paprakas <pavan.prakash@nokia.com> Co-authored-by: Lihua Yuan <lihuay@users.noreply.github.com>
…tions Why: Fix critical minigraph loading failure caused by libyang hash table resize assertion failure. Root cause: libyang 1.0.73 has a known bug in hash table resize logic (lydict_val_eq uses incorrect string length), causing false equality matches and insertion failures during large configs. Fix: Increase LYHT_MIN_SIZE from 8 to 65536 to avoid resize for configs with <50k unique strings; memory impact ~2–4MB (<0.05%). How: 1) Add libyang-increase-lyht-min-size.patch 2) Update patch series to include it Verify: - Rebuild libyang package - Manual device test: before fix crash at BGP entries; after fix loads all entries - Full minigraph loading test passes (Hardconfig completes) Signed-off-by: xincunli-sonic <xincun.li@microsoft.com>
Why: pick up recent DNX SAI fixes (ACL IP type ANY, mirror session attr capability, FIPS version display, LAG stat_id per core, MMU Generic Config Yaml support, etc.). How: update sai-dnx.mk. Verify: load on DNX platform and run basic sanity. Signed-off-by: Tejaswini Chadaga <tchadaga@microsoft.com>
## Why Latest cargo-tarpaulin release depends on gimli 0.33.0 which requires Rust 1.88+, while slave containers use Rust 1.86.0, causing build failures. ## How Pin cargo-tarpaulin to v0.35.1 in slave container Dockerfiles. ## Verify Not provided. Signed-off-by: Ying Xie <yxie@sonic.net>
…sent (#25463) Summary: When config_db.json is missing but minigraph.xml is present, the config-setup boot sequence previously triggered ZTP (if enabled), which generates a minimal config and runs config reload. This removes the device management IP, requiring console access to recover. Additionally, during warm boot the config initialization path had no guard — if config_db.json was absent, ZTP could still be triggered even though warm boot must preserve the existing running configuration. Root cause: do_config_initialization() had no awareness of minigraph.xml. It only checked for ZTP or factory default, even when a valid minigraph was available on disk. check_system_warm_boot() only checked STATE_DB, which may not be available early in the boot sequence. The canonical SONIC_BOOT_TYPE=warm in /proc/cmdline (used by all other boot-type detection in the codebase) was not checked. boot_config() did not skip config initialization during warm boot, allowing ZTP to trigger inappropriately. Fix (3 changes in config-setup): do_config_initialization(): Check for minigraph.xml at the top of the function, before ZTP/factory-default logic. If minigraph is available, use reload_minigraph and return early. This aligns with the pattern already used in do_config_migration(). check_system_warm_boot(): Enhanced to check /proc/cmdline for SONIC_BOOT_TYPE=warm first (the authoritative source set by warm-reboot scripts), then fall back to STATE_DB for compatibility. This is consistent with getBootType() used in docker_image_ctl.j2, syncd_common.sh, and watchdog-control.sh. boot_config(): Added warm boot guard after config migration — during warm boot, skip config initialization and ZTP entirely. Also added minigraph.xml guard on the ZTP restart block so ZTP erase/restart is skipped when minigraph was used. This maintains the config priority order consistent with do_config_migration(): config_db.json > minigraph.xml > ZTP > factory default. Addresses: ADO 36697420 — [202511.08] Config Reload is Run during warm-boot up Signed-off-by: Ying Xie <ying.xie@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
## Why Add vendor PN settings for MSN4700 and allow module PN regex to match all cable lengths. ## How Update MSN4700 media_settings.json to add vendor-PN entry and regex-based module PN. ## Verify Not provided. Signed-off-by: Ying Xie <yxie@sonic.net>
…D automatically (#25596) #### Why I did it src/sonic-platform-daemons ``` * 39dba74 - (HEAD -> master, origin/master, origin/HEAD) Revert "Remove the SFP thermal data retrieval in thermalctld (#739)" (#745) (25 hours ago) [judyjoseph] * 41e0505 - Set initial state before config manager task is up (#752) (31 hours ago) [Gagan Punathil Ellath] * b5f34a0 - Xcvrd Refactor 7/13: Refactor CMIS_STATE_DP_DEINIT logic into handle_cmis_dp_deinit_state (#748) (31 hours ago) [Bobby McGonigle] * ebb54ed - [xcvrd] Separate VDM basic and statistic observables (#750) (2 days ago) [mihirpat1] ``` #### How I did it #### How to verify it #### Description for the changelog
Why I did it Adding support for MUX neighbor_mode to support prefix based mux neighbors SONiC HLD: sonic-net/SONiC#2176
Disable dash-ha service by default
Why I did it Add labels for sensors of Moby by sensors.conf Work item tracking Microsoft ADO (number only): How I did it How to verify it Verified that labels shown in 'sensors' output is matching the output of 'show platform temperature' Add labels for sensors of Moby by sensors.conf Signed-off-by: Boyang Yu <byu@arista.com>
* Add support for MIRROR_URL build attribute This change adds support for MIRROR_URL as a build parameters to sonic-buildimage. MIRROR_URL can be mirror of https://packages.trafficmanager.net. Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com> * Separate Debian snapshot mirror URL from general mirror URL Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com> * Revert changes for older debians Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com> * Install ca-certificates in pre_run_buildinfo Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com> * Change sed delimiter to avoid escape characters Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com> * Simplify the certificates install by bypassing peer check Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com> * Pass https verify peer as an argument for apt Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com> * Add changes for docker-base-trixie Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com> * Rename to all URL to BUILD_<suffix>_URL Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com> --------- Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com> Co-authored-by: Lihua Yuan <lihuay@users.noreply.github.com>
Summary: During SWSS warm restart, the script swssconfig.sh replays only the TUNNEL_DECAP_TABLE subset from ipinip.json. This replay must not run on platforms that already recover IPinIP decap state from APP_DB. The current logic skipped replay only for Broadcom platform. This patch extends the skip behavior to marvell-teralynx ASICs. Type of change: Bug Fix - Adapting skipping of TUNNEL_DECAP replay in case of marvell-teralynx ASIC How did you do it? Updated warm-boot logic to skip applying ipinip.json for: marvell-teralynx similar to broadcom Apply the filtered subset for all other ASICs. This prevents duplicate tunnel-decap create operations during warm restart on Teralynx platforms. How did you verify/test it? Verified the behavior on Marvell-teralynx platform. Any platform specific information? YES, marvell-teralynx Signed-off-by: Gnanapriya Sethuramarajan <gsethuramara@marvell.com> Co-authored-by: Lihua Yuan <lihuay@users.noreply.github.com>
- Why I did it Integrate HW-MGMT 7.0050.3001 Changes - How I did it Run make integrate-mlnx-hw-mgmt - How to verify it Build an image and run tests from "sonic-mgmt".
- Why I did it The command "systemctl restart networking" uses "ifupdown" which has global file lock to prevent concurrent configurations. In some rare cases, we can get a timing conflict between simultaneous processes, and eth0 remains down. "error: Another instance of this program is already running" - How I did it Add a retry mechanism for the "systemctl restart networking" command. - How to verify it sudo ip link set eth0 down sudo flock -x /run/network/.lock sleep 7 & sudo systemctl restart interfaces-config.service Signed-off-by: Ben Levi <belevi@nvidia.com>
Having this PHONY target results in unconditional builds. We should use the docker UT Schema to run the tests instead of doing it from the Makefile. Signed-off-by: Nate White <nate@nexthop.ai>
[ZMQ] Avoid bind on management ip
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
20 participants
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.
No description provided.