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

Sonic cfg mgmt merge2 #62

Merged
merged 68 commits into from
Mar 27, 2020
Merged

Sonic cfg mgmt merge2 #62

merged 68 commits into from
Mar 27, 2020

Conversation

zhenggen-xu
Copy link
Owner

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

stephenxs and others added 30 commits February 24, 2020 10:14
support firmware install, including CPLD and BIOS.

CPLD: cpldupdate
BIOS: boot to onie and update BIOS in onie and then boot to SONiC
Added ONiE oneshoot boot feature

Signed-off-by: Nazarii Hnydyn <[email protected]>
* Start RestAPI container when sonic boots
update FW to xx_2000_3298
update SAI to 1.16.0

update Spectrum-1 and Spectrum-2 buffer pool size according to the new SDK default config change.

	modified:   ../../device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
	modified:   ../../device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
	modified:   ../../device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t0.j2
	modified:   ../../device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t1.j2
	modified:   fw.mk
	modified:   mlnx-sai.mk
	modified:   mlnx-sai/SAI-Implementation
	modified:   sdk-src/sx-kernel/Switch-SDK-drivers
	modified:   sdk.mk

signed-off by [email protected]
…ode for CS6436-56P (sonic-net#4157)

* Add new CIG device CS6436-54P and CS5435-54P, also update code for CS6436-56P

* security kernel update to 4.9.189 for CIG devices

* security kernel update to 4.9.189 for CIG devices

* Update rules

Update rule file
* Sleep done before mismatch handler
sonic-net#4171)

* Made Change to have Configurable option to enable/disable docker image

* [Submodule-Update] sonic-utilities .
Following PR has been merged tp 201911
* Platform Driver Development Framework (PDDF): Adding PDDF CLI utils
* [config] Add 'feature' subcommand
* [fwutil]: Command-line utility for interacting with platform components
* [show] Add subcommand to display the status of auto-restart feature
                                                for each container
* [config] Add subcommand to configure the status of auto-restart
                                                feature for each
                                                container
* [Command Reference] Document CLI commands related to container
                                                auto-restart feature
* [config/main.py] Modify reload() function to load configuration from
                                                init_cfg.json
* Fix for dhcp_relay deletion on a VLAN
* [config] Check if service exists before start/stop/restart of service
* Multi-Db changes for NAT feature
* [reboot] make sure the reboot happens even if platform reboot failed
every service starts after syncd to start the most critical parts first

Signed-off-by: Stepan Blyschak <[email protected]>
This to avoid git status reporting dirty.

Signed-off-by: Abhishek Dosi <[email protected]>
Following PR have been CHerry-picked:
* [portsorch] fix wrong orchagent behaviour when LAG member gets
disabled
* [team sync/mgr] Add debug message before cleaning up LAGs
* Build sonic-ztp package

- Add changes in make rules to conditionally include sonic-ztp package

Signed-off-by: Rajendra Dendukuri <[email protected]>
…3-2. (sonic-net#4182)

This has patch to fix enable/disable attribute for lag member. It's on top of vanilla 3.7.3.3
If sonic-cfggen is passed the -m argument (to load the minigraph file) along with one or more -j <json_file> arguments, load the JSON files before loading the minigraph file.

This ensures that the init_cfg.json file is loaded before the minigraph, therefore the minigraph can override any default configuration options specified in init_cfg.json. Currently, the behavior is reversed.

Note: This is not an issue if loading loading multiple JSON files, because sonic-cfggen loads them in the left-to-right order they were specified on the command line, therefore providing flexibility for loading JSON files in a specific order. As long as init_cfg.json is specified before config_db.json, the values specified in config_db.json will take precedence.
sonic-net#3298)

* ZTP infrastructure changes to support DHCP discovery provisioning data

- Dynamically generate DHCP client configuration based on current ZTP state
- Added support to request and process hostname when using DHCPv6
- Do not process graphservice url dhcp option if ZTP is enabled, ZTP service
will process it
- Generate /e/n/i file with all active interfaces seeking address assignment
via DHCP. Only interfaces that are created in Linux will be added to /e/n/i.
Also DHCP is started only on linked up in-band interfaces.

Signed-off-by: Rajendra Dendukuri <[email protected]>
 Enable m_isCombinedMirrorV6Table for BFN platform (sonic-net#1212)
[vnet]: Update VNET route table size to 40K for BITMAP implementation (sonic-net#1132)
 Default action for Egress ACL Table not poulated. (sonic-net#1208)
Add/Del lag_name_map item according to lag adding and removing (sonic-net#1124)
Increase ip2me CIR/CBR for faster in-band file transfers (sonic-net#1000)
[fwutil]: Set default socket timeout for FW download to 30 sec. (sonic-net#821)
Update config/show to include PFC Watchdog commands (sonic-net#736)
dutta-partha and others added 21 commits March 19, 2020 22:20
…ic-net#4144)

Removing explicit libyang plugin path settings. Libyang debian package installs the extensions in standard location.

Libyang debian package installs the extensions in standard location as per build time configuration (install prefix is set in patch/libyang.patch). If plugin directory is not set, libyang explicitly searches the plugins in LYEXT_PLUGINS_DIR which is populated during build. The plugins are installed in LYEXT_PLUGINS_DIR itself through debian package installation.

$ grep -nr LYEXT_PLUGINS_DIR src/
src/plugin_config.h.in:18:#define LYEXT_PLUGINS_DIR "@EXTENSIONS_PLUGINS_DIR_MACRO@" /**< directory with YANG extension plugins */
src/plugins.c:420: pluginsdir = LYEXT_PLUGINS_DIR;
Master and 201911 use the same version of hw-mgmt 2f65914 , but the hw-mgmt patch was cherry-picked to 201911 badly, the file contents have some diff, and it does not apply on 201911

Signed-off-by: Mykola Faryma <[email protected]>
…t#4302)

Brief:
The community code for has been updated, which mismatched with the existing sonic-mgmt-framework. Hence it broke the build.

Submodule-PR: #43

Details:
The SONiC mgmt Framework, pulls down the community modules in two steps.

Pull the existing; This does a transparent compile too.
Then checkout the specific commit-id for each and do the final compile.
The community code change broke in the compilation phase of step-1.
Fix: For the two affected modules, do download only.

Proper fix:
As part of the next phase of changes, the mgmt-framework is moving go-submodule mode, which will ensure the download happens for the assigned commit-ids only.
e.g. Refer go.mod in sonic-telemetry
We believe that the supervisord issue in face of clock rolling backwards
has been addressed. Therefore reverting change 2598 to allow ntp sync
to right clock at the start up time.

Signed-off-by: Ying Xie <[email protected]>
…ic-net#4263)

- What I did
Add configuration to avoid ntpd from panic and exit if the drift between new time and current system time is large.

- How I did it
Added "tinker panic 0" in ntp.conf file.

- How to verify it
[this assumes that there is a valid NTP server IP in config_db/ntp.conf]

Change the current system time to a bad time with a large drift from time in ntp server; drift should be greater than 1000s.
Reboot the device.
Before the fix:
3. upon reboot, ntp-config service comes up fine, ntp service goes to active(exited) state without any error message. This is because the offset between new time (from ntp server) and the current system time is very large, ntpd goes to panic mode and exits. The system continues to show the bad time.

After the fix:
3. Upon reboot, ntp-config comes up fine, ntp services comes up from and stays in active (running) state. The system clock gets synced with the ntp server time.
I added dependencies to support the NAT feature on the virtual switch.

Signed-off-by: Danny Allen <[email protected]>
… VLAN interfaces (sonic-net#4229)

- Support parsing egress ACLs from minigraph file specified by the "OutAcl" element
- Support attaching ACLs to VLAN interfaces
* Build Arista drivers using DPKG_DEB
* Update arista platform submodule
Instead of updating hostname manualy on Config DB hostname change,
simply share containers UTS namespace with host OS.
Ideally, instead of setting `--uts=host` for every container in SONiC,
this setting can be set per container if feature requires.
One behaviour change is introduced in this commit, when `--privileged`
or `--cap-add=CAP_SYS_ADMIN` and `--uts=host` are combined, container
has privilege to change host OS and every other container hostname.
Such privilege should be fixed by limiting containers capabilities.

Signed-off-by: Stepan Blyschak <[email protected]>
…U ACS-MSN4700 (sonic-net#3901)

* add MSN4700 device files

* update ACS-MSN4700 sai profile

* update buffer pool size, headroom, sensor conf, port config and reboot scripts

* fix ident

* update sensor conf and buffer pool

* [sn4700] add sku 4700 to chassis.py

* [Mellanox-4700] Add 4700 info to psu and thermal platform API

* update buffer config file template to the latest.
update SAI profile to use 100G X 4lanes for now
update port_config.ini according to the SAI profile

* [Mellanox]Update the buffer configurations for 4700

* fix alignment in pg_profile_lookup.ini

* add platform components file for new sku

* Update device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini

Co-Authored-By: Nazarii Hnydyn <[email protected]>

* remove redundant line

* [Mellanox]Correct type, buffer size

Co-authored-by: Nazarii Hnydyn <[email protected]>
Co-authored-by: junchao <[email protected]>
Co-authored-by: Stephen Sun <[email protected]>
…metry (sonic-net#4307)

maintains backward compatibility to search original x509 location
when telemetry table does not have certs

Signed-off-by: Guohan Lu <[email protected]>
Don't remove RIF for Vnet interface when ip prefix is deleted (sonic-net#1225)
[fwutil]: Use overlay driver when mounting next image filesystem (sonic-net#825)
Fix for adding L3 interface to Vlan group (sonic-net#826)Fix for adding L3 interface to Vlan group (sonic-net#826)
[db_migrator]Do DB migration for buffer pool size change on Mellanox platform (sonic-net#833)
explicitly specify command with underscores (sonic-net#846)
[intfutil] set speed to 0 when interface speed is not available (sonic-net#839)
 Conflicts:
	platform/broadcom/sai.mk
	platform/vs/docker-sonic-vs/Dockerfile.j2
	src/sonic-config-engine/sonic-cfggen
	src/sonic-swss
	src/sonic-utilities
@zhenggen-xu zhenggen-xu merged commit a1b5c6f into sonic-cfg-mgmt Mar 27, 2020
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
zhenggen-xu pushed a commit that referenced this pull request Aug 31, 2020
[xcvrd] Update key names in 'get_media_settings_value()' (#63)
[xcvrd] Tweak some transceiver info key names (#62)
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Jan 16, 2021
b002455 - 2020-12-16 : Validate IP only if nexthop attribute is not null (zhenggen-xu#66) [Prince Sunny]
76592a9 - 2020-12-03 : Add License file (zhenggen-xu#62) [Prince Sunny]
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Mar 4, 2021
- Adding instructions to build telemetry server/go client inside docker (zhenggen-xu#68)
- Add RBAC, gNOI, API Versioning and Bulk Set operations. (zhenggen-xu#61) …
- Support NonTLS option for testing purpose only. (zhenggen-xu#67) …
- Oc gnmi examples (zhenggen-xu#62) …
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request May 14, 2021
- Adding instructions to build telemetry server/go client inside docker (zhenggen-xu#68)
- Add RBAC, gNOI, API Versioning and Bulk Set operations. (zhenggen-xu#61) …
- Support NonTLS option for testing purpose only. (zhenggen-xu#67) …
- Oc gnmi examples (zhenggen-xu#62) …
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Aug 9, 2022
[master][sonic-linkmgrd] submodule updates

df51322 Longxiang Lyu   Fri May 6 10:01:46 2022 +0800   Add `ActiveActiveStateMachine` implementation (zhenggen-xu#64)
e721ceb Jing Zhang      Wed May 4 10:07:14 2022 -0700   Add doc for default route related changes  (zhenggen-xu#63)
7bb06fb Jing Zhang      Tue May 3 09:48:28 2022 -0700   Add Cli support to enable or disable default route related feature (zhenggen-xu#68)
e4b02cb Jing Zhang      Mon May 2 13:27:54 2022 -0700   Reset WaitActiveUp count before switching to active (zhenggen-xu#70)
212d960 Jing Zhang      Wed Apr 27 10:35:05 2022 -0700  lower log level to warning (zhenggen-xu#69)
48abc9e Jing Zhang      Thu Apr 14 16:50:04 2022 -0700  Add support to enable switchover time measurement (with link prober interval decreased to 10ms) feature  (zhenggen-xu#61)
c4858a6 Jing Zhang      Thu Apr 14 11:27:55 2022 -0700  Avoid proactively switching to `active` if default route is missing  (zhenggen-xu#62)

sign-off: Jing Zhang [email protected]
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Aug 22, 2022
24f505148 [eloop.c]: Increase timeout of signal termination (zhenggen-xu#62)
2b2c1ad72 [driver_macsec_sonic.c]: Fixbug: a wrong db_wait in delete sa (zhenggen-xu#61)

Signed-off-by: Ze Gan <[email protected]>
@zhenggen-xu zhenggen-xu deleted the sonic-cfg-mgmt-merge2 branch May 24, 2024 19:07
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.