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.

Sign up for GitHub

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

Jump to bottom

[Broadcom]: Update SAI to 2.1.5.1-16 #803

Merged
merged 1 commit into from
Jul 13, 2017
Merged

[Broadcom]: Update SAI to 2.1.5.1-16 #803

merged 1 commit into from
Jul 13, 2017

Conversation

stcheng
Copy link
Contributor

@stcheng stcheng commented Jul 12, 2017

Add Inventec-D7032Q28B-C32 config.bcm file

[Broadcom]: Update SAI to 2.1.5.1-16
9c6bddb 
Add Inventec-D7032Q28B-C32 config.bcm file
@lguohan lguohan merged commit 2090cd3 into sonic-net:master Jul 13, 2017
@stcheng stcheng deleted the sai branch July 13, 2017 03:51
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Mar 19, 2019
@yxieca
[201811 sub-module] advance sub-modules: utilities, swss, swss-common
e44a22b 
Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (sonic-net#469)
  > [aclshow] restore PRIO column and sort entries by priority (sonic-net#476)
  > Update watermark default polling interval to 10s (sonic-net#470)
  > show interface status <interface-name> throws error (fixes sonic-net#427) (sonic-net#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (sonic-net#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741)
  > Fix orchagent SEGV when PortConfigDone not set (sonic-net#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (sonic-net#261)
  > Add multiple fields hdel support (sonic-net#267)


Signed-off-by: Ying Xie <ying.xie@microsoft.com>
@yxieca yxieca mentioned this pull request Mar 19, 2019
Merged
yxieca added a commit that referenced this pull request Mar 19, 2019
@yxieca
[201811 sub-module] advance sub-modules: utilities, swss, swss-common (…
4c61c0e 
…#2679)

Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (#469)
  > [aclshow] restore PRIO column and sort entries by priority (#476)
  > Update watermark default polling interval to 10s (#470)
  > show interface status <interface-name> throws error (fixes #427) (#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (#741)
  > Fix orchagent SEGV when PortConfigDone not set (#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (#261)
  > Add multiple fields hdel support (#267)


Signed-off-by: Ying Xie <ying.xie@microsoft.com>
lguohan added a commit to lguohan/sonic-buildimage that referenced this pull request Mar 28, 2019
@lguohan
[swss]: update swss docker to stretch
530f0ce 
sonic-swss update:

* 60a8a0d 2019-03-28 | [orchagent]: Cast enum class variable to int (sonic-net#819) (HEAD, origin/master, origin/HEAD) [Shuotian Cheng]
* 3dd37a4 2019-03-26 | [vnetorch]: Add VNET/tunnel/route removal flows for Bitmap VNET implementation (sonic-net#816) [Volodymyr Samotiy]
* a937f92 2019-03-22 | [VS]: fix occasional test_fdb_notifications vs test failure (sonic-net#813) [Jipan Yang]
* ea54825 2019-03-21 | [portsorch] Fix inconsistent return value in bindAclTable (sonic-net#791) [yorke]
* 5984e3a 2019-03-07 | Fix orchagent SEGV when PortConfigDone not set (sonic-net#803) [Ramesh Santhanakrishnan]
@lguohan lguohan mentioned this pull request Mar 28, 2019
Merged
lguohan added a commit that referenced this pull request Mar 30, 2019
@lguohan
[swss]: update swss docker to stretch (#2714)
b73f9a5 
* [swss]: update swss docker to stretch

sonic-swss update:

* aa92326 2019-03-29 | fix c++ 11 build complaint for destructors default to noexcept (#822) (HEAD, origin/master, origin/HEAD) [lguohan]
* a304007 2019-03-28 | Allow ACL entry creation without ACL counter (#818) [Wenda Ni]
* 60a8a0d 2019-03-28 | [orchagent]: Cast enum class variable to int (#819) (HEAD, origin/master, origin/HEAD) [Shuotian Cheng]
* 3dd37a4 2019-03-26 | [vnetorch]: Add VNET/tunnel/route removal flows for Bitmap VNET implementation (#816) [Volodymyr Samotiy]
* a937f92 2019-03-22 | [VS]: fix occasional test_fdb_notifications vs test failure (#813) [Jipan Yang]
* ea54825 2019-03-21 | [portsorch] Fix inconsistent return value in bindAclTable (#791) [yorke]
* 5984e3a 2019-03-07 | Fix orchagent SEGV when PortConfigDone not set (#803) [Ramesh Santhanakrishnan]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
@yxieca @tiantianlv
[201811 sub-module] advance sub-modules: utilities, swss, swss-common (…
5b0f2c0 
…sonic-net#2679)

Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (sonic-net#469)
  > [aclshow] restore PRIO column and sort entries by priority (sonic-net#476)
  > Update watermark default polling interval to 10s (sonic-net#470)
  > show interface status <interface-name> throws error (fixes sonic-net#427) (sonic-net#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (sonic-net#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741)
  > Fix orchagent SEGV when PortConfigDone not set (sonic-net#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (#261)
  > Add multiple fields hdel support (#267)


Signed-off-by: Ying Xie <ying.xie@microsoft.com>
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
@yxieca @tiantianlv
[201811 sub-module] advance sub-modules: utilities, swss, swss-common (…
4b81fbf 
…sonic-net#2679)

Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (sonic-net#469)
  > [aclshow] restore PRIO column and sort entries by priority (sonic-net#476)
  > Update watermark default polling interval to 10s (sonic-net#470)
  > show interface status <interface-name> throws error (fixes sonic-net#427) (sonic-net#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (sonic-net#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741)
  > Fix orchagent SEGV when PortConfigDone not set (sonic-net#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (#261)
  > Add multiple fields hdel support (#267)


Signed-off-by: Ying Xie <ying.xie@microsoft.com>
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 10, 2019
@yxieca @tiantianlv
[201811 sub-module] advance sub-modules: utilities, swss, swss-common (…
2c96055 
…sonic-net#2679)

Submodule src/sonic-utilities f95da07..2fe01fe:
  > neighbor advertiser script (sonic-net#469)
  > [aclshow] restore PRIO column and sort entries by priority (sonic-net#476)
  > Update watermark default polling interval to 10s (sonic-net#470)
  > show interface status <interface-name> throws error (fixes sonic-net#427) (sonic-net#440)

Submodule src/sonic-swss 90eb25d..91171b6:
  > fix a unstable swss egress acl test (sonic-net#776)
  > [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741)
  > Fix orchagent SEGV when PortConfigDone not set (sonic-net#803)

Submodule src/sonic-swss-common 2592b0c..5f4abd9:
  > Force only supported commands on consumer table (#261)
  > Add multiple fields hdel support (#267)


Signed-off-by: Ying Xie <ying.xie@microsoft.com>
madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020
@rameshms-work @lguohan
Fix orchagent SEGV when PortConfigDone not set (sonic-net#803)
5984e3a
abdosi added a commit to abdosi/sonic-buildimage that referenced this pull request Apr 21, 2021
@abdosi
[Submodule update] sonic-sairedis
86abb57 
d821bc0 (HEAD -> master, origin/master, origin/HEAD) [Mellanox] Add SAI template config support (sonic-net#803)
bb341e9 [syncd] Bring back TimerWatchdog (sonic-net#821)
badf6ce Update .gitignore (sonic-net#822)
1494bc6 [meta] Mark local function static (sonic-net#818)
34e961c [pyext] Fix pyext/py2 library (sonic-net#820)
0d3749d Moved SAI Header to git tag v1.8.1 (sonic-net#816)
70fff78 Added --purge of base docker image packages before installing new ones. (sonic-net#819)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
abdosi added a commit that referenced this pull request Apr 22, 2021
@abdosi
[submodule update] sonic-sairedis to move to SAI1.8.1 (#7393)
ee98b17 
What/Why I did:

Updated sonic-sairedis submodule to use SAI1.8.1
[Submodule update] sonic-sairedis
d821bc0 (HEAD -> master, origin/master, origin/HEAD) [Mellanox] Add SAI template 
config support (#803)
bb341e9 [syncd] Bring back TimerWatchdog (#821)
badf6ce Update .gitignore (#822)
1494bc6 [meta] Mark local function static (#818)
34e961c [pyext] Fix pyext/py2 library (#820)
0d3749d Moved SAI Header to git tag v1.8.1 (#816)
70fff78 Added --purge of base docker image packages before installing new ones. (#819)

Updated Broadcom SAI Debian package to 4.3.3.4-2 to use SAI 1.8.1 Header
lguohan pushed a commit that referenced this pull request Apr 28, 2021
@kcudnik
[submodule] Advance sonic-sairedis submodule (#7425)
a8be1f4 
9672423 [sairedis] Add missing SAI interface apis (#827)
bb13d59 (origin/202012) Update call git clean on debian/rules (#826)
ca7b115 [Mellanox] Add SAI template config support (#803)
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
@abdosi @raphaelt-nvidia
[submodule update] sonic-sairedis to move to SAI1.8.1 (sonic-net#7393)
efb9e83 
What/Why I did:

Updated sonic-sairedis submodule to use SAI1.8.1
[Submodule update] sonic-sairedis
d821bc0 (HEAD -> master, origin/master, origin/HEAD) [Mellanox] Add SAI template 
config support (sonic-net#803)
bb341e9 [syncd] Bring back TimerWatchdog (sonic-net#821)
badf6ce Update .gitignore (sonic-net#822)
1494bc6 [meta] Mark local function static (sonic-net#818)
34e961c [pyext] Fix pyext/py2 library (sonic-net#820)
0d3749d Moved SAI Header to git tag v1.8.1 (sonic-net#816)
70fff78 Added --purge of base docker image packages before installing new ones. (sonic-net#819)

Updated Broadcom SAI Debian package to 4.3.3.4-2 to use SAI 1.8.1 Header
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
@kcudnik @raphaelt-nvidia
[submodule] Advance sonic-sairedis submodule (sonic-net#7425)
ccd85b7 
9672423 [sairedis] Add missing SAI interface apis (sonic-net#827)
bb13d59 (origin/202012) Update call git clean on debian/rules (sonic-net#826)
ca7b115 [Mellanox] Add SAI template config support (sonic-net#803)
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
@abdosi
[submodule update] sonic-sairedis to move to SAI1.8.1 (sonic-net#7393)
eda7130 
What/Why I did:

Updated sonic-sairedis submodule to use SAI1.8.1
[Submodule update] sonic-sairedis
d821bc0 (HEAD -> master, origin/master, origin/HEAD) [Mellanox] Add SAI template 
config support (sonic-net#803)
bb341e9 [syncd] Bring back TimerWatchdog (sonic-net#821)
badf6ce Update .gitignore (sonic-net#822)
1494bc6 [meta] Mark local function static (sonic-net#818)
34e961c [pyext] Fix pyext/py2 library (sonic-net#820)
0d3749d Moved SAI Header to git tag v1.8.1 (sonic-net#816)
70fff78 Added --purge of base docker image packages before installing new ones. (sonic-net#819)

Updated Broadcom SAI Debian package to 4.3.3.4-2 to use SAI 1.8.1 Header
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
@kcudnik
[submodule] Advance sonic-sairedis submodule (sonic-net#7425)
fd1bf4c 
9672423 [sairedis] Add missing SAI interface apis (sonic-net#827)
bb13d59 (origin/202012) Update call git clean on debian/rules (sonic-net#826)
ca7b115 [Mellanox] Add SAI template config support (sonic-net#803)
AidanCopeland pushed a commit to Metaswitch/sonic-buildimage that referenced this pull request Apr 14, 2022
@nazariig
[Mellanox] Add SAI template config support (sonic-net#803)
d821bc0 
Allow SAI xml dynamic config override when template is defined

Signed-off-by: Nazarii Hnydyn <nazariig@nvidia.com>
mssonicbld added a commit that referenced this pull request Nov 2, 2023
@mssonicbld
[submodule] Update submodule sonic-swss-common to the latest HEAD aut…
c85c12b 
…omatically (#17068)

#### Why I did it
src/sonic-swss-common
```
* a57cf9e - (HEAD -> master, origin/master, origin/HEAD) Add batch support in ZmqProducerStateTable. (#803) (10 hours ago) [mint570]
```
#### How I did it
#### How to verify it
#### Description for the changelog
lixiaoyuner pushed a commit to lixiaoyuner/sonic-buildimage that referenced this pull request Feb 6, 2024
@yaqiangz
Merged PR 9025464: Merge branch 'master' of https://github.com/Azure/…
acd8855 
…sonic-buildimage into internal

1. Resolve conflicts (introduced by this public PR: [sonic-net#16947](sonic-net#16947)) in `dockers/docker-dhcp-relay/Dockerfile.j2`:
```
<<<<<<< HEAD
RUN apt-get install -y dnsmasq gcc python3-dev

RUN pip3 install psutil

RUN apt-get purge -y gcc python3-dev
=======
{% if docker_dhcp_relay_whls.strip() %}
# Copy locally-built Python wheel dependencies
{{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }}

# Install locally-built Python wheel dependencies
{{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }}
{% endif %}
>>>>>>> 274d320
```

Accepted both changes, after resolved:
```
RUN apt-get install -y dnsmasq gcc python3-dev

RUN pip3 install psutil

RUN apt-get purge -y gcc python3-dev

{% if docker_dhcp_relay_whls.strip() %}
# Copy locally-built Python wheel dependencies
{{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }}

# Install locally-built Python wheel dependencies
{{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }}
{% endif %}
```

2. Because dnsmasq (used for ipv4 dhcp_server previously) exist in internal repo but not exist in public master repo, which would cause new added test case added by [sonic-net#16947](sonic-net#16947) in sonic-config-engine would fail. Also, we expect that dnsmasq is not running if "dhcp_server" feature is enabled.
So I **add support for new added test case** and **modify template to avoid run dnsmasq when dhcp_server feature is enabled** in below commit:
![image (2).png](https://dev.azure.com/msazure/b32aa71e-8ed2-41b2-9d77-5bc261222004/_apis/git/repositories/8721f84d-7905-4f85-b5f1-0e19e8eac66b/pullRequests/9025464/attachments/image%20%282%29.png)

Related work items: sonic-net#350, sonic-net#803, sonic-net#2858, sonic-net#16945, sonic-net#16996, sonic-net#17047, sonic-net#17053, sonic-net#17056, sonic-net#17057, sonic-net#17068
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan lguohan approved these changes

@jleveque jleveque jleveque approved these changes

Assignees
No one assigned
Labels
Submodule Update ⏫
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@stcheng @lguohan @jleveque @msftclas