Skip to content

merge with master#13

Merged
simonJi2018 merged 30 commits intosimonJi2018:masterfrom
sonic-net:master
Oct 15, 2018
Merged

merge with master#13
simonJi2018 merged 30 commits intosimonJi2018:masterfrom
sonic-net:master

Conversation

@simonJi2018
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)

Shuotian Cheng and others added 30 commits September 29, 2018 15:01
* VNET/VXLAN Tables
* [schema]: Add MGMT_PORT_TABLE in state database

Signed-off-by: Shu0T1an ChenG <[email protected]>
* [syncd] warn shutdown syncd process when warm boot is enabled

Signed-off-by: Ying Xie <[email protected]>

* [warmboot] mount folder to hold warmboot temporary files

Signed-off-by: Ying Xie <[email protected]>

* Fix a typo
* [platform_accton] Remove dependency on particular version of linux.
Signed-off-by: Polly Hsu <[email protected]>

* [platfrom] as5712-54x: update i2c_client for linux kernel 4.x.
Signed-off-by: Polly Hsu <[email protected]>

* [platform] Update lastest optoe.c from https://github.com/opencomputeproject/oom/blob/master/optoe/optoe.c.
Signed-off-by: roy_lee <[email protected]>

* [platform] rm optoe driver here. For it's inside the kernel.
Signed-off-by: roy_lee <[email protected]>

* [platform] as5712-54x, merge the change of #2002 which is on branch 201807.
Signed-off-by: roy_lee <[email protected]>
#2083)

* Adapt to the new WARM_RESTART_TABLE table schema: change from restart_count to restore_count

Signed-off-by: Jipan Yang <[email protected]>

* Update variable and function name to match restore_count name change

Signed-off-by: Jipan Yang <[email protected]>

* Update swss submodule for warm restart schema change

Signed-off-by: Jipan Yang <[email protected]>
Flashes used for the 7050QX-32 and 7050QX-32S have a fw issue.
The best option to solve the problem is to upgrade to a newer firmware.
However this can only be done while in memory and take 10 seconds.
Adding an upgrade mechanism is possible but would need more
consideration as flashing the firmware and reformating the flash will
exceed the fast-reboot requirements.

A quick mitigation is to align the ext4 partition that we create on
these vfat based system on a 4k boundary.
Here we chose 1M instead but it's the same.
Newer version of sfdisk do this automatically but the one in SONiC
today doesn't have this behavior.

This workaround will only reduce the pace of the flash health
degradation. The only long term fix is to flash the firmware.
* FRR 4.0 integration with SONiC

-- Uses SONiC FRR repo frr/4.0 (which has SONiC support) to build image
-- Makefile changes to make frr4.0 builtable.
-- Updated/Added FRR configuration files
-- bgpd jinja template fixes

To build SONiC images with FRR4.0, simply edit rules/config file and change
routing stack to following:

SONIC_ROUTING_STACK = frr

and then build images as usual.

* Used integrated-vtysh-config in FRR
Changed to single template: frr.conf.j2 for configuration and added tests
First port lane map needs to be swapped.
#2118)

* [build]: generate build timestamp at the beginning and use it for the rest of build

Signed-off-by: Guohan Lu <[email protected]>
* Fix broadcom lane map for 7050-QX32S

First port lane map needs to be swapped.

* Update arista submodules for SFP txdisable toggle

With this update the SFPs will set txdisable to 0 when out of reset.
Allowing optical cables to be used on these ports.
* BFN fixes for sonic master bld (#26)

* Need to still update sde deb package with sai1.3.3, will be done in seperate commit

* Update bfn sde url - sai1.3.3
* Fixed FW upgrade sequence.
* Removed code duplication.
3107549 2018-10-06 | uart: fix race between uart_put_char() and uart_shutdown() (#67) (azure/master) [lguohan]
95db35e 2018-10-02 | [mellanox]: Update kernel with the latest upstream patches. (#62) [sholeksandr]

Signed-off-by: Guohan Lu <[email protected]>
)

Update the hw-mgmt to latest release V.2.0.0060.
Update the related files according to the latest hw-mgmt.

Signed-off-by: Kevin Wang <[email protected]>
disable vxlan init for helix4

Signed-off-by: Guohan Lu <[email protected]>
… 32x100G (Tomhawk) (#2129)

* [platform]:add platfrom snh60a0-320fv2 & snh60b0-640f

* [device]:add platfrom snh60a0-320fv2 & snh60b0-640f

* remove minigraph.xml for snh60a0_320fv2-r0 and snh60b0_640f-r0 platform
[submodule] update sonic-py-swsssdk (pick up fix for issue #254)
Warm boot is managed by SAI. This configuration entry shouldn't be
included in bcm config.

Signed-off-by: Ying Xie <[email protected]>
Snmp container needs to access the PSU path, but /bsp doesn't mount
into the container, so need to use the real path rather than a symlink.

Signed-off-by: Kevin Wang <[email protected]>
* 6d00d14 2018-10-13 | pfcwd cmd check (#342) (HEAD, origin/master, origin/HEAD) [Wenda Ni]
* eb92560 2018-10-12 | [show] Refactor show vlan brief to use configdb and update the output (#340) [Deva Nandhagopal]
* 9a139ab 2018-10-10 | Remove explicit dependency on tabulate; Add comments (#336) [Joe LeVeque]
* 7874b8f 2018-10-09 | Update restart_count to restore_count for warm restart (#326) [Jipan Yang]
* 7a51a85 2018-10-08 | [acl_loader] fix show acl table  (#329) [ironjosh]
* 54ebfc8 2018-10-05 | Add a "-l/--load-sysinfo" option for "config reload" to merge the system info on device (#324) [zhenggen-xu]
* 34810df 2018-10-05 | [show] Eliminate need for writing template files for 'show platform summary' and 'show version' (#335) [Joe LeVeque]
* 4258287 2018-10-05 | Added argument forwarder for platform reboot. (#333) [Nazarii Hnydyn]
* e2b4bd5 2018-10-03 | Warm reboot: Add support for docker upgrade (#292) [Jipan Yang]
* f1236aa 2018-10-01 | Root priviliege for ecn configuration set commands (#332) [Wenda Ni]
* 3098b8a 2018-10-01 | require root privilege for all pfcwd configuration commands (#330) [lguohan]
* 7627d08 2018-09-27 | [config]: Add portchannel related commands (#328) [Shuotian Cheng]
* b8a62d7 2018-09-27 | Add 'alias mode' support for show commands (#298) [paavaanan]
* 4383300 2018-09-26 | [aclshow]: Fix the KeyError issue in aclshow (#325) [Shuotian Cheng]

Signed-off-by: Guohan Lu <[email protected]>
@simonJi2018 simonJi2018 merged commit b8e01b2 into simonJi2018:master Oct 15, 2018
simonJi2018 pushed a commit that referenced this pull request May 19, 2020
* src/sonic-utilities 7ce5b62...3471926 (4):
  > Make `config` command support abbreviation. (sonic-net#893)
  > [fwutil]: Fix firmware update command. (sonic-net#895)
  > [doc]: ZTP configuration and show commands (sonic-net#866)
  > Allow show ztp to display non-sensitive information visible to
  > non-root user (sonic-net#872)

* src/sonic-ztp 374c9e8...c959371 (2):
  > Fix ztp profile unit test (#14)
  > Create a shadow ZTP data json file accessible to non-root user (#13)
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.