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

201811 #44

Merged
merged 29 commits into from
Feb 15, 2019
Merged

201811 #44

merged 29 commits into from
Feb 15, 2019

Conversation

Alex-Dai
Copy link
Collaborator

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

yxieca and others added 29 commits January 31, 2019 10:40
…sist across SONiC upgrades (#2490)

* [reboot cause] Move reboot-cause files to /host directory so they persist across SONiC upgrades

* [sonic-utilities] Update submodule to include related changes
* Disable IPv6 ra for eth0 interface
* QoS config change: 1) DSCP mapping; 2) link pg/queue 6 to lossy buffer;
3) redistribute scheduler

Signed-off-by: Wenda <[email protected]>

* Add scheduling weight to queue 2

Signed-off-by: Wenda <[email protected]>

* Link pg/queue 2 to lossy buffer

Signed-off-by: Wenda <[email protected]>

* Update the pg headroom for a7060-D48C8 50G

Signed-off-by: Wenda <[email protected]>

* Update config gen test for qos

Signed-off-by: Wenda <[email protected]>

* Update pg headroom size, and update egress lossy pool size accordingly

Signed-off-by: Wenda <[email protected]>

* Update headroom pool size; Update ingress service pool and egress lossy
pool sizes accordingly;

Signed-off-by: Wenda <[email protected]>

* a7260: update headroom pool size; Update ingress service pool and egress lossy pool sizes accordingly;

Signed-off-by: Wenda <[email protected]>

* Update config gen test for buffer

Signed-off-by: Wenda <[email protected]>
…iginal attributes etc. (#2368)

* [updategraph] After system upgrade, restore files/directories with
original attributes etc.
Restore a few more files that was missed before.
Restore FRR configuration directory if exists on old system

Signed-off-by: Zhenggen Xu <[email protected]>

* Removed deployment_id_asn_map.yml from copy list

Signed-off-by: Zhenggen Xu <[email protected]>
* Link pg 2 and 6 to lossy buffer profile

Signed-off-by: Wenda <[email protected]>
…nch (#2526)

* [submodule 201811] advance sairedis and swss submodule for 201811 branch

Submodule src/sonic-sairedis 60f97c3..bdb0074:
  > Add more information on failed map sizes (#416)
  > Add WRED specific comparison logic (#413)
  > Initialize notification queue pointer before switch create (#411)
  > Add log info for not matching SG/IPG/QUEUES (#409)
  > Add support for any number of ports in virtual switch using lane map (#407)

Submodule src/sonic-swss 85f6322..65a0256:
  > Increase the watermark polling interval to 10s (#777)
  > [vstest]: fix test_port_an_warm.py test (#779)
  > [wartermarkorch] Fix repeated m_pg_ids and m_unicast_queue_ids add up issue (#752)
  > [teammgrd] Fix inconsistent port admin status (#755)
  > Remove AclTableGroup upon removal of port/lag/vlan (#751)


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

* [submodule] advance sonic-swss submodule

Submodule src/sonic-swss 65a0256..bf21ee3:
  > On a routing vlan, the neighbor entry in the /31 subnet is not added … (#784)
  > portsorch ports init done flag should means buffer, autoneg, speed, m… (#747) (#783)

Signed-off-by: Ying Xie <[email protected]>
* [sub module] sub module sonic-swss-common tracking 201811 branch

And include change:

Submodule src/sonic-swss-common e8caaea..a40837a:
  > [pyext] enable types in stdint.h (#259)

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

* also include:

Submodule src/sonic-swss-common a40837a..594f4e8:
  > Optimized ProducerStateTable set/del notification processing to avoid… (#257)

Signed-off-by: Ying Xie <[email protected]>
- [config/main.py]Fixed - added a validation such that delete portchannel or portchannel members only when it is configured (#277) (#445)
- Revert "[config/main.py]Fixed - added a validation such that delete portchannel or portchannel members only when it is configured (#277) (#445)" (#452)
- [intfutil] add Asymmetric PFC status to 'show interface status' (#437)

Signed-off-by: Mykola Faryma <[email protected]>
This dependency is needed for arista plugins to properly work.
Included:
  > [neighsyncd] increase neighbor syncd restore timeout to 110 seconds (#745)

Signed-off-by: Ying Xie <[email protected]>
- Including Broadcom patch for CS7252202.

Signed-off-by: Ying Xie <[email protected]>
…/alias changes (#2396)

* [lldpmgr] add mgmt ip to lldpd conf templte, handle port description/alias config

Signed-off-by: Mykola Faryma <[email protected]>

* fix typo

* [config-engine] update test sample output lldpd.conf

Signed-off-by: Mykola Faryma <[email protected]>

* fix the log message

* fix lldpd.conf.j2
* [minigraph.py] generate mandatory default port description

Signed-off-by: Mykola Faryma <[email protected]>

* use port name as default description

* [config-engine] update test exaple output

Signed-off-by: Mykola Faryma <[email protected]>

* [minigraph.py] use alias/port name as default description instead of neighbor data

Signed-off-by: Mykola Faryma <[email protected]>
* fe60afa 2019-02-12 | [lldpsyncd] remove dbsyncd logic which is moved to lldpmgr (#15) (HEAD, origin/master, origin/HEAD) [Mykola F]

Signed-off-by: Guohan Lu <[email protected]>
On some platform, portstate might be unknown as it might not
be supported by the driver.

Signed-off-by: Guohan Lu <[email protected]>
PR#2538 cannot merge due to master branch status. It has been tested
against 201811 branch.

Submodule src/sonic-sairedis 21f4a49..d57222a:
  > Add more specific logic for ingress ACL and buffer profile (#421)
  > Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#418)
  > Add support for vlan tagged frames in virtual switch (#417)

Submodule src/sonic-swss 1590030..584490c:
  > Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#786)
  > [vstest]: Potential fix for timing issue in warm_reboot's routing UT (#788)

Submodule src/sonic-swss-common 594f4e8..286ef34:
  > Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (#260)

Submodule src/sonic-utilities c6666e2..b44b462:
  > Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABL… (#458)
  > [aclshow] output only counters per table/rule (#442)

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

[PR 2538] Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE

Signed-off-by: Jipan Yang <[email protected]>
@Alex-Dai
Copy link
Collaborator Author

merge with Azure:201811

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.