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

just merge with master #3

Merged
merged 73 commits into from
Jun 7, 2018
Merged

just merge with master #3

merged 73 commits into from
Jun 7, 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)

andriymoroz-mlnx and others added 30 commits April 25, 2018 10:18
Includes:
- fix for PFCWD zero profile
- fix for racing condition in buffermgrd

Signed-off-by: Andriy Moroz <[email protected]>
b511c96 2018-04-17 | Add kexec reboot string (#46) (HEAD, origin/master, origin/HEAD) [Joe LeVeque]

Signed-off-by: Guohan Lu <[email protected]>
[counters]:separate query of port/queue counters
[buffermgr]: remove the item from consumer queue if invalid

Signed-off-by: Guohan Lu <[email protected]>
* We don't need configure anything until we have interfaces created

* Don't run lldpcli for a port, until a port is up and running

* Remove lldpd socket before starting lldpd

* Fix sample files for lldpd configuration

* Another attempt to make the test working

* Quick fix for lldpd paused after start bug
Install the built version of isc-dhcp-client in docker-dhcp-relay
95 is too close to the edge because by default 5% is already reserved for super-user

Signed-off-by: Andriy Moroz <[email protected]>
* bb85c72 2018-05-01 | Populate existing interface cache, bring down before configDone (#491) (HEAD -> master, origin/master, origin/HEAD) [Prince Sunny]
* bc97597 2018-04-30 | Add ipv6 ACL support in schema file (#490) [zhenggen-xu]
* f939b95 2018-04-27 | [qosorch]: Optimizations of qosorch (#488) [pavel-shirshov]

Signed-off-by: Guohan Lu <[email protected]>
…not in use" (#1665)

* Revert "[swss]: update swss submodule (#1664)"

This reverts commit c74be37.

* Revert "Remove snmpd hw_fsys module, remove disk monitoring which are not in use (#1663)"

This reverts commit 3d61df9.
* [zebra.conf] Fix template issue with multiple lo addresses

* Add unitest for Loopback1
)

Due to some ASIC platform limitations, the hash seed range is from 0
to 15. Thus the switch.json.j2 template is updated so that ToRRouter
is using hash seed 0 and LeafRouter is using hash seed 10.

Signed-off-by: Shu0T1an ChenG <[email protected]>
Provide better ECMP load-balancing via hash seed

Signed-off-by: Guohan Lu <[email protected]>
…ackages by default (#1666)

* [docker-base] Instruct apt-get to NOT install 'recommended' or 'suggested' packages

* Modify docker-fpm-quagga, docker-snmp-sv2 and docker-sonic-vs Dockerfile templates in order to properly install .deb dependencies

* REDIS_SERVER depends on REDIS_TOOLS; ensure REDIS_TOOLS is always installed before REDIS_SERVER
* Revert "[docker-dhcp]: Fix the sonic build issue (#1659)"

This reverts commit 8d3c5fb.
* [syncd]: Add socat and bcmsh wrapper
* Install socat in docker-base
* Add hint banner, add host wrapper
* Refine banner message
* Update buffers config for Mellanox 27xx devices

Signed-off-by: Andriy Moroz <[email protected]>

* Remove buffers template test for msn27xx

Signed-off-by: Andriy Moroz <[email protected]>
[acl-loader]: Change the header from Rule ID to Table (#250)
[acl-loader]: Add --table_name option to update full operation (#249)
[generate_dump]: fix a saidump file copy bug (#248)

Signed-off-by: Shu0T1an ChenG <[email protected]>
pavel-shirshov and others added 24 commits May 18, 2018 20:06
* Update sonic-sairedis and sonic-swss submodules

* Update sonic-swss submodule. Don't collect unwanted counters

* sonic-swss-common update too
This commit adds new code to support z9100 PFC T0 support with
broadcom recommended MMU settings for PFC feature.

Unit tested the setting by loading sonic-broadcom.bin and checking
the hardware for the values from the JSON file. The T0 configs supports
fan-out of 100G ports on Z9100. Added new config.bcm for fanout of 100G
ports and tested the fanout by sending traffic using bcmcmd, new config.bcm
file will be copied to /usr/share/sonic/hwsku/th-z9100-8x100-48x50G.config.bcm.
The sai.profile file is updated to point to hwsku directory.

Signed-off-by: Harish Venkatraman <[email protected]>
This commit adds new code to support z9100 PFC T1 support with
broadcom recommended MMU settings for PFC feature.

Unit tested the setting by loading sonic-broadcom.bin and checking
the hardware for the values from the JSON file. Added the config.bcm
file th-z9100-32x100G.config.bcm to this folder and updated the
sai.profile file to point to hwsku directory. sai.profile now
points to /usr/share/sonic/hwsku/th-z9100-32x100G.config.bcm

Signed-off-by: Harish Venkatraman <[email protected]>
* Add noise config for PortChannel & EthernetInterface in simple-sample-graph.xml

* Add noise config for PORTCHANNEL_INTERFACE in simple-sample-graph.xml

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

* Add noice config for DEVICE_NEIGHBOR in t0-sample-graph.xml

Add unit test against introducing ports not existing in port_config.ini
into DEVICE_NEIGHBOR

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

* DeviceInterfaceLink in minigraph.xml can contain port not existing in
port_config.ini but contraining non-zero Bandwidth attribute

Add noice config in simple-sample-graph.xml to capture the case that
such a port is leaked into config_db.json

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

* Protect PORTCHANNEL from ports not existing in port_config.ini

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

* Protect PORTCHANNEL_INTERFACE from portchannels containing ports not
existing in port_config.ini

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

* Protect DEVICE_NEIGHBOR from ports not existing in port_config.ini

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

* Add noise config Ethernet1 in DeviceInterfaceLinks in simple-sample-graph.xml as it is in PortChannel1001

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

* Add noise config Ethernet1 in DeviceInterfaceLinks in simple-sample-graph.xml as it is in PortChannel1001

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

* Protect PORTCHANNEL from ports not existing in port_config.ini

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

* Protect PORTCHANNEL_INTERFACE from portchannels containing ports not
existing in port_config.ini

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

* Protect DEVICE_NEIGHBOR from ports not existing in port_config.ini

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

* Correct space in minigraph.py

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

* Does not allow non-port_config.ini port to get into the port list

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

* Check PORTCHANNEL against PORT list only if port_config_file exists

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

* Correct format

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

* print warning when a port coming from DeviceInterfaceLink is not in
port_config.ini

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

* Change Ethernet1 and 2 to fortyGigE0/1 and 2,respectively

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

* Change Ethernet1 and 2 to fortyGigE0/1 and 2,respectively

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

* print warning when ignoring ports, portchannels, portchannel interfaces, and
device neighbors

Update t0-sample-graph.xml with interface name 'fortyGigE0/2' and the
ACL_TABLE output

Signed-off-by: Wenda <[email protected]>
* [rc.local] refactor platform identification code to separate function

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

* [rc.local] infrastructure to take action according to installer.conf

* [serial port watchdog] add service to watch serial port processes

Monitor serial port processes. Kill ones stuck for too long.

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

* [rc.local] start watchdog on serial port specified by installer.conf

Signed-off-by: Ying Xie <[email protected]>
…ed ACL table configuration (#1712)

* Fix minigraph parser issue when handling LAG related ACL table configuration
* rephrase the warning message.
* pick up swss change in sonic-net/sonic-swss#494
* Add QoS and Buffers config for Mellanox MSN2410

Signed-off-by: Andriy Moroz <[email protected]>

* Add QoS and Buffers config for Mellanox MSN2100

Signed-off-by: Andriy Moroz <[email protected]>
…al (#1752)

* [serial watchdog] remove serial watchdog service dependency to rc.local

When restarting this service in rc.local, the dependency causes an error
in syslog. Removing the dependency to mute the error log entry.

* remove lines with empty inputs
…thon (#1756)

https://github.com/Azure/azure-kusto-python

azure-kusto-data Package provides the capability to query Kusto clusters with Python.
azure-kusto-ingest Package allows sending data to Kusto service - i.e. ingest data.

The removed package adal is a dependent of the Azure Kusto Library.
The removed azure-storage is deprecated and being replaced with new packages that are
also the dependents of the Azure Kusto Library. (https://github.com/Azure/azure-storage-python)

Signed-off-by: Shu0T1an ChenG <[email protected]>
* Revert "[serial watchdog] remove serial watchdog service dependency to rc.local (#1752)"
* Revert "[service] introducing serial port watchdog service (#1743)"
…ptables/ip6tables accordingly (#1767)

* [caclmgrd] Heuristically determine whether ACL is IPv4 or IPv6, use iptables/ip6tables accordingly

* Check all rules in table until we find one with a SRC_IP
bcmsh is not copied to /usr/bin/ at host side
@simonJi2018 simonJi2018 closed this Jun 7, 2018
@simonJi2018 simonJi2018 reopened this Jun 7, 2018
@simonJi2018 simonJi2018 merged commit 83d9c7e into simonJi2018:master Jun 7, 2018
simonJi2018 pushed a commit that referenced this pull request Jul 25, 2018
- Includes the following commits:
    - [bcmshell.py] Match extra whitespace before prompt in regex (#3)
    - add support for qsfp28 eeprom (#2)
simonJi2018 pushed a commit that referenced this pull request Aug 22, 2018
This version is compatible with Linux kernel 4.9

Signed-off-by: marian-pritsak <[email protected]>
simonJi2018 pushed a commit that referenced this pull request May 14, 2019
…c-net#2832)

* Base DHCP relay Docker image on Strech base Docker

* Change URL for isc-dhcp source repository

* Upgrade isc-dhcp source branch to 4.3.5-3.1

* Update patch #1 to apply to isc-dhcp 4.3.5-3.1

* Update patch #2 to apply to isc-dhcp 4.3.5-3.1

* Update patch #3 to apply to isc-dhcp 4.3.5-3.1

* Update patch #4 to apply to isc-dhcp 4.3.5-3.1

* Remove security patches, as they are now applied as part of 4.3.5-3.1 source

* Reorder patches to apply bug fix first, then features

* Extend makefile to build debug Docker image

* Update commit that series file applies against
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.