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

Merge sonic-swss master into 201803 #1753

Closed
wants to merge 93 commits into from

Conversation

pavel-shirshov
Copy link
Contributor

@pavel-shirshov pavel-shirshov commented May 31, 2018

- What I did
Update src/sonic-sairedis, src/sonic-swss, src/sonic-swss-common with latest masters.

- How I did it

- How to verify it
Build an image and install to DUT

- Description for the changelog

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

qiluo-msft and others added 30 commits April 6, 2018 12:57
…if date is not correctly set (sonic-net#1562)

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
- Includes the following commits:
    - [bcmshell.py] Match extra whitespace before prompt in regex (sonic-net#3)
    - add support for qsfp28 eeprom (sonic-net#2)
cfggen generates new eth0 configuration. Need to first
clean existing configuration on eth0 before bring up
new configuration on eth0. Thus, we need to first bring
down eth0 before putting new configuration into /etc/network/
interfaces

Signed-off-by: Guohan Lu <gulv@microsoft.com>
Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
…net#1549)

* [minigraph.py] Add support to parse tacacs server information
Signed-off-by: Guohan Lu <gulv@microsoft.com>
Signed-off-by: Guohan Lu <gulv@microsoft.com>
Signed-off-by: Guohan Lu <gulv@microsoft.com>
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
* [caclmgrd] Also ignore IP protocol if found in rule; we will only use our predefined protocols
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
…t#1592)

* [minigraph] Fix parser on PNG DeviceInterfaceLink Bandwidth

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
…1591)

* [Broadcom SAI] upgrade Broadcom SAI to version 3.1.3.4-9

Includes configuration files for following devices:

- Quanta 1X1B-32X
- Dell Z9264F
- Inventec D7054Q28B and D7032Q28B

* [bcm sai] upgrade sai version to 3.1.3.4-10

include configuration change to 7060 T0.
Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
…lues (sonic-net#1619)

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
…1620)

[sfputilbase]: Add logic to parse the title of port_config.ini file

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
Signed-off-by: Guohan Lu <gulv@microsoft.com>
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
* ea34b92 2018-04-24 | Fix tables handling race condition in buffermgr (sonic-net#484) (HEAD -> 201803, origin/201803) [Andriy Moroz]
* 53831be 2018-04-19 | [pfcwd]: create PFCWD acl instead of L3 ACL (sonic-net#479) [sihuihan88]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
wendani and others added 8 commits May 24, 2018 19:33
…c-net#1727)

* 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 <wenni@microsoft.com>

* 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 <wenni@microsoft.com>

* 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 <wenni@microsoft.com>

* Protect PORTCHANNEL from ports not existing in port_config.ini

Signed-off-by: Wenda <wenni@microsoft.com>

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

Signed-off-by: Wenda <wenni@microsoft.com>

* Protect DEVICE_NEIGHBOR from ports not existing in port_config.ini

Signed-off-by: Wenda <wenni@microsoft.com>

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

Signed-off-by: Wenda <wenni@microsoft.com>

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

Signed-off-by: Wenda <wenni@microsoft.com>

* Protect PORTCHANNEL from ports not existing in port_config.ini

Signed-off-by: Wenda <wenni@microsoft.com>

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

Signed-off-by: Wenda <wenni@microsoft.com>

* Protect DEVICE_NEIGHBOR from ports not existing in port_config.ini

Signed-off-by: Wenda <wenni@microsoft.com>

* Correct space in minigraph.py

Signed-off-by: Wenda <wenni@microsoft.com>

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

Signed-off-by: Wenda <wenni@microsoft.com>

* Check PORTCHANNEL against PORT list only if port_config_file exists

Signed-off-by: Wenda <wenni@microsoft.com>

* Correct format

Signed-off-by: Wenda <wenni@microsoft.com>

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

Signed-off-by: Wenda <wenni@microsoft.com>

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

Signed-off-by: Wenda <wenni@microsoft.com>

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

Signed-off-by: Wenda <wenni@microsoft.com>

* 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 <wenni@microsoft.com>
* [rc.local] refactor platform identification code to separate function

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

* [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 <ying.xie@microsoft.com>

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

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
* 524685a 2018-05-14 | Ignore bridge port id in fdb consolidated event if value is NULL (sonic-net#319) (origin/201803) [Kamil Cudnik]
* be0d9c3 2018-05-23 | Merge pull request sonic-net#321 from yxieca/syncd [Ying Xie]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
…ed ACL table configuration (sonic-net#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
…et#1739)

* Add QoS and Buffers config for Mellanox MSN2410

Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>

* Add QoS and Buffers config for Mellanox MSN2100

Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
…al (sonic-net#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
@pavel-shirshov pavel-shirshov changed the base branch from master to 201803 May 31, 2018 15:11
pavel-shirshov and others added 14 commits May 31, 2018 08:19
Signed-off-by: Guohan Lu <gulv@microsoft.com>
* Revert "[serial watchdog] remove serial watchdog service dependency to rc.local (sonic-net#1752)"
* Revert "[service] introducing serial port watchdog service (sonic-net#1743)"
…ptables/ip6tables accordingly (sonic-net#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
…t#1777)

Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
Signed-off-by: Nadiya Stetskovych <Nadiya.Stetskovych@cavium.com>
@lguohan
Copy link
Collaborator

lguohan commented Jun 13, 2018

@pavel-shirshov , it looks like the PR does not just contain the submodule update for swss, sairedis, common, it contains so many updates on different files.

This reverts commit 260730a, reversing
changes made to 55f4432.
@pavel-shirshov
Copy link
Contributor Author

Reopen as #1791

abdosi added a commit that referenced this pull request Jun 14, 2021
33f370f890c525512668583a7f4e231415b28738 (HEAD -> 201911, origin/201911)
    [vnet/vxlan] Add support of multiple mappers for the VxLAN tunnel
    (#1753)
Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
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.