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

sync with master #14

Merged
merged 79 commits into from
Nov 16, 2018
Merged

sync with master #14

merged 79 commits into from
Nov 16, 2018

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)

taoyl-ms and others added 30 commits October 15, 2018 13:00
…2145)

[ipinip config] Add v6 ip and peering ip besides currect v4 loopback
* Check that we have dhcprelays text before using it

* Add additional variable to avoid extracting node again and again
* Change the baud-rate back to 115200

* Remove the console speed to let the system inherit from ONIE
* Unify qos config with qos_config.j2 template

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

* Change 7050 to use qos config template

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

	modified:   device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2
	modified:   device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json.j2

* Change a7060, a7260, s6000, s6100, z9100  to use qos config template

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

* Change mlnx devices to use qos config template

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

	modified:   ../../../mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json.j2
	modified:   ../../../mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json.j2
	modified:   ../../../mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2
	modified:   ../../../mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json.j2

* Change barefoot devices to use qos config template

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

	modified:   barefoot/x86_64-accton_wedge100bf_32x-r0/montara/qos.json.j2
	modified:   barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/qos.json.j2

* Change accton as7212 to use qos config template

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

	modified:   accton/x86_64-accton_as7212_54x-r0/AS7212-54x/qos.json.j2

* Apply PORT_QOS_MAP to active ports only

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

* Update qos config test with qos_config.j2 template

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

* Update sample output of qos-dell6100.json

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

* Remove generating the default port name and index list, i.e., remove the generate_port_lists macro, because PORT is always defined

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

* Include pfc_to_pg_map according to platform asic type obtained from
/etc/sonic/sonic_version.yml rather than specifying per hwsku

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

* Customize TC_TO_PRIORITY_GROUP_MAP and
PFC_PRIORITY_TO_PRIORITY_GROUP_MAP for barefoot

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

* Unify PFC_PRIORITY_TO_PRIORITY_GROUP_MAP: remove "0":"0", "1":"1" as
these two pgs do not generate PFC frames.

Signed-off-by: Wenda <[email protected]>
* Encap src_ip is not required for the IPinIP decap tunnels

* Removed unused variables
* Force team device recreation in case it already exists
Remove the teamd.j2 templates used for starting the teamd. Add
teammgrd instead to manage all port channel related configuration
changes. Remove front panel port related configurations in
interfaces.j2 templates as well.

Remove teamd.sh script and use teammgrd to start all the teamd
processes. Remove all the logics in the start.sh script as well.

Update the sonic-swss submodule.

Signed-off-by: Shu0T1an ChenG <[email protected]>
…2175)

[build]: install debug symbols packages when INSTALL_DEBUG_TOOLS=y
The default startsecs is 1 second. However, swssconfig.sh will quickly
exit with expected exit code 0 during warm starting. This case should
not be treated as a failure
* Move bfn asic drivers out of platform package (#30)

* Move bfn asic drivers out of platform package

* Change debian pkg name for bfn modules

* Change license file

* Fix build breakage due to dependency issue

* Minor changes to debian bld files (#31)
* 6e76e9b 2018-10-22 | [vstest]: fix redis mount point with --dvsname option (#654) (HEAD, origin/master, origin/HEAD) [lguohan]
* 3d4bed1 2018-10-22 | [mirrororch]: Fix bug when no need to update session type (#648) [Shuotian Cheng]
*   4bf28ed 2018-10-22 | Merge pull request #649 from lguohan/vstest [lguohan]
|\
| * 8620a51 2018-10-22 | [vstest]: disable ipv6 in test_crm.py::test_CrmFdbEntry [Guohan Lu]
| * f684d65 2018-10-21 | change mode to 644 for test_setro.py [Guohan Lu]
| * 51e0d40 2018-10-22 | Enable aclfield.data for SAI_DTEL_ATTR_INT_L4_DSCP [Guohan Lu]
| * 9290950 2018-10-21 | use unique directory to mount redis.sock [Guohan Lu]
| * 7d1b09e 2018-10-21 | add --keeptb option to keep testbed after test [Guohan Lu]
| * 6ee779c 2018-10-22 | gather logs from vs container [Guohan Lu]
| * 9b49555 2018-10-21 | make sure delete the srv namespace after test [Guohan Lu]
| * e04bd2d 2018-10-20 | add testlog for all tests [Guohan Lu]
| * a2d9be4 2018-10-20 | simplify start_swss/stop_swss [Guohan Lu]
| * d76a560 2018-10-21 | add ingore object type to CountSubscribedObjects [Guohan Lu]
| * 5e2c1de 2018-10-20 | refactor test_swss_neighbor_syncup test [Guohan Lu]
| * 9e9a553 2018-10-20 | ensure vrfmgrd, teammgrd, portmgrd are running before test [Guohan Lu]
|/
* e8e3ddc 2018-10-21 | disable ipv6 for vEthernet interface in virtual switch (#650) [lguohan]
* 7c90bb3 2018-10-19 | Fix portorch bake: get port count from db (#645) [Qi Luo]

Signed-off-by: Guohan Lu <[email protected]>
Shuotian Cheng and others added 28 commits November 2, 2018 19:22
Currently, the teamd configuration is no longer used in SONiC. The
configuration is dynamically generated and stored in the configuration
database, which is picked up by the teammgrd.

To create new portchannels, and the members, the command:
config portchannel add
config portchannel member add
are used.

Signed-off-by: Shu0T1an ChenG <[email protected]>
This script shall not flush all the entries in the state database
when it starts up, since there are entries maintained and written
by other processes outside this docker.

The issue we noticed was that the portchannel states are cleaned
up after teamsyncd writes the entries into the database, which
causes the IPs failed to be configured because intfmgrd considers
the portchannels are not ready yet.

Signed-off-by: Shu0T1an ChenG <[email protected]>
[config]: Change entrypoint name from 'cli' to 'config' for watermark cmd (#363)

Signed-off-by: Shu0T1an ChenG <[email protected]>
This can be used when sonic-buildimage repo is a git submodule of other
repo.

e.g) if sonic-buildimage is a git submodule of "parent" repo and
sonic-buildimage is just under the top directory of "parent" repo, we
can build sonic-buildimage like below

$ cd parent/sonic-buildimage
$ DOCKER_BUILDER_MOUNT=`realpath ../`:`realpath ../` \
  DOCKER_BUILDER_WORKDIR=`pwd` make all

Signed-off-by: Wataru Ishida <[email protected]>
* Add Warm-reboot startup and shutdown mode for teamd

* Address comments, fix some bugs

* Use tab instead of 8 spaces
Add logrotate, apt-utils, psmics packages to speed up
build process.

Signed-off-by: Shu0T1an ChenG <[email protected]>
* Restore neighbor table to kernel during system warm-reboot

Added a service: "restore_neighbors" to restore neighbor table into
kernel during system warm reboot. The service is started by supervisord
in swss docker when the docker is started.

In case system warm reboot is enabled, it will try to restore the neighbor
table from appDB into kernel through netlink API calls and update the neighbor
table by sending arp/ns requests to all neighbor entries, then it sets the
stateDB flag for neighsyncd to continue the reconciliation process.

-- Added tcpdump python-scapy debian package into orchagent and vs dockers.
-- Added python module: pyroute2 netifaces into orchagent and vc dockers.
-- Workarounded tcpdump issue in the vs docker

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

* Move the restore_neighbors.py to sonic-swss submodule
Made changes to makefiles accordingly

Make dockerfile.j2 changes and supervisord config changes

Add python monotonic lib for time access

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

* Added PYTHON_SWSSCOMMON as swss runtime dependency

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

* 248a095 2018-11-07 | Add best candidate search for acl table (#371) [Kamil Cudnik]
* d1e26c3 2018-11-07 | Ignore order when compare QOS MAP list entries (#372) [Kamil Cudnik]
* e8df347 2018-11-05 | Add best candidate search for router interface using tunnel term tabl… (#370) [Kamil Cudnik]
* 8ae173b 2018-11-01 | Refactor saidump graph generator (#367) [Kamil Cudnik]

common

* 2a37c5c 2018-11-07 | Add system warm-reboot check in WarmRestart class (#246) (HEAD, origin/master, origin/HEAD) [zhenggen-xu]
* fb082b5 2018-11-06 | Fix ProducerStateTable::clear() to clear StateHash properly (#244) [Taoyu Li]
* 0ee636b 2018-11-05 | Remove local googletest submodule and link with system gtest (#245) [Qi Luo]
* b56ffba 2018-10-31 | Add NEIGH_RESTORE_TABLE in stateDB (#243) [zhenggen-xu]
* b58c69d 2018-10-28 | swss-common: add op 'create' case to avoid flush immediately (#219) [Dong Zhang]

swss
* afdcf34 2018-11-12 | Support neighsyncd system warmreboot. (#661) (HEAD, origin/master, origin/HEAD) [zhenggen-xu]
* f380685 2018-11-09 | Routing-stack warm-reboot feature. (#602) [Rodny Molina]
* 9fbcb60 2018-11-09 | Add warm-reboot mode for teammgrd (#678) [pavel-shirshov]
* 8c60787 2018-11-09 | Don't add loopback ip2me route again if already configured (#656) [Jipan Yang]
* 6eb1613 2018-11-08 | [test]: Add interface IPv6 add/remove test case (#677) [Shuotian Cheng]
* 5de5054 2018-11-07 | [vrfmgrd]: Support VNET setting (#657) [Marian Pritsak]
* f666011 2018-11-06 | [teammgrd]: Add retry logic when enslaving member port into team (#669) [Shuotian Cheng]
* 36e304d 2018-11-05 | [vstest]: print output when runcmd returns error (#672) [lguohan]
* aede5d4 2018-11-05 | [test]: Fix clean up wrong interface IP (#673) [Shuotian Cheng]
* aeceaca 2018-11-02 | [portmgrd]: portmgrd shall be responsible for all ports update (#668) [Shuotian Cheng]
* 5796e54 2018-11-02 | Orchagent warm restart data restore requires three iterations (#670) [Jipan Yang]
* 15a2299 2018-11-01 | [vlanmgrd]: Do not bring up VLAN members by default (#667) [Shuotian Cheng]
* 44a4460 2018-11-01 | [test]: Clean up LAGs after finishing the test (#666) [Shuotian Cheng]

Signed-off-by: Guohan Lu <[email protected]>
* Fix teamd behavior for Warm-reboot mode

* Don't save 'read' state into the struct. Try to read a lacp file everytime when a port starts.

* Fix filename for access()
SONiC uses same mac address for both phy ports and LAGs
* build docker-saiserver

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

* add docker saiserver mlnx/bfn/cavm

* set nephos to 1.3.5

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

- cold shutdown is used by regular service stop and/or fast reboot
- warm shutdown is used by warm restart and/or warm reboot

Signed-off-by: Ying Xie <[email protected]>
@simonJi2018 simonJi2018 merged commit 602732d into simonJi2018:master Nov 16, 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.