Sync up the changes from upstream for addressing the feedback for PR# 3874 #59
Conversation
This file contains 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
* Updates per review comments 1) core_uploader service waits for syslog.service 2) core_uploader service enabled for restart on failure 3) Use mtime instead of file size + ample time to be robust. * Avoid reloading already uploaded file, by marking the names with a prefix. * Updated failing path. 1) If rc file is missing or required data missing, it periodically logs error in forever loop. 2) If upload fails, retry every hour with a error log, forever. * Fix few bugs * The binary update_json.py will come from sonic-utilities.
ASIC reset events are captured by hw-mgmt and hw-mgmt calls chipup/chipdown internally without OS iteraction Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
…s= (sonic-net#3819) The sflow service should not start unless the swss service is started. However, if this service is not started, the sflow service should not attempt to start them, instead it should simply fail to start. Using Requisite=, we will achieve this behavior, whereas using Requires= will cause the required service to be started.
…m-26 (sonic-net#3830) * [device][accton]: Update for AS7326-56X complying the Broadcom SAI latest version 3.5.3.1m-26 * Update Accton-AS7326-56X to adapt xxx.config.bcm based on the latest update of Device-Specific File Directory Structure. * Update Accton-AS7326-56X LED BIN complying the Broadcom SAI latest version 3.5.3.1m-26 Signed-off-by: polly_hsu@edge-core.com * [device][accton]: Merge the SDK config with sonic-net#3103 (Fix Accton as7326 port breakouk) Signed-off-by: Polly Hsu <pollyhsu2git@gmail.com>
…ts, not (sonic-net#3807)" (sonic-net#3835) This reverts commit 351410e.
[Broadcom] : update saibcm-modules to sdk 6.5.16 [Broadcom SAI] : upgrade Broadcom SAI to 3.7.3.2
…ic-net#3846) Fix the issue when an SFP module is plugged into a QSFP port via an adapter. - How I did it Originally the type of an SFP module is determined according to the SKU dictionary. However, it's possible that as SFP module is plugged into a QSFP port via an adapter. In this case, the EEPROM content will be parsed in the wrong format. To address that we fetch the identifier value of an xSFP module and then get the type by parsing it.
…sonic-net#3958) * [docker-base-stretch]: Do not check expire for stretch-backports repo Signed-off-by: Guohan Lu <gulv@microsoft.com>
Put a flag for fast-reboot to the db using EXPIRE feature. Using this flag in other part of SONiC to start in Fast-reboot mode. If we reload a config, the state in the db will be removed.
…nic-net#3742) Delay CPU intensive services at boot - How I did it Made snmp.timer work and add telemetry.timer. But this is not enough because it breaks the existing snmp dependency on swss. So, in this solution snmp timer is a wanted by swss service, but since OnBootSec timer expires only once it will not trigger snmp service, so I added line "OnUnitActiveSec=0 sec" which will start snmp service based on the last time it was active. On boot only OnBootSec will expire, on swss start/restarts only second timer will expire immediately and trigger snmp service. However, snmp service will not stop after "systemctl stop snmp" because of the second timer which will always expire when snmp service because unavailable. So there is a conflict which will be handled by systemd if we add "Conflicts=" line to both snmp.service and snmp.timer. So during boot: snmp does not start by default swss starts and starts snmp timer OnUnitActiveSec=0 does not expire since there is no snmp active OnBootSec expires and starts snmp service and snmp timer gets stopped During "systemctl restart swss" snmp stops because of Requisite on swss snmp unblocks snmp timer from running swss starts and starts snmp timer OnUnitActiveSec=0 expires imidiately and start snmp which stops snmp timer During "systemctl stop snmp" stop of snmp service unblocks snmp timer but no one starts the timer so it is not started by "OnUnitActiveSec=0"
* Implement path traversal just once * Add support of vrf to bgpcfgd
Cherry pick changes from master into 201911
* Added sonic-mgmt-framework as submodule / docker * fix build issues * update sonic-mgmt-framework submodule branch to master * Merged changes 70007e6d2ba3a4c0b371cd693ccc63e0a8906e77..00d4fcfed6a759e40d7b92120ea0ee1f08300fc6 00d4fcfed6a759e40d7b92120ea0ee1f08300fc6 Modified environemnt variables * Changes to build sonic-mgmt-framework docker * bumped up sonic-mgmt-framework commit-id * version bump for sonic-mgmt-framework commit-it * bumped up sonic-mgmt-framework commit-id * Add python packages to docker * Build fix for docker with python packages * added libyang as dependent package * Allow building images on NFS-mounted clones Prior to this change, `build_debian.sh` would generate a Debian filesystem in `./fsroot`. This needs root permissions, and one of the tests that is performed is whether the user can create a character special file in the filesystem (using mknod). On most NFS deployments, `root` is the least privileged user, and cannot run mknod. Also, attempting to run commands like rm or mv as root would fail due to permission errors, since the root user gets mapped to an unprivileged user like `nobody`. This commit changes the location of the Debian filesystem to `/fsroot`, which is a tmpfs mount within the slave Docker. The default squashfs, docker tarball and zip files are also created within /tmp, before being copied back to /sonic as the regular user. The side effect of this change is that the contents of `/fsroot` are no longer available once the slave container exits, however they are available within the squashfs image. Signed-off-by: Nirenjan Krishnan <Nirenjan.Krishnan@dell.com> * bumped up sonc-mgmt-framework commit to include PR zhenggen-xu#18 * REST Server startup script is enahnced to read the settings from ConfigDB. Below table provides mapping of db field to command line argument name. ============================================================ ConfigDB entry key Field name REST Server argument ============================================================ REST_SERVER|default port -port REST_SERVER|default client_auth -client_auth REST_SERVER|default log_level -v DEVICE_METADATA|x509 server_crt -cert DEVICE_METADATA|x509 server_key -key DEVICE_METADATA|x509 ca_crt -cacert ============================================================ * Replace src/telemetry as submodule to sonic-telemetry * Update telemetry commit HEAD * Update sonic-telemetry commit HEAD * libyang env path update * Add libyang dependency to telemetry * Add scripts to create JSON files for CLI backend Scripts to create /var/platform/syseeprom and /var/platform/system, which are back-end files for CLI, for system EEPROM and system information. Signed-off-by: Howard Persh <Howard_Persh@dell.com> * In startup script, create directory where CLI back-end files live Signed-off-by: Howard Persh <Howard_Persh@dell.com> * build dependency pkgs added to docker for build failure fix * Changes to fix build issue for mgmt framework * Fix exec path issue with telemetry * s5232[device] PSU detecttion and default led state support * Processing of first boot in rc.local should not have premature exit Signed-off-by: Howard Persh <Howard_Persh@dell.com> * docker mount options added for platform, system features * bumped up sonic-mgmt-framework commit id to pick 23rd July 2019 changes * Added mount options for telemetry docker to get access for system and platform info. * Update commit for sonic-utilities * [dell]: Corrected dport map and renamed config files for S5232F * Fix telemetry submodule commit * added support for sonic-cli console * [Dell S5232F, Z9264F] Harden FPGA driver kernel module For Dell S5232F and Z9264F platforms, be more strict when checking state in ISR of FPGA driver, to harden against spurious interrupts. Signed-off-by: Howard Persh <Howard_Persh@dell.com> * update mgmt-framework submodule to 27th Aug commit. * remove changes not related to mgmt-framework and sonic-telemetry * Revert "Replace src/telemetry as submodule to sonic-telemetry" This reverts commit 11c3192. * Revert "Replace src/telemetry as submodule to sonic-telemetry" This reverts commit 11c3192. * make submodule changes and remove a change not related to PR * more changes * Update .gitmodules * Update Dockerfile.j2 * Update .gitmodules * Update .gitmodules * Update .gitmodules reverting experimental change * Removed syspoll for release_1.0 Signed-off-by: Jeff Yin <29264773+jeff-yin@users.noreply.github.com> * Update docker-sonic-mgmt-framework.mk * Update sonic-mgmt-framework.mk * Update sonic-mgmt-framework.mk * Update docker-sonic-mgmt-framework.mk * Update docker-sonic-mgmt-framework.mk * Revert "Processing of first boot in rc.local should not have premature exit" This reverts commit e99a91f. * Remove old telemetry directory * Update docker-sonic-mgmt-framework.mk * Resolving merge conflict with Azure * Reverting the wrong merge * Use CVL_SCHEMA_PATH instead of changing directory for telemetry startup * Add missing export * Add python mmh3 to slave dockerfile * Remove sonic-mgmt-framework build dep for telemetry, fix dialout startup issues * Provided flag to disable compiling mgmt-framework * Update sonic-utilites point latest commit id * Point sonic-utilities to Azure accepted SHA * Updating mgmt framework to right sha * Add sonic-telemetry submodule * Update the mgmt-framework commit id Co-authored-by: jghalam <joe.ghalam@gmail.com> Co-authored-by: Partha Dutta <51353699+dutta-partha@users.noreply.github.com> Co-authored-by: srideepDell <srideep_devireddy@dell.com> Co-authored-by: nirenjan <nirenjan@users.noreply.github.com> Co-authored-by: Sachin Holla <51310506+sachinholla@users.noreply.github.com> Co-authored-by: Eric Seifert <seiferteric@gmail.com> Co-authored-by: Howard Persh <hpersh@yahoo.com> Co-authored-by: Jeff Yin <29264773+jeff-yin@users.noreply.github.com> Co-authored-by: Arunsundar Kannan <31632515+arunsundark@users.noreply.github.com> Co-authored-by: rvasanthm <51932293+rvasanthm@users.noreply.github.com> Co-authored-by: Ashok Daparthi-Dell <Ashok_Daparthi@Dell.com> Co-authored-by: anand-kumar-subramanian <51383315+anand-kumar-subramanian@users.noreply.github.com>
…wn repos Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
…s exit. (sonic-net#3667) Signed-off-by: Yong Zhao <yozhao@microsoft.com>
- [warm/fast reboot] continue executing when killing docker failed (sonic-net#713) [Ying Xie] - [neighbor_advertiser]: Add sleep in setting mirror session and ACL rules(sonic-net#714)[Shuotian Cheng] - [config]: Flush the neighbor table when removing the router interface(sonic-net#606) [Shuotian Cheng] - Add a generic configlet application script (sonic-net#716) [Renuka Manavalan] - Management vrf snmp cli support (sonic-net#472) [Harish Venkatraman] - show subinterfaces status (sonic-net#642) [Wenda Ni] - sonic-utilities: Add support for sFlow (sonic-net#592) [Garrick He]
* Add extra Smartsville hwskus
sonic-net#3713) Signed-off-by: Yong Zhao <yozhao@microsoft.com>
* Use 7.2 tree to generate frr packages * Adapt patches for frr/7.2 * Use vrf_id
…nic-net#3657) Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
…#3708) * Rename asn/deployment_id_asn_map.yaml to constants/constants.yaml * Fix bgp templates * Add community for loopback when bgpd is isolated * Use correct community value
Conflicts: rules/frr.mk sonic-slave-stretch/Dockerfile.j2 src/sonic-py-swsssdk src/sonic-swss src/sonic-utilities
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>
…nggen-xu#55) Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
zhenggen-xu#56) * [sonic-head.yang]: Libyang sweep host bits from inet:ip-prefix, fixing that problem. Changed inet:ip-prefix to custom ip-prefix. Changed test case accordingly. * [setup.py]: Build yang tree while package build. Changes done: 1.) Build yang tree while package build. 2.) Add sonic_yang_tree as part of package. 3.) Fix sonic-loopback-interface.yang for ip-prefix problem.
Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>
…ng from YANG models. (zhenggen-xu#52) Changes: 1.) Added yang extensions in YANG models. 2.) Changed the translation and rev translation code to depend on yang extensions. 3.) Load yang models in test code similar to dev code. 4.) Minor changes in test files. Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com
Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com
li-pingmao
changed the title
|
Not Master branch, sonic-cfg-mgmt. Please rebase. Thx. |
Signed-off-by: Praveen Chaudhary pchaudhary@linkedin.com
* Correct alias name * Code-review comments addressed Co-authored-by: Vasant <vapatil@linkedin.com>
Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
|
can you do a rebase? it is hard to what is you change here? |
li-pingmao
force-pushed
the
sonic-cfg-new
branch
from
b002f1a to
4837e85
Compare
praveen-li
pushed a commit
to praveen-li/sonic-buildimage
that referenced
this pull request
Jun 29, 2020
…te submodules (sonic-net#4852) * src/sonic-platform-common 75698a8...82bbeab (9): > [sfputil] Make SfpUtilHelper.get_physical_to_logical noexcept as in SfpUtilBase (sonic-net#96) > [sfp_base] Update return value documentation of channel-specific methods (sonic-net#98) > [sfp] Tweak key names of some transceiver info fields (sonic-net#97) > fix typo: portconfig.ini to port_config.ini (zhenggen-xu#94) > [chassis_base] Add platform API support for system LED (zhenggen-xu#91) > Add PCIe check commad (zhenggen-xu#64) > [sfputilbase.py] Don't try to print EEPROM sysfs file name if we failed to read from it (zhenggen-xu#81) > [sfputilbase | sfputilhelper] Add support of platform.json (zhenggen-xu#72) > [eeprom] Add try-except to catch the IOError (zhenggen-xu#85) * src/sonic-platform-daemons 0f4fd83...abe115e (2): > [xcvrd] Tweak some transceiver info key names (zhenggen-xu#62) > [psud][thermalctld] Always get fan/PSU LED status from platform API to avoid status inconsistencies (zhenggen-xu#59) * src/sonic-utilities fd7781b...16a33f2 (9): > [config] Fix syntax error (sonic-net#966) > [config] Fix indentation level in _get_disabled_services_list() (sonic-net#965) > a4e64d1 [sonic_installer] Refactor sonic_installer code (sonic-net#953) > 90efd62 [Show | Command Reference] Add Port breakout Show Command (sonic-net#859) > [sfpshow][mock_state_db] Tweak key names of some transceiver info fields (sonic-net#958) > [show] Add missing verbose option to "show line" (sonic-net#961) > [filter-fdb] Check VLAN Presence When Filter FDB (sonic-net#957) > [master]fix sonic-net#4716 show ipv6 interfaces neighbor_ip is N/A issue (sonic-net#948) > Fix for command. show interface transceiver eeprom -d Ethernet (sonic-net#955) Note: sonic-utilities update fixes sonic-net#4716
praveen-li
pushed a commit
to praveen-li/sonic-buildimage
that referenced
this pull request
Sep 15, 2020
* src/redis-dump-load 832a645...7585497 (2): > Merge pull request zhenggen-xu#63 from jleveque/update_gitignore > Merge pull request zhenggen-xu#59 from breser/redis-load-empty
praveen-li
pushed a commit
to praveen-li/sonic-buildimage
that referenced
this pull request
Mar 4, 2021
) * [MultiDB]: update sonic-db-cli output to redis-cli output format (zhenggen-xu#59) Signed-off-by: Dong Zhang d.zhang@alibaba-inc.com
praveen-li
pushed a commit
to praveen-li/sonic-buildimage
that referenced
this pull request
Dec 23, 2022
[sonic-linkmgrd][202012] submodule update 3523738 Jing Zhang Sun Apr 3 20:54:40 2022 -0700 Reset link prober state when default route is back zhenggen-xu#56 8282e78 Jing Zhang Fri Apr 15 15:59:34 2022 -0700 Keep incrementing sequence number when link prober is suspended and shutdown zhenggen-xu#55 (zhenggen-xu#65) 8246eb8 Jing Zhang Thu Apr 14 18:49:36 2022 -0700 Shutdown ICMP heartbeats when default route state is missing and ToR is in auto mode zhenggen-xu#44 (zhenggen-xu#59) sign-off: Jing Zhang zhangjing@microsoft.com
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
- What I did
Address the feeback from pull request sonic-net#3874
sonic-net#3874
- How I did it
- How to verify it
build the sonic-yang-mgmt python package and run pytests
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)